玉虚修改

dev_chengFeng
wangzhenxing 2021-10-13 19:35:30 +08:00
parent ee434c85cc
commit 7dce99c08c
4 changed files with 366 additions and 46 deletions

View File

@ -285,6 +285,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.0000801, y: 1.0000801, z: 1.0000801}
m_Children:
- {fileID: 7481626437020308095}
- {fileID: 978435034}
- {fileID: 2378507004330905690}
- {fileID: 377890632584110658}
@ -1005,7 +1006,7 @@ RectTransform:
- {fileID: 1311678371}
- {fileID: 449976643}
m_Father: {fileID: 544923840}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -2464,7 +2465,7 @@ RectTransform:
- {fileID: 2864542705385792955}
- {fileID: 1636333534884893722}
m_Father: {fileID: 289396712796020021}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -2544,6 +2545,85 @@ RectTransform:
m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945}
m_SizeDelta: {x: 99.7, y: 29.09}
m_Pivot: {x: 0, y: 0}
--- !u!1 &322339096638839563
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3695999130615298554}
- component: {fileID: 5414320932166937311}
- component: {fileID: 8104152851373489673}
m_Layer: 5
m_Name: hintTxt
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3695999130615298554
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 322339096638839563}
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: 45731545550030046}
m_RootOrder: 15
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: -342.9, y: 399.5}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5414320932166937311
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 322339096638839563}
m_CullTransparentMesh: 0
--- !u!114 &8104152851373489673
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 322339096638839563}
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: 0.72156864, g: 0.49411768, b: 0.22352943, 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u53EF\u4EE5\u62D6\u52A8\u6211\u65B9\u961F\u4F0D\u4EA4\u6362\u987A\u5E8F"
--- !u!1 &381964509640387762
GameObject:
m_ObjectHideFlags: 0
@ -3240,7 +3320,7 @@ RectTransform:
- {fileID: 99210870190894048}
- {fileID: 8965343829048748507}
m_Father: {fileID: 544923840}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -4277,13 +4357,87 @@ RectTransform:
- {fileID: 8352111052963767139}
- {fileID: 3976252848729862311}
m_Father: {fileID: 2454767744427163227}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -150}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &965032231646224627
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7069328145536966044}
- component: {fileID: 9075190443584155157}
- component: {fileID: 8798523546884442734}
m_Layer: 0
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7069328145536966044
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 965032231646224627}
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: 289396712796020021}
m_RootOrder: 0
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: 0, y: 16}
m_SizeDelta: {x: 342, y: 235}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9075190443584155157
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 965032231646224627}
m_CullTransparentMesh: 0
--- !u!114 &8798523546884442734
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 965032231646224627}
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: c8dc4b581862dc6489ffed5f6895227f, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &995607891640827907
GameObject:
m_ObjectHideFlags: 0
@ -9881,6 +10035,80 @@ RectTransform:
m_AnchoredPosition: {x: -0.00000095367, y: 2.7}
m_SizeDelta: {x: 90, y: 90}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1169571872168685504
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3134008648869430522}
- component: {fileID: 2851946474550297640}
- component: {fileID: 1096977223606817136}
m_Layer: 0
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3134008648869430522
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1169571872168685504}
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: 2454767744427163227}
m_RootOrder: 0
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: 0, y: 16}
m_SizeDelta: {x: 342, y: 235}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2851946474550297640
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1169571872168685504}
m_CullTransparentMesh: 0
--- !u!114 &1096977223606817136
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1169571872168685504}
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: 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_Sprite: {fileID: 21300000, guid: c8dc4b581862dc6489ffed5f6895227f, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1191407721029254100
GameObject:
m_ObjectHideFlags: 0
@ -9986,7 +10214,7 @@ RectTransform:
- {fileID: 7647335528286786941}
- {fileID: 6861152536463026438}
m_Father: {fileID: 2454767744427163227}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -15896,7 +16124,7 @@ RectTransform:
- {fileID: 5871017920800380130}
- {fileID: 2708711333808849973}
m_Father: {fileID: 544923840}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -16778,7 +17006,7 @@ RectTransform:
- {fileID: 489483876933481745}
- {fileID: 5128391771607932086}
m_Father: {fileID: 2454767744427163227}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -17203,7 +17431,7 @@ RectTransform:
- {fileID: 6541679624463849713}
- {fileID: 1637434661666730347}
m_Father: {fileID: 544923840}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -27902,6 +28130,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.0000801, y: 1.0000801, z: 1.0000801}
m_Children:
- {fileID: 3134008648869430522}
- {fileID: 7424559739773759072}
- {fileID: 6882095296446410185}
- {fileID: 8821953059339078470}
@ -46124,7 +46353,7 @@ RectTransform:
- {fileID: 8793522432146621789}
- {fileID: 8049240551386519239}
m_Father: {fileID: 289396712796020021}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -51414,7 +51643,7 @@ RectTransform:
- {fileID: 1246489551654148873}
- {fileID: 1089421972869505741}
m_Father: {fileID: 544923840}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -52936,7 +53165,7 @@ RectTransform:
- {fileID: 4467136512065534249}
- {fileID: 6940262694333247954}
m_Father: {fileID: 289396712796020021}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -53167,7 +53396,7 @@ RectTransform:
- {fileID: 1103824548697527367}
- {fileID: 8232618220044396602}
m_Father: {fileID: 289396712796020021}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -61155,7 +61384,7 @@ RectTransform:
- {fileID: 9078071625860029226}
- {fileID: 1180131656158804388}
m_Father: {fileID: 2454767744427163227}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -63256,7 +63485,7 @@ RectTransform:
- {fileID: 4259693820309517815}
- {fileID: 1832642502507207762}
m_Father: {fileID: 2454767744427163227}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -63294,7 +63523,7 @@ RectTransform:
- {fileID: 8798272905648185567}
- {fileID: 3515590574380362628}
m_Father: {fileID: 289396712796020021}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -63899,6 +64128,80 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &6695147229409375395
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7481626437020308095}
- component: {fileID: 8915333998107825457}
- component: {fileID: 7791679313261914972}
m_Layer: 0
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7481626437020308095
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6695147229409375395}
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: 544923840}
m_RootOrder: 0
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: 0, y: 16}
m_SizeDelta: {x: 342, y: 235}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8915333998107825457
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6695147229409375395}
m_CullTransparentMesh: 0
--- !u!114 &7791679313261914972
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6695147229409375395}
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: 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_Sprite: {fileID: 21300000, guid: c8dc4b581862dc6489ffed5f6895227f, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &6697516504019379471
GameObject:
m_ObjectHideFlags: 0
@ -64680,7 +64983,7 @@ RectTransform:
- {fileID: 4636326593734500089}
- {fileID: 385865293345550882}
m_Father: {fileID: 289396712796020021}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -69707,7 +70010,7 @@ RectTransform:
m_Children:
- {fileID: 8159136970283096376}
m_Father: {fileID: 2454767744427163227}
m_RootOrder: 6
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}
@ -69782,7 +70085,7 @@ RectTransform:
- {fileID: 5323583236078228975}
- {fileID: 7746331044526088285}
m_Father: {fileID: 544923840}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -70881,7 +71184,7 @@ RectTransform:
m_Children:
- {fileID: 5785725775666054806}
m_Father: {fileID: 544923840}
m_RootOrder: 6
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}
@ -71065,7 +71368,7 @@ RectTransform:
- {fileID: 6767652227670518821}
- {fileID: 5454130758368452414}
m_Father: {fileID: 2454767744427163227}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -72465,6 +72768,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.0000801, y: 1.0000801, z: 1.0000801}
m_Children:
- {fileID: 7069328145536966044}
- {fileID: 1653811743553198398}
- {fileID: 665276008079046967}
- {fileID: 6805169673396032451}
@ -72662,6 +72966,7 @@ RectTransform:
- {fileID: 401543628526806861}
- {fileID: 5078161218142474052}
- {fileID: 1555752588146770169}
- {fileID: 3695999130615298554}
m_Father: {fileID: 8287557198943698003}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -74870,7 +75175,7 @@ RectTransform:
m_Children:
- {fileID: 2971202682372015923}
m_Father: {fileID: 289396712796020021}
m_RootOrder: 6
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}

