kawagiri/TH1
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

修复攻击时序问题

Browse Source
This commit is contained in:
wuwenbo 2025-08-01 17:12:55 +08:00
parent c08698ab9d
commit 600b8d1b7d
11 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Unity/Assets/Resources/BT/AllTech.asset
View File

@ -18,7 +18,7 @@ MonoBehaviour:
_version: 3.33
_category:
_comments:
_translation: {x: -194.1828, y: -279.2578}
_zoomFactor: 0.68789506
_translation: {x: 1161, y: -247}
_zoomFactor: 0.5740126
_haltSerialization: 0
_externalSerializationFile: {fileID: 0}

4
Unity/Assets/Resources/BT/BT.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7a686a47eee2fa44cb0a34b5d86e4d5e, type: 3}
m_Name: BT
m_EditorClassIdentifier:
_serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"_position":{"x":498.9811,"y":132.3516},"$type":"NodeCanvas.BehaviourTrees.Selector","$id":"0"},{"_subTree":{"_value":1},"_tag":"\u9632\u5b88\u79d1\u6280","_position":{"x":-223.1669,"y":366.2295},"_comment":"","$type":"NodeCanvas.BehaviourTrees.SubTree","$id":"1"},{"_subTree":{"_value":2},"_tag":"\u57ce\u5e02","_position":{"x":-39.6286,"y":368.0934},"$type":"NodeCanvas.BehaviourTrees.SubTree","$id":"2"},{"_subTree":{"_value":3},"_tag":"\u53d1\u5c55\u79d1\u6280","_position":{"x":151.7755,"y":366.7513},"$type":"NodeCanvas.BehaviourTrees.SubTree","$id":"3"},{"_subTree":{"_value":4},"_tag":"\u81ea\u7531\u4eba","_position":{"x":332.4889,"y":366.5828},"$type":"NodeCanvas.BehaviourTrees.SubTree","$id":"4"},{"_subTree":{"_value":5},"_tag":"\u519b\u56e2","_position":{"x":507.5888,"y":365.6096},"$type":"NodeCanvas.BehaviourTrees.SubTree","$id":"5"},{"_subTree":{"_value":6},"_tag":"\u514b\u5236\u79d1\u6280","_position":{"x":698.7617,"y":369.8222},"$type":"NodeCanvas.BehaviourTrees.SubTree","$id":"6"},{"_subTree":{"_value":7},"_tag":"\u6361\u6f0f\u79d1\u6280\u53d1\u5c55","_position":{"x":914.2001,"y":368.6},"$type":"NodeCanvas.BehaviourTrees.SubTree","$id":"7"},{"_subTree":{"_value":8},"_position":{"x":1087.276,"y":365.9682},"$type":"NodeCanvas.BehaviourTrees.SubTree","$id":"8"},{"_action":{"nodeId":300,"$type":"NodeCanvas.Tasks.Actions.AIFinishAction"},"_tag":"<color=red>300</color>","_position":{"x":1251.001,"y":366.4711},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"9"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"9"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}'
_serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"_position":{"x":498.9811,"y":132.3516},"$type":"NodeCanvas.BehaviourTrees.Selector","$id":"0"},{"_subTree":{"_value":1},"_tag":"\u9632\u5b88\u79d1\u6280","_position":{"x":-223.1669,"y":365.2295},"_comment":"","$type":"NodeCanvas.BehaviourTrees.SubTree","$id":"1"},{"_subTree":{"_value":2},"_tag":"\u57ce\u5e02","_position":{"x":-39.6286,"y":368.0934},"$type":"NodeCanvas.BehaviourTrees.SubTree","$id":"2"},{"_subTree":{"_value":3},"_tag":"\u53d1\u5c55\u79d1\u6280","_position":{"x":151.7755,"y":366.7513},"$type":"NodeCanvas.BehaviourTrees.SubTree","$id":"3"},{"_subTree":{"_value":4},"_tag":"\u81ea\u7531\u4eba","_position":{"x":332.4889,"y":366.5828},"$type":"NodeCanvas.BehaviourTrees.SubTree","$id":"4"},{"_subTree":{"_value":5},"_tag":"\u519b\u56e2","_position":{"x":507.5888,"y":365.6096},"$type":"NodeCanvas.BehaviourTrees.SubTree","$id":"5"},{"_subTree":{"_value":6},"_tag":"\u514b\u5236\u79d1\u6280","_position":{"x":698.7617,"y":368.8217},"$type":"NodeCanvas.BehaviourTrees.SubTree","$id":"6"},{"_subTree":{"_value":7},"_tag":"\u6361\u6f0f\u79d1\u6280\u53d1\u5c55","_position":{"x":909.1974,"y":369.6005},"$type":"NodeCanvas.BehaviourTrees.SubTree","$id":"7"},{"_subTree":{"_value":8},"_position":{"x":1072.268,"y":367.9693},"$type":"NodeCanvas.BehaviourTrees.SubTree","$id":"8"},{"_action":{"nodeId":300,"$type":"NodeCanvas.Tasks.Actions.AIFinishAction"},"_tag":"<color=red>300</color>","_position":{"x":1244.998,"y":374.4753},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"9"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"9"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}'
_objectReferences:
- {fileID: 0}
- {fileID: 11400000, guid: 5c2d56f30f0281f4b89ebbbe5f2015e8, type: 2}
@ -27,7 +27,7 @@ MonoBehaviour:
_version: 3.33
_category:
_comments:
_translation: {x: 363, y: 488}
_translation: {x: 456, y: 79}
_zoomFactor: 1
_haltSerialization: 0
_externalSerializationFile: {fileID: 0}

6
Unity/Assets/Resources/BT/City.asset
View File

File diff suppressed because one or more lines are too long

6
Unity/Assets/Resources/BT/CityFinal.asset
View File

File diff suppressed because one or more lines are too long

4
Unity/Assets/Resources/BT/CommonTech.asset
View File

@ -18,7 +18,7 @@ MonoBehaviour:
_version: 3.33
_category:
_comments:
_translation: {x: 226.22678, y: -51.781044}
_zoomFactor: 0.7499281
_translation: {x: 14.338246, y: -283.33554}
_zoomFactor: 0.99983853
_haltSerialization: 0
_externalSerializationFile: {fileID: 0}

2
Unity/Assets/Resources/BT/DefendTech.asset
View File

@ -18,7 +18,7 @@ MonoBehaviour:
_version: 3.33
_category:
_comments:
_translation: {x: 4897, y: -402}
_translation: {x: 4817, y: -392}
_zoomFactor: 1
_haltSerialization: 0
_externalSerializationFile: {fileID: 0}

2
Unity/Assets/Resources/BT/DevelopmentTech.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7a686a47eee2fa44cb0a34b5d86e4d5e, type: 3}
m_Name: DevelopmentTech
m_EditorClassIdentifier:
_serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"_tag":"","_position":{"x":1123.901,"y":2478.447},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"0"},{"_action":{"MarkStr":"DevelopmentTech","CheckNotHave":true,"nodeId":72,"$type":"NodeCanvas.Tasks.Actions.MarkAction"},"_position":{"x":840.5993,"y":2699.115},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"1"},{"_tag":"","_position":{"x":1322.302,"y":2634.844},"$type":"NodeCanvas.BehaviourTrees.Selector","$id":"2"},{"_tag":"","_position":{"x":1200.942,"y":2743.915},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"3"},{"_condition":{"CountryStrategy":2,"$type":"NodeCanvas.Tasks.Actions.CountryStrategyCondition"},"_tag":"","_position":{"x":877.7873,"y":3058.272},"$type":"NodeCanvas.BehaviourTrees.ConditionNode","$id":"4"},{"_action":{"ActionTypes":[9],"nodeId":73,"$type":"NodeCanvas.Tasks.Actions.AIGeneratorAction"},"_tag":"","_position":{"x":1085.258,"y":3058.442},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"5"},{"_action":{"CalculateTypes":[34],"nodeId":74,"$type":"NodeCanvas.Tasks.Actions.AICalculateAction"},"_tag":"","_position":{"x":1239.123,"y":3046.497},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"6"},{"_action":{"nodeId":75,"$type":"NodeCanvas.Tasks.Actions.AIExecuteAction"},"_tag":"","_position":{"x":1528.575,"y":3045.925},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"7"},{"_action":{"MarkStr":"DevelopmentTech","nodeId":76,"$type":"NodeCanvas.Tasks.Actions.MarkAction"},"_position":{"x":1475.873,"y":2751.671},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"8"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}'
_serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"_tag":"","_position":{"x":1123.901,"y":2478.447},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"0"},{"_action":{"MarkStr":"DevelopmentTech","CheckNotHave":true,"nodeId":72,"$type":"NodeCanvas.Tasks.Actions.MarkAction"},"_tag":"<color=red>72</color>","_position":{"x":840.5993,"y":2699.115},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"1"},{"_tag":"","_position":{"x":1322.302,"y":2634.844},"$type":"NodeCanvas.BehaviourTrees.Selector","$id":"2"},{"_tag":"","_position":{"x":1200.942,"y":2743.915},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"3"},{"_condition":{"CountryStrategy":2,"$type":"NodeCanvas.Tasks.Actions.CountryStrategyCondition"},"_tag":"","_position":{"x":877.7873,"y":3058.272},"$type":"NodeCanvas.BehaviourTrees.ConditionNode","$id":"4"},{"_action":{"ActionTypes":[9],"nodeId":73,"$type":"NodeCanvas.Tasks.Actions.AIGeneratorAction"},"_tag":"<color=red>73</color>","_position":{"x":1085.258,"y":3058.442},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"5"},{"_action":{"CalculateTypes":[34],"nodeId":74,"$type":"NodeCanvas.Tasks.Actions.AICalculateAction"},"_tag":"<color=red>74</color>","_position":{"x":1239.123,"y":3046.497},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"6"},{"_action":{"nodeId":75,"$type":"NodeCanvas.Tasks.Actions.AIExecuteAction"},"_tag":"<color=red>75</color>","_position":{"x":1528.575,"y":3045.925},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"7"},{"_action":{"MarkStr":"DevelopmentTech","nodeId":76,"$type":"NodeCanvas.Tasks.Actions.MarkAction"},"_tag":"<color=red>76</color>","_position":{"x":1475.873,"y":2751.671},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"8"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}'
_objectReferences: []
_graphSource:
_version: 3.33

4
Unity/Assets/Resources/BT/Legion.asset
View File

@ -18,7 +18,7 @@ MonoBehaviour:
_version: 3.33
_category:
_comments:
_translation: {x: -1647.5687, y: 444.97247}
_zoomFactor: 0.37475988
_translation: {x: -1198, y: 401}
_zoomFactor: 0.25009006
_haltSerialization: 0
_externalSerializationFile: {fileID: 0}

6
Unity/Assets/Resources/BT/Unit.asset
View File

File diff suppressed because one or more lines are too long

1
Unity/Assets/Scripts/BTNodeCanvas/AIExcuteAction.cs
View File

@ -35,7 +35,6 @@ namespace NodeCanvas.Tasks.Actions
data.value.MaxAiAction.Param.MapData = data.value.Map;
data.value.MaxAiAction.Param.RefreshParams();
data.value.MaxAiAction.CheckIsActionInPlayerSight();
data.value.MaxAiAction.CheckIsActionDuration();
if (data.value.MaxAiAction.IsInSight)
data.value.MaxAiAction.ActionLogic.CameraControl(data.value.MaxAiAction.Param);
EndAction(true);

3
Unity/Assets/Scripts/Logic/AI/AILogic.cs
View File

@ -10,6 +10,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using Logic.Action;
using Logic.CrashSight;
using Logic.Timeline;
using NodeCanvas.BehaviourTrees;
using NodeCanvas.Framework;
using UnityEngine;
@ -135,7 +136,9 @@ namespace Logic.AI
else
{
_data.MaxAiAction.ActionLogic.Execute(_data.MaxAiAction.Param, !_data.MaxAiAction.IsInSight);
_data.MaxAiAction.CheckIsActionDuration();
_targetTime = Time.time + _data.MaxAiAction.Duration;
MainEditor.Instance.OnActionExcuted();
_data.MaxAiAction = null;
AILogicState = AILogicState.Pausing;