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/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)) 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 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)