Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
ZhangBiao 2020-08-21 18:30:50 +08:00
commit bbe2c8c1f3
6 changed files with 105 additions and 18 deletions

View File

@ -14192,6 +14192,46 @@ MonoBehaviour:
extension: .mp3
resPathIndex: 87
resAbNameIndex: 495
- resName: s_jieling_fl_3008_skeff_casting_attacked_mp3
extension: .mp3
resPathIndex: 87
resAbNameIndex: 495
- resName: s_jieling_fl_3008_skeff_casting_screeneff_mp3
extension: .mp3
resPathIndex: 87
resAbNameIndex: 495
- resName: s_jieling_hs_3006_skeff_casting_attacked_mp3
extension: .mp3
resPathIndex: 87
resAbNameIndex: 495
- resName: s_jieling_hs_3006_skeff_casting_screeneff_mp3
extension: .mp3
resPathIndex: 87
resAbNameIndex: 495
- resName: s_jieling_lms_3009_skeff_casting_attacked_mp3
extension: .mp3
resPathIndex: 87
resAbNameIndex: 495
- resName: s_jieling_lms_3009_skeff_casting_screeneff_mp3
extension: .mp3
resPathIndex: 87
resAbNameIndex: 495
- resName: s_jieling_md_3007_skeff_casting_attacked_mp3
extension: .mp3
resPathIndex: 87
resAbNameIndex: 495
- resName: s_jieling_md_3007_skeff_casting_screeneff_mp3
extension: .mp3
resPathIndex: 87
resAbNameIndex: 495
- resName: s_jieling_sl_3005_skeff_casting_attacked_mp3
extension: .mp3
resPathIndex: 87
resAbNameIndex: 495
- resName: s_jieling_sl_3005_skeff_casting_screeneff_mp3
extension: .mp3
resPathIndex: 87
resAbNameIndex: 495
- resName: Audio_skeff_debuff_012
extension: .mp3
resPathIndex: 88
@ -18208,6 +18248,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 132
resAbNameIndex: 1495
- resName: x_xianshishangshi_banner_png
extension: .png
resPathIndex: 132
resAbNameIndex: 1495
- resName: y_yjj_zi
extension: .png
resPathIndex: 132
@ -27988,6 +28032,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 156
resAbNameIndex: 1610
- resName: r_fb_90008
extension: .png
resPathIndex: 156
resAbNameIndex: 1610
- resName: r_fb_90010
extension: .png
resPathIndex: 156
@ -28024,6 +28072,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 156
resAbNameIndex: 1610
- resName: r_fb_90020
extension: .png
resPathIndex: 156
resAbNameIndex: 1610
- resName: r_fb_90021
extension: .png
resPathIndex: 156
@ -28032,6 +28084,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 156
resAbNameIndex: 1610
- resName: r_fb_90023
extension: .png
resPathIndex: 156
resAbNameIndex: 1610
- resName: r_fb_90024
extension: .png
resPathIndex: 156
@ -28044,10 +28100,18 @@ MonoBehaviour:
extension: .png
resPathIndex: 156
resAbNameIndex: 1610
- resName: r_fb_90027
extension: .png
resPathIndex: 156
resAbNameIndex: 1610
- resName: r_fb_90028
extension: .png
resPathIndex: 156
resAbNameIndex: 1610
- resName: r_fb_90029
extension: .png
resPathIndex: 156
resAbNameIndex: 1610
- resName: r_fb_90031
extension: .png
resPathIndex: 156
@ -28068,6 +28132,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 156
resAbNameIndex: 1610
- resName: r_fb_90037
extension: .png
resPathIndex: 156
resAbNameIndex: 1610
- resName: r_fb_90038
extension: .png
resPathIndex: 156
@ -28104,6 +28172,14 @@ MonoBehaviour:
extension: .png
resPathIndex: 156
resAbNameIndex: 1610
- resName: r_fb_90048
extension: .png
resPathIndex: 156
resAbNameIndex: 1610
- resName: r_fb_90049
extension: .png
resPathIndex: 156
resAbNameIndex: 1610
- resName: r_fb_90050
extension: .png
resPathIndex: 156
@ -49235,7 +49311,6 @@ MonoBehaviour:
- lz4/bg/r_guanka_richang_tanchuangdi.unity3d
- lz4/bg/r_zl_bg.unity3d
- lz4/dynamicatlas/artfont/r_zl_biaoti.unity3d
- lz4/dynamicatlas/r_hunyin_hunyinkuangzise001.unity3d
- lz4/dynamicatlas/r_ymqf_dikuang.unity3d
- lz4/dynamicatlas/r_zl_biaotidi.unity3d
- lz4/fonts/fzjinls.unity3d
@ -49243,10 +49318,8 @@ MonoBehaviour:
- lz4/icons.unity3d
- lz4/prefabs/effect/ui/ui_effect_baoxiang_kaiqi.unity3d
- lz4/prefabs/effect/ui/ui_effect_baoxiang_kekaiqi.unity3d
- lz4/prefabs/ui/view.unity3d
- lz4/publicartres/animations.unity3d
- lz4/publicartres/materials.unity3d
- lz4/publicartres/models.unity3d
- lz4/publicartres/textures.unity3d
- assetBundleName: lz4/prefabs/ui/monstercamp.unity3d
dependences:

View File

@ -609,6 +609,7 @@ RedPointType = {
QianKunBox = 2016,--乾坤包囊
PoZhenZhuXian = 2017,--破阵诛仙
PoZhenZhuXianTask = 20171,--破阵诛仙任务
PoZhenZhuXianRecharge = 20172,--破阵诛仙累充
---聊天相关-----
Chat = 207,

View File

@ -1143,6 +1143,16 @@ function TimeToDH(second)
return string.format(Language[12278],day, hour)
end
--- 将一段时间转换为时
function TimeToH(second)
local day = math.floor(second / (24 * 3600))
local minute = math.floor(second / 60) % 60
local sec = second % 60
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
return string.format("%02d时", hour)
end
--- 将一段时间转换为时分秒
function TimeToHMS(t)
if not t or t < 0 then

View File

@ -16,19 +16,19 @@ local _PageInfo = {--后期可以做成tableInserticon名字都去读表
},
[3] = { --破阵诛仙
default = "p_pozhengzhuxian_anniu_02", lock = "p_pozhengzhuxian_anniu_02", select = "p_pozhengzhuxian_anniu_01",
rpType = RedPointType.PoZhenZhuXianTask,panelType = PanelType.QianKunBox,
rpType = RedPointType.PoZhenZhuXianTask,panelType = PanelType.Main,
},
[4] = { --珍奇礼包
default = "z_zhenqibaoge_anniu_02", lock = "z_zhenqibaoge_anniu_02", select = "z_zhenqibaoge_anniu_01",
rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,
rpType = "",panelType = PanelType.Main,
},
[5] = { --累计充值
default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu",
rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,
rpType = RedPointType.PoZhenZhuXianRecharge,panelType = PanelType.Main,
},
[6] = { --限时商市
default = "x_xianshishangshi_anniu_02", lock = "x_xianshishangshi_anniu_02", select = "x_xianshishangshi_anniu_01",
rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,
rpType = "",panelType = PanelType.Main,
},
}

View File

@ -13,6 +13,8 @@ function PoZhenZhuXianPage:ctor(mainPanel, gameObject)
end
function PoZhenZhuXianPage:InitComponent(gameObject)
itemsGrid = {}--item重复利用
singleTaskPre = {}
this.time = Util.GetGameObject(gameObject, "content/tiao/time"):GetComponent("Text")
this.itemPre = Util.GetGameObject(gameObject, "content/itempre")
this.scrollItem = Util.GetGameObject(gameObject, "content/grid")
@ -64,11 +66,11 @@ function PoZhenZhuXianPage:SetTime()
five_timeDown = CalculateSecondsNowTo_N_OClock(5)
week_timeDown = endtime - GetTimeStamp()
for k,v in pairs(singleTaskPre) do
v.com.gameObject:SetActive(true)
-- v.com.gameObject:SetActive(true)
if v and v.data.type == 1 then
v.com:GetComponent("Text").text = "剩余:"..TimeToHMS(five_timeDown)
v.com:GetComponent("Text").text = "剩余:"..TimeToH(five_timeDown)
else
v.com:GetComponent("Text").text = "剩余:"..TimeToHMS(week_timeDown)
v.com:GetComponent("Text").text = "剩余:"..TimeToDH(week_timeDown)
end
end
this.time.text = "剩余时间:"..TimeToDHMS(week_timeDown)
@ -84,11 +86,11 @@ function PoZhenZhuXianPage:SetTime()
return
end
for k,v in pairs(singleTaskPre) do
v.com.gameObject:SetActive(true)
-- v.com.gameObject:SetActive(true)
if v and v.data.type == 1 then
v.com:GetComponent("Text").text = "剩余:"..TimeToHMS(five_timeDown)
v.com:GetComponent("Text").text = "剩余:"..TimeToH(five_timeDown)
else
v.com:GetComponent("Text").text = "剩余:"..TimeToHMS(week_timeDown)
v.com:GetComponent("Text").text = "剩余:"..TimeToDH(week_timeDown)
end
end
this.time.text = "剩余时间:"..TimeToDHMS(week_timeDown)
@ -217,15 +219,15 @@ function PoZhenZhuXianPage:OnDestroy()
self.timer = nil
end
sortingOrder = 0
if singleTaskPre then
singleTaskPre = {}
end
singleTaskPre = {}
itemsGrid = {}
end
function PoZhenZhuXianPage:OnHide()
sortingOrder = 0
if self.timer then
self.timer:Stop()
self.timer = nil
end
end
--- 将一段时间转换为天时分秒
function PoZhenZhuXianPage:TimeToDHMS(second)

View File

@ -387,6 +387,7 @@ function this.RegisterRedCheckFunc()
RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus)
RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus)
RPData:SetParent(RedPointType.PoZhenZhuXianTask, OperatingManager.CheckPoZhenZhuXianTaskRed)
-- RPData:SetParent(RedPointType.PoZhenZhuXianRecharge, OperatingManager.CheckLeiJiChongZhiRedData)
RPData:AddCheckFunc(RedPointType.OrdinaryExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.EXPEDITION)
RPData:AddCheckFunc(RedPointType.HeroExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN)