Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/Config/FabaoConfig.json

@@ -6,7 +6,7 @@
       "name": "神龙鼎",
       "Type": 1,
       "magicAttribute": 1,
-      "model": "fb_feicuihulu",
+      "model": "fb_ding1",
       "cd": 30.0,
       "fragmentID": 11001,
       "ShuxingIDs": [
@@ -40,7 +40,7 @@
       "name": "翡翠葫芦",
       "Type": 1,
       "magicAttribute": 2,
-      "model": "fb_ding1",
+      "model": "fb_feicuihulu",
       "cd": 30.0,
       "fragmentID": 11003,
       "ShuxingIDs": [
@@ -74,7 +74,7 @@
       "name": "琉璃宝塔",
       "Type": 1,
       "magicAttribute": 2,
-      "model": "fb_jian1",
+      "model": "fb_linglongta",
       "cd": 30.0,
       "fragmentID": 11005,
       "ShuxingIDs": [
@@ -91,7 +91,7 @@
       "name": "九幽镇魂瓶",
       "Type": 1,
       "magicAttribute": 4,
-      "model": "fb_jian2",
+      "model": "fb_BossPing",
       "cd": 30.0,
       "fragmentID": 11006,
       "ShuxingIDs": [
@@ -159,7 +159,7 @@
       "name": "玄龟盾",
       "Type": 1,
       "magicAttribute": 16,
-      "model": "fb_ding1",
+      "model": "fb_xuanguidun",
       "cd": 30.0,
       "fragmentID": 11010,
       "ShuxingIDs": [

Assets/Res/Config/HeroModelConfig.json

@@ -68,7 +68,7 @@
       ],
       "fa_bao_id": [
         10001,
-        10006,
+        -1,
         10010,
         -1
       ],
@@ -105,7 +105,7 @@
       ],
       "fa_bao_id": [
         10003,
-        10008,
+        -1,
         10001,
         -1
       ],
@@ -141,8 +141,8 @@
         2001
       ],
       "fa_bao_id": [
-        10004,
-        10009,
+        10006,
+        -1,
         10003,
         -1
       ],
@@ -178,9 +178,9 @@
         9002
       ],
       "fa_bao_id": [
+        10001,
+        10003,
         10006,
-        10008,
-        10009,
         10010
       ],
       "heroStory": null

Assets/Res/UI/CombatPanel.prefab

@@ -82,7 +82,7 @@ TrailRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Time: 0.3
+  m_Time: 0.1
   m_PreviewTimeScale: 1
   m_Parameters:
     serializedVersion: 3
@@ -257,7 +257,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3432402722451799021
 RectTransform:
   m_ObjectHideFlags: 0
@@ -267,7 +267,7 @@ RectTransform:
   m_GameObject: {fileID: 271049740906135972}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 216.53334, y: 216.53334, z: 216.53334}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4464206910806027079}
@@ -309,7 +309,7 @@ MonoBehaviour:
   m_IsTrail: 0
   m_IgnoreCanvasScaler: 1
   m_Scale: 100
-  m_Scale3D: {x: 200, y: 200, z: 200}
+  m_Scale3D: {x: 300, y: 300, z: 300}
   m_AnimatableProperties: []
   m_Particles:
   - {fileID: 8405072210762430866}
@@ -599,7 +599,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0.7, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!96 &4033994229361683235
@@ -647,7 +647,7 @@ TrailRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Time: 0.3
+  m_Time: 0.1
   m_PreviewTimeScale: 1
   m_Parameters:
     serializedVersion: 3
@@ -997,7 +997,7 @@ TrailRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Time: 0.3
+  m_Time: 0.1
   m_PreviewTimeScale: 1
   m_Parameters:
     serializedVersion: 3
@@ -1615,7 +1615,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1
+      scalar: 10
       minScalar: 5
       maxCurve:
         serializedVersion: 2
@@ -2369,7 +2369,7 @@ ParticleSystem:
     rateOverTime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1
+      scalar: 0
       minScalar: 10
       maxCurve:
         serializedVersion: 2
@@ -2472,8 +2472,66 @@ ParticleSystem:
         m_PreInfinity: 2
         m_PostInfinity: 2
         m_RotationOrder: 4
-    m_BurstCount: 0
-    m_Bursts: []
+    m_BurstCount: 1
+    m_Bursts:
+    - serializedVersion: 2
+      time: 0
+      countCurve:
+        serializedVersion: 2
+        minMaxState: 0
+        scalar: 1
+        minScalar: 30
+        maxCurve:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        minCurve:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+      cycleCount: 0
+      repeatInterval: 0.01
+      probability: 1
   SizeModule:
     enabled: 0
     curve:
