DESKTOP-PG06IH1\Mr.AB 1 år sedan
förälder
incheckning
eb7e2fcc50

+ 6 - 7
ActionTowerDefense/Assets/Resources/Prefab/Demonic_Giant.prefab

@@ -96,7 +96,6 @@ MonoBehaviour:
   damage: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
-  hurtTime: 0
   repelValue: 0
 --- !u!1 &2460330936527559963
 GameObject:
@@ -443,16 +442,14 @@ MonoBehaviour:
   attack1Infos:
   - damage: 10
     attackDir: {x: -2, y: 1, z: 0}
-    force: 30000
+    force: 100
     changeHurt: 1
-    hurtTime: 3
     repelValue: 31
   attack2Infos:
   - damage: 10
     attackDir: {x: -1, y: 0, z: 0}
-    force: 10000
+    force: 100
     changeHurt: 0
-    hurtTime: 3
     repelValue: 31
   attackTriggers:
   - {fileID: 7729941002223262554}
@@ -469,7 +466,6 @@ MonoBehaviour:
   searchTrigger: {fileID: 2932762729738363159}
   targetTypes: 0400000005000000
   canHitFly: 0
-  hurtKeepTime: 0
   foot: {fileID: 5440846222604650418}
   extraRiseGravity: -28.8
   extraFallGravity: -14.4
@@ -480,6 +476,9 @@ MonoBehaviour:
   totalWeakTime: 10
   weakUpSpeed: 10
   decelerationRatio: 1
+  minHurtKeepTime: 0.2
+  hurtKeepTime: 0
+  hurtChangeVelocity: 1
   id: 0
   costMp: 150
   searchState: 0
@@ -493,7 +492,7 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5440846222648032759}
   serializedVersion: 2
-  m_Mass: 500
+  m_Mass: 100
   m_Drag: 0
   m_AngularDrag: 0.05
   m_UseGravity: 1

+ 6 - 7
ActionTowerDefense/Assets/Resources/Prefab/Enemy_Arrow.prefab

@@ -979,26 +979,22 @@ MonoBehaviour:
     attackDir: {x: -1, y: 0, z: 0}
     force: 1000
     changeHurt: 1
-    hurtTime: 0
     repelValue: 0
   - damage: 10
     attackDir: {x: -1, y: 0, z: 0}
     force: 1000
     changeHurt: 1
-    hurtTime: 0
     repelValue: 0
   - damage: 10
     attackDir: {x: -1, y: 0, z: 0}
     force: 1000
     changeHurt: 1
-    hurtTime: 0
     repelValue: 0
   attack2Infos:
   - damage: 10
     attackDir: {x: -1, y: 0, z: 0}
     force: 1000
     changeHurt: 0
-    hurtTime: 0
     repelValue: 0
   attackTriggers: []
   attackType: 1
@@ -1017,7 +1013,6 @@ MonoBehaviour:
   searchTrigger: {fileID: 3566347593191160092}
   targetTypes: 010000000300000002000000
   canHitFly: 1
-  hurtKeepTime: 0
   foot: {fileID: 8639832132450015562}
   extraRiseGravity: -28.8
   extraFallGravity: -14.4
@@ -1027,6 +1022,10 @@ MonoBehaviour:
   weakTime: 0
   totalWeakTime: 10
   weakUpSpeed: 10
+  decelerationRatio: 1
+  minHurtKeepTime: 0.2
+  hurtKeepTime: 0
+  hurtChangeVelocity: 1
   id: 0
   jumpSpeed: 10
   searchState: 0
@@ -1035,9 +1034,9 @@ MonoBehaviour:
   attackRatio: 0
   maxMoveSpeed: 15
   minMoveSpeed: 10
-  dropSoul: 3
+  dropSoul: 1
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
-  soulStartSpeed: 8
+  soulStartSpeed: 0
   dropSoulAngle: 30
 --- !u!54 &8639832132491289349
 Rigidbody:

+ 10 - 11
ActionTowerDefense/Assets/Resources/Prefab/Enemy_Giant.prefab

@@ -96,7 +96,6 @@ MonoBehaviour:
   damage: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
-  hurtTime: 0
   repelValue: 0
 --- !u!1 &2460330936527559963
 GameObject:
@@ -441,18 +440,16 @@ MonoBehaviour:
   totalHp: 100
   hp: 0
   attack1Infos:
-  - damage: 30
+  - damage: 10
     attackDir: {x: -1, y: 0, z: 0}
-    force: 1000
+    force: 100
     changeHurt: 1
-    hurtTime: 0
     repelValue: 0
   attack2Infos:
-  - damage: 30
+  - damage: 10
     attackDir: {x: -1, y: 0, z: 0}
-    force: 1000
+    force: 100
     changeHurt: 0
-    hurtTime: 0
     repelValue: 0
   attackTriggers:
   - {fileID: 7729941002223262554}
@@ -469,7 +466,6 @@ MonoBehaviour:
   searchTrigger: {fileID: 2932762729738363159}
   targetTypes: 010000000200000003000000
   canHitFly: 0
-  hurtKeepTime: 0
   foot: {fileID: 5440846222604650418}
   extraRiseGravity: -28.8
   extraFallGravity: -14.4
@@ -480,6 +476,9 @@ MonoBehaviour:
   totalWeakTime: 10
   weakUpSpeed: 10
   decelerationRatio: 5
+  minHurtKeepTime: 0.2
+  hurtKeepTime: 0
+  hurtChangeVelocity: 1
   id: 0
   jumpSpeed: 10
   searchState: 0
@@ -488,9 +487,9 @@ MonoBehaviour:
   attackRatio: 0
   maxMoveSpeed: 2
   minMoveSpeed: 1
