diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 34a8ffeb49..124389ec36 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -15143,7 +15143,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 22.3, y: -135.8} - m_SizeDelta: {x: 321.54, y: 38.17} + m_SizeDelta: {x: 321.54, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2733125391278969484 CanvasRenderer: @@ -22376,7 +22376,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 11.6, y: -189.5} - m_SizeDelta: {x: 274.8, y: 43} + m_SizeDelta: {x: 274.8, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3955148087171381323 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalentPopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalentPopup.prefab index b900c65643..15b6380316 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalentPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalentPopup.prefab @@ -514,9 +514,9 @@ RectTransform: m_Father: {fileID: 7723528773779627565} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 568, y: 1084} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 28, y: 124} m_SizeDelta: {x: 692.1, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4185124015842772771 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua index 1688ad4f0d..0b5fe7ac01 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua @@ -112,6 +112,7 @@ function this.SingleInfoDataShow(go,data) Util.GetGameObject(curHeroGoList[i], "hero"):SetActive(false) Util.GetGameObject(curHeroGoList[i], "frame"):GetComponent("Image").sprite = Util.LoadSprite("r_characterbg_gray") end + -- LogGreen(" #data.teamInfo ".. #data.teamInfo) for i = 1, #data.teamInfo do local heroGo = Util.GetGameObject(curHeroGoList[data.teamInfo[i].position], "hero") heroGo:SetActive(true) @@ -133,8 +134,15 @@ function this.SingleInfoDataShow(go,data) --抢夺点击事件 Util.AddOnceClick(Util.GetGameObject(go, "lootBtn"), function() GuildCarDelayManager.SetheroDid(data.uid) - UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.GUILD_CAR_DELEAY) - this:ClosePanel() + if data.teamInfo and #data.teamInfo > 0 then + UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.GUILD_CAR_DELEAY) + this:ClosePanel() + else + GuildCarDelayManager.FightBattle(function() + this:ClosePanel() + UIManager.OpenPanel(UIName.GuildCarDelayMainPanel) + end) + end end) end --界面关闭时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua index a196563e02..8278f80e92 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua @@ -48,11 +48,23 @@ function this.FightBattle( callBack) type = 2 PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILD_CAR_DELEAY_LOOT, 1) end + -- LogGreen("type "..type.." monsterId "..monsterId) NetManager.FastFightChallengeRequest(type,monsterId,function (msg) this.score = msg.score this.hurt = msg.hurt local fightData = BattleManager.GetBattleServerData(msg,fightType) + if fightData.fightData.enemyData[1] and LengthOfTable(fightData.fightData.enemyData[1]) > 4 then UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.GUILD_CAR_DELAY, callBack) + else--抢夺目标阵容为空时 + --车迟抢夺cd计时 + GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Loot) + -- "抢夺成功,获得XXXX积分!"Language[10027] + PopupTipPanel.ShowTip(string.format(Language[12391], this.score)) + if callBack then + callBack() + callBack = nil + end + end end) end function this.SetCdTime(progress)