@@ -6263,7 +6321,7 @@ ParticleSystemRenderer:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1511716398290541191}
-  m_Enabled: 0
+  m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
@@ -6350,7 +6408,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2492483722477418191
 RectTransform:
   m_ObjectHideFlags: 0
@@ -6360,7 +6418,7 @@ RectTransform:
   m_GameObject: {fileID: 1589813874732275212}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 216.53334, y: 216.53334, z: 216.53334}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5192395887186932662}
@@ -6402,7 +6460,7 @@ MonoBehaviour:
   m_IsTrail: 0
   m_IgnoreCanvasScaler: 1
   m_Scale: 100
-  m_Scale3D: {x: 200, y: 200, z: 200}
+  m_Scale3D: {x: 300, y: 300, z: 300}
   m_AnimatableProperties: []
   m_Particles:
   - {fileID: 4995138386317412458}
@@ -6682,7 +6740,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1
+      scalar: 10
       minScalar: 5
       maxCurve:
         serializedVersion: 2
@@ -7436,7 +7494,7 @@ ParticleSystem:
     rateOverTime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1
+      scalar: 0
       minScalar: 10
       maxCurve:
         serializedVersion: 2
@@ -7539,8 +7597,66 @@ ParticleSystem:
         m_PreInfinity: 2
         m_PostInfinity: 2
         m_RotationOrder: 4
-    m_BurstCount: 0
-    m_Bursts: []
+    m_BurstCount: 1
+    m_Bursts:
+    - serializedVersion: 2
+      time: 0
+      countCurve:
+        serializedVersion: 2
+        minMaxState: 0
+        scalar: 1
+        minScalar: 30
+        maxCurve:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        minCurve:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+      cycleCount: 0
+      repeatInterval: 0.01
+      probability: 1
   SizeModule:
     enabled: 0
     curve:
@@ -11330,7 +11446,7 @@ ParticleSystemRenderer:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2041723204215340495}
-  m_Enabled: 0
+  m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
@@ -13242,7 +13358,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5083746142576606959
 RectTransform:
   m_ObjectHideFlags: 0
@@ -13252,7 +13368,7 @@ RectTransform:
   m_GameObject: {fileID: 3630126313745892733}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 216.53334, y: 216.53334, z: 216.53334}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4964821023745262004}
@@ -13294,7 +13410,7 @@ MonoBehaviour:
   m_IsTrail: 0
   m_IgnoreCanvasScaler: 1
   m_Scale: 100
-  m_Scale3D: {x: 200, y: 200, z: 200}
+  m_Scale3D: {x: 300, y: 300, z: 300}
   m_AnimatableProperties: []
   m_Particles:
   - {fileID: 5865426792235925707}
@@ -13545,7 +13661,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3447245252671686522
 RectTransform:
   m_ObjectHideFlags: 0
@@ -13555,7 +13671,7 @@ RectTransform:
   m_GameObject: {fileID: 3835180794105779333}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 216.53334, y: 216.53334, z: 216.53334}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 935401750109990742}
@@ -13597,7 +13713,7 @@ MonoBehaviour:
   m_IsTrail: 0
   m_IgnoreCanvasScaler: 1
   m_Scale: 100
-  m_Scale3D: {x: 200, y: 200, z: 200}
+  m_Scale3D: {x: 300, y: 300, z: 300}
   m_AnimatableProperties: []
   m_Particles:
   - {fileID: 5934611095510434815}
@@ -15510,7 +15626,7 @@ TrailRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Time: 0.3
+  m_Time: 0.1
   m_PreviewTimeScale: 1
   m_Parameters:
     serializedVersion: 3
@@ -15703,7 +15819,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1
+      scalar: 10
       minScalar: 5
       maxCurve:
         serializedVersion: 2
@@ -16457,7 +16573,7 @@ ParticleSystem:
     rateOverTime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1
+      scalar: 0
       minScalar: 10
       maxCurve:
         serializedVersion: 2
@@ -16560,8 +16676,66 @@ ParticleSystem:
         m_PreInfinity: 2
         m_PostInfinity: 2
         m_RotationOrder: 4
-    m_BurstCount: 0
-    m_Bursts: []
+    m_BurstCount: 1
+    m_Bursts:
+    - serializedVersion: 2
+      time: 0
+      countCurve:
+        serializedVersion: 2
+        minMaxState: 0
+        scalar: 1
+        minScalar: 30
+        maxCurve:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        minCurve:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+      cycleCount: 0
+      repeatInterval: 0.01
+      probability: 1
   SizeModule:
     enabled: 0
     curve:
@@ -20351,7 +20525,7 @@ ParticleSystemRenderer:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5468089488749836170}
-  m_Enabled: 0
+  m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
@@ -21166,7 +21340,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1644425788953578442
 RectTransform:
   m_ObjectHideFlags: 0
@@ -21176,7 +21350,7 @@ RectTransform:
   m_GameObject: {fileID: 6403299825149927359}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 216.53334, y: 216.53334, z: 216.53334}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1561100274603988533}
@@ -21218,7 +21392,7 @@ MonoBehaviour:
   m_IsTrail: 0
   m_IgnoreCanvasScaler: 1
   m_Scale: 100
-  m_Scale3D: {x: 200, y: 200, z: 200}
+  m_Scale3D: {x: 300, y: 300, z: 300}
   m_AnimatableProperties: []
   m_Particles:
   - {fileID: 1130059750844321892}
@@ -21692,7 +21866,7 @@ TrailRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Time: 0.3
+  m_Time: 0.1
   m_PreviewTimeScale: 1
   m_Parameters:
     serializedVersion: 3
@@ -23128,7 +23302,7 @@ ParticleSystem:
   ringBufferLoopRange: {x: 0, y: 1}
   emitterVelocityMode: 1
   looping: 1
-  prewarm: 0
+  prewarm: 1
   playOnAwake: 1
   useUnscaledTime: 0
   autoRandomSeed: 1
@@ -23195,7 +23369,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1
+      scalar: 10
       minScalar: 5
       maxCurve:
         serializedVersion: 2
@@ -23949,7 +24123,7 @@ ParticleSystem:
     rateOverTime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1
+      scalar: 0
       minScalar: 10
       maxCurve:
         serializedVersion: 2
@@ -24052,8 +24226,66 @@ ParticleSystem:
         m_PreInfinity: 2
         m_PostInfinity: 2
         m_RotationOrder: 4
-    m_BurstCount: 0
-    m_Bursts: []
+    m_BurstCount: 1
+    m_Bursts:
+    - serializedVersion: 2
+      time: 0
+      countCurve:
+        serializedVersion: 2
+        minMaxState: 0
+        scalar: 1
+        minScalar: 30
+        maxCurve:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        minCurve:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+      cycleCount: 0
+      repeatInterval: 0.01
+      probability: 1
   SizeModule:
     enabled: 0
     curve:
@@ -27843,7 +28075,7 @@ ParticleSystemRenderer:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8896841209734753404}
-  m_Enabled: 0
+  m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
@@ -28034,7 +28266,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1
+      scalar: 10
       minScalar: 5
       maxCurve:
         serializedVersion: 2
@@ -28788,7 +29020,7 @@ ParticleSystem:
     rateOverTime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1
+      scalar: 0
       minScalar: 10
       maxCurve:
         serializedVersion: 2
@@ -28891,8 +29123,66 @@ ParticleSystem:
         m_PreInfinity: 2
         m_PostInfinity: 2
         m_RotationOrder: 4
-    m_BurstCount: 0
-    m_Bursts: []
+    m_BurstCount: 1
+    m_Bursts:
+    - serializedVersion: 2
+      time: 0
+      countCurve:
+        serializedVersion: 2
+        minMaxState: 0
+        scalar: 1
+        minScalar: 30
+        maxCurve:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        minCurve:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+      cycleCount: 0
+      repeatInterval: 0.01
+      probability: 1
   SizeModule:
     enabled: 0
     curve:
@@ -32682,7 +32972,7 @@ ParticleSystemRenderer:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8975472117318567199}
-  m_Enabled: 0
+  m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1

Assets/Scenes/testCombat.scene

