From c2f46b2077537d756e2b0158c2a44ed106e80500 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 30 Oct 2020 11:53:13 +0900 Subject: [PATCH] =?UTF-8?q?[=E7=81=B5=E5=85=BD]=E7=81=B5=E5=85=BD=E6=8A=80?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Resolve/ResolvePanel.prefab | 14 +++++++------- .../~Lua/Modules/Battle/BattleManager.lua | 2 +- .../Logic/Monster/MonsterSkill/MSkillGroup.lua | 3 +-- .../~Lua/Modules/Battle/View/Unit/MonsterView.lua | 1 - 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab index 98a525810e..d8f318389c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab @@ -15,7 +15,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &982844875 RectTransform: m_ObjectHideFlags: 0 @@ -36,7 +36,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: 279, y: 467.98} + m_AnchoredPosition: {x: 299, y: 467.98} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.50000006, y: 0.5} --- !u!1 &140963331504414998 @@ -395,7 +395,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6630273786794472594 RectTransform: m_ObjectHideFlags: 0 @@ -942,7 +942,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: b2723f36525f0f74996d4a83ce331dcd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -12505,7 +12505,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8403986016978127714 RectTransform: m_ObjectHideFlags: 0 @@ -12522,7 +12522,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: 281.6, y: 462.5} + m_AnchoredPosition: {x: 299, y: 462.5} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5687762551274503171 @@ -14432,7 +14432,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index c03bf4df12..f3b44741fb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -246,7 +246,7 @@ function this.PokemonUnitAdapter(pokemonUnit) -- 技能 local skills = string.split(pokemonUnit.unitSkillIds, "#") for i = 1, #skills do - role.skill[i] = this.MonsterSkillAdapter(tonumber(skills[i])) + role.skill = this.MonsterSkillAdapter(tonumber(skills[i])) end -- 属性 local propertys = string.split(pokemonUnit.property, "#") diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkillGroup.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkillGroup.lua index 10f68bf2f3..0be5960de2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkillGroup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkillGroup.lua @@ -14,8 +14,7 @@ function MSkillGroup:Init(monster, groupData) self.skillGroupData = groupData -- 创建技能 self.skillList = {} - for index, data in ipairs(self.skillGroupData[1]) do - LogError("index==="..index) + for index, data in ipairs(self.skillGroupData) do self.skillList[index] = MSkillManager.CreateMSkill(monster, self, index, data) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua index 212a242470..497de70afc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua @@ -119,7 +119,6 @@ function MonsterView:PlaySpineAnim(gog, time, name, isLoop) gog.AnimationState:SetAnimation(0, "idle", true) end gog.AnimationState:ClearTracks() -- 清除上一个动画的影响(修复概率攻击动画播放错误的问题) - LogError("animation name"..name) gog.AnimationState:SetAnimation(time, name, isLoop) gog.AnimationState.Complete = gog.AnimationState.Complete + _complete end