Explorar el Código

修改状态字体看不见的bug

SZAND\msx_2 hace 6 meses
padre
commit
33ac007079

+ 2 - 4
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1001.prefab

@@ -288,7 +288,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 1
   canFly: 0
-  statePre: {fileID: 664503451345505760, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+  statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
   ls: {fileID: 0}
   isInSoulTower: 0
   beLarger: 0
@@ -617,8 +617,6 @@ MonoBehaviour:
   rb: {fileID: 0}
   haveGravity: 1
   trigGroundList: []
-  myBaGuaTrigger: {fileID: 0}
-  baGuaTrigger: []
 --- !u!1 &3381575400802596466
 GameObject:
   m_ObjectHideFlags: 0
@@ -923,9 +921,9 @@ MonoBehaviour:
   freezeFrame: 0
   isFreeze: 0
   canFreeze: 0
+  curCharacterState: 0
   hitStunTime: 0
   canHitStun: 0
-  characterState: 0
 --- !u!1 &6164447163453378808
 GameObject:
   m_ObjectHideFlags: 0

+ 2 - 4
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1002.prefab

@@ -288,7 +288,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 1
   canFly: 0
-  statePre: {fileID: 664503451345505760, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+  statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
   ls: {fileID: 0}
   isInSoulTower: 0
   beLarger: 0
@@ -617,8 +617,6 @@ MonoBehaviour:
   rb: {fileID: 0}
   haveGravity: 1
   trigGroundList: []
-  myBaGuaTrigger: {fileID: 0}
-  baGuaTrigger: []
 --- !u!1 &3381575400802596466
 GameObject:
   m_ObjectHideFlags: 0
@@ -923,9 +921,9 @@ MonoBehaviour:
   freezeFrame: 0
   isFreeze: 0
   canFreeze: 0
+  curCharacterState: 0
   hitStunTime: 0
   canHitStun: 0
-  characterState: 0
 --- !u!1 &6164447163453378808
 GameObject:
   m_ObjectHideFlags: 0

+ 117 - 4
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1003.prefab

@@ -269,9 +269,9 @@ MonoBehaviour:
   freezeFrame: 0
   isFreeze: 0
   canFreeze: 0
+  curCharacterState: 0
   hitStunTime: 0
   canHitStun: 0
-  characterState: 0
 --- !u!1 &4480734502875862885
 GameObject:
   m_ObjectHideFlags: 0
@@ -494,8 +494,6 @@ MonoBehaviour:
   rb: {fileID: 0}
   haveGravity: 1
   trigGroundList: []
-  myBaGuaTrigger: {fileID: 0}
-  baGuaTrigger: []
 --- !u!1 &5440846222648032759
 GameObject:
   m_ObjectHideFlags: 0
@@ -530,6 +528,7 @@ Transform:
   - {fileID: 6459001683917408033}
   - {fileID: 770599430276839403}
   - {fileID: 3103190932458336017}
+  - {fileID: 7164054200076138051}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -575,7 +574,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 1
   canFly: 0
-  statePre: {fileID: 664503451345505760, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+  statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
   ls: {fileID: 0}
   isInSoulTower: 0
   beLarger: 0
@@ -1346,3 +1345,117 @@ MonoBehaviour:
   m_BlockingMask:
     serializedVersion: 2
     m_Bits: 4294967295
+--- !u!1001 &4646637656625338383
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 5440846222648032754}
+    m_Modifications:
+    - target: {fileID: 664503451345505760, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_Name
+      value: State
+      objectReference: {fileID: 0}
+    - target: {fileID: 2528763506941341260, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 3712194136713465915, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_SortingOrder
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -4.78
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 2.1719794
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5211133053390361366, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9026216715105469786, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+--- !u!4 &7164054200076138051 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2528763506941341260, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+  m_PrefabInstance: {fileID: 4646637656625338383}
+  m_PrefabAsset: {fileID: 0}

+ 2 - 4
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1004.prefab

@@ -267,9 +267,9 @@ MonoBehaviour:
   freezeFrame: 0
   isFreeze: 0
   canFreeze: 0
+  curCharacterState: 0
   hitStunTime: 0
   canHitStun: 0
-  characterState: 0
 --- !u!1 &1637528673901708253
 GameObject:
   m_ObjectHideFlags: 0
@@ -1108,8 +1108,6 @@ MonoBehaviour:
   rb: {fileID: 0}
   haveGravity: 1
   trigGroundList: []
-  myBaGuaTrigger: {fileID: 0}
-  baGuaTrigger: []
 --- !u!1 &8639832132491289359
 GameObject:
   m_ObjectHideFlags: 0
@@ -1189,7 +1187,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 1
   canFly: 1
-  statePre: {fileID: 664503451345505760, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+  statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
   ls: {fileID: 0}
   isInSoulTower: 0
   beLarger: 0

+ 2 - 4
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1005.prefab

@@ -267,9 +267,9 @@ MonoBehaviour:
   freezeFrame: 0
   isFreeze: 0
   canFreeze: 0
+  curCharacterState: 0
   hitStunTime: 0
   canHitStun: 0
-  characterState: 0
 --- !u!1 &1637528673901708253
 GameObject:
   m_ObjectHideFlags: 0
@@ -1108,8 +1108,6 @@ MonoBehaviour:
   rb: {fileID: 0}
   haveGravity: 1
   trigGroundList: []
-  myBaGuaTrigger: {fileID: 0}
-  baGuaTrigger: []
 --- !u!1 &8639832132491289359
 GameObject:
   m_ObjectHideFlags: 0
@@ -1189,7 +1187,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 1
   canFly: 1
-  statePre: {fileID: 664503451345505760, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+  statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
   ls: {fileID: 0}
   isInSoulTower: 0
   beLarger: 0

+ 2 - 4
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1006.prefab

@@ -288,7 +288,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 1
   canFly: 0
-  statePre: {fileID: 664503451345505760, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+  statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
   ls: {fileID: 0}
   isInSoulTower: 0
   beLarger: 0
@@ -617,8 +617,6 @@ MonoBehaviour:
   rb: {fileID: 0}
   haveGravity: 1
   trigGroundList: []
-  myBaGuaTrigger: {fileID: 0}
-  baGuaTrigger: []
 --- !u!1 &3381575400802596466
 GameObject:
   m_ObjectHideFlags: 0
@@ -923,9 +921,9 @@ MonoBehaviour:
   freezeFrame: 0
   isFreeze: 0
   canFreeze: 0
+  curCharacterState: 0
   hitStunTime: 0
   canHitStun: 0
-  characterState: 0
 --- !u!1 &6164447163453378808
 GameObject:
   m_ObjectHideFlags: 0

+ 2 - 2
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1007.prefab

@@ -209,9 +209,9 @@ MonoBehaviour:
   freezeFrame: 0
   isFreeze: 0
   canFreeze: 0
+  curCharacterState: 0
   hitStunTime: 0
   canHitStun: 0
-  characterState: 0
 --- !u!114 &7039260392684945265
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1187,7 +1187,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 1
   canFly: 1
-  statePre: {fileID: 664503451345505760, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+  statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
   ls: {fileID: 0}
   isInSoulTower: 0
   beLarger: 0

+ 7 - 11
ActionTowerDefense/Assets/Resources/Prefab/FX/InjuryNum.prefab

@@ -34,6 +34,7 @@ RectTransform:
   m_Children:
   - {fileID: 8776407069468589577}
   m_Father: {fileID: 5535641789940809310}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -57,9 +58,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 25
-  m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 1516060329
   m_SortingOrder: 10
   m_TargetDisplay: 0
@@ -102,10 +101,10 @@ MonoBehaviour:
   m_BlockingObjects: 0
   m_BlockingMask:
     serializedVersion: 2
-    m_Bits: 4294967295
+    m_Bits: 6291455
 --- !u!95 &2733015194565802992
 Animator:
-  serializedVersion: 7
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -119,12 +118,10 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &6467251191553420251
 GameObject:
   m_ObjectHideFlags: 0
@@ -149,7 +146,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6467251191553420251}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -157,6 +153,7 @@ Transform:
   m_Children:
   - {fileID: 628417829899537910}
   m_Father: {fileID: 0}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2075992615353979807
 MonoBehaviour:
@@ -204,6 +201,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 628417829899537910}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -281,17 +279,15 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 0
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
-  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
-  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0

+ 146 - 114
ActionTowerDefense/Assets/Resources/Prefab/FX/State.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &125323372448996681
+--- !u!1 &3572002781091887612
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,29 +8,162 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 52885029862508044}
-  - component: {fileID: 7122153731883727379}
-  - component: {fileID: 5140750648809699322}
+  - component: {fileID: 2913273066787468669}
+  - component: {fileID: 7262369446806873204}
+  - component: {fileID: 1736136917563236017}
+  - component: {fileID: 5790823170315115973}
   m_Layer: 5
-  m_Name: state
+  m_Name: Canvas
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &52885029862508044
+--- !u!224 &2913273066787468669
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 125323372448996681}
+  m_GameObject: {fileID: 3572002781091887612}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.5}
+  m_LocalScale: {x: 1.09125, y: 1.09125, z: 1.09125}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 598656166424958890}
+  m_Father: {fileID: 2528763506941341260}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 1.27}
+  m_SizeDelta: {x: 10, y: 10}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &7262369446806873204
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3572002781091887612}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 25
+  m_SortingLayerID: 1516060329
+  m_SortingOrder: 10
+  m_TargetDisplay: 0
+--- !u!114 &1736136917563236017
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3572002781091887612}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 1
+--- !u!114 &5790823170315115973
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3572002781091887612}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 6291455
+--- !u!1 &4272231268506418309
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2528763506941341260}
+  m_Layer: 0
+  m_Name: State
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2528763506941341260
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4272231268506418309}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2913273066787468669}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7813536448118523970
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 598656166424958890}
+  - component: {fileID: 1743591398513417855}
+  - component: {fileID: 7725129542750687400}
+  m_Layer: 5
+  m_Name: Text (TMP)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &598656166424958890
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7813536448118523970}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.024999999, y: 0.024999999, z: 0.024999999}
+  m_ConstrainProportionsScale: 1
   m_Children: []
