Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
dc5f09cc02
|
|
@ -612,7 +612,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1709950243102644360
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -5433,7 +5433,7 @@ ParticleSystem:
|
|||
--- !u!199 &5104331235060178184
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -5509,7 +5509,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &3549260751842462633
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -10438,7 +10438,7 @@ ParticleSystem:
|
|||
--- !u!199 &8643527419215915995
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -15709,7 +15709,7 @@ ParticleSystem:
|
|||
--- !u!199 &4987984508322184416
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -22582,7 +22582,7 @@ ParticleSystem:
|
|||
--- !u!199 &3262653027282754651
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -27551,7 +27551,7 @@ ParticleSystem:
|
|||
--- !u!199 &253417761310031868
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -27853,7 +27853,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7161819338335154618
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -32986,7 +32986,7 @@ ParticleSystem:
|
|||
--- !u!199 &2319293122981156966
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -38264,7 +38264,7 @@ ParticleSystem:
|
|||
--- !u!199 &7771438493932148345
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -43288,7 +43288,7 @@ ParticleSystem:
|
|||
--- !u!199 &1758218800894468996
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -48309,7 +48309,7 @@ ParticleSystem:
|
|||
--- !u!199 &7978786288442372732
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -53436,7 +53436,7 @@ ParticleSystem:
|
|||
--- !u!199 &2554868232433594259
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -113,7 +113,10 @@ function JumpServerPanel:OnShow(...)
|
|||
CheckRedPointStatus(v.redPointType)
|
||||
end
|
||||
end
|
||||
self:UpdateCarbonContent()
|
||||
JumpServerManager.GetWorldArenaInfoRequest(function()
|
||||
self:UpdateCarbonContent()
|
||||
end)
|
||||
|
||||
-- 音效
|
||||
-- SoundManager.PlayMusic(SoundConfig.BGM_Carbon)
|
||||
end
|
||||
|
|
@ -223,20 +226,17 @@ function JumpServerPanel:SystemState(id,fun)
|
|||
func()
|
||||
return
|
||||
end
|
||||
JumpServerManager.GetWorldArenaInfoRequest(function()
|
||||
if not JumpServerManager.GetHightLadderDataIsStart() then
|
||||
type[id].state = -4
|
||||
type[id].tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).OpenWeek)
|
||||
elseif not JumpServerManager.GetHightLadderDataIsGroup() then
|
||||
type[id].state = -5
|
||||
type[id].tipStr = "未划分跨服分组,无法参与!"
|
||||
else
|
||||
type[id].state = 1
|
||||
type[id].tipStr = ""
|
||||
end
|
||||
func()
|
||||
return
|
||||
end)
|
||||
if not JumpServerManager.GetHightLadderDataIsStart() then
|
||||
type[id].state = -4
|
||||
type[id].tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).OpenWeek)
|
||||
elseif not JumpServerManager.GetHightLadderDataIsGroup() then
|
||||
type[id].state = -5
|
||||
type[id].tipStr = "未划分跨服分组,无法参与!"
|
||||
else
|
||||
type[id].state = 1
|
||||
type[id].tipStr = ""
|
||||
end
|
||||
func()
|
||||
elseif id== JumpServer_Type.YuXuLunDao then
|
||||
-- 判断功能是否开启
|
||||
if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.JumpServer_YuXu) then
|
||||
|
|
@ -246,20 +246,17 @@ function JumpServerPanel:SystemState(id,fun)
|
|||
return
|
||||
end
|
||||
-- 跨服相关判断
|
||||
JumpServerManager.GetWorldArenaInfoRequest(function()
|
||||
if not JumpServerManager.GetYuxuIsStart() then
|
||||
type[id].state = -4
|
||||
type[id].tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,2).OpenWeek)
|
||||
elseif not JumpServerManager.GetHightLadderDataIsGroup() then
|
||||
type[id].state = -5
|
||||
type[id].tipStr = "未划分跨服分组,无法参与!"
|
||||
else
|
||||
type[id].state = 1
|
||||
type[id].tipStr = ""
|
||||
end
|
||||
func()
|
||||
return
|
||||
end)
|
||||
if not JumpServerManager.GetYuxuIsStart() then
|
||||
type[id].state = -4
|
||||
type[id].tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,2).OpenWeek)
|
||||
elseif not JumpServerManager.GetHightLadderDataIsGroup() then
|
||||
type[id].state = -5
|
||||
type[id].tipStr = "未划分跨服分组,无法参与!"
|
||||
else
|
||||
type[id].state = 1
|
||||
type[id].tipStr = ""
|
||||
end
|
||||
func()
|
||||
elseif id== JumpServer_Type.QiJieShiLian then
|
||||
-- 判断功能是否开启
|
||||
if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.QIJIESHILIAN) then
|
||||
|
|
@ -269,20 +266,17 @@ function JumpServerPanel:SystemState(id,fun)
|
|||
return
|
||||
end
|
||||
-- 跨服相关判断
|
||||
JumpServerManager.GetWorldArenaInfoRequest(function()
|
||||
if not JumpServerManager.GetQiJieIsStart() then
|
||||
type[id].state = -4
|
||||
type[id].tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,3).OpenWeek)
|
||||
elseif not JumpServerManager.GetHightLadderDataIsGroup() then
|
||||
type[id].state = -5
|
||||
type[id].tipStr = "未划分跨服分组,无法参与!"
|
||||
else
|
||||
type[id].state = 1
|
||||
type[id].tipStr = ""
|
||||
end
|
||||
func()
|
||||
return
|
||||
end)
|
||||
if not JumpServerManager.GetQiJieIsStart() then
|
||||
type[id].state = -4
|
||||
type[id].tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,3).OpenWeek)
|
||||
elseif not JumpServerManager.GetHightLadderDataIsGroup() then
|
||||
type[id].state = -5
|
||||
type[id].tipStr = "未划分跨服分组,无法参与!"
|
||||
else
|
||||
type[id].state = 1
|
||||
type[id].tipStr = ""
|
||||
end
|
||||
func()
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -293,6 +293,11 @@ function this.OnPowerValueChange()
|
|||
end
|
||||
|
||||
function this.OnSortingOrderChange()
|
||||
if this.starGridList then
|
||||
for _, starGrid in pairs(this.starGridList) do
|
||||
Util.SetParticleSortLayer(starGrid,MapPanel.sortingOrder + 1)
|
||||
end
|
||||
end
|
||||
Util.AddParticleSortLayer(this.chufa, MapPanel.sortingOrder - orginLayer)
|
||||
orginLayer = MapPanel.sortingOrder
|
||||
end
|
||||
|
|
@ -450,6 +455,8 @@ function TrialMapPanel:OnDestroy()
|
|||
this.spLoader:Destroy()
|
||||
ClearRedPointObject(RedPointType.TrialReward)
|
||||
SubUIManager.Close(this.upView)
|
||||
-- 清空数据
|
||||
this.starGridList = {}
|
||||
end
|
||||
|
||||
|
||||
|
|
@ -499,6 +506,10 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn)
|
|||
pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig[v.tmpId].PropertyName))
|
||||
lv.text=v.level
|
||||
local star,starType = GetStarOrGodSoulLv(1,v)
|
||||
if not this.starGridList then
|
||||
this.starGridList = {}
|
||||
end
|
||||
this.starGridList[i] = starGrid
|
||||
SetHeroStars(this.spLoader, starGrid, star,starType)
|
||||
Util.SetParticleSortLayer(starGrid,MapPanel.sortingOrder + 1)
|
||||
--选择
|
||||
|
|
|
|||
Loading…
Reference in New Issue