玉虚论道提交
parent
d9214666c2
commit
683b48fb0c
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -231,86 +231,6 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "Lv.100 \u73A9\u5BB6\u540D\u79F0\u4E03\u4E2A\u5B57"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &1263874943785460
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 224665534445020654}
|
||||
- component: {fileID: 222768795159222548}
|
||||
- component: {fileID: 4641542338210525316}
|
||||
m_Layer: 0
|
||||
m_Name: power
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &224665534445020654
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1263874943785460}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 224554849999382432}
|
||||
m_RootOrder: 4
|
||||
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: -225.70001, y: -37.8}
|
||||
m_SizeDelta: {x: 160, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222768795159222548
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1263874943785460}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4641542338210525316
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1263874943785460}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 34
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u6218\u6597\u529B999999"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &1295805759717506
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -341,7 +261,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 224554849999382432}
|
||||
m_RootOrder: 7
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -408,7 +328,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &224394420753899040
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -786,7 +706,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 224554849999382432}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -994,7 +914,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u9632\u5B88\u8BB0\u5F55"
|
||||
m_Text: "\u8BB0\u5F55"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &1525294244515472
|
||||
GameObject:
|
||||
|
|
@ -1199,7 +1119,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &224554849999382432
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1215,9 +1135,10 @@ RectTransform:
|
|||
- {fileID: 224118980026860550}
|
||||
- {fileID: 224716622061782722}
|
||||
- {fileID: 224170130709635840}
|
||||
- {fileID: 224665534445020654}
|
||||
- {fileID: 224526222665731884}
|
||||
- {fileID: 3509744561967990086}
|
||||
- {fileID: 224680640099687478}
|
||||
- {fileID: 6045299183821778622}
|
||||
- {fileID: 224755499865730954}
|
||||
- {fileID: 224657052121031630}
|
||||
m_Father: {fileID: 224719904181348034}
|
||||
|
|
@ -1261,7 +1182,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 224538950842027662}
|
||||
m_Father: {fileID: 224554849999382432}
|
||||
m_RootOrder: 8
|
||||
m_RootOrder: 9
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -1612,6 +1533,99 @@ Animator:
|
|||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &2594473538131394211
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6045299183821778622}
|
||||
- component: {fileID: 2546401682415148537}
|
||||
- component: {fileID: 5614868350129524766}
|
||||
- component: {fileID: 7519776742680212988}
|
||||
m_Layer: 5
|
||||
m_Name: power
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6045299183821778622
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2594473538131394211}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.6, y: 0.6, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 224554849999382432}
|
||||
m_RootOrder: 7
|
||||
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: -50, y: -41.5}
|
||||
m_SizeDelta: {x: 658.3, y: 102.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2546401682415148537
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2594473538131394211}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5614868350129524766
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2594473538131394211}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 634137158f07dff488d018d707aa403a, type: 2}
|
||||
m_FontSize: 0
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 188
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 2.7
|
||||
m_Text: 155267
|
||||
--- !u!114 &7519776742680212988
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2594473538131394211}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_textSpacing: -31.5
|
||||
--- !u!1 &3642162230025459234
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1765,7 +1779,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u6682\u65E0\u9632\u5B88\u8BB0\u5F55"
|
||||
m_Text: "\u6682\u65E0\u8BB0\u5F55"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &6450021190322221424
|
||||
GameObject:
|
||||
|
|
@ -1842,3 +1856,77 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &6528578632629310783
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3509744561967990086}
|
||||
- component: {fileID: 7474440629963233091}
|
||||
- component: {fileID: 5470042405521133208}
|
||||
m_Layer: 5
|
||||
m_Name: powerBtn (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3509744561967990086
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6528578632629310783}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 224554849999382432}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 252, y: -134}
|
||||
m_SizeDelta: {x: 218, y: 88}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7474440629963233091
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6528578632629310783}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5470042405521133208
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6528578632629310783}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 7f7cdabfab0b95c41828e1ddca64a2b6, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
|
|
|
|||
|
|
@ -129,6 +129,9 @@ function WorldArenaBattleInfoPanel:InitComponent()
|
|||
this.titleTxt=Util.GetGameObject(self.transform, "BG/title"):GetComponent("Text")
|
||||
this.myTeamInfo=Util.GetGameObject(self.transform, "BG/myInfo")
|
||||
this.enTeamInfo=Util.GetGameObject(self.transform, "BG/enInfo")
|
||||
this.effect=Util.GetGameObject(self.transform, "BG/Effect")
|
||||
this.effect:SetActive(false)
|
||||
screenAdapte(this.effect)
|
||||
--我方阵营
|
||||
this.leftTeam={}
|
||||
--第一局胜利图标
|
||||
|
|
@ -174,6 +177,7 @@ function this:OnSortingOrderChange()
|
|||
if myHeadObj then
|
||||
myHeadObj:SetLayer(self.sortingOrder)
|
||||
end
|
||||
Util.SetParticleSortLayer(this.effect, self.sortingOrder+10)
|
||||
end
|
||||
|
||||
--刷新战斗消耗信息
|
||||
|
|
@ -195,16 +199,20 @@ function WorldArenaBattleInfoPanel:PlayFightAnim(leftList, rightList, num, func)
|
|||
coroutine.start(function()
|
||||
for i = 1, num do
|
||||
leftList[i].transform:DOLocalMoveX(90, 0.2, false):OnComplete(function()
|
||||
|
||||
leftList[i].transform:DOLocalMoveX(10, 0.3, false):OnComplete(function()
|
||||
if func then
|
||||
func(i)
|
||||
end
|
||||
end)
|
||||
end)
|
||||
this.effect:SetActive(true)
|
||||
rightList[i].transform:DOLocalMoveX(-80, 0.2, false):OnComplete(function()
|
||||
rightList[i].transform:DOLocalMoveX(10, 0.3, false)
|
||||
end)
|
||||
coroutine.wait(0.2)
|
||||
|
||||
coroutine.wait(0.5)
|
||||
this.effect:SetActive(false)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
|
@ -232,13 +240,13 @@ function WorldArenaBattleInfoPanel:BindEvent()
|
|||
local list={2001,2002,2003}
|
||||
|
||||
local num=PrivilegeManager.GetPrivilegeRemainValue(2028)
|
||||
local type=0
|
||||
local costType=0
|
||||
if num>0 then
|
||||
type=0
|
||||
costType=0
|
||||
else
|
||||
type=1
|
||||
costType=1
|
||||
end
|
||||
if type==1 then
|
||||
if costType==1 then
|
||||
local itemId, needNum = WorldArenaManager.GetArenaChallengeCost()
|
||||
local haveNum = BagManager.GetItemCountById(itemId)
|
||||
if haveNum < needNum then
|
||||
|
|
@ -247,7 +255,7 @@ function WorldArenaBattleInfoPanel:BindEvent()
|
|||
return
|
||||
end
|
||||
end
|
||||
NetManager.CrossYuXuLunDaoChallengeRequest(list,enemyId,type,function(msg)
|
||||
NetManager.CrossYuXuLunDaoChallengeRequest(list,enemyId,costType,function(msg)
|
||||
LogError("战斗结束")
|
||||
resultList=msg.fightResult
|
||||
fightDataList=msg.fightData
|
||||
|
|
@ -259,6 +267,8 @@ function WorldArenaBattleInfoPanel:BindEvent()
|
|||
isAnim = false
|
||||
state = 3
|
||||
type = 2
|
||||
this.btnItem.gameObject:SetActive(false)
|
||||
this.btnText.gameObject:SetActive(true)
|
||||
this.btnText.text="确定"
|
||||
end
|
||||
end)
|
||||
|
|
@ -286,10 +296,10 @@ function WorldArenaBattleInfoPanel:BindEvent()
|
|||
for i = 1, #this.playBacks do
|
||||
Util.AddClick(this.playBacks[i],function()
|
||||
|
||||
-- if not leftAllTeam[i] or not rightAllTeam[i] or #leftAllTeam[i]==0 or #rightAllTeam[i]==0 then
|
||||
-- PopupTipPanel.ShowTip("本场战斗无法回放!")
|
||||
-- return
|
||||
-- end
|
||||
if not leftAllTeam[i] or not rightAllTeam[i] or #leftAllTeam[i]==0 or #rightAllTeam[i]==0 then
|
||||
PopupTipPanel.ShowTip("本场战斗无法回放!")
|
||||
return
|
||||
end
|
||||
|
||||
local nameStr = myInfoData.name.."|"..enInfoData.name
|
||||
local realResult = resultList[i] --(resultList[i] + 1) % 2 -- 服务器返回的是我的结果,转换为真实结果
|
||||
|
|
@ -397,8 +407,8 @@ function this.ShowInfo(msg)
|
|||
if msg.fightData then
|
||||
fightDataList=msg.fightData
|
||||
end
|
||||
this.myName.text= PracticeManager.SetNameColor(JingJiShouWeiToEn(PlayerManager.nickName),msg.myTeamInfo.practiceLevel)
|
||||
this.myServer.text= PracticeManager.SetNameColor(PlayerManager.serverInfo.name,msg.myTeamInfo.practiceLevel)
|
||||
this.myName.text= PracticeManager.SetNameColor(PlayerManager.serverInfo.name.." "..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
|
||||
myHeadObj = SubUIManager.Open(SubUIConfig.PlayerHeadView, this.myHeadPar.transform)
|
||||
|
|
@ -411,8 +421,8 @@ function this.ShowInfo(msg)
|
|||
myHeadObj:SetLayer(this.sortingOrder)
|
||||
myHeadObj:SetEffectScale(0.7)
|
||||
--敌人信息
|
||||
this.rightName.text= PracticeManager.SetNameColor(msg.defTeamInfo.name,msg.defTeamInfo.practiceLevel)
|
||||
this.rightServer.text= PracticeManager.SetNameColor(msg.defTeamInfo.serverName,msg.defTeamInfo.practiceLevel)
|
||||
this.rightName.text= PracticeManager.SetNameColor(msg.defTeamInfo.serverName.." "..msg.defTeamInfo.name,msg.defTeamInfo.practiceLevel)
|
||||
this.rightServer.gameObject:SetActive(false)
|
||||
local enRank=WorldArenaManager.GetRankImgByScore(msg.defTeamInfo.crossTeamScore)
|
||||
this.enRankImg.sprite=this.spLoader:LoadSprite("y_yuxulundao_xiaobiao_0"..enRank)
|
||||
if not enHeadObj then
|
||||
|
|
@ -439,7 +449,6 @@ function this.ShowInfo(msg)
|
|||
this.enScore.text= msg.defScore>0 and "积分+"..msg.defScore or "积分"..msg.defScore
|
||||
this.enScore.color = msg.defScore>0 and UIColor.GREEN or UIColor.RED
|
||||
end
|
||||
LogError("myteam len=="..#msg.myTeamInfo.crossTeam[1].team)
|
||||
this.SetTeamInfo(this.myTeamInfo,msg.myTeamInfo.crossTeam,1)
|
||||
this.SetTeamInfo(this.enTeamInfo,msg.defTeamInfo.crossTeam,2)
|
||||
|
||||
|
|
@ -474,14 +483,11 @@ function this.SetTeamInfo(_go,teamData,type)
|
|||
for index = 1, 3 do
|
||||
local go = Util.GetGameObject(_go,"defendbox"..index)
|
||||
local data = teamData[index]
|
||||
--local title = Util.GetGameObject(go,"Title"):GetComponent("Text")
|
||||
local teamList ={}
|
||||
for i = 1, 6 do
|
||||
local aa=Util.GetGameObject(go,"Demons/heroPro ("..i..")")
|
||||
table.insert(teamList,aa)
|
||||
end
|
||||
--title.text = string.format( "第%s队",NumToChinese[index])
|
||||
--self:SetImgPos(go,data.totalForce)
|
||||
for i, demon in ipairs(teamList) do
|
||||
Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(1))
|
||||
Util.GetGameObject(demon, "pos"):GetComponent("Image").sprite=this.spLoader:LoadSprite("bd_xinkapaifan"..i)
|
||||
|
|
@ -500,6 +506,9 @@ function this.SetTeamInfo(_go,teamData,type)
|
|||
Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = hero.level
|
||||
Util.GetGameObject(teamList[hero.position], "frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality, hero.star))
|
||||
if type==1 then
|
||||
LogError("hero star=="..hero.star)
|
||||
end
|
||||
SetHeroIcon(this.spLoader, hero,Util.GetGameObject(heroGo, "icon"):GetComponent("Image"),heroConfig)
|
||||
local frameBtn = Util.GetGameObject(teamList[hero.position], "frame")
|
||||
--local heroData = {}
|
||||
|
|
|
|||
|
|
@ -70,9 +70,7 @@ function WorldArenaMainPanel:BindEvent()
|
|||
-- PopupTipPanel.ShowTip(Language[10075])
|
||||
-- return
|
||||
-- end
|
||||
-- UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.ARENA_DEFEND)
|
||||
UIManager.OpenPanel(UIName.WorldArenaMyTeamPanel,1)
|
||||
--UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel)
|
||||
end)
|
||||
|
||||
-- 挑战按钮
|
||||
|
|
@ -113,12 +111,22 @@ function WorldArenaMainPanel:BindEvent()
|
|||
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[27])
|
||||
end)
|
||||
-- 刷新按钮
|
||||
this._RefreshTimeStemp=0
|
||||
Util.AddClick(this.RefreshBtn, function()
|
||||
local curTimeStemp = GetTimeStamp()
|
||||
local limitTime = 3
|
||||
-- 计算距离下一次刷新剩余时间
|
||||
local lastTime = math.floor(limitTime - (curTimeStemp - this._RefreshTimeStemp))
|
||||
if this._RefreshTimeStemp ~= 0 and lastTime > 0 then
|
||||
PopupTipPanel.ShowTip(lastTime..Language[10079])
|
||||
return
|
||||
end
|
||||
this._RefreshTimeStemp = curTimeStemp
|
||||
self:RefreshChallengeList()
|
||||
end)
|
||||
-- 记录按钮
|
||||
Util.AddClick(this.RecordBtn, function()
|
||||
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) then
|
||||
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_YuXu) then
|
||||
PopupTipPanel.ShowTip(Language[10075])
|
||||
return
|
||||
end
|
||||
|
|
@ -134,9 +142,7 @@ function WorldArenaMainPanel:BindEvent()
|
|||
end)
|
||||
-- 奖励按钮
|
||||
Util.AddClick(this.RewardBtn, function()
|
||||
UIManager.OpenPanel(UIName.WorldArenaRankRewardPanel,WorldArenaManager.myRankId)
|
||||
--UIManager.OpenPanel(UIName.WorldArenaUpRewardPanel,3,2)
|
||||
--UIManager.OpenPanel(UIName.WorldArenaMyTeamPanel, FORMATION_TYPE.ARENA_DEFEND)
|
||||
UIManager.OpenPanel(UIName.WorldArenaRankRewardPanel,myRank)
|
||||
end)
|
||||
--商店按钮
|
||||
Util.AddClick(this.StoreBtn, function()
|
||||
|
|
@ -184,11 +190,12 @@ function WorldArenaMainPanel:OnOpen(...)
|
|||
grid, rankData=WorldArenaManager.GetRankImgByScore(msg.newMyscore)
|
||||
oldScore=msg.oldMyscore
|
||||
--新赛季本地数据制成0
|
||||
if msg.drop then
|
||||
if msg.drop and #msg.drop>0 then
|
||||
LogError("有充值奖励")
|
||||
WorldArenaManager.AddReward(msg.drop)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."yuxulundaoScore",0)
|
||||
end
|
||||
myRank=msg.myRank
|
||||
rewardState=msg.dailyRewardState
|
||||
challengeTime=msg.changedTimes
|
||||
freeTimes=PrivilegeManager.GetPrivilegeRemainValue(2028)
|
||||
|
|
@ -198,11 +205,11 @@ function WorldArenaMainPanel:OnOpen(...)
|
|||
this.SetStarShow(grid,self.sortingOrder)
|
||||
this.endTime.text="周日23:30赛季结束"
|
||||
this:RefreshEnemyData(msg.arenaEnemys)
|
||||
myRank=msg.myRank
|
||||
|
||||
LogError(" main panel".." battletime=="..challengeTime.." rank=="..myRank.."freeTimes=="..freeTimes)
|
||||
this.freeTimes.text = string.format("%s次", math.max(freeTimes, 0))
|
||||
--检测段位是否发生变化
|
||||
if msg.updrop then
|
||||
if msg.updrop and #msg.updrop>0 then
|
||||
LogError("有升级奖励")
|
||||
WorldArenaManager.AddReward(msg.updrop)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -56,11 +56,9 @@ function WorldArenaMyTeamPanel:InitComponent()
|
|||
self.btnBack = Util.GetGameObject(self.gameObject, "Frame/BackBtn")
|
||||
self.mask = Util.GetGameObject(self.gameObject, "mask")
|
||||
self.Content = Util.GetGameObject(self.gameObject, "Frame/Content")
|
||||
-- self.OnBeginDrag = function(p,d) OnBeginDrag(self,p,d) end
|
||||
-- self.OnDrag= function(p,d) OnDrag(self,p,d) end
|
||||
-- self.OnEndDrag= function(p,d) OnEndDrag(self,p,d) end
|
||||
self.tempInfo = Util.GetGameObject(self.Content, "tempInfo")
|
||||
|
||||
self.tipTxt=Util.GetGameObject(self.gameObject, "Frame/Text"):GetComponent("Text")
|
||||
self.tipTxt.text="可以拖动队伍进行顺序交换"
|
||||
self.InfoList = {}
|
||||
self.dragViewList = {}
|
||||
self.triggerList = {}
|
||||
|
|
@ -155,7 +153,6 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index)
|
|||
--队伍阵容
|
||||
for i, hero in pairs(data) do
|
||||
local heroTid = data[i].heroId
|
||||
LogError(" heroTid=="..heroTid)
|
||||
if heroTid then
|
||||
local heroGo = Util.GetGameObject(self.Heros[index][hero.position], "hero")
|
||||
local heroData=HeroManager.GetSingleHeroData(heroTid)
|
||||
|
|
@ -165,7 +162,7 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index)
|
|||
allPower=allPower+heroData.warPower
|
||||
Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = heroData.lv
|
||||
Util.GetGameObject(self.Heros[index][hero.position], "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality, hero.star))
|
||||
Util.GetGameObject(self.Heros[index][hero.position], "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
|
||||
SetHeroIcon(self.spLoader, hero,Util.GetGameObject(heroGo, "icon"):GetComponent("Image"),heroConfig)
|
||||
local frameBtn = Util.GetGameObject(self.Heros[index][hero.position], "frame")
|
||||
local heroData = {}
|
||||
|
|
|
|||
Loading…
Reference in New Issue