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

ZhangBiao 2020-10-10 14:23:53 +08:00
commit 0ea4b713cb
2 changed files with 3 additions and 2 deletions

View File

@ -57,8 +57,8 @@ local activityType = {
bg = "Bg2",
hero = {
[1]={name="Bg2/hero1",id=10003,hero="d_danxinbixue_shenjiang1"},
[2]={name="Bg2/hero3",id=10024,hero="d_danxinbixue_shenjiang2"},
[3]={name="Bg2/hero2",id=10089,hero="d_danxinbixue_shenjiang3"},
[2]={name="Bg2/hero3",id=10024,hero="d_danxinbixue_shenjiang3"},
[3]={name="Bg2/hero2",id=10089,hero="d_danxinbixue_shenjiang2"},
},
title = "d_danxinbixue_zi",
helptype = HELP_TYPE.TimeLimitedCall

View File

@ -145,6 +145,7 @@ end
function Expert_UpLv:OnDestroy()
sortingOrder = 0
itemList = {}
end
return Expert_UpLv