From ce7c70820bce2230bcc5209e7c8c6b06b62977c3 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Sat, 15 Aug 2020 19:02:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=80=82=E9=85=8D=20?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E7=AB=9E=E6=8A=80=E5=9C=BA=E8=BF=9B=E6=94=BB?= =?UTF-8?q?=E9=98=B5=E5=AE=B9=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Battle/BattleBestPopup.prefab | 12 ++++---- .../~Lua/Modules/Player/JumpManager.lua | 28 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattleBestPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattleBestPopup.prefab index 159fea52f8..9af28fafe9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattleBestPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattleBestPopup.prefab @@ -305,9 +305,9 @@ RectTransform: m_Father: {fileID: 8485517753741111699} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 81.09961} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -878.9004} m_SizeDelta: {x: 348, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &624247546002579982 @@ -902,10 +902,10 @@ RectTransform: m_Father: {fileID: 8485517753741111699} m_RootOrder: 0 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 1920} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8487183040723315029 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 806f589b5d..3c3da6b965 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -47,23 +47,23 @@ local jumpDic = { end end, [JumpType.Arena] = function(data)--竞技场 - local arenaDefend = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_DEFEND) + -- local arenaDefend = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_DEFEND) local arenaAttack = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_ATTACK) --首次进入竞技场 将主线编队复制到竞技场防守、进攻编队 - if #arenaAttack.teamHeroInfos==0 then - -- LogColor("red","竞技进攻编队为空") - local formation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL) - local newFormation = {} - for index = 1, #formation.teamHeroInfos do - local teamInfo = formation.teamHeroInfos[index] - local singleData = {} - singleData.heroId = teamInfo.heroId - singleData.position = index - table.insert(newFormation, singleData) - end - FormationManager.RefreshFormation(FormationTypeDef.FORMATION_ARENA_ATTACK,newFormation,formation.teamPokemonInfos) - end + -- if #arenaAttack.teamHeroInfos==0 then + -- -- LogColor("red","竞技进攻编队为空") + -- local formation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL) + -- local newFormation = {} + -- for index = 1, #formation.teamHeroInfos do + -- local teamInfo = formation.teamHeroInfos[index] + -- local singleData = {} + -- singleData.heroId = teamInfo.heroId + -- singleData.position = index + -- table.insert(newFormation, singleData) + -- end + -- FormationManager.RefreshFormation(FormationTypeDef.FORMATION_ARENA_ATTACK,newFormation,formation.teamPokemonInfos) + -- end if #arenaDefend.teamHeroInfos == 0 then -- LogColor("red","竞技防守编队为空") local formation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL) From f3e4b9f95123fa3a6bbb89eb8638c65fe889ad8e Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Sat, 15 Aug 2020 20:10:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=91=E5=90=8E=E7=AB=AF=E5=8F=91?= =?UTF-8?q?=E9=80=81=E4=B8=BB=E7=BA=BF=E6=88=98=E5=8A=9B=E5=8F=98=E5=8C=96?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Formation/FormationManager.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua index ec6738574c..dbcba6d603 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua @@ -216,6 +216,7 @@ function this.CheckHeroIdExist(heroId) end function this.UserPowerChanged() + local maxPower, targetTeamId = 0 for _, teamInfo in pairs(this.formationList) do if #teamInfo.teamHeroInfos > 0 then @@ -227,7 +228,7 @@ function this.UserPowerChanged() end if maxPower > PlayerManager.maxForce then Log(Language[10684]) - NetManager.RequestUserForceChange(targetTeamId) + NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)--targetTeamId PlayerManager.maxForce = maxPower end end From a1e08138d07f5a6c24a62d09bdba95b60d72e198 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 6 Aug 2020 13:55:35 +0800 Subject: [PATCH 3/3] expedition head frame update --- .../Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua index 8e12b746f5..40ad6210fd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua @@ -116,7 +116,7 @@ function this:FormationAdapter(msg) local demonData = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId) Util.GetGameObject(demon, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(demonData.Icon)) local heroConFig = ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId) - Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroConFig.Quality,heroConFig.Star)) + Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroConFig.Quality, curData.hero.star)) Util.GetGameObject(demon, "nameText"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId).ReadingName SetHeroStars(starGrid, curData.hero.star) proImage.sprite = Util.LoadSprite(GetProStrImageByProNum(demonData.PropertyName))