-  dropSoul: 10
+  dropSoul: 3
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
-  soulStartSpeed: 12
+  soulStartSpeed: 0
   dropSoulAngle: 30
 --- !u!54 &5440846222648032765
 Rigidbody:
@@ -500,7 +499,7 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5440846222648032759}
   serializedVersion: 2
-  m_Mass: 40
+  m_Mass: 100
   m_Drag: 0
   m_AngularDrag: 0.05
   m_UseGravity: 1

+ 10 - 10
ActionTowerDefense/Assets/Resources/Prefab/Enemy_Sword.prefab

@@ -170,7 +170,6 @@ MonoBehaviour:
   damage: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
-  hurtTime: 0
   repelValue: 0
 --- !u!1 &2437299196472462361
 GameObject:
@@ -238,16 +237,14 @@ MonoBehaviour:
   attack1Infos:
   - damage: 30
     attackDir: {x: -1, y: 0, z: 0}
-    force: 50
+    force: 1000
     changeHurt: 1
-    hurtTime: 0
     repelValue: 0
   attack2Infos:
   - damage: 30
     attackDir: {x: -1, y: 0, z: 0}
-    force: 50
-    changeHurt: 0
-    hurtTime: 0
+    force: 1000
+    changeHurt: 1
     repelValue: 0
   attackTriggers:
   - {fileID: 2280520615464243483}
@@ -264,7 +261,6 @@ MonoBehaviour:
   searchTrigger: {fileID: 428784489592146076}
   targetTypes: 010000000300000002000000
   canHitFly: 0
-  hurtKeepTime: 0
   foot: {fileID: 2437299196663985756}
   extraRiseGravity: -28.8
   extraFallGravity: -14.4
@@ -274,6 +270,10 @@ MonoBehaviour:
   weakTime: 0
   totalWeakTime: 10
   weakUpSpeed: 10
+  decelerationRatio: 1
+  minHurtKeepTime: 0.2
+  hurtKeepTime: 0
+  hurtChangeVelocity: 1
   id: 0
   jumpSpeed: 9
   searchState: 0
@@ -282,9 +282,9 @@ MonoBehaviour:
   attackRatio: 0
   maxMoveSpeed: 12
   minMoveSpeed: 8
-  dropSoul: 5
+  dropSoul: 1
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
-  soulStartSpeed: 10
+  soulStartSpeed: 0
   dropSoulAngle: 30
 --- !u!54 &2437299196472462355
 Rigidbody:
@@ -294,7 +294,7 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2437299196472462361}
   serializedVersion: 2
-  m_Mass: 20
+  m_Mass: 10
   m_Drag: 0
   m_AngularDrag: 0.05
   m_UseGravity: 1

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
ActionTowerDefense/Assets/Resources/Spine/demon_giant/demon_diant.json


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

@@ -59,7 +59,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: attack_march
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -145,7 +145,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: idle
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -231,7 +231,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: hitted
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -308,7 +308,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: attack_summon
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -394,7 +394,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: walk
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -502,7 +502,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: weak
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -614,7 +614,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: die
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1

+ 14 - 9
ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword.atlas.txt

@@ -1,5 +1,5 @@
 demon_sword.png
-size:785,271
+size:945,271
 filter:Linear,Linear
 pma:true
 scale:0.9
@@ -7,21 +7,24 @@ X
 bounds:68,40,23,20
 rotate:90
 arm1
-bounds:509,103,63,166
+bounds:749,28,63,166
 offsets:0,1,63,167
+rotate:90
 arm1_blue
-bounds:574,103,63,166
+bounds:880,103,63,166
 offsets:0,1,63,167
 blade_0004
 bounds:2,65,204,131
 offsets:20,11,230,230
 rotate:90
 body
-bounds:639,157,71,112
+bounds:385,14,71,112
 offsets:0,0,72,113
+rotate:90
 body_blue
-bounds:712,157,71,112
+bounds:499,14,71,112
 offsets:0,0,72,113
+rotate:90
 eye1
 bounds:2,9,54,64
 offsets:3,4,60,72
@@ -31,11 +34,13 @@ bounds:135,2,123,81
 face_blue
 bounds:260,2,123,81
 hand
-bounds:639,89,69,66
+bounds:613,22,69,66
 offsets:1,1,71,67
+rotate:90
 hand_blue
-bounds:710,89,69,66
+bounds:681,22,69,66
 offsets:1,1,71,67
+rotate:90
 head1
 bounds:135,85,168,184
 offsets:1,2,170,187
@@ -46,6 +51,6 @@ leg1_blue
 bounds:407,87,100,182
 offsets:0,0,100,183
 sword
-bounds:385,10,75,373
-offsets:0,0,77,373
+bounds:509,93,176,369
+offsets:0,0,177,369
 rotate:90

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword.json


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


+ 95 - 9
ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword_Controller.controller

@@ -1,5 +1,91 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!74 &-8331072301632061642
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: walk2
+  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: 1.3333
+        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: 1.3333
+    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 &-7526092193057868662
 AnimatorState:
   serializedVersion: 6
@@ -59,7 +145,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: weak
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -145,7 +231,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: attack_summon
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -271,7 +357,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: walk
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -294,7 +380,7 @@ AnimationClip:
         inWeight: 0
         outWeight: 0
       - serializedVersion: 3
-        time: 1.3333
+        time: 0.6667
         value: 0
         inSlope: 0
         outSlope: 0
@@ -330,7 +416,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 1.3333
+    m_StopTime: 0.6667
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -431,7 +517,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: hitted
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -534,7 +620,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: idle
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -620,7 +706,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: attack_march
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -758,7 +844,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: die
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1

Vissa filer visades inte eftersom för många filer har ändrats