diff --git a/Assets/GWConquest/Animations/BattleUnitIconCooldown.anim b/Assets/GWConquest/Animations/BattleUnitIconCooldown.anim index d418c3b..ffe797e 100644 --- a/Assets/GWConquest/Animations/BattleUnitIconCooldown.anim +++ b/Assets/GWConquest/Animations/BattleUnitIconCooldown.anim @@ -22,7 +22,26 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.2784314 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Image (2) + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.27843 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -31,7 +50,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.5 - value: 0.05490196 + value: 0.054902 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -40,7 +59,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3 - value: 0.2784314 + value: 0.27843 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -50,28 +69,9 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Color.a - path: Image/UnitSprite - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Image (2) - classID: 1 + attribute: m_Alpha + path: Image + classID: 225 script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 @@ -81,13 +81,6 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: - - serializedVersion: 2 - path: 83635035 - attribute: 304273561 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - typeID: 114 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 2409291885 attribute: 2086281974 @@ -95,6 +88,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 83635035 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -122,7 +122,26 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.2784314 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Image (2) + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.27843 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -131,7 +150,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.5 - value: 0.05490196 + value: 0.054902 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -140,7 +159,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3 - value: 0.2784314 + value: 0.27843 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -150,28 +169,9 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Color.a - path: Image/UnitSprite - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Image (2) - classID: 1 + attribute: m_Alpha + path: Image + classID: 225 script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 diff --git a/Assets/GWConquest/Animations/BattleUnitIconMoving.anim b/Assets/GWConquest/Animations/BattleUnitIconMoving.anim index 76b1c76..eb4b640 100644 --- a/Assets/GWConquest/Animations/BattleUnitIconMoving.anim +++ b/Assets/GWConquest/Animations/BattleUnitIconMoving.anim @@ -60,7 +60,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -68,8 +68,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 - value: 1 + time: 0.8333333 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -77,17 +77,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.0333333 - value: 0 - inSlope: 0 - outSlope: 0 + time: 1.25 + value: 0.5 + inSlope: 0.011764975 + outSlope: 0.011764975 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1.5 - value: 0 + value: 0.5019608 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -95,17 +95,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.9666667 - value: 0 - inSlope: 0 - outSlope: 0 + time: 1.75 + value: 0.5 + inSlope: -0.011764883 + outSlope: -0.011764883 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.5 - value: 1 + time: 2.1666667 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -114,7 +114,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -125,7 +125,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.a - path: Image/UnitSprite + path: MovingIcon classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -133,7 +133,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -141,8 +141,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8333333 - value: 0 + time: 0.5 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -150,17 +150,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.25 - value: 0.5 - inSlope: 0.011764975 - outSlope: 0.011764975 + time: 1.0333333 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1.5 - value: 0.5019608 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -168,17 +168,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.75 - value: 0.5 - inSlope: -0.011764883 - outSlope: -0.011764883 + time: 1.9666667 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.1666667 - value: 0 + time: 2.5 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -187,7 +187,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -197,10 +197,10 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Color.a - path: MovingIcon - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + attribute: m_Alpha + path: Image + classID: 225 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -224,17 +224,17 @@ AnimationClip: customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 4179961175 + path: 2181801916 attribute: 304273561 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} typeID: 114 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 2181801916 - attribute: 304273561 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - typeID: 114 + path: 83635035 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 customType: 0 isPPtrCurve: 0 pptrCurveMapping: [] @@ -302,7 +302,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -310,8 +310,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 - value: 1 + time: 0.8333333 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -319,17 +319,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.0333333 - value: 0 - inSlope: 0 - outSlope: 0 + time: 1.25 + value: 0.5 + inSlope: 0.011764975 + outSlope: 0.011764975 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1.5 - value: 0 + value: 0.5019608 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -337,17 +337,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.9666667 - value: 0 - inSlope: 0 - outSlope: 0 + time: 1.75 + value: 0.5 + inSlope: -0.011764883 + outSlope: -0.011764883 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.5 - value: 1 + time: 2.1666667 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -356,7 +356,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -367,7 +367,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.a - path: Image/UnitSprite + path: MovingIcon classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -375,7 +375,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -383,8 +383,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8333333 - value: 0 + time: 0.5 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -392,17 +392,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.25 - value: 0.5 - inSlope: 0.011764975 - outSlope: 0.011764975 + time: 1.0333333 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1.5 - value: 0.5019608 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -410,17 +410,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.75 - value: 0.5 - inSlope: -0.011764883 - outSlope: -0.011764883 + time: 1.9666667 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.1666667 - value: 0 + time: 2.5 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -429,7 +429,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -439,10 +439,10 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Color.a - path: MovingIcon - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + attribute: m_Alpha + path: Image + classID: 225 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/GWConquest/Animations/BattleUnitIconVisible.anim b/Assets/GWConquest/Animations/BattleUnitIconVisible.anim index d1c8c90..c931832 100644 --- a/Assets/GWConquest/Animations/BattleUnitIconVisible.anim +++ b/Assets/GWConquest/Animations/BattleUnitIconVisible.anim @@ -55,6 +55,63 @@ AnimationClip: path: HiddenSprite classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Image/UnitSprite (1) + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Image/UnitSprite (2) + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Image/UnitSprite + classID: 114 + script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -77,6 +134,27 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1997132267 + attribute: 3305885265 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 24 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1545896488 + attribute: 3305885265 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 24 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 4179961175 + attribute: 3305885265 + script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + typeID: 114 + customType: 24 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -137,6 +215,63 @@ AnimationClip: path: HiddenSprite classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Image/UnitSprite (1) + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Image/UnitSprite (2) + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Image/UnitSprite + classID: 114 + script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/GWConquest/Animations/ExplosionDeath.anim b/Assets/GWConquest/Animations/ExplosionDeath.anim index e701686..5ebb696 100644 --- a/Assets/GWConquest/Animations/ExplosionDeath.anim +++ b/Assets/GWConquest/Animations/ExplosionDeath.anim @@ -145,43 +145,6 @@ AnimationClip: path: Image/UnitSprite classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.a - path: Image/UnitSprite - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: serializedVersion: 2 m_Curve: @@ -377,6 +340,43 @@ AnimationClip: path: EffectImage classID: 224 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.4 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: Image + classID: 225 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -488,13 +488,6 @@ AnimationClip: typeID: 114 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 4179961175 - attribute: 304273561 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - typeID: 114 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 2763502510 attribute: 304273561 @@ -509,6 +502,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 83635035 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 1327555438 attribute: 2015549526 @@ -720,43 +720,6 @@ AnimationClip: path: Image/UnitSprite classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.a - path: Image/UnitSprite - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: serializedVersion: 2 m_Curve: @@ -1009,6 +972,43 @@ AnimationClip: path: EffectImage classID: 224 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.4 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: Image + classID: 225 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/GWConquest/Animations/UnitDeath.anim b/Assets/GWConquest/Animations/UnitDeath.anim index e1967b1..0976534 100644 --- a/Assets/GWConquest/Animations/UnitDeath.anim +++ b/Assets/GWConquest/Animations/UnitDeath.anim @@ -218,43 +218,6 @@ AnimationClip: path: Image/UnitSprite classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.a - path: Image/UnitSprite - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: serializedVersion: 2 m_Curve: @@ -440,6 +403,43 @@ AnimationClip: path: Image (1) classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.4 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: Image + classID: 225 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -497,13 +497,6 @@ AnimationClip: typeID: 114 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 4179961175 - attribute: 304273561 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - typeID: 114 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 172550804 attribute: 1574349066 @@ -518,6 +511,13 @@ AnimationClip: typeID: 114 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 83635035 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 1327555438 attribute: 2015549526 @@ -865,43 +865,6 @@ AnimationClip: path: Image/UnitSprite classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.a - path: Image/UnitSprite - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: serializedVersion: 2 m_Curve: @@ -1087,6 +1050,43 @@ AnimationClip: path: Image (1) classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.4 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: Image + classID: 225 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/GWConquest/Animations/UnitHidden.anim b/Assets/GWConquest/Animations/UnitHidden.anim index d124271..6fc9616 100644 --- a/Assets/GWConquest/Animations/UnitHidden.anim +++ b/Assets/GWConquest/Animations/UnitHidden.anim @@ -55,6 +55,63 @@ AnimationClip: path: Image/UnitSprite classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Image/UnitSprite + classID: 114 + script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Image/UnitSprite (2) + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Image/UnitSprite (1) + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -77,6 +134,27 @@ AnimationClip: typeID: 114 customType: 24 isPPtrCurve: 0 + - serializedVersion: 2 + path: 4179961175 + attribute: 3305885265 + script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + typeID: 114 + customType: 24 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1545896488 + attribute: 3305885265 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 24 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1997132267 + attribute: 3305885265 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 24 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -137,6 +215,63 @@ AnimationClip: path: Image/UnitSprite classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Image/UnitSprite + classID: 114 + script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Image/UnitSprite (2) + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Image/UnitSprite (1) + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/GWConquest/Animations/UnitRevealed.anim b/Assets/GWConquest/Animations/UnitRevealed.anim index e1b7165..576a99b 100644 --- a/Assets/GWConquest/Animations/UnitRevealed.anim +++ b/Assets/GWConquest/Animations/UnitRevealed.anim @@ -218,52 +218,6 @@ AnimationClip: path: Image/UnitSprite classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3833333 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.75 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.8833333 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.a - path: Image/UnitSprite - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: serializedVersion: 2 m_Curve: @@ -496,6 +450,100 @@ AnimationClip: path: HiddenSprite classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3833333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.75 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: Image + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Image/UnitSprite (1) + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Image/UnitSprite (2) + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Image/UnitSprite + classID: 114 + script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} m_PPtrCurves: - curve: - time: 0 @@ -532,13 +580,6 @@ AnimationClip: typeID: 114 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 4179961175 - attribute: 304273561 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - typeID: 114 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 2763502510 attribute: 2526845255 @@ -588,6 +629,34 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 83635035 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1997132267 + attribute: 3305885265 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 24 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1545896488 + attribute: 3305885265 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 24 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 4179961175 + attribute: 3305885265 + script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + typeID: 114 + customType: 24 + isPPtrCurve: 0 - serializedVersion: 2 path: 1327555438 attribute: 2015549526 @@ -935,52 +1004,6 @@ AnimationClip: path: Image/UnitSprite classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3833333 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.75 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.8833333 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.a - path: Image/UnitSprite - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: serializedVersion: 2 m_Curve: @@ -1213,6 +1236,100 @@ AnimationClip: path: HiddenSprite classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3833333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.75 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Alpha + path: Image + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Image/UnitSprite (1) + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Image/UnitSprite (2) + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Image/UnitSprite + classID: 114 + script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/GWConquest/Prefabs/UI/BattleUnitIcon.prefab b/Assets/GWConquest/Prefabs/UI/BattleUnitIcon.prefab index 90b0d0d..cc67046 100644 --- a/Assets/GWConquest/Prefabs/UI/BattleUnitIcon.prefab +++ b/Assets/GWConquest/Prefabs/UI/BattleUnitIcon.prefab @@ -161,6 +161,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 634451363950775190} + - component: {fileID: 6876257253298647874} + - component: {fileID: 9059160273793771577} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -191,6 +193,32 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -12, y: -12} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6876257253298647874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1162488441138915787} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: -2, y: -2, z: -2, w: -2} + m_Softness: {x: 0, y: 0} +--- !u!225 &9059160273793771577 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1162488441138915787} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &1619096849984119122 GameObject: m_ObjectHideFlags: 0 @@ -900,7 +928,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &968728054296979172 RectTransform: m_ObjectHideFlags: 0 @@ -1005,7 +1033,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3613406984414568876 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs b/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs index 3510ad5..84f5159 100644 --- a/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs +++ b/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs @@ -74,6 +74,7 @@ namespace GWConquest { private void Awake() { Animator = GetComponent(); + SetUnitSpriteActive(false); } public void OnRemove() @@ -93,7 +94,6 @@ namespace GWConquest { foreach(var img in AdditionalImages) { img.sprite = Unit.Class.Sprite; - img.gameObject.SetActive(true); } if(!DebugUI.ShowHiddenUnits && Unit.Player != Player.CurrentPlayer && Unit.RevealState == RevealState.ClassHidden) { @@ -105,22 +105,27 @@ namespace GWConquest { isRevealed = true; } - IconImage.gameObject.SetActive(true); + SetUnitSpriteActive(true); GetComponent().SetBool("IsSpace", Unit.Class.ZoneType == ZoneType.Space); } else { IconImage.sprite = null; - IconImage.gameObject.SetActive(false); - foreach(var img in AdditionalImages) - { - img.gameObject.SetActive(false); - } + SetUnitSpriteActive(false); } ImageTransform = IconImage.GetComponent(); } + private void SetUnitSpriteActive(bool active) + { + IconImage.gameObject.SetActive(active); + foreach(var img in AdditionalImages) + { + img.gameObject.SetActive(active); + } + } + public void OnClick(){ var battleUI = GetComponentInParent(); if(!battleUI.SelectingTarget && Unit != null) @@ -188,7 +193,7 @@ namespace GWConquest { ShieldsBar.gameObject.SetActive(false); } - IconImage.gameObject.SetActive(true); + SetUnitSpriteActive(true); } else { HealthBarGO.SetActive(false); @@ -224,7 +229,7 @@ namespace GWConquest { else { HealthBarGO.SetActive(false); ShieldEffect.SetActive(false); - IconImage.gameObject.SetActive(false); + SetUnitSpriteActive(false); GetComponent().SetBool("StatusIcon", false); }