Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
fef7ea4d0b
|
|
@ -754,7 +754,6 @@ end
|
|||
function this:OnOpen()
|
||||
activitys = DynamicActivityManager.GetActivityTableDataByPageInde(0)
|
||||
this.CreatActivity()
|
||||
FixedUpdateBeat:Add(this.OnUpdate, self)--长按方法注册
|
||||
end
|
||||
|
||||
--检测六星前往活动是否显示
|
||||
|
|
@ -1096,6 +1095,8 @@ function this:OnShow()
|
|||
HarmonyManager.CheckRedPoinStatusUpTowerMainCityRed()
|
||||
--山河试炼红点
|
||||
CheckRedPointStatus(RedPointType.FightLevelTrial)
|
||||
|
||||
FixedUpdateBeat:Add(this.OnUpdate, self)--长按方法注册
|
||||
end
|
||||
|
||||
--
|
||||
|
|
@ -1685,13 +1686,10 @@ function this.RefreshBattleUpLvTip()
|
|||
end
|
||||
local roleRefreshNum = 0
|
||||
function this.OnMainPlayerNPCRefresh()
|
||||
-- Log("roleRefreshNum asd ")
|
||||
if roleRefreshNum < 20 then
|
||||
roleRefreshNum = roleRefreshNum + 1
|
||||
-- LogRed("roleRefreshNum "..roleRefreshNum)
|
||||
elseif roleRefreshNum >= 20 and PlayerManager.MainPanelRoleMonveState then
|
||||
roleRefreshNum = 0
|
||||
-- LogRed("PlayerManager.MainPanelRoleMonveState "..tostring(PlayerManager.MainPanelRoleMonveState))
|
||||
if curNPCList and #curNPCList > 0 then
|
||||
table.sort(curNPCList,function(a,b)
|
||||
return a.leader.transform.localPosition.y > b.leader.transform.localPosition.y
|
||||
|
|
|
|||
Loading…
Reference in New Issue