@@ -12396,10 +12396,6 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 1507424885}
-    - target: {fileID: 1199557933932386932, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 1371450738590366279, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
       propertyPath: m_Sprite
       value: 
@@ -12408,18 +12404,6 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 1435405003}
-    - target: {fileID: 1644425788953578442, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 216.53334
-      objectReference: {fileID: 0}
-    - target: {fileID: 1644425788953578442, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 216.53334
-      objectReference: {fileID: 0}
-    - target: {fileID: 1644425788953578442, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 216.53334
-      objectReference: {fileID: 0}
     - target: {fileID: 1850980594320727087, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
       propertyPath: m_Sprite
       value: 
@@ -12432,18 +12416,6 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 116613988}
-    - target: {fileID: 2492483722477418191, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 216.53334
-      objectReference: {fileID: 0}
-    - target: {fileID: 2492483722477418191, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 216.53334
-      objectReference: {fileID: 0}
-    - target: {fileID: 2492483722477418191, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 216.53334
-      objectReference: {fileID: 0}
     - target: {fileID: 2510936881516916421, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
       propertyPath: m_Sprite
       value: 
@@ -12452,38 +12424,10 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 1572835774}
-    - target: {fileID: 2877124575884073766, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 3340256974330815082, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 1429286905}
-    - target: {fileID: 3432402722451799021, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 216.53334
-      objectReference: {fileID: 0}
-    - target: {fileID: 3432402722451799021, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 216.53334
-      objectReference: {fileID: 0}
-    - target: {fileID: 3432402722451799021, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 216.53334
-      objectReference: {fileID: 0}
-    - target: {fileID: 3447245252671686522, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 216.53334
-      objectReference: {fileID: 0}
-    - target: {fileID: 3447245252671686522, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 216.53334
-      objectReference: {fileID: 0}
-    - target: {fileID: 3447245252671686522, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 216.53334
-      objectReference: {fileID: 0}
     - target: {fileID: 3993025648395396609, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
       propertyPath: m_Sprite
       value: 
@@ -12496,18 +12440,6 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 238775745}
-    - target: {fileID: 5083746142576606959, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 216.53334
-      objectReference: {fileID: 0}
-    - target: {fileID: 5083746142576606959, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 216.53334
-      objectReference: {fileID: 0}
-    - target: {fileID: 5083746142576606959, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 216.53334
-      objectReference: {fileID: 0}
     - target: {fileID: 5414737009933938547, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
       propertyPath: m_Sprite
       value: 
@@ -12536,10 +12468,6 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 710592782}
-    - target: {fileID: 6272876660185714787, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 6377344707678363892, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
       propertyPath: m_Sprite
       value: 
@@ -12564,14 +12492,6 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 1325970310}
-    - target: {fileID: 7414269832283765684, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7838251563289779031, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 8238143942918488046, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
       propertyPath: m_Sprite
       value: 

Assets/Scripts/GameLogic/Combat/CombatType/TestCombatType.cs

@@ -115,9 +115,9 @@ namespace GameLogic.Combat.CombatType
                 cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatHeroAi(), combatHeroInfo, pos,
                     delegate(CombatHeroEntity entity)
                     {
-                        entity.CurrCombatHeroInfo.hp = (EncryptionLong)(200);
+                        entity.CurrCombatHeroInfo.hp = (EncryptionLong) testHeroInfoConfig.hp;
 
-                        entity.MaxCombatHeroInfo.hp = (EncryptionLong)(200);
+                        entity.MaxCombatHeroInfo.hp =  (EncryptionLong) testHeroInfoConfig.hp;
                         combatController.CombatHeroController.AddHero(entity);
                     }));
             }

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControl.cs

@@ -171,7 +171,8 @@ namespace GameLogic.Combat.Hero
             if (CombatController.currActiveCombat.IsFightState)
             {
                 float speed = _combatHeroEntity.CurrCombatHeroInfo.GetAttSpeed;
-                SkillTurntable.Update(t, 1 * speed);
+                float angle = 360 / (1.0f / speed);
+                SkillTurntable.Update(t, angle*t);
             }
 
             if (taoismSkillBasic != null)

Assets/Scripts/GameLogic/Combat/Hero/CombatMagicWeaponEntity.cs

@@ -87,6 +87,8 @@ namespace GameLogic.Combat.Hero
             this._rootMagicWeaponControl = magicWeaponControl;
             string modelName = magicWeaponConfig.model;
 
+            CurrCombatHeroInfo = new CombatHeroInfo();
+            CurrCombatHeroInfo.modelName= magicWeaponConfig.model;
             cd = magicWeaponConfig.cd;
 
             // GameTimeLineParticleFactory

Assets/Scripts/GameUI/UI/CombatPanel/UseSkillShowFxMono.cs

@@ -11,7 +11,7 @@ namespace Fort23.Mono
         protected ParticleSystemPool gObjectPoolInterface;
         protected float _currTime;
         protected float _timeAdd;
-        private float _speed =3;
+        private float _speed =0.5f;
 
         public void Init(BesselPathGroup besselPathGroup, ParticleSystemPool gObjectPoolInterface)
         {
@@ -19,7 +19,7 @@ namespace Fort23.Mono
             this.besselPathGroup = besselPathGroup;
             this.gObjectPoolInterface = gObjectPoolInterface;
             _currTime = 0;
-            _timeAdd = 1.0f /3;
+            _timeAdd = 1.0f /_speed;
             StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
         }