Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
commit
fe2e122607
|
@ -35,8 +35,8 @@ local bannerType = {
|
||||||
[27] = {compent = "bg1",titilebg1 = "x_xianglongfuhu_banner2_zh"},
|
[27] = {compent = "bg1",titilebg1 = "x_xianglongfuhu_banner2_zh"},
|
||||||
[28] = {compent = "bg1",titilebg1 = "b_bowenduoshi_banner_zh"},
|
[28] = {compent = "bg1",titilebg1 = "b_bowenduoshi_banner_zh"},
|
||||||
[29] = {compent = "bg1",titilebg1 = "t_tianxiangjiren_banner_zh"},
|
[29] = {compent = "bg1",titilebg1 = "t_tianxiangjiren_banner_zh"},
|
||||||
[30] = {compent = "bg1",titilebg1 = "q_qikaidesheng_banner_zh"},
|
[30] = {compent = "bg1",titilebg1 = "s_suoxiangpimi_banner_zh"},
|
||||||
[31] = {compent = "bg1",titilebg1 = "t_tianxiangjiren_banner_zh"},
|
[31] = {compent = "bg1",titilebg1 = "x_xialuxiangfeng_banner_zh"},
|
||||||
[32] = {compent = "bg1",titilebg1 = "s_suoxiangpimi_banner_zh"},
|
[32] = {compent = "bg1",titilebg1 = "s_suoxiangpimi_banner_zh"},
|
||||||
[33] = {compent = "bg1",titilebg1 = "x_xialuxiangfeng_banner_zh"},
|
[33] = {compent = "bg1",titilebg1 = "x_xialuxiangfeng_banner_zh"},
|
||||||
[34] = {compent = "bg1",titilebg1 = "t_tongqiangtiebi_banner_zh"},
|
[34] = {compent = "bg1",titilebg1 = "t_tongqiangtiebi_banner_zh"},
|
||||||
|
|
|
@ -353,22 +353,22 @@ local activityType = {
|
||||||
[4330] = {
|
[4330] = {
|
||||||
bg = "Bg2",
|
bg = "Bg2",
|
||||||
hero = {
|
hero = {
|
||||||
[1]={name="Bg2/hero1",id=10008,hero="b_bowenduoshi_shenjiang1"}, ----精卫
|
[1]={name="Bg2/hero1",id=10092,hero="s_shibukedang_shenjiang11"}, ----精卫
|
||||||
[2]={name="Bg2/hero2",id=10014,hero="c_ccfy_kuang01"}, ---哪吒
|
[2]={name="Bg2/hero2",id=10033,hero="b_bianhuanmoce_shenjiang2"}, ---哪吒
|
||||||
[3]={name="Bg2/hero3",id=10013,hero="y_yishandaohai_shenjiang2"}, --吕洞宾
|
[3]={name="Bg2/hero3",id=10090,hero="x_xianglongfuhu_shenjiang22"}, --吕洞宾
|
||||||
},
|
},
|
||||||
title = "b_bowenduoshi_zi_zh",
|
title = "s_suoxiangpimi_zi_zh",
|
||||||
helptype = HELP_TYPE.TimeLimitedCall
|
helptype = HELP_TYPE.TimeLimitedCall
|
||||||
},
|
},
|
||||||
-- 天相吉人
|
-- 天相吉人
|
||||||
[4331] = {
|
[4331] = {
|
||||||
bg = "Bg2",
|
bg = "Bg2",
|
||||||
hero = {
|
hero = {
|
||||||
[1]={name="Bg2/hero1",id=10087,hero="t_tianxiangjiren_shenjiang1"}, ----娥皇
|
[1]={name="Bg2/hero1",id=10024,hero="d_danxinbixue_shenjiang3"}, ----娥皇
|
||||||
[2]={name="Bg2/hero2",id=10043,hero="t_tianxiangjiren_shenjiang2"}, ---太阴星君
|
[2]={name="Bg2/hero2",id=10023,hero="x_xuanjimiaosuan_shenjiang2"}, ---太阴星君
|
||||||
[3]={name="Bg2/hero3",id=10033,hero="t_tianxiangjiren_shenjiang3"}, --净光天女
|
[3]={name="Bg2/hero3",id=10041,hero="x_xianshizaohuan_ttjz"}, --净光天女
|
||||||
},
|
},
|
||||||
title = "t_tianxiangjiren_zi_zh",
|
title = "x_xialuxiangfeng_zi_zh",
|
||||||
helptype = HELP_TYPE.TimeLimitedCall
|
helptype = HELP_TYPE.TimeLimitedCall
|
||||||
},
|
},
|
||||||
--博文多识 限时召唤
|
--博文多识 限时召唤
|
||||||
|
|
|
@ -843,6 +843,7 @@ function this.ExpeditionResetIndication(buffer)
|
||||||
PlayerPrefs.SetInt(PlayerManager.uid.."Expedition", 0)
|
PlayerPrefs.SetInt(PlayerManager.uid.."Expedition", 0)
|
||||||
ExpeditionManager.SetExpeditionState(3)
|
ExpeditionManager.SetExpeditionState(3)
|
||||||
ExpeditionManager.expeditionLeve = 1
|
ExpeditionManager.expeditionLeve = 1
|
||||||
|
ExpeditionManager.allSHoly = {}
|
||||||
ExpeditionManager.InitExpeditionData(msg)
|
ExpeditionManager.InitExpeditionData(msg)
|
||||||
ExpeditionManager.RefreshPanelShowByState()
|
ExpeditionManager.RefreshPanelShowByState()
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue