Merge remote-tracking branch 'origin/master' into MapXiaoXiong

2024-10-23 14:37:17 +08:00
parent b3d2fdf760 d48401607d
commit e2ed62ddea
110 changed files with 75341 additions and 5220 deletions
--- a/Assets/GameRes/AutoSource/enemyai/enemyFsm_a.asset
+++ b/Assets/GameRes/AutoSource/enemyai/enemyFsm_a.asset
@@ -135,7 +135,9 @@ MonoBehaviour:
      height: 40
    defaultState: 0
    name: Runawary
-    StateScripts: []
+    StateScripts:
+    - className: Game.Component.EnemyFSM_AI.Runaway
+      guid: c272ad5978c64a97b2d8208f16e9cac6
    parents: []
    isSubStateMachine: 0
    isBuildInState: 0
--- a/Assets/GameRes/AutoSource/enemyai/enemyFsm_b.asset
+++ b/Assets/GameRes/AutoSource/enemyai/enemyFsm_b.asset
@@ -14,8 +14,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  viewPosition: {x: 232, y: 290, z: 0}
  viewScale: {x: 0.65751624, y: 0.65751624, z: 1}
-  Layers:
-  - Active
+  Layers: []
  originGUID: 
  states:
  - rect:
@@ -136,7 +135,9 @@ MonoBehaviour:
      height: 40
    defaultState: 0
    name: Runawary
-    StateScripts: []
+    StateScripts:
+    - className: Game.Component.EnemyFSM_AI.Runaway
+      guid: c272ad5978c64a97b2d8208f16e9cac6
    parents: []
    isSubStateMachine: 0
    isBuildInState: 0
--- a/Assets/GameRes/AutoSource/enemyai/enemyFsm_c.asset
+++ b/Assets/GameRes/AutoSource/enemyai/enemyFsm_c.asset
@@ -14,8 +14,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  viewPosition: {x: 232, y: 290, z: 0}
  viewScale: {x: 0.65751624, y: 0.65751624, z: 1}
-  Layers:
-  - Active
+  Layers: []
  originGUID: 
  states:
  - rect:
@@ -136,7 +135,9 @@ MonoBehaviour:
      height: 40
    defaultState: 0
    name: Runawary
-    StateScripts: []
+    StateScripts:
+    - className: Game.Component.EnemyFSM_AI.Runaway
+      guid: c272ad5978c64a97b2d8208f16e9cac6
    parents: []
    isSubStateMachine: 0
    isBuildInState: 0
--- a/Assets/GameRes/AutoSource/enemyai/enemyFsm_witch.asset
+++ b/Assets/GameRes/AutoSource/enemyai/enemyFsm_witch.asset
@@ -135,7 +135,9 @@ MonoBehaviour:
      height: 40
    defaultState: 0
    name: Runawary
-    StateScripts: []
+    StateScripts:
+    - className: Game.Component.EnemyFSM_AI.Runaway
+      guid: c272ad5978c64a97b2d8208f16e9cac6
    parents: []
    isSubStateMachine: 0
    isBuildInState: 0