diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMyTeamPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMyTeamPanel.prefab index c45b978626..014fda3537 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMyTeamPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMyTeamPanel.prefab @@ -3846,7 +3846,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -4419,7 +4419,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -5164,7 +5164,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -7478,7 +7478,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -7552,7 +7552,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -8049,7 +8049,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -8469,7 +8469,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -8740,7 +8740,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -8814,7 +8814,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -10198,7 +10198,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -10483,7 +10483,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -10814,7 +10814,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -12168,7 +12168,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -12301,7 +12301,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -12525,7 +12525,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -13375,7 +13375,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -13826,7 +13826,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -14322,7 +14322,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab index 1d64fa90f3..d6448ece30 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab @@ -9748,7 +9748,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 139, y: 36.1} + m_AnchoredPosition: {x: 33.2, y: 36.1} m_SizeDelta: {x: 80, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4416805191077310780 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index bcbb4ded0b..dfb66121a4 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -486,7 +486,7 @@ PanelType = { XiangYaoDuoBao = {14,16,1220},--降妖夺宝 NiuQiChongTian = {14,16,1300},--牛气冲天 XiuXing = {14,16,1226},--修行 - WorldArena = { 107,16,106}, --玉虚论道 + WorldArena = { 107,16,23}, --玉虚论道 } diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua index cdc39c072c..e528ad7044 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua @@ -246,7 +246,7 @@ function WorldArenaBattleInfoPanel:BindEvent() end local list={2001,2002,2003} - local num=PrivilegeManager.GetPrivilegeRemainValue(2028) + local num=PrivilegeManager.GetPrivilegeRemainValue(0) local costType=0 if num>0 then costType=0 @@ -413,7 +413,7 @@ function this.ShowInfo(msg) if msg.fightData then fightDataList=msg.fightData end - this.myName.text= PracticeManager.SetNameColor(PlayerManager.serverInfo.name.." "..PlayerManager.nickName,msg.myTeamInfo.practiceLevel) + this.myName.text= PracticeManager.SetNameColor(msg.myTeamInfo.serverName.." "..PlayerManager.nickName,msg.myTeamInfo.practiceLevel) this.myServer.gameObject:SetActive(false) this.myRankImg.sprite=this.spLoader:LoadSprite("y_yuxulundao_xiaobiao_0"..1) if not myHeadObj then @@ -489,6 +489,7 @@ function this.SetTeamInfo(_go,teamData,type) for index = 1, 3 do local go = Util.GetGameObject(_go,"defendbox"..index) local data = teamData[index] + local fightTxt=Util.GetGameObject(go,"WarPower/Text"):GetComponent("Text") local teamList ={} for i = 1, 6 do local aa=Util.GetGameObject(go,"Demons/heroPro ("..i..")") @@ -555,7 +556,7 @@ function this:OnClose() _CloseFunc = nil end -- 重置状态 - state = 1 + --state = 1 isAnim = false end @@ -580,6 +581,7 @@ function WorldArenaBattleInfoPanel:OnDestroy() this.TimeCounter = nil end myHeroNum=0 + state=1 end diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaManager.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaManager.lua index a0427fc960..c0e9c93231 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaManager.lua @@ -65,7 +65,7 @@ function this.SetChallegeTime(num) challengeTime=num end function this.GetFreeTime() - return PrivilegeManager.GetPrivilegeRemainValue(2028) + return PrivilegeManager.GetPrivilegeRemainValue(0) end