From 41282c144c43a854ad6cf16d21839bf5d61ebfc9 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Sat, 11 Sep 2021 15:47:19 +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=E4=B8=83=E7=95=8C=E5=B8=81=E5=A2=9E=E5=8A=A0=E5=8A=A0?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 3 ++- .../~Lua/Modules/JumpServer/JumpServerPanel.lua | 2 +- .../~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua | 7 +++++++ .../~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua | 2 +- Assets/ManagedResources/~Lua/View/UpView.lua | 4 +++- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 6e7a0a7935..ae620b0440 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -486,7 +486,7 @@ PanelType = { XiangYaoDuoBao = {14,16,1220},--降妖夺宝 NiuQiChongTian = {14,16,1300},--牛气冲天 XiuXing = {14,16,1226},--修行 - QiJie = {14,16,16},--七界试炼 + QiJie = {14,16,1240},--七界试炼 WorldArena = { 14,16,106}, --玉虚论道 } @@ -553,6 +553,7 @@ UpViewRechargeType = { LuoFuJingShi = 1207,--罗浮晶石 SuiFanXingCheng = 1007, -- 碎繁星辰 yuxulundaoTicket=106, --玉虚论道邀请函 + QiJieCoin = 1240,--七界币 } SHOP_PAGE = { diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua index 334eda262b..4067513467 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua @@ -162,7 +162,7 @@ function JumpServerPanel:BtnClick(id) end if id == JumpServer_Type.QiJieShiLian then local qiejieConfig = ConfigManager.GetConfig(ConfigName.QijieStage) - NetManager.SevenWorldInfoRequest(nil,function (msg) + NetManager.SevenWorldInfoRequest(0,function (msg) if qiejieConfig[msg.id] then UIManager.OpenPanel(UIName.QiJieShiLianPanel) else diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua index 295faa3c20..098194e600 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua @@ -181,6 +181,7 @@ function this.FormatTreasureData(_tabNum) return dataList end +--获取战斗结束后信息(拼接) function this.GetBattleResult() local config = QijieStage[this.curLevelId] local data = {} @@ -196,4 +197,10 @@ function this.GetBattleResult() return data end +--获取遗物效果 +function this.GetTreasureEffect(treasureList) + local moneyString = "" + local attriString = "" +end + return QiJieShiLianManager \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua index 20e4c1530b..939f9c7a50 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua @@ -88,7 +88,7 @@ function QiJieShiLianPanel:BindEvent() UIManager.OpenPanel(UIName.GeneralInfoPopup,GENERALINFO_TYPE.QiJieGoalAttri,self.configData) end) Util.AddClick(self.giftBtn,function() - NetManager.SevenWorldRelicRequest(nil,function (msg) + NetManager.SevenWorldRelicRequest(0,function (msg) UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.QiJieTreasure) end) end) diff --git a/Assets/ManagedResources/~Lua/View/UpView.lua b/Assets/ManagedResources/~Lua/View/UpView.lua index 45fd803c20..10582b37bd 100644 --- a/Assets/ManagedResources/~Lua/View/UpView.lua +++ b/Assets/ManagedResources/~Lua/View/UpView.lua @@ -57,6 +57,7 @@ local _ShowPlusType = { UpViewRechargeType.SuiFanXingCheng, UpViewRechargeType.LuoFuJingShi, UpViewRechargeType.yuxulundaoTicket, + UpViewRechargeType.QiJieCoin, } -- 判断是否显示加号 @@ -383,7 +384,8 @@ function UpView:RechargeType(_type) _type==UpViewRechargeType.XuanHuangZhiQi or _type==UpViewRechargeType.LuoFuJingShi or _type==UpViewRechargeType.XiuXian or - _type==UpViewRechargeType.SuiFanXingCheng then + _type==UpViewRechargeType.SuiFanXingCheng or + _type==UpViewRechargeType.QiJieCoin then UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _type) end end