DESKTOP-PG06IH1\Mr.AB 1 rok pred
rodič
commit
bf4d405c48

+ 34 - 13
ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow.atlas.txt

@@ -1,39 +1,60 @@
 demon_arrow.png
-size:303,517
+size:404,526
 filter:Linear,Linear
 pma:true
 scale:0.9
 X
-bounds:136,59,23,20
+bounds:66,179,23,20
+rotate:90
 arm1
-bounds:229,349,63,166
+bounds:2,10,63,166
+offsets:0,1,63,167
+arm1_blue
+bounds:67,11,63,166
 offsets:0,1,63,167
 body
-bounds:226,235,71,112
+bounds:234,2,71,112
+offsets:0,0,72,113
+rotate:90
+body_blue
+bounds:311,248,71,112
 offsets:0,0,72,113
 eye1
-bounds:247,101,54,64
+bounds:348,40,54,64
 offsets:3,4,60,72
 face2
-bounds:164,40,123,81
+bounds:145,217,123,81
+rotate:90
+face2_blue
+bounds:228,237,123,81
 rotate:90
 hair
-bounds:2,169,62,346
+bounds:2,178,62,346
 hand
-bounds:226,167,69,66
+bounds:322,177,69,66
 offsets:1,1,71,67
+rotate:90
+hand_blue
+bounds:322,106,69,66
+offsets:1,1,71,67
+rotate:90
 head2
-bounds:66,353,161,162
+bounds:226,362,161,162
 offsets:1,1,163,163
 leg1
-bounds:66,169,100,182
+bounds:124,342,100,182
+offsets:0,0,100,183
+leg1_blue
+bounds:132,20,100,182
 offsets:0,0,100,183
 wing
-bounds:2,81,160,86
+bounds:234,75,160,86
 offsets:0,0,161,86
+rotate:90
 x_bow
-bounds:168,165,186,56
+bounds:66,338,186,56
 offsets:1,1,188,58
 rotate:90
 x_bow1
-bounds:2,2,132,77
+bounds:66,204,132,77
+rotate:90

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow.json


BIN
ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow.png


+ 86 - 0
ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow_Controller.controller

@@ -484,6 +484,92 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events: []
+--- !u!74 &-3542623208674112379
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: weak
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - 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_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:
+    - serializedVersion: 2
+      path: 0
+      attribute: 1341452863
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 2.6667
+    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: []
 --- !u!1102 &-1749174710585307993
 AnimatorState:
   serializedVersion: 6

+ 34 - 11
ActionTowerDefense/Assets/Resources/Spine/demon_giant/demon_diant.atlas.txt

@@ -1,37 +1,60 @@
 demon_diant.png
-size:1547,676
+size:1949,815
 filter:Linear,Linear
 pma:true
 scale:0.9
 Hammer
-bounds:2,218,456,950
+bounds:2,357,456,950
 rotate:90
 L_arm
-bounds:2,26,190,492
+bounds:1387,190,190,492
+offsets:0,0,191,492
+rotate:90
+L_arm_blue
+bounds:2,165,190,492
 offsets:0,0,191,492
 rotate:90
 L_leg
-bounds:759,55,139,161
+bounds:161,2,139,161
+L_leg_blue
+bounds:302,2,139,161
 R_arm
-bounds:954,4,237,310
+bounds:496,45,237,310
+offsets:1,2,239,313
+R_arm_blue
+bounds:906,14,237,310
 offsets:1,2,239,313
 rotate:90
 R_forearm
-bounds:496,47,169,261
+bounds:735,94,169,261
+R_forearm_blue
+bounds:1381,19,169,261
 rotate:90
 body
-bounds:954,243,560,431
+bounds:954,253,560,431
+rotate:90
+body_blue
+bounds:1387,382,560,431
 crotch
-bounds:1266,26,77,56
+bounds:1881,303,77,56
 offsets:1,1,79,59
+rotate:90
 eyes
-bounds:1429,2,87,99
+bounds:735,5,87,99
 offsets:4,4,95,107
 rotate:90
 forearm
-bounds:1266,84,161,157
+bounds:1218,94,161,157
 offsets:1,0,162,158
+forearm_blue
+bounds:2,2,161,157
+offsets:1,0,162,158
+rotate:90
 head
-bounds:1429,91,150,116
+bounds:1644,38,150,116
+offsets:1,0,152,117
+rotate:90
+head_blue
+bounds:1762,38,150,116
 offsets:1,0,152,117
 rotate:90

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
ActionTowerDefense/Assets/Resources/Spine/demon_giant/demon_diant.json


BIN
ActionTowerDefense/Assets/Resources/Spine/demon_giant/demon_diant.png


+ 2 - 2
ActionTowerDefense/Assets/Resources/Spine/demon_giant/demon_diant_Controller.controller

@@ -499,7 +499,7 @@ AnimationClip:
         inWeight: 0
         outWeight: 0
       - serializedVersion: 3
-        time: 1.3333
+        time: 2
         value: 0
         inSlope: 0
         outSlope: 0
@@ -535,7 +535,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 1.3333
+    m_StopTime: 2
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

+ 28 - 13
ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword.atlas.txt

@@ -1,36 +1,51 @@
 demon_sword.png
-size:319,510
+size:785,271
 filter:Linear,Linear
 pma:true
 scale:0.9
 X
-bounds:208,6,23,20
+bounds:68,40,23,20
 rotate:90
 arm1
-bounds:181,156,63,166
+bounds:509,103,63,166
+offsets:0,1,63,167
+arm1_blue
+bounds:574,103,63,166
 offsets:0,1,63,167
 blade_0004
-bounds:2,2,204,131
+bounds:2,65,204,131
 offsets:20,11,230,230
+rotate:90
 body
-bounds:246,210,71,112
+bounds:639,157,71,112
+offsets:0,0,72,113
+body_blue
+bounds:712,157,71,112
 offsets:0,0,72,113
 eye1
-bounds:249,373,54,64
+bounds:2,9,54,64
 offsets:3,4,60,72
-face
-bounds:208,31,123,81
 rotate:90
+face
+bounds:135,2,123,81
+face_blue
+bounds:260,2,123,81
 hand
-bounds:249,439,69,66
+bounds:639,89,69,66
+offsets:1,1,71,67
+hand_blue
+bounds:710,89,69,66
 offsets:1,1,71,67
-rotate:90
 head1
-bounds:79,324,168,184
+bounds:135,85,168,184
 offsets:1,2,170,187
 leg1
-bounds:79,140,100,182
+bounds:305,87,100,182
+offsets:0,0,100,183
+leg1_blue
+bounds:407,87,100,182
 offsets:0,0,100,183
 sword
-bounds:2,135,75,373
+bounds:385,10,75,373
 offsets:0,0,77,373
+rotate:90

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword.json


BIN
ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword.png


+ 86 - 0
ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword_Controller.controller

@@ -52,6 +52,92 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!74 &-5791269459727520420
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: weak
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - 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
+        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_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:
+    - serializedVersion: 2
+      path: 0
+      attribute: 1341452863
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 2
+    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: []
 --- !u!74 &-5571899726282846508
 AnimationClip:
   m_ObjectHideFlags: 0

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov