改了动画化参数

meng_yao/Assets/Prefabs/charatar/qi_e_Ani/Circle.controller

@@ -21,6 +21,12 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 9100000}
+  - m_Name: AttackSpeed
+    m_Type: 1
+    m_DefaultFloat: 1
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -150,13 +156,13 @@ AnimatorState:
   m_IKOnFeet: 0
   m_WriteDefaultValues: 1
   m_Mirror: 0
-  m_SpeedParameterActive: 0
+  m_SpeedParameterActive: 1
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
   m_Motion: {fileID: 7400000, guid: 94e7f9e70d4bb0444803f9a389539eef, type: 2}
   m_Tag: 
-  m_SpeedParameter: 
+  m_SpeedParameter: AttackSpeed
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 

meng_yao/Assets/Resources/animation/A_fightin/konglong_1/Circle.controller

@@ -42,13 +42,13 @@ AnimatorState:
   m_IKOnFeet: 0
   m_WriteDefaultValues: 1
   m_Mirror: 0
-  m_SpeedParameterActive: 0
+  m_SpeedParameterActive: 1
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
   m_Motion: {fileID: 7400000, guid: 5a058bceaa362ea4b928864f4c44ce36, type: 2}
   m_Tag: 
-  m_SpeedParameter: 
+  m_SpeedParameter: AttackSpeed
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
@@ -100,6 +100,12 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 9100000}
+  - m_Name: AttackSpeed
+    m_Type: 1
+    m_DefaultFloat: 1
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer

meng_yao/Assets/Resources/animation/A_fightin/tigerAni/Circle.controller

@@ -41,13 +41,13 @@ AnimatorStateMachine:
     m_Position: {x: 260, y: 90, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -2194801018154674215}
-    m_Position: {x: 530, y: 80, z: 0}
+    m_Position: {x: 580, y: 90, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -3922979554938479288}
-    m_Position: {x: 540, y: 240, z: 0}
+    m_Position: {x: 580, y: 250, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -8831474942015023954}
-    m_Position: {x: 250, y: 250, z: 0}
+    m_Position: {x: 260, y: 250, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -100,13 +100,13 @@ AnimatorState:
   m_IKOnFeet: 0
   m_WriteDefaultValues: 1
   m_Mirror: 0
-  m_SpeedParameterActive: 0
+  m_SpeedParameterActive: 1
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
   m_Motion: {fileID: 7400000, guid: 50dc5864fe388914db008b0901db2804, type: 2}
   m_Tag: 
-  m_SpeedParameter: 
+  m_SpeedParameter: AttackSpeed
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
@@ -180,6 +180,12 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 9100000}
+  - m_Name: AttackSpeed
+    m_Type: 1
+    m_DefaultFloat: 1
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer

meng_yao/Assets/Resources/animation/A_fightin/tuziAnimation/Circle.controller

@@ -39,13 +39,13 @@ AnimatorState:
   m_IKOnFeet: 0
   m_WriteDefaultValues: 1
   m_Mirror: 0
-  m_SpeedParameterActive: 0
+  m_SpeedParameterActive: 1
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
   m_Motion: {fileID: 7400000, guid: 2d6ddf84ed034e7409ad5be4241cfdea, type: 2}
   m_Tag: 
-  m_SpeedParameter: 
+  m_SpeedParameter: AttackSpeed
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
@@ -122,6 +122,12 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 9100000}
+  - m_Name: AttackSpeed
+    m_Type: 1
+    m_DefaultFloat: 1
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer

meng_yao/Assets/common

@@ -1 +1 @@
-Subproject commit 8fec6273a4346583fb36152f04a9a9ac7c7f00dc
+Subproject commit 992d14d1f9039e6d189495ddd16e904b88090ae3

meng_yao/Assets/script/A_Fight/json/MengyaoInfo.cs

@@ -46,18 +46,18 @@ public class Character
 {
     public string Id { get; set; }
     public string Name { get; set; }
-    public string Quality { get; set; }
+    public string Quality { get; set; }//品质
-    public string Elements { get; set; }
+    public string Elements { get; set; }//属性
-    public string Info { get; set; }
+    public string Info { get; set; }//详情
-    public string SkillId { get; set; }
+    public string SkillId { get; set; }//技能
-    public string AttackType { get; set; }
+    public string AttackType { get; set; }//攻击类型
-    public string AttackActionType { get; set; }
+    public string AttackActionType { get; set; }//攻击作用类型
-    public string MaxAttack { get; set; }
+    public string MaxAttack { get; set; }//攻击力上限
-    public string MinAttack { get; set; }
+    public string MinAttack { get; set; }//攻击力下限
-    public string AttackRange { get; set; }
+    public string AttackRange { get; set; }//攻击范围
-    public string AttackCD { get; set; }
+    public string AttackCD { get; set; }//攻击CD
-    public string CritRate { get; set; }
+    public string CritRate { get; set; }//暴击率
-    public string CriticalHitRateBonus { get; set; }
+    public string CriticalHitRateBonus { get; set; }//暴击加成
 }
 
 [System.Serializable]