View File

@ -19,6 +19,8 @@ local isAnim = false
local _CloseFunc = nil
local leftAllTeam={}
local rightAllTeam={}
local myOldScore=0
local enOldScore=0
local function OnBeginDrag(self, Pointgo, data)
if state~=1 then
return
@ -287,9 +289,11 @@ function WorldArenaBattleInfoPanel:BindEvent()
end)
this.myScore.gameObject:SetActive(true)
this.enScore.gameObject:SetActive(true)
this.myScore.text= msg.myScore>0 and "积分+"..msg.myScore or "积分"..msg.myScore
this.myScore.text= msg.myScore>0 and "积分 "..myOldScore .."+"..msg.myScore or "积分 "..myOldScore .."-"..msg.myScore
this.enScore.text= msg.defScore>0 and "积分 "..enOldScore .."+"..msg.defScore or "积分 "..enOldScore .."-"..msg.defScore
-- this.myScore.text= msg.myScore>0 and "积分+"..msg.myScore or "积分"..msg.myScore
this.myScore.color = msg.myScore>0 and UIColor.GREEN or UIColor.RED
this.enScore.text= msg.defScore>0 and "积分+"..msg.defScore or "积分"..msg.defScore
--this.enScore.text= msg.defScore>0 and "积分+"..msg.defScore or "积分"..msg.defScore
this.enScore.color = msg.defScore>0 and UIColor.GREEN or UIColor.RED
WorldArenaManager.SetNewScore(msg.myNewScore)
WorldArenaManager.SetMyData(msg.myRank,WorldArenaManager.GetchallengeTimes()+1)
@ -394,8 +398,8 @@ function WorldArenaBattleInfoPanel:OnOpen(msg,_type,closeFunc,list)
this.playBacks[i]:SetActive(false)
this.ShowBattleState(i, state)
end
this.myScore.gameObject:SetActive(false)
this.enScore.gameObject:SetActive(false)
--this.myScore.gameObject:SetActive(false)
--this.enScore.gameObject:SetActive(false)
elseif state==3 then
this.myScore.gameObject:SetActive(true)
this.enScore.gameObject:SetActive(true)
@ -462,10 +466,22 @@ function this.ShowInfo(msg)
end
end
if state==3 then
this.myScore.text= msg.myScore>0 and "积分+"..msg.myScore or "积分"..msg.myScore
if type==1 then
this.myScore.text= msg.myScore>0 and "积分 "..msg.myTeamInfo.crossTeamScore .."+"..msg.myScore or "积分 "..msg.myTeamInfo.crossTeamScore .."-"..msg.myScore
this.enScore.text= msg.defScore>0 and "积分 "..msg.defTeamInfo.crossTeamScore .."+"..msg.defScore or "积分 "..msg.defTeamInfo.crossTeamScore .."-"..msg.defScore
else
this.myScore.text= msg.myScore>0 and "积分+"..msg.myScore or "积分"..msg.myScore
this.enScore.text= msg.defScore>0 and "积分+"..msg.defScore or "积分"..msg.defScore
end
this.myScore.color = msg.myScore>0 and UIColor.GREEN or UIColor.RED
this.enScore.text= msg.defScore>0 and "积分+"..msg.defScore or "积分"..msg.defScore
this.enScore.color = msg.defScore>0 and UIColor.GREEN or UIColor.RED
else
myOldScore=msg.myTeamInfo.crossTeamScore
this.myScore.text="积分 "..myOldScore
enOldScore=msg.defTeamInfo.crossTeamScore
this.enScore.text="积分 "..enOldScore
this.myScore.color =Color.New(0.9019,0.76,0.3882,1)
this.enScore.color = Color.New(0.9019,0.76,0.3882,1)
end
this.SetTeamInfo(this.myTeamInfo,msg.myTeamInfo.crossTeam,1)
this.SetTeamInfo(this.enTeamInfo,msg.defTeamInfo.crossTeam,2)

View File

@ -183,6 +183,9 @@ local oldScore
function WorldArenaMainPanel:OnOpen(msg)
-- 参数保存
-- NetManager.CrossYuXuLunDaoGetInfoRequest(function(msg)
if msg.isFirst then
FormationManager.RefreshFormationData(this.CheckTeamDamage)
end
local currRankId=msg.newLevelId
LogError(" newMyscore=="..msg.newMyscore.." oldmyscore=="..msg.oldMyscore)
grid, rankData=WorldArenaManager.GetRankImgByScore(msg.newMyscore)
@ -216,9 +219,7 @@ function WorldArenaMainPanel:OnOpen(msg)
WorldArenaManager.AddReward(msg.updrop)
end
this.CheckIsRankChange(msg.updrop)
if msg.isFirst then
FormationManager.RefreshFormationData()
end
-- end)
end
@ -403,14 +404,18 @@ end
-- 打开,重新打开时回调
function WorldArenaMainPanel:OnShow()
SoundManager.PlayMusic(SoundConfig.BGM_Arena)
this.CheckTeamDamage()
end
function WorldArenaMainPanel.CheckTeamDamage()
local allDamage=0
for i = 2001, 2003 do
allDamage=allDamage+FormationManager.GetFormationPower(i)
end
this.power.text=allDamage
this.power.text=allDamage
end
function WorldArenaMainPanel:OnSortingOrderChange(order)
--this.sortingOrder=order
if titleLive then

View File

@ -172,25 +172,19 @@ function this.RefreshMyInfo()
end
--获取奖励
if curRankType == 3 then--竞技场
for k,value in ConfigPairs(arenaReward) do
if myrank <= 3 then
if tabNum == 1 then
rewardList = arenaReward[myrank].DailyReward
elseif tabNum == 2 then
rewardList = arenaReward[myrank].SeasonReward
end
elseif myrank > 3 then
--if curRankType == 3 then--竞技场
for k,value in ConfigPairs(ConfigList[2]) do
-- if myrank > 3 then
if myrank >= value.MinRank and myrank <= value.MaxRank then
if tabNum == 1 then
rewardList = value.DailyReward
rewardList = value.SeasonRewardShow
elseif tabNum == 2 then
rewardList = value.SeasonReward
rewardList = value.SeasonRewardShow
end
end
end
-- end
end
end
--end
--显示奖励