SZAND\msx_2 пре 6 месеци
родитељ
комит
1806fc1dbd

+ 115 - 24
ActionTowerDefense/Assets/Resources/Prefab/Conduct/Demonic_BigGiant.prefab

@@ -97,6 +97,28 @@ MonoBehaviour:
   isSingleAttack: 0
   cantSingleAttack: 0
   trigedObjs: []
+  attackInfo:
+    damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    attackEffect: 
+    floatState:
+      time: 0
+    blowUp:
+      dir: {x: 0, y: 0, z: 0}
+      force: 0
+      time: 0
+    shotDown:
+      dir: {x: 0, y: 0, z: 0}
+      force: 0
+      time: 0
+    stun:
+      time: 0
+    armor:
+      rate: 0
+    changeDamage:
+      rate: 0
+    sustainedInjury:
+      damage: 0
   damage: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
@@ -498,17 +520,19 @@ MonoBehaviour:
   outlineMats: []
   outline1Mats: []
   foot: {fileID: 5440846222604650418}
+  attributeStatus: {fileID: 0}
   extraRiseGravity: -28.8
   extraFallGravity: -14.4
   canMove: 1
   moveSpeed: 2
+  flyHeight: 0
+  flyUpSpeed: 10
   totalBeRepelValue: 1000
   beRepelValue: 0
   weakTime: 0
   totalWeakTime: 5
   newTotalWeakTime: 0
   weakHitRate: 2
-  weakForce: {x: 0, y: 0, z: 0}
   easyToGetHit: 0.2
   isDamageReduction: 0
   reductionDegree: 0
@@ -544,12 +568,10 @@ MonoBehaviour:
   playerID: 0
   id: 0
   costMp: 75
-  totalSummonTime: 0.5
   isBack: 0
-  flyHeight: 0
-  flyUpSpeed: 10
   baseSortingOrder: 100
   runSpeed: 0
+  summonTime: 0
   isReturnSoulTower: 0
   origSoulPos: {x: 0, y: 0, z: 0}
   isRecorded: 0
@@ -559,14 +581,13 @@ MonoBehaviour:
   maxAttackDis: 0
   minAttackDis: 0
   needToChange: 0
+  curAttackID: 0
   adsorbSpeed: 0
   adsorbTarget: {x: 0, y: 0, z: 0}
   effectPrefab: {fileID: 0}
   dropSoulMax: 3
   dropSoulMin: 1
   dropSoulAngle: 60
-  upFirstAfterWeaknessOrNot: 0
-  isBeBlownUp: 0
   stageSize:
   - 1.5
   - 2
@@ -615,16 +636,35 @@ MonoBehaviour:
   nextEndKeyTime: 0
   curKeyNum: 0
   attackType: 0
+  curDamage: 0
   canHitFly: 1
   armorPiercing: 0
   attackInfo:
     damage: 0
     attackDir: {x: 0, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
+    attackEffect: 
+    floatState:
+      time: 0
+    blowUp:
+      dir: {x: 0, y: 0, z: 0}
+      force: 0
+      time: 0
+    shotDown:
+      dir: {x: 0, y: 0, z: 0}
+      force: 0
+      time: 0
+    stun:
+      time: 0
+    armor:
+      rate: 0
+    changeDamage:
+      rate: 0
+    sustainedInjury:
+      damage: 0
   addAttackEffect: {fileID: 0}
-  curDamage: 0
+  skill: {fileID: 0}
+  attackEffect: {fileID: 0}
+  effect: {fileID: 0}
   attackTrigger: {fileID: 7729941002223262554}
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
@@ -633,7 +673,6 @@ MonoBehaviour:
   shootAlwaysTrack: 0
   targetTypes: 040000000500000006000000
   beTargetCharacter: []
-  getDistanceOffset: 0
   attackMethod:
   - id: 0
     attackName: "\u8D77\u624B\u5F0F\u6376\u5730"
@@ -642,9 +681,25 @@ MonoBehaviour:
     attackInfo:
       damage: 50
       attackDir: {x: 0, y: 0, z: 0}
-      force: 0
-      changeHurt: 0
-      repelValue: 0
+      attackEffect: 
+      floatState:
+        time: 0
+      blowUp:
+        dir: {x: 0, y: 0, z: 0}
+        force: 0
+        time: 0
+      shotDown:
+        dir: {x: 0, y: 0, z: 0}
+        force: 0
+        time: 0
+      stun:
+        time: 0
+      armor:
+        rate: 0
+      changeDamage:
+        rate: 0
+      sustainedInjury:
+        damage: 0
     attackTrigger: {fileID: 7729941002223262554}
     targetTypes: 040000000500000006000000
     canHitFly: 1
@@ -653,7 +708,8 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
-    curDamage: 0
+    skillPrefab: {fileID: 0}
+    skill: {fileID: 0}
   - id: 1
     attackName: "\u884C\u519B\u5F0F\u6376\u5730"
     attackType: 0
@@ -661,10 +717,26 @@ MonoBehaviour:
     attackInfo:
       damage: 50
       attackDir: {x: 0, y: 0, z: 0}
-      force: 0
-      changeHurt: 0
-      repelValue: 0
-    attackTrigger: {fileID: 0}
+      attackEffect: 
+      floatState:
+        time: 0
+      blowUp:
+        dir: {x: 0, y: 0, z: 0}
+        force: 0
+        time: 0
+      shotDown:
+        dir: {x: 0, y: 0, z: 0}
+        force: 0
+        time: 0
+      stun:
+        time: 0
+      armor:
+        rate: 0
+      changeDamage:
+        rate: 0
+      sustainedInjury:
+        damage: 0
+    attackTrigger: {fileID: 7729941002223262554}
     targetTypes: 040000000500000006000000
     canHitFly: 1
     armorPiercing: 0
@@ -672,7 +744,8 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
-    curDamage: 0
+    skillPrefab: {fileID: 0}
+    skill: {fileID: 0}
   curAttackMethod:
     id: 0
     attackName: 
@@ -681,9 +754,25 @@ MonoBehaviour:
     attackInfo:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
-      force: 0
-      changeHurt: 0
-      repelValue: 0
+      attackEffect: 
+      floatState:
+        time: 0
+      blowUp:
+        dir: {x: 0, y: 0, z: 0}
+        force: 0
+        time: 0
+      shotDown:
+        dir: {x: 0, y: 0, z: 0}
+        force: 0
+        time: 0
+      stun:
+        time: 0
+      armor:
+        rate: 0
+      changeDamage:
+        rate: 0
+      sustainedInjury:
+        damage: 0
     attackTrigger: {fileID: 0}
     targetTypes: 
     canHitFly: 0
@@ -692,7 +781,8 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
-    curDamage: 0
+    skillPrefab: {fileID: 0}
+    skill: {fileID: 0}
 --- !u!1 &6139679835290116115
 GameObject:
   m_ObjectHideFlags: 0
@@ -868,6 +958,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   imgHp: {fileID: 891910447640254832}
+  pc: {fileID: 0}
 --- !u!1 &7208291223413765209
 GameObject:
   m_ObjectHideFlags: 0

+ 4 - 2
ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -183,6 +183,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   imgHp: {fileID: 51013470}
+  pc: {fileID: 0}
 --- !u!1 &1969773272
 GameObject:
   m_ObjectHideFlags: 0
@@ -1427,8 +1428,8 @@ MonoBehaviour:
   translator:
     autoReset: 1
     useCustomMixMode: 1
-    layerMixModes: 01000000
-    layerBlendModes: 01000000
+    layerMixModes: 010000000100000001000000
+    layerBlendModes: 010000000200000002000000
   updateTiming: 1
 --- !u!1 &5569876744729591823
 GameObject:
@@ -1632,6 +1633,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   imgHp: {fileID: 7367632414814067470}
+  pc: {fileID: 0}
 --- !u!1 &6798833300103051034
 GameObject:
   m_ObjectHideFlags: 0

+ 23 - 5
ActionTowerDefense/Assets/Resources/Prefab/Skills/multiShotArrow.prefab

@@ -149,16 +149,34 @@ MonoBehaviour:
   canStop: 0
   stopTime: 1.5
   owner: {fileID: 0}
+  attackInfo:
+    damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    attackEffect: 
+    floatState:
+      time: 0
+    blowUp:
+      dir: {x: 0, y: 0, z: 0}
+      force: 0
+      time: 0
+    shotDown:
+      dir: {x: 0, y: 0, z: 0}
+      force: 0
+      time: 0
+    stun:
+      time: 0
+    armor:
+      rate: 0
+    changeDamage:
+      rate: 0
+    sustainedInjury:
+      damage: 0
   rb: {fileID: 0}
   trigedObjs: []
-  damage: 0
-  force: 0
-  changeHurt: 0
-  repelValue: 0
   bulletType: 1
   isGetTarget: 0
   speed: 10
-  maxFlyTime: 2
+  maxFlyTime: 5
   flyTime: 0
   isTrack: 0
   canAlwaysTrack: 0

+ 135 - 0
ActionTowerDefense/Assets/Resources/Spine/Player01/player01_Controller.controller

@@ -551,6 +551,28 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1107 &-6374771397057241012
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: scale1
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 6362910963293582869}
+    m_Position: {x: 389.36255, y: 93.73837, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 6362910963293582869}
 --- !u!74 &-6275172737193922551
 AnimationClip:
   m_ObjectHideFlags: 0
@@ -742,6 +764,32 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &-4583417261382784084
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: scale10
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 71d6f8655bef28741a0cfef59137bb6d, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &-4370475405230803441
 AnimatorState:
   serializedVersion: 6
@@ -1346,6 +1394,30 @@ AnimatorController:
     m_Behaviours: []
     m_BlendingMode: 0
     m_SyncedLayerIndex: -1
+    m_DefaultWeight: 1
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+  - serializedVersion: 5
+    m_Name: scale1
+    m_StateMachine: {fileID: -6374771397057241012}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 1
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+  - serializedVersion: 5
+    m_Name: scale10
+    m_StateMachine: {fileID: 8209892245514719656}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
     m_DefaultWeight: 0
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
@@ -1738,6 +1810,47 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events: []
+--- !u!1102 &6362910963293582869
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: scale1
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 40a9f112ca0a3cd4b95aab26a6c1b6a2, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!206 &7131689805988816564
+BlendTree:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BlendTree
+  m_Childs: []
+  m_BlendParameter: Blend
+  m_BlendParameterY: Blend
+  m_MinThreshold: 0
+  m_MaxThreshold: 1
+  m_UseAutomaticThresholds: 1
+  m_NormalizedBlendValues: 0
+  m_BlendType: 0
 --- !u!74 &7933751664992966251
 AnimationClip:
   m_ObjectHideFlags: 1
@@ -1874,6 +1987,28 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1107 &8209892245514719656
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: scale10
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -4583417261382784084}
+    m_Position: {x: 420.55872, y: 87.499176, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -4583417261382784084}
 --- !u!1102 &9220035916879395579
 AnimatorState:
   serializedVersion: 6

+ 53 - 0
ActionTowerDefense/Assets/Resources/Spine/Player01/scale1.anim

@@ -0,0 +1,53 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: scale1
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

+ 8 - 0
ActionTowerDefense/Assets/Resources/Spine/Player01/scale1.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 40a9f112ca0a3cd4b95aab26a6c1b6a2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 53 - 0
ActionTowerDefense/Assets/Resources/Spine/Player01/scale10.anim

@@ -0,0 +1,53 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: scale10
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

+ 8 - 0
ActionTowerDefense/Assets/Resources/Spine/Player01/scale10.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 71d6f8655bef28741a0cfef59137bb6d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 49 - 2
ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow_Controller.controller

@@ -619,7 +619,35 @@ AnimationClip:
     m_KeepOriginalPositionXZ: 0
     m_HeightFromFeet: 0
     m_Mirror: 0
-  m_EditorCurves: []
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 2.6667
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: dummy
+    path: 
+    classID: 1
+    script: {fileID: 0}
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
@@ -822,7 +850,26 @@ AnimationClip:
     m_KeepOriginalPositionXZ: 0
     m_HeightFromFeet: 0
     m_Mirror: 0
-  m_EditorCurves: []
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: dummy
+    path: 
+    classID: 1
+    script: {fileID: 0}
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0

+ 2 - 0
ActionTowerDefense/Assets/Scenes/Game.unity

@@ -30935,6 +30935,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   imgHp: {fileID: 2035765039200662796}
+  pc: {fileID: 0}
 --- !u!114 &2035765039221954014
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -31647,6 +31648,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   imgHp: {fileID: 8826891585155877212}
+  pc: {fileID: 0}
 --- !u!114 &8826891585155877212
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 1 - 0
ActionTowerDefense/Assets/Scripts/Characters/PlayerController.cs

@@ -365,6 +365,7 @@ public class PlayerController : MoveCharacter
         base.Init();
         uiHp = GameManager.instance.p1uiHP;
         uiMp = GameManager.instance.p1uiMP;
+        uiMp.pc = this;
         mp = totalMp;
         uiMp.Show(mp, totalMp);
         demonicNums = new TextMeshProUGUI[3];

+ 12 - 1
ActionTowerDefense/Assets/Scripts/UIHP.cs

@@ -6,13 +6,24 @@ using UnityEngine.UI;
 public class UIHP : MonoBehaviour
 {
     public Image imgHp;
+    [HideInInspector]
+    public PlayerController pc;
+    
     public void Show(int hp, int totalHp)
     {
         imgHp.fillAmount = (float)hp / (float)totalHp;
     }
 
+    //À¶ºÄרÊô
     public void Show(float hp, float totalHp)
     {
-        imgHp.fillAmount = hp / totalHp;
+        float ratio = hp / totalHp;
+        imgHp.fillAmount = ratio;
+        ChangeHairSize(ratio);
+    }
+
+    private void ChangeHairSize(float ratio)
+    {
+        pc.ani.SetLayerWeight(2, ratio);
     }
 }

+ 2 - 2
ActionTowerDefense/Assets/Spine/Runtime/spine-csharp/Slot.cs

@@ -175,8 +175,8 @@ namespace Spine {
 			}
 		}
 
-		/// <summary>Sets this slot to the setup pose.</summary>
-		public void SetToSetupPose () {
+        /// <summary>Sets this slot to the setup pose.</summary>
+        public void SetToSetupPose () {
 			r = data.r;
 			g = data.g;
 			b = data.b;