diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua index a21c86a450..7ef830c052 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua @@ -47,8 +47,6 @@ function EnvoyItem:SetItemData(data) end function EnvoyItem:OnOpen() - - self.lock:SetActive(false) self:SetItem(self.gameObject,self.data) Util.AddOnceClick(self.gameObject,function () @@ -58,12 +56,12 @@ function EnvoyItem:OnOpen() -- body UIManager.OpenPanel(UIName.HongMengEnvoyUnloadPanel,self.data) else - if self.data.time - GetTimeStamp() > 0 then local content = "" - local money = math.ceil((self.data.time - GetTimeStamp()) / 432) + local str = ConfigManager.GetConfigData(ConfigName.SpecialConfig,100).Value + local num = tonumber(string.split(str,"#")[1]) + local money = math.ceil((HarmonyManager.hongmengHeroInfos[boxData.Id].time - GetTimeStamp()) / num)*tonumber(string.split(str,"#")[3]) content =string.format(Language[12189],money) - MsgPanel.ShowTwo(content,function () MsgPanel.Hide() end,function () diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua index d1ddeddb37..8d1e2d8ba0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua @@ -177,7 +177,9 @@ function this.SingleBoxDataShow(go,boxData,index) -- print(Language[12205],HarmonyManager.GongMingBox) else local content = "" - local money = math.ceil((HarmonyManager.hongmengHeroInfos[boxData.Id].time - GetTimeStamp()) / 432) + local str = ConfigManager.GetConfigData(ConfigName.SpecialConfig,100).Value + local num = tonumber(string.split(str,"#")[1]) + local money = math.ceil((HarmonyManager.hongmengHeroInfos[boxData.Id].time - GetTimeStamp()) / num)*tonumber(string.split(str,"#")[3]) content =string.format(Language[12189],money) MsgPanel.ShowTwo(content,function () MsgPanel.Hide() diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua index 6a8f538f5a..cae7181316 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua @@ -383,6 +383,9 @@ function EveryDayGiftNew:GetRemainTime() self.localTimer = nil end local la = self.actConfig.ShowTime ~= 1 and Language[10023] or Language[11355] + if self.actConfig.ActiveType == ActivityTypeDef.XinRenShop then + la = "结束时间:" + end local freshTime = 0 local packFreshTime = 0 diff --git a/Assets/ManagedResources/~Lua/View/UpView.lua b/Assets/ManagedResources/~Lua/View/UpView.lua index e9ca65c608..b0604efc73 100644 --- a/Assets/ManagedResources/~Lua/View/UpView.lua +++ b/Assets/ManagedResources/~Lua/View/UpView.lua @@ -348,16 +348,20 @@ function UpView:RechargeType(_type) PopupTipPanel.ShowTip(Language[10422]) return end - JumpManager.GoJump(36008) - elseif _type == UpViewRechargeType.SoulCrystal then - -- 充值商店 - if not MapManager.Mapping then - if not ShopManager.IsActive(SHOP_TYPE.SOUL_STONE_SHOP) then - PopupTipPanel.ShowTip(Language[10422]) - return - end + if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XinRenShop) then + JumpManager.GoJump(36012) + else JumpManager.GoJump(36008) end + -- elseif _type == UpViewRechargeType.SoulCrystal then + -- -- 充值商店 + -- if not MapManager.Mapping then + -- if not ShopManager.IsActive(SHOP_TYPE.SOUL_STONE_SHOP) then + -- PopupTipPanel.ShowTip(Language[10422]) + -- return + -- end + -- JumpManager.GoJump(36008) + -- end elseif _type == UpViewRechargeType.YeQiuQuan then--跳限时商市 if UIManager.IsOpen(UIName.TenRecruitPanel) then UIManager.ClosePanel(UIName.TenRecruitPanel)