diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattleTestPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattleTestPanel.prefab index f68d80389b..960dd311e0 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattleTestPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattleTestPanel.prefab @@ -24213,7 +24213,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: + m_Text: 20002 --- !u!1 &1813713665846541036 GameObject: m_ObjectHideFlags: 0 @@ -28341,7 +28341,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1813713666443736898} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -31228,7 +31228,7 @@ MonoBehaviour: m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_CustomCaretColor: 0 m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} - m_Text: + m_Text: 20002 m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua index d64407b5e5..2c451ee664 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua @@ -352,6 +352,7 @@ function this.RefreshFightData(type) end local isPokemon=true local MSkillId = data.id..data.star + LogError("data.id=="..data.id.." data.star=="..data.star) data.skill={} data.skill[1] = BattleManager.MonsterSkillAdapter(MSkillId) or {} if monster.skillId~=nil and monster.skillId~=0 then @@ -374,8 +375,9 @@ function this.RefreshFightData(type) data.skill[1]=BattleManager.WeaponSkillAdapter(monster.weaponId) if pokemonUnit.PassiveSkill then - LogError("pokemonUnit.PassiveSkill=="..pokemonUnit.PassiveSkill) - local passs=string.split(pokemonUnit.PassiveSkill, "#") + --LogError("pokemonUnit.PassiveSkill=="..pokemonUnit.PassiveSkill) + --local passs=string.split(pokemonUnit.PassiveSkill, "#") + local passs=pokemonUnit.PassiveSkill local passivityList = {} for j = 1, #passs do LogError("神兵被动============="..passs[j])