diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index e15dcd9ee0..a3602ddb35 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1028,6 +1028,7 @@ JumpType = { XuanYuanMirror=74 , --车迟斗法 CompoundHero = 78,--神将合成、置换 Pokemon = 79,--灵兽山 + JumpServerHightLadder = 82,--灵兽山 HongMengZhen = 86,-- 鸿蒙阵 FightLevel = 107,-- 山河社稷图 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index 181c6f8159..e3fb513cd3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -8,6 +8,7 @@ BattlePanel = Inherit(BasePanel) local this = BattlePanel local battleTimeScaleKey = "battleTimeScaleKey" +local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local ArtResourcesConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local timeCount local endFunc @@ -501,6 +502,9 @@ function this.ShowBattleResult(result, msg) --公会副本 elseif fightType == BATTLE_TYPE.GuildTranscript then this.ShowBattleResultByGuildTranscript() + --罗浮争锋 + elseif fightType == BATTLE_TYPE.JumpServerhightLadder then + this.ShowBattleResultByJumpServerHightLadder(result) -- --无尽副本 -- elseif fightType == BATTLE_TYPE.MAP_FIGHT and CarbonManager.difficulty == CARBON_TYPE.ENDLESS then -- this.ShowBattleResultByMapFight() @@ -516,6 +520,8 @@ function this.ShowBattleResult(result, msg) this:ClosePanel() elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.TASUILINGXIAO then this.ShowBattleResultByTaSuiLingXiao() + elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.JumpServerhightLadder then + this.ShowBattleResultByJumpServerHightLadder(result) else if result == 0 then -- 失败 local haveRecord = BattleRecordManager.isHaveRecord() @@ -561,6 +567,32 @@ function this.ShowBattleResultByCarDeleayType() end end, 0.1):Start() end +-- 罗浮争锋结算界面特殊显示 +function this.ShowBattleResultByJumpServerHightLadder(_result) + + if _result == 0 then -- 失败 + if fightType == BATTLE_TYPE.JumpServerhightLadder then + PopupTipPanel.ShowTip("挑战失败,罗浮争锋排行无变化!") + if JumpServerManager.curBattleDrop.itemlist ~= nil and #JumpServerManager.curBattleDrop.itemlist > 0 then + local content = {} + for i = 1, #JumpServerManager.curBattleDrop.itemlist do + local itemdata = {} + itemdata.configData = itemConfig[JumpServerManager.curBattleDrop.itemlist[i].itemId] + itemdata.name = GetLanguageStrById(itemdata.configData.Name) + itemdata.icon = this.spLoader:LoadSprite(GetResourcePath(itemdata.configData.ResourceID)) + itemdata.num = JumpServerManager.curBattleDrop.itemlist[i].itemNum + table.insert(content, itemdata) + end + PopupText(content, 0.5, 2) + end + end + local haveRecord = BattleRecordManager.isHaveRecord() + UIManager.OpenPanel(UIName.BattleFailPopup, this, haveRecord,nil,fightType) + else -- 胜利 + UIManager.OpenPanel(UIName.BattleWinPopup, this, isBack, fightType, this.lastBattleResult) + end + +end -- 十绝阵结算界面特殊显示 function this.ShowBattleResultByDeathPos() -- 延时执行避免事件冲突 diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua index bdcf9f0e6e..e2da7e74b7 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua @@ -383,7 +383,7 @@ function this.BuyVipFun(type,warOrSd,fun) --是否花费XX妖晶购买1次挑战次数并发起挑战? local costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FUNCTION_SHOP, JumpServerManager.shopGoodId, 1) local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,costId).Name - local tipStr = warOrSd == 1 and "否花费%s%s购买1次挑战次数并发起挑战?" or "是否花费%s%s购买1次挑战次数并进行扫荡?" + local tipStr = warOrSd == 1 and "是否花费%s%s购买1次挑战次数并发起挑战?" or "是否花费%s%s购买1次挑战次数并进行扫荡?" MsgPanel.ShowTwo(string.format( tipStr,finalNum,itemName), nil, function() --买东西 if finalNum > BagManager.GetItemCountById(costId) then diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderRewardSortPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderRewardSortPanel.lua index 62b560d45e..a191a65524 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderRewardSortPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderRewardSortPanel.lua @@ -129,8 +129,8 @@ function this.SetGoldExperSortInfo() end local content = Util.GetGameObject(this.myActivityRewardGo, "Demons") Util.ClearChild(content.transform) - for i = 1, #rewardData.SeasonReward do - SubUIManager.Open(SubUIConfig.ItemView, content.transform):OnOpen(false,rewardData.SeasonReward[i],0.75) + for i = 1, #rewardData.SeasonRewardShow do + SubUIManager.Open(SubUIConfig.ItemView, content.transform):OnOpen(false,rewardData.SeasonRewardShow[i],0.75) end end end @@ -159,8 +159,8 @@ function JumpServerHightLadderRewardSortPanel:ActivityRewardSingleShow(activityR end local content = Util.GetGameObject(activityRewardGo, "content") Util.ClearChild(content.transform) - for i = 1, #rewardData.SeasonReward do - SubUIManager.Open(SubUIConfig.ItemView, content.transform):OnOpen(false,rewardData.SeasonReward[i],0.75) + for i = 1, #rewardData.SeasonRewardShow do + SubUIManager.Open(SubUIConfig.ItemView, content.transform):OnOpen(false,rewardData.SeasonRewardShow[i],0.75) end end --界面关闭时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua index d7517278eb..4e11f10fb1 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua @@ -42,6 +42,8 @@ function this.GetWorldArenaInfoRequest(fun) if fun then fun() end + --检测跨服天梯 + JumpServerManager.CheckJumpServerhightLadderMainCityRedPoint() end) end function this.InithightLadderData(_msg) @@ -64,7 +66,7 @@ function this.InithightLadderData(_msg) myRank = _msg.arenaInfo.score enterable = _msg.enterable--是否可以参加 竞技场100名以内参加 isGroup = _msg.isGroup--是否被分组 是1 否0 - isStart = _msg.isStart--是否在3周内,在为0 不在为1 + isStart = _msg.isStart--是否在3周内,在为0 不在为1 开服三周后功能开始 end --推送更新 function this.IndicationHightLadderData(_msg) @@ -301,11 +303,15 @@ end function this.ZeroRefreshPanel() -- LogPink("跨天 跨服天梯膜拜状态刷新") Timer.New(function() - if UIManager.IsOpen(UIName.JumpServerHightLadderPanel) then - this.GetWorldArenaInfoRequest() - end + this.GetWorldArenaInfoRequest(function () + --一分钟间隔阶段 踢回主城 + -- if UIManager.IsOpen(UIName.JumpServerHightLadderPanel) or UIManager.IsOpen(UIName.JumpServerPanel) then + -- if false then + -- UIManager.OpenPanel(UIName.MainPanel); + -- end + -- end + end) end, 3):Start() - end local curPersonInfo = {} function this.SetCurPersonInfo(_curPersonInfo) diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua index a95a02687c..0fc7c07a2e 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua @@ -89,7 +89,6 @@ end --跨服 function JumpServerPanel:OnOpen() this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main}) - JumpServerManager.CheckJumpServerhightLadderMainCityRedPoint() end --界面打开时调用(用于子类重写) @@ -99,12 +98,9 @@ function JumpServerPanel:OnShow(...) CheckRedPointStatus(type[i].redPointType) end end - -- JumpServerManager.CheckJumpServerhightLadderMainCityRedPoint() this.UpdateCarbonContent() -- 音效 -- SoundManager.PlayMusic(SoundConfig.BGM_Carbon) - --检测跨服天梯 - JumpServerManager.CheckJumpServerhightLadderMainCityRedPoint() end function this.UpdateCarbonContent() diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index b00545901c..44e87825c7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -962,7 +962,7 @@ function this.GetWorldArenaInfoIndication(buffer) -- LogPink("%%%%%%%%%%%msg.arenaInfo: "..#msg.arenaInfo.arenaEnemys.." msg.stage: "..msg.stage.." msg.endTime: "..msg.endTime) LogPink("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%") -- JumpServerManager.IndicationHightLadderData(msg) - JumpServerManager.GetWorldArenaInfoRequest() + JumpServerManager.ZeroRefreshPanel() end --心愿抽卡信息推送 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 6a3c37a1a4..607823c3b3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -721,6 +721,33 @@ local jumpDic = { [JumpType.chaozhijijin] = function(data) this.JumpActivity(JumpType.chaozhijijin % 10000,data[1]) end, + [JumpType.JumpServerHightLadder] = function(data) + if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) then + PopupTipPanel.ShowTip( ActTimeCtrlManager.GetFuncTip( FUNCTION_OPEN_TYPE.JumpServer_HightLadder)) + return + end + local conFigWorldLevel = ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).WorldLevel + if PlayerManager.worldLeve < conFigWorldLevel then --如果世界等级不足 + PopupTipPanel.ShowTip(string.format("世界等级到达%s后开启!",conFigWorldLevel)) + return + end + if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) == false then --如果未解锁 + PopupTipPanel.ShowTip("赛季过渡中!") + return + end + JumpServerManager.GetWorldArenaInfoRequest(function() + if not JumpServerManager.GetHightLadderDataIsStart() then + PopupTipPanel.ShowTip(string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).OpenWeek)) + return + elseif not JumpServerManager.GetHightLadderDataIsGroup() then + PopupTipPanel.ShowTip("未划分跨服分组,无法参与!") + return + else + UIManager.OpenPanel(UIName.JumpServerHightLadderPanel) + return + end + end) + end, } function this.JumpActivity(data,skipfactor) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua index cf96cdceeb..fabfa37752 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua @@ -129,8 +129,8 @@ function this.ClosePanelRefreshData() this.ShowBattleResultByExpedition() elseif fightType == BATTLE_TYPE.XIAOYAOYOU then--逍遥游 this.ShowBattleResultByXYY() - elseif fightType == BATTLE_TYPE.JumpServerhightLadder then--跨服天梯 - this.ShowBattleResultByJumpServerHightLadder() + -- elseif fightType == BATTLE_TYPE.JumpServerhightLadder then--跨服天梯 + -- this.ShowBattleResultByJumpServerHightLadder() --新回放功能 elseif fightType == BATTLE_TYPE.BACK_BATTLE then if BattleManager.GetLastBattleType() == BATTLE_TYPE.EXECUTE_FIGHT then-- 猎妖之路 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua index 92c2d8c58a..3719ad2d92 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua @@ -401,12 +401,14 @@ function this.JumpServerHithtLadder() this:ClosePanel() end end, 0,true,true) - local MyRank = JumpServerManager.GetHightLadderDataMyRank() - local OldMyRank = JumpServerManager.GetHightLadderDataOldMyRank() - if MyRank ~= OldMyRank then - PopupTipPanel.ShowTip("挑战成功,罗浮争锋排行已提升至".. MyRank .."名!" ) - elseif MyRank == OldMyRank then - PopupTipPanel.ShowTip("挑战成功") + if m_fightType == BATTLE_TYPE.JumpServerhightLadder then + local MyRank = JumpServerManager.GetHightLadderDataMyRank() + local OldMyRank = JumpServerManager.GetHightLadderDataOldMyRank() + if MyRank ~= OldMyRank then + PopupTipPanel.ShowTip("挑战成功,罗浮争锋排行已提升至".. MyRank .."名!" ) + elseif MyRank == OldMyRank then + PopupTipPanel.ShowTip("挑战成功") + end end end) else diff --git a/Version/国内-跨服-测试.txt b/Version/国内-跨服-测试.txt new file mode 100644 index 0000000000..938840e952 --- /dev/null +++ b/Version/国内-跨服-测试.txt @@ -0,0 +1 @@ +{"subChannel":"1000","buglyId":"261348dcd3","channel":"MHT","resUrl":"http://jl.tyu89.wang/mht_china/jumpserver_test/","packageVersion":"0.1","version":"0.1.1","serverUrl":"http://42.193.191.129:8080/"} \ No newline at end of file