From 2cb125db92b4f44efc2fbf8990949ace8cafc56f Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1545929779@qq.com> Date: Mon, 29 Apr 2024 21:57:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=97=E6=B5=AE=E7=BC=96=E9=98=9F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicActivityManager.lua | 2 +- .../~Lua/Modules/Guide/GuideManager.lua | 9 ++-- .../JumpServer/JumpServerHightLadderPanel.lua | 47 ++++++++++++++++++- .../Modules/JumpServer/JumpServerManager.lua | 1 + .../~Lua/Modules/Popup/PlayerInfoPopup.lua | 3 ++ 5 files changed, 54 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 3b688e14f2..65bf5a43ce 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -206,7 +206,7 @@ function this.CheckMingWangRed() if growData then for i = 1, 20 do local curData = growData[i] - if curData.data.limitNum - curData.data.boughtNum > 0 and + if curData and curData.data.limitNum - curData.data.boughtNum > 0 and BagManager.GetTotalItemNum(curData.data.costId) >= curData.data.price and BagManager.GetItemCountById(1351) >=DynamicActivityManager.GetMingWangLv(curData.data.shopItemData.BuyRule[2]-1) then return true diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index e9b4dc7f63..648ee682c0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -60,20 +60,17 @@ end function this.OnLevelChange() -- 提审服不再出发相关引导 LogError("1111111111111111111111111122222222222222等级辩护引导1111111111111 "..PlayerManager.level) - -- if SERVER_VERSION == 1 then - -- LogError("1111111111111111111111111122222222222222首充加入引导1111111111111") - -- return - -- end + -- 首充引导特殊处理到十级开放 if PlayerManager.level == 10 then LogError(" 首充加入引导") - --if CheckListIsContainValue1(_FuncGuideList,100200)==false then + if CheckListIsContainValue1(_FuncGuideList,100200)==false then if PlayerPrefs.GetInt(PlayerManager.uid.."isGMEsp")==0 then --GuideManager.ShowGuide(100200) table.insert(_FuncGuideList, 100200) end - --end + end this.CheckFuncGuide() --解开孙悟空封印的剧情 -- StoryMapManager.isShowStory = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua index 35c42e1434..2bee0be05d 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua @@ -339,7 +339,30 @@ function this.ShowSingleData(go,data,i) end) Util.AddOnceClick(cliclBtn,function() JumpServerManager.SetCurPersonInfo(data.personInfo) - UIManager.OpenPanel(UIName.PlayerInfoPopup, data.personInfo.uid, PLAYER_INFO_VIEW_TYPE.JUPMSERVER,data.personInfo.servername) + local formation=FormationTypeDef.LuoFuZhengFeng1 + if JumpServerManager.arenaType~=0 and JumpServerManager.stage==3 then + if JumpServerManager.arenaType==1 then + formation= FormationTypeDef.LuoFuZhengFeng1 + elseif JumpServerManager.arenaType==2 then + formation= FormationTypeDef.LuoFuZhengFeng2 + elseif JumpServerManager.arenaType==3 then + formation= FormationTypeDef.LuoFuZhengFeng3 + elseif JumpServerManager.arenaType==4 then + formation= FormationTypeDef.LuoFuZhengFeng4 + end + else + if curPos==1 then + formation= FormationTypeDef.LuoFuZhengFeng1 + elseif curPos==2 then + formation= FormationTypeDef.LuoFuZhengFeng2 + elseif curPos==3 then + formation= FormationTypeDef.LuoFuZhengFeng3 + elseif curPos==4 then + formation= FormationTypeDef.LuoFuZhengFeng4 + end + end + JumpServerManager.showRankType=formation + UIManager.OpenPanel(UIName.PlayerInfoPopup, data.personInfo.uid, PLAYER_INFO_VIEW_TYPE.JUPMSERVER,data.personInfo.servername,formation) end) elseif stage == JumpServer_Stage.NoStar and data and data.personInfo then playerInfo:SetActive(true) @@ -372,6 +395,28 @@ function this.ShowSingleData(go,data,i) end) Util.AddOnceClick(cliclBtn,function() JumpServerManager.SetCurPersonInfo(nil) + local formation=FormationTypeDef.LuoFuZhengFeng1 + if JumpServerManager.arenaType~=0 and JumpServerManager.stage==3 then + if JumpServerManager.arenaType==1 then + formation= FormationTypeDef.LuoFuZhengFeng1 + elseif JumpServerManager.arenaType==2 then + formation= FormationTypeDef.LuoFuZhengFeng2 + elseif JumpServerManager.arenaType==3 then + formation= FormationTypeDef.LuoFuZhengFeng3 + elseif JumpServerManager.arenaType==4 then + formation= FormationTypeDef.LuoFuZhengFeng4 + end + else + if curPos==1 then + formation= FormationTypeDef.LuoFuZhengFeng1 + elseif curPos==2 then + formation= FormationTypeDef.LuoFuZhengFeng2 + elseif curPos==3 then + formation= FormationTypeDef.LuoFuZhengFeng3 + elseif curPos==4 then + formation= FormationTypeDef.LuoFuZhengFeng4 + end + end UIManager.OpenPanel(UIName.PlayerInfoPopup, data.personInfo.uid, PLAYER_INFO_VIEW_TYPE.JUPMSERVER,data.personInfo.servername) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua index e7c8b7c74b..1aef96f62d 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua @@ -18,6 +18,7 @@ function this.Initialize() this.isGroup = -1 this.arenaType=1 this.stage=0 + this.showRankType=0 --当前显示罗浮玩家列表的编队类型 end --------------------------------------------- --跨服天梯数据 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index e65ea96a20..3183b85460 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -313,6 +313,9 @@ end function PlayerInfoPopup:OnShow() -- this.RefreshBtnShow() -- 请求数据 + if this._ViewType==PLAYER_INFO_VIEW_TYPE.JUPMSERVER then + this._Config.formationType=JumpServerManager.showRankType + end LogGreen("角色Id:"..tostring(this._PlayerId).." 编队Id:"..tostring(this._Config.formationType)) if this._PlayerId > 0 then--如果PlayerId > 0 说明是真人或者机器人,为0暂时为灵脉使用,直接是怪物组,数据需要自己拼接 netserverName = nil