-  m_Father: {fileID: 5211133053390361366}
+  m_Father: {fileID: 2913273066787468669}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -38,21 +171,21 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7122153731883727379
+--- !u!222 &1743591398513417855
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 125323372448996681}
+  m_GameObject: {fileID: 7813536448118523970}
   m_CullTransparentMesh: 1
---- !u!114 &5140750648809699322
+--- !u!114 &7725129542750687400
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 125323372448996681}
+  m_GameObject: {fileID: 7813536448118523970}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
@@ -66,7 +199,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u7729\u6655"
+  m_text: "\u7684"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 39a7404a24ab897418249c0d649949a8, type: 2}
   m_sharedMaterial: {fileID: -1504297583073342176, guid: 39a7404a24ab897418249c0d649949a8, type: 2}
@@ -135,104 +268,3 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &664503451345505760
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5211133053390361366}
-  - component: {fileID: 3712194136713465915}
-  - component: {fileID: 9026216715105469786}
-  - component: {fileID: 1764315810963999005}
-  m_Layer: 5
-  m_Name: State
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5211133053390361366
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 664503451345505760}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: -0.025, y: 0.025, z: 0.025}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 52885029862508044}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -0.269989, y: 1.9199982}
-  m_SizeDelta: {x: 10, y: 10}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!223 &3712194136713465915
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 664503451345505760}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 25
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!114 &9026216715105469786
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 664503451345505760}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 1
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
---- !u!114 &1764315810963999005
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 664503451345505760}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 6291455

+ 2 - 2
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Arrow.prefab

@@ -167,9 +167,9 @@ MonoBehaviour:
   freezeFrame: 0
   isFreeze: 0
   canFreeze: 0
+  curCharacterState: 0
   hitStunTime: 0
   canHitStun: 0
-  characterState: 0
 --- !u!1 &1637528673901708253
 GameObject:
   m_ObjectHideFlags: 0
@@ -1187,7 +1187,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 0
   canFly: 1
-  statePre: {fileID: 664503451345505760, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+  statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
   ls: {fileID: 0}
   isInSoulTower: 0
   beLarger: 0

+ 2 - 2
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant.prefab

@@ -211,9 +211,9 @@ MonoBehaviour:
   freezeFrame: 0
   isFreeze: 0
   canFreeze: 0
+  curCharacterState: 0
   hitStunTime: 0
   canHitStun: 0
-  characterState: 0
 --- !u!114 &2652897828757319036
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -574,7 +574,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 0
   canFly: 0
-  statePre: {fileID: 664503451345505760, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+  statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
   ls: {fileID: 0}
   isInSoulTower: 0
   beLarger: 0

+ 2 - 2
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Sword.prefab

@@ -205,7 +205,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 0
   canFly: 0
-  statePre: {fileID: 664503451345505760, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+  statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
   ls: {fileID: 0}
   isInSoulTower: 0
   beLarger: 0
@@ -1368,9 +1368,9 @@ MonoBehaviour:
   freezeFrame: 0
   isFreeze: 0
   canFreeze: 0
+  curCharacterState: 0
   hitStunTime: 0
   canHitStun: 0
-  characterState: 0
 --- !u!114 &458493600764543102
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 1 - 1
ActionTowerDefense/Assets/Scripts/Characters/Character.cs

@@ -260,7 +260,7 @@ public class Character : MonoBehaviour
     {
         if (curStateObj == null)
         {
-            curStateObj = Instantiate(statePre, bodyTrans);
+            curStateObj = Instantiate(statePre, transform);
             stateText = curStateObj.GetComponentInChildren<TextMeshProUGUI>();
         }
         if (curStateObj.activeSelf)

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 147 - 95
ActionTowerDefense/Assets/TextMesh Pro/Resources/Fonts & Materials/AaErMoXingShu-2 SDF.asset


Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio