DESKTOP-PG06IH1\Mr.AB 6 өдөр өмнө
parent
commit
d0189c3f08

+ 1 - 1
ActionTowerDefense/Assets/Resources/Prefab/ESpirits/ESpirits_ArmoredSamurai.prefab

@@ -1067,7 +1067,7 @@ MonoBehaviour:
       endType: 1
       endType: 1
       endKeyName: attack_off
       endKeyName: attack_off
       endKeyTime: 0.43333337
       endKeyTime: 0.43333337
-    totalTime: 1.5000001
+    totalTime: 2
   keyTimes: []
   keyTimes: []
   attackTime: 0
   attackTime: 0
   attackKeyCount: 0
   attackKeyCount: 0

+ 63 - 44
ActionTowerDefense/Assets/Resources/Spine/Boss_umbrella/Boss_braid.atlas.txt

@@ -3,111 +3,130 @@ size:1024,1024
 filter:Linear,Linear
 filter:Linear,Linear
 pma:true
 pma:true
 arm1
 arm1
-bounds:736,871,20,67
+bounds:736,866,20,67
 offsets:3,8,25,83
 offsets:3,8,25,83
 rotate:90
 rotate:90
 arm2
 arm2
-bounds:2,8,27,97
+bounds:811,897,27,97
 offsets:4,2,35,101
 offsets:4,2,35,101
 rotate:90
 rotate:90
 body
 body
-bounds:431,606,58,133
-offsets:5,8,67,149
+bounds:431,599,59,135
+offsets:4,7,67,149
 braid
 braid
-bounds:573,821,177,48
-offsets:11,9,199,61
+bounds:573,812,180,52
+offsets:10,6,199,61
 braid_body
 braid_body
-bounds:431,893,32,373
-offsets:4,22,40,417
+bounds:431,888,36,378
+offsets:2,21,40,417
 rotate:90
 rotate:90
 braid_head
 braid_head
-bounds:2,37,87,207
-offsets:7,13,100,233
+bounds:2,38,90,208
+offsets:5,12,100,233
 rotate:90
 rotate:90
 braid_slash
 braid_slash
-bounds:2,126,256,254
+bounds:2,130,256,254
 offsets:0,0,256,256
 offsets:0,0,256,256
+bullet_shurikan
+bounds:413,393,199,42
+rotate:90
+bullet_shurikan_back
+bounds:673,736,30,19
+rotate:90
 cloth2
 cloth2
-bounds:431,927,42,476
-offsets:3,10,48,494
+bounds:431,926,44,478
+offsets:2,9,48,494
 rotate:90
 rotate:90
 cloth3
 cloth3
-bounds:431,971,46,534
-offsets:4,14,55,555
+bounds:431,972,49,542
+offsets:3,7,55,555
 rotate:90
 rotate:90
 cover
 cover
-bounds:2,382,409,206
+bounds:2,386,409,206
 offsets:24,12,457,230
 offsets:24,12,457,230
+ear
+bounds:212,22,50,106
+offsets:1,0,51,106
 eye
 eye
-bounds:260,128,10,37
+bounds:264,27,10,37
 offsets:2,1,13,40
 offsets:2,1,13,40
 rotate:90
 rotate:90
 eye_bow
 eye_bow
-bounds:381,172,17,10
+bounds:378,113,17,10
 offsets:1,1,19,12
 offsets:1,1,19,12
+rotate:90
 face
 face
-bounds:491,644,95,86
+bounds:492,639,95,86
 offsets:6,7,108,99
 offsets:6,7,108,99
 rotate:90
 rotate:90
 fu1
 fu1
-bounds:967,973,44,50
-offsets:4,4,51,58
-rotate:90
+bounds:755,809,48,55
+offsets:3,3,51,58
 fu2
 fu2
-bounds:101,10,25,62
-offsets:2,4,29,70
+bounds:2,10,26,66
+offsets:2,3,29,70
 rotate:90
 rotate:90
 hair
 hair
-bounds:260,184,196,140
-offsets:18,15,231,169
+bounds:260,184,200,142
+offsets:17,14,231,169
 rotate:90
 rotate:90
 hair_back
 hair_back
-bounds:431,741,140,128
+bounds:431,736,140,128
 offsets:15,22,166,165
 offsets:15,22,166,165
 hair_dai
 hair_dai
-bounds:573,755,64,91
+bounds:264,39,64,91
 offsets:6,6,76,103
 offsets:6,6,76,103
-rotate:90
 hair_face
 hair_face
-bounds:491,597,45,73
-offsets:4,5,52,83
+bounds:492,591,46,75
+offsets:3,4,52,83
 rotate:90
 rotate:90
 hair_face2
 hair_face2
-bounds:211,41,46,83
-offsets:4,6,54,95
+bounds:626,650,48,84
+offsets:3,7,54,95
 hand1
 hand1
-bounds:909,932,37,45
+bounds:694,773,37,45
 offsets:3,3,42,50
 offsets:3,3,42,50
 rotate:90
 rotate:90
 leg1
 leg1
-bounds:806,897,28,97
-offsets:8,12,44,121
+bounds:573,736,30,98
+offsets:7,12,44,121
 rotate:90
 rotate:90
 leg2
 leg2
-bounds:260,140,42,119
+bounds:573,768,42,119
 offsets:5,5,52,130
 offsets:5,5,52,130
 rotate:90
 rotate:90
+rope_1
+bounds:580,640,94,44
+rotate:90
+rope_2
+bounds:330,26,104,46
+rotate:90
+rope_3
+bounds:260,132,117,50
 tatoon
 tatoon
-bounds:413,538,14,50
+bounds:379,132,14,50
 offsets:3,2,18,54
 offsets:3,2,18,54
 unmbraller_bone1
 unmbraller_bone1
-bounds:431,871,20,303
+bounds:431,866,20,303
 offsets:6,15,32,333
 offsets:6,15,32,333
 rotate:90
 rotate:90
 unmbraller_bone2
 unmbraller_bone2
-bounds:666,775,76,44
-offsets:5,7,86,52
+bounds:911,927,68,43
+offsets:10,7,86,52
 unmbraller_face
 unmbraller_face
-bounds:2,590,427,427
+bounds:2,594,427,427
 offsets:19,20,465,468
 offsets:19,20,465,468
 unmbraller_head
 unmbraller_head
-bounds:752,821,46,48
+bounds:975,973,46,48
 offsets:3,3,52,54
 offsets:3,3,52,54
 
 
 Boss_braid_2.png
 Boss_braid_2.png
-size:256,256
+size:512,512
 filter:Linear,Linear
 filter:Linear,Linear
 pma:true
 pma:true
+light/braid_slash
+bounds:2,220,256,254
+offsets:0,0,256,256
 light/light
 light/light
 bounds:2,2,216,216
 bounds:2,2,216,216
 offsets:20,20,256,256
 offsets:20,20,256,256

BIN
ActionTowerDefense/Assets/Resources/Spine/Boss_umbrella/Boss_braid.png


BIN
ActionTowerDefense/Assets/Resources/Spine/Boss_umbrella/Boss_braid.skel.bytes


BIN
ActionTowerDefense/Assets/Resources/Spine/Boss_umbrella/Boss_braid_2.png


+ 4 - 2
ActionTowerDefense/Assets/Resources/Spine/Boss_umbrella/Boss_braid_SkeletonData.asset

@@ -18,11 +18,13 @@ MonoBehaviour:
   skeletonJSON: {fileID: 4900000, guid: 66273cf60128f7c418ac82fc4f7ce33c, type: 3}
   skeletonJSON: {fileID: 4900000, guid: 66273cf60128f7c418ac82fc4f7ce33c, type: 3}
   isUpgradingBlendModeMaterials: 0
   isUpgradingBlendModeMaterials: 0
   blendModeMaterials:
   blendModeMaterials:
-    requiresBlendModeMaterials: 0
+    requiresBlendModeMaterials: 1
     applyAdditiveMaterial: 1
     applyAdditiveMaterial: 1
     additiveMaterials: []
     additiveMaterials: []
     multiplyMaterials: []
     multiplyMaterials: []
-    screenMaterials: []
+    screenMaterials:
+    - pageName: Boss_braid_2.png
+      material: {fileID: 2100000, guid: d5957745dfd63644d85e47b7942a0da7, type: 2}
   skeletonDataModifiers: []
   skeletonDataModifiers: []
   fromAnimation: []
   fromAnimation: []
   toAnimation: []
   toAnimation: []

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 1858 - 20
ActionTowerDefense/Assets/Resources/Spine/Boss_umbrella/Boss_braid_SkeletonData_Controller.controller


BIN
ActionTowerDefense/Assets/Resources/Spine/ESpirits_Sumrai/ESpirits_Sumrai.skel.bytes


+ 2 - 2
ActionTowerDefense/Assets/Resources/Spine/ESpirits_Sumrai/ESpirits_Sumrai_Controller.controller

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

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно