From 60c954bf38303cfd8022d9879dd8244ed2eb4974 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 16 Sep 2021 19:36:16 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=83=E7=95=8C=E8=AF=95=E7=82=BC?= =?UTF-8?q?=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Main/MainPanel.prefab | 2 +- .../Prefabs/UI/Popup/RewardItemPopup.prefab | 44 +++++++++---------- .../~Lua/Common/GlobalDefine.lua | 1 + .../~Lua/Modules/Battle/View/BattlePanel.lua | 26 +++++++++++ .../~Lua/Modules/Main/GMPanel.lua | 2 +- .../~Lua/Modules/Net/NetManager.lua | 2 +- .../~Lua/Modules/Popup/BattleWinPopup.lua | 33 -------------- .../~Lua/Modules/Popup/PlayerInfoPopup.lua | 10 ++++- .../QiJieShiLian/QiJieShiLianManager.lua | 7 +-- .../QiJieShiLian/QiJieShiLianPanel.lua | 3 +- .../Ranking/RankingSingleListPanel.lua | 15 ++++++- 11 files changed, 81 insertions(+), 64 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 49d313881b..93c4eadf78 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -7139,7 +7139,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: m_Left: 0 - m_Right: 0 + m_Right: -20 m_Top: 0 m_Bottom: 81 m_ChildAlignment: 8 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab index f9e881fe1e..0c1208c4e3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab @@ -1311,10 +1311,10 @@ RectTransform: m_Father: {fileID: 7931363699697377376} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 140, y: -80} - m_SizeDelta: {x: 280, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2469963345403365470 CanvasRenderer: @@ -4166,8 +4166,8 @@ RectTransform: m_Father: {fileID: 116605021529156332} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.33, y: 0} - m_AnchorMax: {x: 0.33, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 2, y: -20} m_Pivot: {x: 0.5, y: 0.5} @@ -4227,7 +4227,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1820491450244357017 RectTransform: m_ObjectHideFlags: 0 @@ -4244,7 +4244,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -341.29993, y: -156} + m_AnchoredPosition: {x: -341.29993, y: -197} m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1640789188004953930 @@ -4668,7 +4668,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.33, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -5037,7 +5037,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7790924946932124895 RectTransform: m_ObjectHideFlags: 0 @@ -5054,7 +5054,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -156.39996, y: -156} + m_AnchoredPosition: {x: -156.39996, y: -197} m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4758216133618425530 @@ -8684,10 +8684,10 @@ RectTransform: m_Father: {fileID: 7931363699697377376} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 455, y: -80} - m_SizeDelta: {x: 280, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1619564404937160144 CanvasRenderer: @@ -10086,7 +10086,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7931363699697377376 RectTransform: m_ObjectHideFlags: 0 @@ -10393,10 +10393,10 @@ RectTransform: m_Father: {fileID: 7931363699697377376} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 770, y: -80} - m_SizeDelta: {x: 280, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1083577264318959937 CanvasRenderer: @@ -12047,7 +12047,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7688062164259211823 RectTransform: m_ObjectHideFlags: 0 @@ -13870,7 +13870,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1609996456372680657 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 045d140287..9913a23a18 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1837,6 +1837,7 @@ PLAYER_INFO_VIEW_TYPE = { TSLX = 6,--踏碎凌霄当前排行编队 JUPMSERVER = 7,--跨服天梯 JUPMSERVER_NORMAL = 8,--跨服主线编队 + QIJIESHILIAN = 9,--七界试炼编队 } --限时达人 周卡 限时活动 拍脸 异妖直购 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index e3fb513cd3..f986e85bf1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -522,6 +522,8 @@ function this.ShowBattleResult(result, msg) this.ShowBattleResultByTaSuiLingXiao() elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.JumpServerhightLadder then this.ShowBattleResultByJumpServerHightLadder(result) + elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.QIJIE_FIGHT then + this.ShowBattleResultByQiJieShiLian() else if result == 0 then -- 失败 local haveRecord = BattleRecordManager.isHaveRecord() @@ -532,6 +534,8 @@ function this.ShowBattleResult(result, msg) end elseif fightType == BATTLE_TYPE.TASUILINGXIAO then this.ShowBattleResultByTaSuiLingXiao() + elseif fightType == BATTLE_TYPE.QIJIE_FIGHT then + this.ShowBattleResultByQiJieShiLian() else if result == 0 then -- 失败 local haveRecord = BattleRecordManager.isHaveRecord() @@ -667,6 +671,28 @@ function this.ShowBattleResultByTaSuiLingXiao() end end, 0.1):Start() end + +-- 七界试炼结算界面特殊显示 +function this.ShowBattleResultByQiJieShiLian() + Timer.New(function() + local bestData, allDamage= BattleRecordManager.GetBattleBestData() + if bestData then + -- 胜利显示本场比赛的表现最好的英雄 + UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId,bestData.skinId, bestData.damage, allDamage, function(_BattleBestPopup) + -- 打开关卡奖励界面 + UIManager.OpenPanel(UIName.RewardItemPopup, QiJieShiLianManager.battleResult.drop, 1,function(isBackBattle) + LogPink("isBackBattle "..tostring(isBackBattle)) + if not isBackBattle then + if _BattleBestPopup then + _BattleBestPopup:ClosePanel() + end + this:ClosePanel() + end + end, 10,true,true) + end) + end + end, 0.1):Start() +end -- 战斗波次变化回调 function this.OnOrderChanged(order) -- body diff --git a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua index 747d104f5e..0a7ae7c86e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua @@ -44,7 +44,7 @@ GMPanel = Inherit(BasePanel) local this = GMPanel local heroList = { - "4#10033#11", "4#10026#11", "4#10008#11", "4#10012#11", "4#10015#11","4#10014#11","4#10033#10","4#10026#10","4#10008#10","4#10012#10","4#10015#10","4#10014#10" + "4#10033#11", "4#10085#11", "4#10008#11", "4#10089#11", "4#10006#11", "4#10009#11", "4#10023#11" } local baowuList = { "1#100005#1", "1#100010#1", "1#100015#1", "1#100020#1", "1#100025#1","1#100030#1", "1#100035#1","1#100040#1" diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index a5bbed6eb3..c6784708f6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -2788,7 +2788,7 @@ function this.RequestPlayerInfo(uid, teamId,serverName,teamType, func) data.playerId = uid data.teamId = teamId data.serverId = serverName and 1 or 0 - data.teamType =teamType + -- data.teamType =teamType local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.GET_PLAYER_ONE_TEAM_INFO_REQUEST, MessageTypeProto_pb.GET_PLAYER_ONE_TEAM_INFO_RESPONSE, msg, function(buffer) local data = buffer:DataByte() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua index 6867e98c5d..738125132e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua @@ -68,8 +68,6 @@ function BattleWinPopup:NextStep() this.JumpServerHithtLadder() elseif m_fightType == BATTLE_TYPE.EndlessMpaFight then--无尽地图战斗 this.ShowBattleResultByEndless() - elseif m_fightType == BATTLE_TYPE.EndlessMpaFight then--七界试炼战斗 - this.ShowBattleResultByQiJie() --新回放功能 elseif m_fightType == BATTLE_TYPE.BACK_BATTLE then if BattleManager.GetLastBattleType() == BATTLE_TYPE.STORY_FIGHT then-- 新关卡战斗 @@ -114,37 +112,6 @@ function this.ShowBattleResultByMapFight() end end ---七界试炼战斗界面特殊显示 -function this.ShowBattleResultByQiJie() - local bestData, allDamage= BattleRecordManager.GetBattleBestData() - -- QiJieShiLianManager.battleResult = m_battleResult - if bestData then - -- 胜利显示本场比赛的表现最好的英雄 - UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId,bestData.skinId, bestData.damage, allDamage, function(_BattleBestPopup) - -- 打开关卡奖励界面 - UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function(isBackBattle) - if not isBackBattle then - if _BattleBestPopup then - _BattleBestPopup:ClosePanel() - end - if m_battlePanel then - m_battlePanel:ClosePanel() - end - this:ClosePanel() - end - end, 10, true, true) - end) - else - -- 打开关卡奖励界面 - UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function() - if m_battlePanel then - m_battlePanel:ClosePanel() - end - this:ClosePanel() - end, 10, true) - end -end - --无尽副本战斗界面特殊显示 function this.ShowBattleResultByEndless() local bestData, allDamage= BattleRecordManager.GetBattleBestData() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index 2047b05878..f488b07bac 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -69,6 +69,14 @@ local _ViewConfig = { {name = "切磋", func = 7}, } }, + [PLAYER_INFO_VIEW_TYPE.QIJIESHILIAN] = { + formationType = FormationTypeDef.FORMATION_QIJIESHILIAN, + tip = "七界试炼阵容:", + isAddFriend = false, + btnType = { + {name = "切磋", func = 7}, + } + }, } local curPlayerName = "" @@ -202,7 +210,7 @@ end function PlayerInfoPopup:OnShow() this.RefreshBtnShow() -- 请求数据 - -- --LogGreen(this._PlayerId.." "..this._Config.formationType) + LogGreen(this._PlayerId.." "..this._Config.formationType) netserverName = nil if this.serverName and this.serverName ~= "" then--and this.serverName ~= PlayerManager.serverInfo.name netserverName = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua index c8854fc33c..807a359342 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua @@ -71,6 +71,7 @@ function this.GetServerData(msg) this.curRank = msg.ranking this.curScore = msg.integral this.curProgress = msg.totalTier + LogRed("id:"..tostring(msg.id).." ranking:"..tostring(msg.ranking).." integral:"..tostring(msg.integral).." totalTier:"..tostring(msg.totalTier)) end function this.CheckCurStageNum() @@ -192,15 +193,15 @@ end function this.GetBattleResult() local config = QijieStage[this.curLevelId] local data = {} - data[1] = string.format( "阵容加成: %s%\n(%s条)",(#this.battleResult.teamBuffIds)*(config.ConditionValue[1][2]/100),#this.battleResult.teamBuffIds) - data[2] = string.format( "遗物加成: %s%\n(%s条)",(#this.battleResult.relicIds)*10,#this.battleResult.relicIds) + data[1] = "阵容加成: "..(#this.battleResult.teamBuffIds)*(config.ConditionValue[1][2]/100).."%\n("..#this.battleResult.teamBuffIds.."条)" + data[2] = "遗物加成: "..(#this.battleResult.relicIds*10).."%\n("..#this.battleResult.relicIds.."个)" local bonue = config.RoundReward[1][2] for i = 1, #config.RoundReward do if this.battleResult.round > config.RoundReward[i][1] then bonue = config.RoundReward[i][2] end end - data[3] = string.format( "回合加成: %s%\n(%s条)",bonue/100,this.battleResult.round) + data[3] = "回合加成: "..(bonue/100).."%\n("..this.battleResult.round.."回合)" return data end diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua index 28be743cf3..0e04486bc2 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua @@ -96,7 +96,7 @@ function QiJieShiLianPanel:BindEvent() UIManager.OpenPanel(UIName.GeneralTreasurePanel,ActivityTypeDef.QiJieTreasure) end) Util.AddClick(self.rewardBtn,function() - UIManager.OpenPanel(UIName.GeneralRankRewardPanel,4,1)--需要活动id，和我的排名 + UIManager.OpenPanel(UIName.GeneralRankRewardPanel,4,QiJieShiLianManager.curRank)--需要活动id，和我的排名 end) Util.AddClick(self.sortBtn,function() UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[28]) @@ -162,6 +162,7 @@ end --界面打开时调用（用于子类重写） function QiJieShiLianPanel:OnShow() self.curStage = 0 + NetManager.SevenWorldInfoRequest(0) self:Refresh() end diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index e2322b9ee7..810bdcb486 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua @@ -214,6 +214,9 @@ function this.SetRankingInfo(isTop, isAnim) elseif sData.rankType == RANK_TYPE.JUMPSERVER_HIGHTLADDER then--跨服天梯 dData = { rankInfo = {param1 = myRankData.param1}, force = myRankData.param1,} + elseif sData.rankType == RANK_TYPE.QIJIESHILIAN_RANK then--七界试炼 + dData = { rankInfo = {param1 = myRankData.param1}, + force = myRankData.param1,} end this.SetInfoShow(this.infoGo,dData,sData.rankType) --数据拆分 @@ -299,8 +302,10 @@ function this.SetHeadsInfo(data,root,index,name,level) UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER,data.serverName and data.serverName or nil) elseif sData.rankType == RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR or sData.rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_MONSTER_RANK then UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER_NORMAL,data.serverName and data.serverName or nil) - elseif sData.rankType == RANK_TYPE.WORLDARENA then + elseif sData.rankType == RANK_TYPE.WORLDARENA then--玉虚论道 UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, data.uid,2) + elseif sData.rankType == RANK_TYPE.QIJIESHILIAN_RANK then--七界试炼 + UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.QIJIESHILIAN,data.serverName and data.serverName or nil) else UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid) end @@ -342,6 +347,8 @@ function this.AddPlayerInfoClick(root,uid,serverName) UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER_NORMAL,serverName and serverName or nil) elseif sData.rankType == RANK_TYPE.WORLDARENA then UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, uid,2) + elseif sData.rankType == RANK_TYPE.QIJIESHILIAN_RANK then--七界试炼 + UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.QIJIESHILIAN,serverName and serverName or nil) else UIManager.OpenPanel(UIName.PlayerInfoPopup, uid) end @@ -566,6 +573,12 @@ function this.SetInfoShow(go,data,rankType,Value0) yxldTxt.text = "积分:".. data.crossScore local rate=WorldArenaManager.GetRankImgByScore(data.crossScore) yxldImg.sprite=this.spLoader:LoadSprite("y_yuxulundao_xiaobiao_0"..rate) + elseif rankType==RANK_TYPE.QIJIESHILIAN_RANK then--七界试炼 + if Value0 then + Value0:GetComponent("Text").text = ""..data.userName.."" + end + arenaScore:SetActive(true) + arenaScore:GetComponent("Text").text = "本周积分: ".. data.rankInfo.param1 end end return RankingSingleListPanel