【诸多修改】提交
parent
fc318e7d44
commit
6283677b8f
|
@ -47,8 +47,6 @@ function EnvoyItem:SetItemData(data)
|
||||||
end
|
end
|
||||||
|
|
||||||
function EnvoyItem:OnOpen()
|
function EnvoyItem:OnOpen()
|
||||||
|
|
||||||
|
|
||||||
self.lock:SetActive(false)
|
self.lock:SetActive(false)
|
||||||
self:SetItem(self.gameObject,self.data)
|
self:SetItem(self.gameObject,self.data)
|
||||||
Util.AddOnceClick(self.gameObject,function ()
|
Util.AddOnceClick(self.gameObject,function ()
|
||||||
|
@ -58,12 +56,12 @@ function EnvoyItem:OnOpen()
|
||||||
-- body
|
-- body
|
||||||
UIManager.OpenPanel(UIName.HongMengEnvoyUnloadPanel,self.data)
|
UIManager.OpenPanel(UIName.HongMengEnvoyUnloadPanel,self.data)
|
||||||
else
|
else
|
||||||
|
|
||||||
if self.data.time - GetTimeStamp() > 0 then
|
if self.data.time - GetTimeStamp() > 0 then
|
||||||
local content = ""
|
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)
|
content =string.format(Language[12189],money)
|
||||||
|
|
||||||
MsgPanel.ShowTwo(content,function ()
|
MsgPanel.ShowTwo(content,function ()
|
||||||
MsgPanel.Hide()
|
MsgPanel.Hide()
|
||||||
end,function ()
|
end,function ()
|
||||||
|
|
|
@ -177,7 +177,9 @@ function this.SingleBoxDataShow(go,boxData,index)
|
||||||
-- print(Language[12205],HarmonyManager.GongMingBox)
|
-- print(Language[12205],HarmonyManager.GongMingBox)
|
||||||
else
|
else
|
||||||
local content = ""
|
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)
|
content =string.format(Language[12189],money)
|
||||||
MsgPanel.ShowTwo(content,function ()
|
MsgPanel.ShowTwo(content,function ()
|
||||||
MsgPanel.Hide()
|
MsgPanel.Hide()
|
||||||
|
|
|
@ -383,6 +383,9 @@ function EveryDayGiftNew:GetRemainTime()
|
||||||
self.localTimer = nil
|
self.localTimer = nil
|
||||||
end
|
end
|
||||||
local la = self.actConfig.ShowTime ~= 1 and Language[10023] or Language[11355]
|
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 freshTime = 0
|
||||||
local packFreshTime = 0
|
local packFreshTime = 0
|
||||||
|
|
||||||
|
|
|
@ -348,16 +348,20 @@ function UpView:RechargeType(_type)
|
||||||
PopupTipPanel.ShowTip(Language[10422])
|
PopupTipPanel.ShowTip(Language[10422])
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
JumpManager.GoJump(36008)
|
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XinRenShop) then
|
||||||
elseif _type == UpViewRechargeType.SoulCrystal then
|
JumpManager.GoJump(36012)
|
||||||
-- 充值商店
|
else
|
||||||
if not MapManager.Mapping then
|
|
||||||
if not ShopManager.IsActive(SHOP_TYPE.SOUL_STONE_SHOP) then
|
|
||||||
PopupTipPanel.ShowTip(Language[10422])
|
|
||||||
return
|
|
||||||
end
|
|
||||||
JumpManager.GoJump(36008)
|
JumpManager.GoJump(36008)
|
||||||
end
|
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--跳限时商市
|
elseif _type == UpViewRechargeType.YeQiuQuan then--跳限时商市
|
||||||
if UIManager.IsOpen(UIName.TenRecruitPanel) then
|
if UIManager.IsOpen(UIName.TenRecruitPanel) then
|
||||||
UIManager.ClosePanel(UIName.TenRecruitPanel)
|
UIManager.ClosePanel(UIName.TenRecruitPanel)
|
||||||
|
|
Loading…
Reference in New Issue