添加战斗逻辑

Assembly-CSharp.csproj

@@ -79,6 +79,7 @@
     <None Include="Assets\Art\UIAssets\TextrueJson\wuqi_duanbing.txt" />
     <None Include="Assets\Art\UIAssets\TextrueJson\zhanling.txt" />
     <None Include="Assets\Art\UIAssets\TextrueJson\rczc.txt" />
+    <None Include="Assets\Res\TimeLineAssets\Hero04_TD.txt" />
     <None Include="Assets\Art\UIAssets\TextrueJson\daoju.txt" />
     <None Include="Assets\Art\UIAssets\TextrueJson\suishenzhuangbei.txt" />
     <None Include="Assets\Art\UIAssets\TextrueJson\qjbuff.txt" />
@@ -116,6 +117,7 @@
     <None Include="Assets\Art\UIAssets\TextrueJson\yaoganjiemian.txt" />
     <None Include="Assets\Art\UIAssets\TextrueJson\decorate.txt" />
     <None Include="Assets\Art\UIAssets\TextrueJson\c1m1.txt" />
+    <None Include="Assets\Res\TimeLineAssets\Hero03_TD.txt" />
     <None Include="Assets\Res\Config\HeroModelConfig.json" />
     <None Include="Assets\Art\UIAssets\TextrueJson\weituozhandou.txt" />
     <None Include="Assets\Art\UIAssets\TextrueJson\shangcheng.txt" />
@@ -150,6 +152,7 @@
     <None Include="Assets\Art\UIAssets\TextrueJson\zhangjiedaditu.txt" />
     <None Include="Assets\Art\UIAssets\TextrueJson\mp.txt" />
     <None Include="Assets\Art\UIAssets\TextrueJson\gf.txt" />
+    <None Include="Assets\Res\TimeLineAssets\Hero02_TD.txt" />
     <None Include="Assets\Art\UIAssets\TextrueJson\tongyong_kuang.txt" />
     <None Include="Assets\Art\UIAssets\TextrueJson\cbtbuff.txt" />
     <None Include="Assets\Res\TimeLineAssets\Hero1_TD.txt" />

Assets/Art/ArtHero/Hero02.prefab

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1c1e6b4c4ba941a3d37a2490c8db7bb7e90c5f8a076a90ba7cee96c09701854
-size 65862
+oid sha256:9dcef912f159188039933915f0d7d442ad1a98209807847be595f8b4fb3f99c3
+size 68322

Assets/Art/ArtHero/Hero03.prefab

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b73d1a6a5a3aaf1b075e3b68368c90006d2896cd4ddd9412e7d67eb4b8f0060f
-size 71836
+oid sha256:22c989735fa5ec04c5b1a9beeb4db84bb9cc8eeb4115f584da3aca9464500ece
+size 74298

Assets/Art/ArtHero/Hero04.prefab

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e97056dcdb74cec5ec298559df569a59dbd0b7b8914d96c68250d4e34878566
-size 80318
+oid sha256:1fcd19ef1411a13357149ebacea9fa50728abedb33631e14fdd8c651a0bd203e
+size 82782

Assets/Res/CombatHero/Hero01.prefab

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:118f9599a041ed10cc8d478989b1c2f6c9f7634baf7cbaf126984956f0121bd6
-size 655472
+oid sha256:41cca293e3142b9a4aff66c6099702fba37877e784a2459753cfa29ae26af6ba
+size 655462

Assets/Res/CombatHero/Hero02.prefab

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0565cc73476e4f9c5d11c1884d39af63259b0638b099994c0fc7119307ce65b
+size 66649

Assets/Res/CombatHero/Hero02.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DC4bvS6oUShy9jaAITQo10yURogA2NRfspa17GoF/BMtHloTCY+I9b8=
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/CombatHero/Hero03.prefab

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b4395909d98c8036c68165cc34b07b4286c09bf8c9401e1a42e098616173e037
+size 68951

Assets/Res/CombatHero/Hero03.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CC9KsX77Uy1imBfwX4WqCPMgqO6xW2jDxzp+Y7qGOj5BaWmI+rxIsl4=
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/CombatHero/Hero04.prefab

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b20fade27a66413020dbede083f8a54a524d8dc74d6dbb56a247bed041cdf380
+size 81137

Assets/Res/CombatHero/Hero04.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CCwf4HyrVnsOwWd/sTNbeHpW3IZHbPzpuybveZOY1XBaqjVGeBGbge4=
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/HeroAnimtion/Hero01.asset

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bc5642f1cbcd1679ab3584b2a8d98df0b5e6d8aee787e6da30d24f58c0e7a9ad
-size 7224

Assets/Res/HeroAnimtion/Hero01_library.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:04facccd4563c222fec3a450d2c2dfc654bcd74ce7cd2c216858bfd3da454a4b
+size 7232

Assets/Res/HeroAnimtion/Hero02_library.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eda58a33008b068d8d27fe9b868a362e56a294df7c595b594d0d62f1c5155ee7
+size 5430

Assets/Res/HeroAnimtion/Hero02_library.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Wy8ZtXupUyjCfm4kghShsqBKAXzUoBMTArLalbRu+MaLp01yt24Nl4M=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/HeroAnimtion/Hero03_library.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:98585fe7ca8891eac184ae14f487ca342cf6eee24f85b3b4fcfa498561448ca7
+size 5346

Assets/Res/HeroAnimtion/Hero03_library.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DSgc4S2tVXoYtRkaR+S481gmm5K8cOTG7J9a6OU19L08soPJc/4Vato=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/HeroAnimtion/Hero04_library.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:efd6a6217f1acc63f42f6c20ff26dc792ab27d858906445a64a9d2437f57a212
+size 5427

Assets/Res/HeroAnimtion/Hero04_library.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: W3kYvXirVXujMYtckeB1Jh2pTp/B9xQAB5NmRwEJLNf+oE+IBNzZczg=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/HeroAnimtion/gw001_library.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af1d87a22a1a665816dcb3993ce78d3f1f7368e3101c0953d18c360f3f79c24e
+size 5287

Assets/Res/HeroAnimtion/gw_001.asset

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe76decdcd90bd618cb22a9a46f769cc454e809c1dc341052c7e511674d62ec7
-size 5280

Assets/Res/TimeLineAssets/Hero02_TD.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WSkXt3ivVXgWB/HQ8QbA9ajGLAcZDZqUuRqsWFkMi1ySwOh0A8lKpfg=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/TimeLineAssets/Hero03_TD.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: D3MavX/+UXJtASUeXBjGEjS3mTSx7IE9UoU6L4lRgaDXH1fXQ8tI9XI=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/TimeLineAssets/Hero04_TD.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: B38e5iOsWy1GptZgm+LehA7cFoVUirZVNYpeA4imSb0rG2tezB5//rI=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -132,6 +132,18 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 1553673690297972401, guid: ad281f95eddc5284d86b6f7f2aebdea4, type: 3}
+      propertyPath: m_UseGravity
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1553673690297972401, guid: ad281f95eddc5284d86b6f7f2aebdea4, type: 3}
+      propertyPath: m_ImplicitCom
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1553673690297972401, guid: ad281f95eddc5284d86b6f7f2aebdea4, type: 3}
+      propertyPath: m_ImplicitTensor
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5896097632680916319, guid: ad281f95eddc5284d86b6f7f2aebdea4, type: 3}
       propertyPath: m_LocalPosition.x
       value: 40.759926
@@ -373,23 +385,23 @@ MonoBehaviour:
     attSpeed: 1
     attDis: 2
     skillId: 1b270000
-  - modelName: Hero01
+  - modelName: Hero02
     hp: 1000
     att: 30
     attSpeed: 1
-    attDis: 2
+    attDis: 5
     skillId: 1b270000
-  - modelName: Hero01
+  - modelName: Hero03
     hp: 1000
     att: 30
     attSpeed: 1
-    attDis: 2
+    attDis: 5
     skillId: 1b270000
-  - modelName: Hero01
+  - modelName: Hero04
     hp: 1000
     att: 30
     attSpeed: 1
-    attDis: 2
+    attDis: 6
     skillId: 1b270000
   enemyHeroInfo:
   - enemyHeroInfo: