diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua index 3ce341a8e1..7d2fdaf35e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua @@ -182,10 +182,12 @@ function this.OnTabChange(index, lastIndex) local monster=this.battleRecord.mdata local showList = this.battleRecord.data if showType == 4 then - showList = this.battleRecord.mdata + showList={} + --= this.battleRecord.mdata for key, value in pairs(monster) do - if key==100 or key==106 then - table.remove(showList,key) + if key~=100 and key~=106 then + --table.remove(showList,key) + table.insert(showList,value) end end else diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 3908bce235..b20f861aa2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -520,7 +520,7 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData) local scale = roleConfig.play_liveScale local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2], 0) live.texture = CardRendererManager.GetSpineTexture(_pos, liveName, Vector3.one * scale, livePos, true) - --SetHEeroLiveToward(live,heroData.heroConfig.Toward) + SetHEeroLiveToward(live,heroData.heroConfig.Toward) live.transform.localScale = Vector3.one live.transform.localPosition = Vector3.zero