From 1cbebc79d4b6a4c01f540e224f993aee0ef32bd1 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 28 Apr 2021 00:32:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E6=8E=A8=E9=80=81=E7=A4=BC?= =?UTF-8?q?=E5=8C=85=E3=80=91=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UpGradePackage/UpGradePackagePanel.lua | 37 +++---------------- 1 file changed, 6 insertions(+), 31 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua index e998e8127b..9420301fdd 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -178,50 +178,25 @@ function this:Refresh() end Util.GetGameObject(self.gameObject,activityType[curType].comp):SetActive(true) - -- local level = 0 - -- if (PlayerManager.level)%10 == 8 then - -- level = PlayerManager.level - -- else - -- level = (math.floor(PlayerManager.level/10)-1)*10+8 - -- end rechargeNum= VipManager.GetChargedNum() - - + curGiftId = rechargeData.goodsId + LogBlue("#curGiftId:"..tostring(curGiftId)) if curType == 1 then - -- this.tip.text = Language[11937]..level..Language[12174] or "" this.tip.text = string.format("恭喜您等级提升至%s级,我们为您准备了超值礼包,助您提升战力!!!",RechargeConfig[curGiftId].Desc) - -- elseif curType == 3 then - -- local specialConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,93).Value - -- local num = tonumber(specialConfig) - -- local value = fightLevelConfig[FightPointPassManager.lastPassFightId].SortId - -- local value2 = GetLanguageStrById(ConfigManager.GetConfigDataByKey(ConfigName.MainLevelConfig,"SortId",math.floor(value/num)*num).Name) - -- this.tip.text =Language[11939]..value2..Language[11940] - -- elseif curType == 4 then - -- local specialConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,92).Value - -- local str = string.split(specialConfig,"|") - -- local nums = string.split(str[1],"#") - -- local canGet = false - -- local value = MonsterCampManager.monsterWave - -- local value2 = 0 - -- if value <= tonumber(nums[#nums]) then - -- local temp = tonumber(nums[#nums]) - tonumber(nums[#nums-1]) - -- value2 = math.floor(value/temp) * temp - -- else - -- value2 = math.floor((value - tonumber(nums[#nums]))/tonumber(str[2]))* tonumber(str[2]) + tonumber(nums[#nums]) - -- end + LogPink(string.format("恭喜您等级提升至%s级,我们为您准备了超值礼包,助您提升战力!!!",RechargeConfig[curGiftId].Desc)) elseif curType == 3 then this.tip.text = string.format("恭喜通关当前关卡,我们为您准备了超值礼包,助您战力飙升") + LogYellow(string.format("恭喜通关当前关卡,我们为您准备了超值礼包,助您战力飙升")) elseif curType == 4 then this.tip.text = string.format("恭喜您击败心魔挑战成功,我们为您准备了超值礼包,帮助您击杀心魔快速通关!") + LogYellow(string.format("恭喜您击败心魔挑战成功,我们为您准备了超值礼包,帮助您击杀心魔快速通关!")) else this.tip.text = "" + LogPurple("空的!!!!!!!!!!!") end - -- this.tip.text = curType == 1 and "恭喜您等级提升至"..level.."级,我们为您准备了超值礼包,助您提升战力!!!" or "" - this.arrowsLeft:SetActive(num > 1) this.arrowsRight:SetActive(num > 1) - curGiftId = rechargeData.goodsId curEndTime = rechargeData.endTime this.endTime.text = Language[10573]..TimeToHMS(curEndTime-GetTimeStamp()) this.endTime.gameObject:GetComponent("RectTransform").localPosition = activityType[curType].timePos From e918945386083046098a0e7fa22fddab48b40a42 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 28 Apr 2021 00:32:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=BB=E5=9F=8E=E5=85=AD=E6=98=9F?= =?UTF-8?q?=E7=8E=89=E5=B8=9D=E5=85=A5=E5=8F=A3=E8=BF=9B=E5=85=A5=E6=88=90?= =?UTF-8?q?=E9=95=BF=E7=A4=BC=E5=8C=85=E6=BB=91=E5=8A=A8=E5=88=B0=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E6=9D=A1=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 1 + Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua | 2 ++ .../~Lua/Modules/Recharge/View/EveryDayGift.lua | 3 +++ 3 files changed, 6 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index a02b1c6dff..3668e25cb0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -334,6 +334,7 @@ function this:BindEvent() --六星前往 Util.AddClick(this.btnSixStarGo,function() + PlayerManager.isSixStarJump=true JumpManager.GoJump(36011) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua index f0be44a927..21d54853f4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua @@ -33,6 +33,8 @@ this.now_index = 0 --头像框数据 this.headFrameList = {} this.MainPanelRoleMonveState = false +--是否为从六星玉帝入口跳转进入 +this.isSixStarJump=false --激活的称号 时装 坐骑 this.isRefreshMainPanelNpc = true diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua index ec36512dd1..5fd36b9f7b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua @@ -174,6 +174,9 @@ function EveryDayGift:RefreshGiftData(isTop,isAni) break end end + if PlayerManager.isSixStarJump and curindex==0 then + curindex=7 + end if curindex ~= 0 then --LogGreen("curindex:"..curindex) self.scrollView:SetIndex(curindex)