diff --git a/meng_yao/Assets/Config/mangyaotast.json b/meng_yao/Assets/Config/mangyaotast.json index c75846c24..491a791b8 100644 --- a/meng_yao/Assets/Config/mangyaotast.json +++ b/meng_yao/Assets/Config/mangyaotast.json @@ -36,7 +36,7 @@ "Name": "木萌妖-01", "Quality": "0", "Elements": "2", - "Info": "当攻击范围内出现敌人后就会锁定敌人,然后持续射出子弹进行攻击。\n子弹速度非常快,需要确保必定能命中敌人。", + "Info": "当攻击范围内出现敌人后就会锁定敌人,然后持续射出子弹进行攻击。", "SkillId": "2001", "AttackType": "0", "AttackActionType": "0", diff --git a/meng_yao/Assets/Prefabs/charatar/mkl.prefab b/meng_yao/Assets/Prefabs/charatar/mkl.prefab index cc6767167..874671235 100644 --- a/meng_yao/Assets/Prefabs/charatar/mkl.prefab +++ b/meng_yao/Assets/Prefabs/charatar/mkl.prefab @@ -74,7 +74,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: dcb3a731cfcc70c4ab418922d45ec4a4, type: 3} - m_Color: {r: 0, g: 0.9413085, b: 1, a: 1} + m_Color: {r: 0, g: 1, b: 0.0597775, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -449,6 +449,7 @@ MonoBehaviour: retbutton: {fileID: 0} ClosureObj: {fileID: 0} id: M_M_001 + Name: camp: 0 hp: 100 dieIndex: -1 @@ -458,6 +459,15 @@ MonoBehaviour: _Canvas: {fileID: 0} spriteRenderers: {fileID: 0} HurtDirectin: 0 + Quality: + Elements: + Info: + SkillId: + AttackType: + AttackActionType: + AttackCD: 0 + CritRate: 0 + CriticalHitRateBonus: 0 gold: 10 MaxAttack: 10 MinAttack: 10 diff --git a/meng_yao/Assets/Prefabs/charatar/qi_e_Ani/Circle.controller b/meng_yao/Assets/Prefabs/charatar/qi_e_Ani/Circle.controller index 8cd9890e6..c89fc6dde 100644 --- a/meng_yao/Assets/Prefabs/charatar/qi_e_Ani/Circle.controller +++ b/meng_yao/Assets/Prefabs/charatar/qi_e_Ani/Circle.controller @@ -156,7 +156,7 @@ AnimatorState: m_IKOnFeet: 0 m_WriteDefaultValues: 1 m_Mirror: 0 - m_SpeedParameterActive: 1 + m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 diff --git a/meng_yao/Assets/Prefabs/ui/info_mengyao.prefab b/meng_yao/Assets/Prefabs/ui/info_mengyao.prefab index 175aded00..eba43f99a 100644 --- a/meng_yao/Assets/Prefabs/ui/info_mengyao.prefab +++ b/meng_yao/Assets/Prefabs/ui/info_mengyao.prefab @@ -146,6 +146,8 @@ MonoBehaviour: AttackText: {fileID: 7805053267802664886} AttackFanweiText: {fileID: 7805053267816179159} AttackCD: {fileID: 7805053267580272315} + textList: [] + HpImage: {fileID: 0} --- !u!1001 &8782491853943243843 PrefabInstance: m_ObjectHideFlags: 0 @@ -153,6 +155,22 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8782491854383104503} m_Modifications: + - target: {fileID: 1562946257751396911, guid: 60d99ddd21f6df84195814f4d3ab7d07, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1562946257751396911, guid: 60d99ddd21f6df84195814f4d3ab7d07, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1562946257751396911, guid: 60d99ddd21f6df84195814f4d3ab7d07, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1562946258103303046, guid: 60d99ddd21f6df84195814f4d3ab7d07, type: 3} + propertyPath: m_Text + value: "\u6728\u840C\u5996-01" + objectReference: {fileID: 0} - target: {fileID: 1562946258269228164, guid: 60d99ddd21f6df84195814f4d3ab7d07, type: 3} propertyPath: m_AnchorMax.y value: 0 diff --git a/meng_yao/Assets/Resources/animation/A_fightin/konglong_1/Circle.controller b/meng_yao/Assets/Resources/animation/A_fightin/konglong_1/Circle.controller index 9e755a520..98f2ca845 100644 --- a/meng_yao/Assets/Resources/animation/A_fightin/konglong_1/Circle.controller +++ b/meng_yao/Assets/Resources/animation/A_fightin/konglong_1/Circle.controller @@ -42,7 +42,7 @@ AnimatorState: m_IKOnFeet: 0 m_WriteDefaultValues: 1 m_Mirror: 0 - m_SpeedParameterActive: 1 + m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 diff --git a/meng_yao/Assets/Resources/animation/A_fightin/tigerAni/Circle.controller b/meng_yao/Assets/Resources/animation/A_fightin/tigerAni/Circle.controller index 8f488b3de..036715eb7 100644 --- a/meng_yao/Assets/Resources/animation/A_fightin/tigerAni/Circle.controller +++ b/meng_yao/Assets/Resources/animation/A_fightin/tigerAni/Circle.controller @@ -100,7 +100,7 @@ AnimatorState: m_IKOnFeet: 0 m_WriteDefaultValues: 1 m_Mirror: 0 - m_SpeedParameterActive: 1 + m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 diff --git a/meng_yao/Assets/Resources/animation/A_fightin/tuziAnimation/Circle.controller b/meng_yao/Assets/Resources/animation/A_fightin/tuziAnimation/Circle.controller index 3037805fc..d12b513e5 100644 --- a/meng_yao/Assets/Resources/animation/A_fightin/tuziAnimation/Circle.controller +++ b/meng_yao/Assets/Resources/animation/A_fightin/tuziAnimation/Circle.controller @@ -39,7 +39,7 @@ AnimatorState: m_IKOnFeet: 0 m_WriteDefaultValues: 1 m_Mirror: 0 - m_SpeedParameterActive: 1 + m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 diff --git a/meng_yao/Assets/script/A_Fight/CharacterClick.cs b/meng_yao/Assets/script/A_Fight/CharacterClick.cs index 84c15319f..f1830152e 100644 --- a/meng_yao/Assets/script/A_Fight/CharacterClick.cs +++ b/meng_yao/Assets/script/A_Fight/CharacterClick.cs @@ -83,7 +83,7 @@ public class CharacterClick : MonoBehaviour } else { - panelRect.GetComponent().UpDateShow("1", MyCharacter.Name, MyCharacter.Info, MyCharacter.MaxAttack + "~" + MyCharacter.MinAttack, MyCharacter.AttackRange, MyCharacter.AttackCD); + panelRect.GetComponent().UpDateShow(role.Level.ToString(), role.Name, role.Info, role.MaxAttack + "~" + role.MinAttack, role.AttackRange.ToString(), role.AttackCD.ToString()); }