【跨服天梯】提交

zhangqiang 2020-12-16 17:04:17 +08:00
parent fd28024dc2
commit 37336acb66
16 changed files with 678 additions and 192 deletions

View File

@ -5018,9 +5018,9 @@ RectTransform:
m_Father: {fileID: 1012972711}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 117, y: -56}
m_SizeDelta: {x: 234, y: 112}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &698392787
@ -5161,7 +5161,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -59, y: 18.7}
m_SizeDelta: {x: 0, y: 70}
m_SizeDelta: {x: 380, y: 70}
m_Pivot: {x: 1, y: 0}
--- !u!114 &708116011
MonoBehaviour:
@ -5639,10 +5639,10 @@ RectTransform:
m_Father: {fileID: 708116007}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 158, y: 0}
m_SizeDelta: {x: 0, y: 68.95}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 158, y: -35}
m_SizeDelta: {x: 230, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1240811747
CanvasRenderer:
@ -5934,10 +5934,10 @@ RectTransform:
m_Father: {fileID: 708116007}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 300.5, y: 0}
m_SizeDelta: {x: 0, y: 68.95}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 300.5, y: -35}
m_SizeDelta: {x: 55, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1596169479
CanvasRenderer:
@ -6261,9 +6261,9 @@ RectTransform:
m_Father: {fileID: 1012972711}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 56, y: -496.3}
m_SizeDelta: {x: 112, y: 112}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2110103218
@ -26449,7 +26449,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: 53.800014, y: 16.20002}
m_AnchoredPosition: {x: 80, y: 16.20002}
m_SizeDelta: {x: 208.26, y: 72.19}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2839595269000931517
@ -31697,9 +31697,9 @@ RectTransform:
m_Father: {fileID: 3952385394978222417}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 50, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -50}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5885637088687318906
@ -32063,9 +32063,9 @@ RectTransform:
m_Father: {fileID: 3952385394978222417}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 50, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -208.75}
m_SizeDelta: {x: 100, y: 217.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1473222624206509369
@ -62726,9 +62726,9 @@ RectTransform:
m_Father: {fileID: 3952385394978222417}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -392.5}
m_SizeDelta: {x: 100, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6889475057108059259
@ -73601,8 +73601,8 @@ RectTransform:
m_Father: {fileID: 1043104976139942255}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 2, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
@ -74092,9 +74092,9 @@ RectTransform:
m_Father: {fileID: 3814890933284291651}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 53, y: -53}
m_SizeDelta: {x: 106, y: 106}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3791543136630995348
@ -85132,7 +85132,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.4499817, y: 0.46502018}
m_SizeDelta: {x: 0.89996, y: 0.93}
m_Pivot: {x: 0.5, y: 0.5}
@ -91150,10 +91150,10 @@ RectTransform:
m_Father: {fileID: 708116007}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 354, y: 0}
m_SizeDelta: {x: 0, y: 69.49}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 354, y: -35}
m_SizeDelta: {x: 52, y: 69.49}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5594570048363825325
CanvasRenderer:
@ -91420,9 +91420,9 @@ RectTransform:
m_Father: {fileID: 3814890933284291651}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 269.44, y: -53}
m_SizeDelta: {x: 106, y: 106}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5575929133019220475
@ -91561,7 +91561,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 55, y: -137}
m_SizeDelta: {x: 0, y: 74.5}
m_SizeDelta: {x: 322.44, y: 74.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5535357721351960960
MonoBehaviour:
@ -107666,9 +107666,9 @@ RectTransform:
m_Father: {fileID: 1012972711}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 101.75, y: -276.15}
m_SizeDelta: {x: 203.5, y: 308.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5423471315474658513
@ -109227,9 +109227,9 @@ RectTransform:
m_Father: {fileID: 3814890933284291651}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 161.22, y: -53}
m_SizeDelta: {x: 106, y: 106}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7914440216826683292
@ -119076,7 +119076,6 @@ GameObject:
- component: {fileID: 7327426409395673384}
- component: {fileID: 6605491976650546744}
- component: {fileID: 8327437912906711713}
- component: {fileID: 4528871497690529275}
m_Layer: 5
m_Name: bg
m_TagString: Untagged
@ -119140,48 +119139,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &4528871497690529275
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7922189349811194424}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue:
- initV3: {x: 1.3, y: 1.3, z: 1.3}
initFloat: 0
isInit: 1
changeV3: {x: 1, y: 1, z: 1}
changeFloat: 0
duration: 0.8
delay: 0
curveType: 1
changeType: 4
sequeueType: 1
loop: 999999999
loopType: 1
targetObj: {fileID: 0}
- initV3: {x: 1.3, y: 1.3, z: 1.3}
initFloat: 0
isInit: 1
changeV3: {x: 1, y: 1, z: 1}
changeFloat: 0
duration: 0.8
delay: 0
curveType: 1
changeType: 4
sequeueType: 1
loop: 999999999
loopType: 1
targetObj: {fileID: 0}
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 1
--- !u!1 &7995026743456038678
GameObject:
m_ObjectHideFlags: 0
@ -136183,11 +136140,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 5391497229806396012}
m_Modifications:
- target: {fileID: 4537954547819557299, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_Name
value: UI_Effect_MuBiaoJiangLi
objectReference: {fileID: 0}
- target: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_LocalPosition.x
@ -136293,6 +136245,11 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4537954547819557299, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_Name
value: UI_Effect_MuBiaoJiangLi
objectReference: {fileID: 0}
- target: {fileID: 7667894851207529766, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_IsActive

View File

@ -654,6 +654,114 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &582138868479774742
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2215580721701931438}
- component: {fileID: 2982429734061171408}
- component: {fileID: 5083266895898158857}
- component: {fileID: 618237225173043547}
m_Layer: 5
m_Name: click
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2215580721701931438
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 582138868479774742}
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: 1430845684553144955}
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: 2, y: 34.921}
m_SizeDelta: {x: 285.8, y: 285.76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2982429734061171408
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 582138868479774742}
m_CullTransparentMesh: 0
--- !u!114 &5083266895898158857
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 582138868479774742}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
--- !u!114 &618237225173043547
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 582138868479774742}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 5083266895898158857}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &741812677914622116
GameObject:
m_ObjectHideFlags: 0
@ -765,7 +873,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: 103.3, y: -0.00002002716}
m_AnchoredPosition: {x: 185, y: -0.00002002716}
m_SizeDelta: {x: 39, y: 39}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2062163480134798091
@ -805,6 +913,114 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &930132012536605656
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 185441702523426086}
- component: {fileID: 4189953821546504250}
- component: {fileID: 3604786207172062327}
- component: {fileID: 5666557821598695822}
m_Layer: 5
m_Name: click
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &185441702523426086
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 930132012536605656}
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: 8987838287907432538}
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: 2.0000002, y: 34.921}
m_SizeDelta: {x: 285.8, y: 285.76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4189953821546504250
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 930132012536605656}
m_CullTransparentMesh: 0
--- !u!114 &3604786207172062327
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 930132012536605656}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
--- !u!114 &5666557821598695822
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 930132012536605656}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 3604786207172062327}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &954962083207176104
GameObject:
m_ObjectHideFlags: 0
@ -839,7 +1055,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: 103.3, y: -0.00002002716}
m_AnchoredPosition: {x: 185, y: -0.00002002716}
m_SizeDelta: {x: 39, y: 39}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &300288002416934859
@ -1280,6 +1496,114 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -100}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1352710954021550394
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2252301661636636695}
- component: {fileID: 2953630892981664169}
- component: {fileID: 8996229279422303833}
- component: {fileID: 6263613242846949259}
m_Layer: 5
m_Name: click
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2252301661636636695
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1352710954021550394}
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: 1684780915685091005}
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: 2.0000002, y: 34.921}
m_SizeDelta: {x: 285.8, y: 285.76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2953630892981664169
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1352710954021550394}
m_CullTransparentMesh: 0
--- !u!114 &8996229279422303833
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1352710954021550394}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
--- !u!114 &6263613242846949259
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1352710954021550394}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 8996229279422303833}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &1363570566151756749
GameObject:
m_ObjectHideFlags: 0
@ -2777,7 +3101,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: -101.1, y: 0}
m_AnchoredPosition: {x: -185, y: 0}
m_SizeDelta: {x: 39, y: 39}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5495597259235052125
@ -3147,6 +3471,7 @@ RectTransform:
- {fileID: 1571636340027626783}
- {fileID: 7340625489207875014}
- {fileID: 5504391721893863288}
- {fileID: 2252301661636636695}
m_Father: {fileID: 7192441510342929614}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3189,7 +3514,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: 103.3, y: -0.00002002716}
m_AnchoredPosition: {x: 185, y: -0.00002002716}
m_SizeDelta: {x: 39, y: 39}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6470824255990438370
@ -5719,7 +6044,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: -101.1, y: 0}
m_AnchoredPosition: {x: -185, y: 0}
m_SizeDelta: {x: 39, y: 39}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2228692082852730701
@ -5790,6 +6115,7 @@ RectTransform:
- {fileID: 3451334845964751407}
- {fileID: 4505637871155458561}
- {fileID: 3306706041597119646}
- {fileID: 6212456619462555992}
m_Father: {fileID: 7192441510342929614}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -5906,6 +6232,7 @@ RectTransform:
- {fileID: 4691522976865405718}
- {fileID: 5314950743064490536}
- {fileID: 2902116975109795492}
- {fileID: 2215580721701931438}
m_Father: {fileID: 7192441510342929614}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -7082,6 +7409,114 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u626B \u8361"
LanguageIndex: 10625
--- !u!1 &7149273007620742569
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6212456619462555992}
- component: {fileID: 4104886713270441621}
- component: {fileID: 9065196975561139782}
- component: {fileID: 2906410956062101244}
m_Layer: 5
m_Name: click
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6212456619462555992
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7149273007620742569}
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: 8252654752434907045}
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: 2.0000002, y: 34.921}
m_SizeDelta: {x: 285.8, y: 285.76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4104886713270441621
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7149273007620742569}
m_CullTransparentMesh: 0
--- !u!114 &9065196975561139782
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7149273007620742569}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
--- !u!114 &2906410956062101244
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7149273007620742569}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 9065196975561139782}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &7151287893466731114
GameObject:
m_ObjectHideFlags: 0
@ -7113,6 +7548,7 @@ RectTransform:
- {fileID: 2358775322044653583}
- {fileID: 6710054022066474049}
- {fileID: 8914165076397393219}
- {fileID: 185441702523426086}
m_Father: {fileID: 7192441510342929614}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -7591,7 +8027,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: 103.3, y: -0.00002002716}
m_AnchoredPosition: {x: 185, y: -0.00002002716}
m_SizeDelta: {x: 39, y: 39}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4094251795850942351
@ -8821,7 +9257,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: -101.1, y: 0}
m_AnchoredPosition: {x: -185, y: 0}
m_SizeDelta: {x: 39, y: 39}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6530183788528716095
@ -9123,7 +9559,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: -101.1, y: 0}
m_AnchoredPosition: {x: -185, y: 0}
m_SizeDelta: {x: 39, y: 39}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6201476369068130991

View File

@ -362,7 +362,7 @@ UIName = {
JumpServerPanel = 362,--跨服玩法主界面
JumpServerHightLadderPanel = 363,--跨服天梯主界面
JumpServerHightLadderRecordPopup = 364,--跨服天梯挑战记录
JumpServerHightLadderRewardSortPanel = 365,--跨服天梯排行奖励
JumpServerHightLadderRewardSortPanel = 370,--跨服天梯排行奖励
}
SubUIConfig = {

View File

@ -31,9 +31,6 @@ function this.On_Btn1_Click()
end
this.root:ClosePanel()
-- 如果未打开则打开
if not UIManager.IsOpen(UIName.ArenaMainPanel) then
UIManager.OpenPanel(UIName.ArenaMainPanel)
end
end
--
function this.InitView()
@ -41,7 +38,7 @@ function this.InitView()
this.root.btn_1:SetActive(true)
this.root.btn_1_lab.text = Language[10712]
this.root.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Arena })
this.root.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.JumpServerHightLadder })
end

View File

@ -5,10 +5,13 @@ local datas = {}
local liveNodeList = {}
local goList = {}
local stage = 0
local enterable = false
local JoinRank = ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).JoinRank
local isFirstRefresh = false
--初始化组件(用于子类重写)
function JumpServerHightLadderPanel:InitComponent()
this.timeText = Util.GetGameObject(self.gameObject, "titleObg/timeImage/Text")
this.helpBtn = Util.GetGameObject(self.gameObject,"titleObg/HelpBtn")
this.helpBtn = Util.GetGameObject(self.gameObject,"HelpBtn")
this.helpPos = this.helpBtn:GetComponent("RectTransform").localPosition
this.sortBtn = Util.GetGameObject(self.gameObject,"rightBtns/sortBtn")
this.rewardSortBtn = Util.GetGameObject(self.gameObject,"rightBtns/rewardSortBtn")
@ -59,7 +62,7 @@ function JumpServerHightLadderPanel:BindEvent()
UIManager.OpenPanel(UIName.JumpServerHightLadderRecordPopup)
end)
Util.AddClick(this.shopBtn,function()
JumpManager.GoJump(20005)
JumpManager.GoJump(3005)
end)
Util.AddClick(this.formationBtn,function()
-- if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer) then
@ -71,9 +74,10 @@ function JumpServerHightLadderPanel:BindEvent()
Util.AddClick(this.sdBtn,function()
--条件判断
this.BuyVipFun(1,function()
this.BuyVipFun(1,2,function()
--直接战斗
JumpServerManager.StarFightHightLadder(nil,1,function(msg)
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_MIANFEINUM, 1)--更新特权
this.RefreshBuyNum()
this.OnShowPanel()
end)
@ -81,26 +85,27 @@ function JumpServerHightLadderPanel:BindEvent()
end)
Util.AddClick(this.addNumBtn,function()
this.BuyVipFun(2,function()
this.RefreshBuyNum()
end)
this.BuyVipFun(2,nil)
end)
end
--添加事件监听(用于子类重写)
function JumpServerHightLadderPanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderPanel, this.OnShowPanel)
-- Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderNum, this.RefreshBuyNum)
end
--移除事件监听(用于子类重写)
function JumpServerHightLadderPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderPanel, this.OnShowPanel)
-- Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderNum, this.RefreshBuyNum)
end
--跨服
function JumpServerHightLadderPanel:OnOpen()
this.UpView:OnOpen({showType = UpViewOpenType.ShowRight, panelType = PanelType.Main})
this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.JumpServerHightLadder})
JumpServerManager.GetWorldArenaInfoRequest()
isFirstRefresh = false
end
--界面打开时调用(用于子类重写)
@ -115,6 +120,7 @@ end
function this.OnShowPanel()
stage = JumpServerManager.GetHightLadderDatastage()
datas = JumpServerManager.GetHightLadderDataArenaInfo()
enterable = JumpServerManager.GetHightLadderDataEnterable()
LogPink("datas.arenaEnemys "..#datas.arenaEnemys)
for i = 1, 4 do
this.ShowSingleData(goList[i],datas.arenaEnemys[i],i)
@ -127,28 +133,38 @@ function this.OnShowPanel()
this.numInfo:SetActive(false)
local timeStr = ""
LogPink("stage "..stage)
this.canPlayerTipText:GetComponent("Text").text = "本服千战主胜台前"..JoinRank.."名可以参加"
timeStr = "后开始"
--1 未开始 2 战斗阶段 3 膜拜阶段
if stage == JumpServer_Stage.NoStar then
this.canPlayerTipText:SetActive(true)
this.canPlayerTipText:GetComponent("Text").text = "本服千战主胜台前100名可以参加"
timeStr = "后开始"
elseif stage == JumpServer_Stage.Attack then
this.mySortText:SetActive(true)
this.sdBtn:SetActive(true)
this.numInfo:SetActive(true)
local myRank = JumpServerManager.GetHightLadderDataMyRank() <= 1000 and JumpServerManager.GetHightLadderDataMyRank() or "1000+"
this.mySortText:GetComponent("Text").text = "我的排名:".. myRank
this.RefreshBuyNum()
timeStr = "后结束"
if enterable then
this.mySortText:SetActive(true)
this.sdBtn:SetActive(true)
this.numInfo:SetActive(true)
local myRank = JumpServerManager.GetHightLadderDataMyRank() <= 1000 and JumpServerManager.GetHightLadderDataMyRank() or "1000+"
this.mySortText:GetComponent("Text").text = "我的排名:".. myRank
this.RefreshBuyNum()
timeStr = "后结束"
else
this.canPlayerTipText:SetActive(true)
end
elseif stage == JumpServer_Stage.End then
local myRank = JumpServerManager.GetHightLadderDataMyRank() <= 1000 and JumpServerManager.GetHightLadderDataMyRank() or "1000+"
this.mySortText:GetComponent("Text").text = "我的排名:".. myRank
this.canPlayerTipText:GetComponent("Text").text = "已通过邮件发放排名奖励"
timeStr = "后开始"
if enterable then
local myRank = JumpServerManager.GetHightLadderDataMyRank() <= 1000 and JumpServerManager.GetHightLadderDataMyRank() or "1000+"
this.mySortText:GetComponent("Text").text = "我的排名:".. myRank
this.canPlayerTipText:GetComponent("Text").text = "已通过邮件发放排名奖励"
timeStr = "后开始"
else
this.canPlayerTipText:SetActive(true)
end
end
this.RemainTimeDown(this.timeText,this.timeText:GetComponent("Text"),JumpServerManager.GetHightLadderDataEndTime(),timeStr)
end
function this.RefreshBuyNum()
LogGreen("JumpServerManager.GetCanBattleCount() "..JumpServerManager.GetCanBattleCount())
LogGreen("JumpServerManager.GetCanBuyBattleCount() "..JumpServerManager.GetCanBuyBattleCount())
this.mianfeiText.text = JumpServerManager.GetCanBattleCount()
this.buyText.text = JumpServerManager.GetCanBuyBattleCount()
end
@ -157,6 +173,7 @@ function this.ShowSingleData(go,data,i)
LogPink("data "..data.personInfo.uid)
local playerInfo = Util.GetGameObject(go, "playerInfo")
local sdBtn = Util.GetGameObject(go, "sdBtn")
local cliclBtn = Util.GetGameObject(go, "click")
local sdBtnRedPoint = Util.GetGameObject(go, "sdBtn/redPoint")
local liveDef = Util.GetGameObject(go, "liveDef")
playerInfo:SetActive(false)
@ -172,27 +189,37 @@ function this.ShowSingleData(go,data,i)
Util.GetGameObject(go, "liveDef"):GetComponent("Image").sprite = Util.LoadSprite(str)
Util.AddOnceClick(sdBtn,function()
end)
Util.AddOnceClick(cliclBtn,function()
end)
elseif stage == JumpServer_Stage.Attack and data then
playerInfo:SetActive(true)
sdBtn:SetActive(true)
Util.GetGameObject(go, "sdBtn/Text"):GetComponent("Text").text = "挑 战"
Util.GetGameObject(go, "playerInfo/name/nameText"):GetComponent("Text").text = data.personInfo.name
Util.GetGameObject(go, "playerInfo/name/nameText"):GetComponent("Text").text = data.personInfo.servername.." "..data.personInfo.name
Util.GetGameObject(go, "playerInfo/warPower/powerBtn/value"):GetComponent("Text").text = data.personInfo.totalForce
Util.GetGameObject(go, "playerInfo/warPower/Text"):GetComponent("Text").text = "".. data.personInfo.rank ..""
local live = Util.GetGameObject(go, "playerInfo/live")
this.LocadPersonInfoLive(go,NameManager.roleSex,live.transform)
sdBtnRedPoint:SetActive(JumpServerManager.GetCanBattleCount() > 0)
Util.AddOnceClick(sdBtn,function()
this.BuyVipFun(1,function()
if not enterable then
PopupTipPanel.ShowTip("本服千战主胜台前"..JoinRank.."名可以参加")
return
end
this.BuyVipFun(1,1,function()
--直接战斗
JumpServerManager.StarFightHightLadder(data.personInfo,0,function(msg)
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_MIANFEINUM, 1)--更新特权
this.RefreshBuyNum()
this.OnShowPanel()
end)
end)
end)
Util.AddOnceClick(cliclBtn,function()
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.personInfo.uid, nil,data.personInfo.servername)
end)
elseif stage == JumpServer_Stage.End and data then
playerInfo:SetActive(true)
sdBtn:SetActive(true)
@ -203,7 +230,7 @@ function this.ShowSingleData(go,data,i)
LogPink("data.worshipTime 为空 ")
end
Util.GetGameObject(go, "sdBtn/Text"):GetComponent("Text").text = not data.hadProud and "膜 拜" or data.worshipTime
Util.GetGameObject(go, "playerInfo/name/nameText"):GetComponent("Text").text = data.personInfo.name
Util.GetGameObject(go, "playerInfo/name/nameText"):GetComponent("Text").text = data.personInfo.servername.." "..data.personInfo.name
Util.GetGameObject(go, "playerInfo/warPower/powerBtn/value"):GetComponent("Text").text = data.personInfo.totalForce
Util.GetGameObject(go, "playerInfo/warPower/Text"):GetComponent("Text").text = "".. data.personInfo.rank ..""
local live = Util.GetGameObject(go, "playerInfo/live")
@ -216,7 +243,9 @@ function this.ShowSingleData(go,data,i)
end)
end
end)
Util.AddOnceClick(cliclBtn,function()
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.personInfo.uid, nil,data.personInfo.servername)
end)
end
end
function this.LocadPersonInfoLive(go,roleSex,live)
@ -235,12 +264,12 @@ function this.LocadPersonInfoLive(go,roleSex,live)
end
--刷新倒计时显示
function this.RemainTimeDown(_timeTextExpertgo,_timeTextExpert,timeDown,str)
if timeDown > 0 then
if timeDown - GetTimeStamp() > 0 then
if _timeTextExpertgo then
_timeTextExpertgo:SetActive(true)
end
if _timeTextExpert then
_timeTextExpert.text = this.TimeStampToDateString(timeDown)..str
_timeTextExpert.text = this.TimeStampToDateString(timeDown - GetTimeStamp())..str
end
if this.timer then
this.timer:Stop()
@ -248,14 +277,20 @@ function this.RemainTimeDown(_timeTextExpertgo,_timeTextExpert,timeDown,str)
end
this.timer = Timer.New(function()
if _timeTextExpert then
_timeTextExpert.text = this.TimeStampToDateString(timeDown)..str
LogGreen(" 跨服天梯 "..this.TimeStampToDateString(timeDown)..str)
_timeTextExpert.text = this.TimeStampToDateString(timeDown - GetTimeStamp())..str
end
if timeDown < 0 then
if timeDown - GetTimeStamp() < 0 then
if _timeTextExpertgo then
_timeTextExpertgo:SetActive(false)
end
this.timer:Stop()
this.timer = nil
if not isFirstRefresh then
LogError("跨服天梯前端刷新")
JumpServerManager.GetWorldArenaInfoRequest()
isFirstRefresh = true
end
end
timeDown = timeDown - 1
end, 1, -1, true)
@ -264,6 +299,11 @@ function this.RemainTimeDown(_timeTextExpertgo,_timeTextExpert,timeDown,str)
if _timeTextExpertgo then
_timeTextExpertgo:SetActive(false)
end
if not isFirstRefresh then
LogError("跨服天梯前端刷新")
JumpServerManager.GetWorldArenaInfoRequest()
isFirstRefresh = true
end
end
end
@ -272,40 +312,49 @@ function this.TimeStampToDateString(second)
local minute = math.floor(second / 60) % 60
local sec = second % 60
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
return string.format(Language[10548],day, hour, minute, sec)
if day > 0 then
return string.format("%d:%02d:%02d:%02d",day, hour, minute, sec)
else
return string.format("%02d:%02d:%02d", hour, minute, sec)
end
end
function this.BuyVipFun(type,fun)
if JumpServerManager.GetCanBattleCount() <= 0 then --今日已无剩余次数!
if JumpServerManager.GetCanBuyBattleCount() <= 0 then
PopupTipPanel.ShowTip(Language[12326])
else
--是否花费XX妖晶购买1次挑战次数并发起挑战
if type == 1 then
local costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FUNCTION_SHOP, JumpServerManager.shopGoodId, 1)
local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,costId).Name
if finalNum > BagManager.GetItemCountById(costId) then
PopupTipPanel.ShowTip(string.format(Language[11652],itemName))
return
end
MsgPanel.ShowTwo(string.format( Language[12327],finalNum,itemName), nil, function()
--买东西
ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,JumpServerManager.shopGoodId,1,function()
PopupTipPanel.ShowTip(Language[12328])
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_MIANFEINUM, 1)--更新特权
if fun then
fun ()
end
function this.BuyVipFun(type,warOrSd,fun)
if type == 1 then
if JumpServerManager.GetCanBattleCount() <= 0 then --今日已无剩余次数!
if JumpServerManager.GetCanBuyBattleCount() <= 0 then
PopupTipPanel.ShowTip(Language[12326])
else
--是否花费XX妖晶购买1次挑战次数并发起挑战
local costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FUNCTION_SHOP, JumpServerManager.shopGoodId, 1)
local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,costId).Name
if finalNum > BagManager.GetItemCountById(costId) then
PopupTipPanel.ShowTip(string.format(Language[11652],itemName))
return
end
local tipStr = warOrSd == 1 and Language[12327] or "是否花费%s%s购买1次挑战次数并进行扫荡"
MsgPanel.ShowTwo(string.format( tipStr,finalNum,itemName), nil, function()
--买东西
ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,JumpServerManager.shopGoodId,1,function()
local tipStr2 = warOrSd == 1 and Language[12328] or "扫荡成功!"
PopupTipPanel.ShowTip(tipStr2)
if fun then
fun ()
end
end)
end)
end)
elseif type == 2 then
UIManager.OpenPanel(UIName.ShopBuyPopup, 7,10032)
end
else
if fun then
fun ()
end
end
else
if fun then
fun ()
end
elseif type == 2 then
UIManager.OpenPanel(UIName.ShopBuyPopup, 7,10035,function()
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_BUYNUM, 1)--更新特权
this.RefreshBuyNum()
end)
end
end

View File

@ -88,11 +88,11 @@ function this.RankNodeAdapter(node, data)
warOrGuard = 2
curShowPersonInfo = data.blueEnemy
end
lv_name.text = "lv"..curShowPersonInfo.personInfo.name--curShowPersonInfo.personInfo.serverId.." "..
lv_name.text = curShowPersonInfo.personInfo.servername.." "..curShowPersonInfo.personInfo.name--
power.text = Language[10090]..curShowPersonInfo.personInfo.totalForce
time.text = GetDeltaTimeStr(data.fightData.fightSeed)
curSort:GetComponent("Text").text = data.oldrank
nextSort:GetComponent("Text").text = data.rank
curSort:GetComponent("Text").text = data.oldrank <= 1000 and data.oldrank or "1000+"
nextSort:GetComponent("Text").text = data.rank <= 1000 and data.rank or "1000+"
curSort:SetActive(false)
nextSort:SetActive(false)
upImage:SetActive(false)

View File

@ -1,5 +1,6 @@
require("Base/BasePanel")
JumpServerHightLadderRewardSortPanel = Inherit(BasePanel)
local this = JumpServerHightLadderRewardSortPanel
local type = 0
local expertSortDataTabs = {}--排行
@ -116,6 +117,7 @@ function this.SetGoldExperSortInfo()
end
else
sortNumTabs[4]:SetActive(true)
LogError("rewardData.MaxRank "..rewardData.MaxRank.." "..myData.rank)
if rewardData.MaxRank < 0 then
Util.GetGameObject(sortNumTabs[4], "TitleText"):GetComponent("Text").text = rewardData.MinRank .."+"
else
@ -124,8 +126,8 @@ function this.SetGoldExperSortInfo()
end
local content = Util.GetGameObject(this.myActivityRewardGo, "Demons")
Util.ClearChild(content.transform)
for i = 1, #rewardData.RankingReward do
SubUIManager.Open(SubUIConfig.ItemView, content.transform):OnOpen(false,rewardData.RankingReward[i],0.75)
for i = 1, #rewardData.SeasonReward do
SubUIManager.Open(SubUIConfig.ItemView, content.transform):OnOpen(false,rewardData.SeasonReward[i],0.75)
end
end
end
@ -154,8 +156,8 @@ function JumpServerHightLadderRewardSortPanel:ActivityRewardSingleShow(activityR
end
local content = Util.GetGameObject(activityRewardGo, "content")
Util.ClearChild(content.transform)
for i = 1, #rewardData.RankingReward do
SubUIManager.Open(SubUIConfig.ItemView, content.transform):OnOpen(false,rewardData.RankingReward[i],0.75)
for i = 1, #rewardData.SeasonReward do
SubUIManager.Open(SubUIConfig.ItemView, content.transform):OnOpen(false,rewardData.SeasonReward[i],0.75)
end
end
--界面关闭时调用(用于子类重写)

View File

@ -8,7 +8,8 @@ local endTime = 0 --阶段结束时间戳
local arenaInfo--
local myRank = -1
local oldMyRank = -1
this.shopGoodId = 2011--挑战价格
local enterable = 0-- -1不可参加
this.shopGoodId = 10035--挑战价格
function this.Initialize()
@ -28,10 +29,12 @@ function this.InithightLadderData(_msg)
LogPink("_msg.stage ".._msg.stage)
LogPink("_msg.endTime ".._msg.endTime)
LogPink("_msg.arenaInfo.score ".._msg.arenaInfo.score)
LogPink("_msg.enterable ".._msg.enterable)
arenaInfo = _msg.arenaInfo
stage = _msg.stage
endTime = _msg.endTime
myRank = _msg.arenaInfo.score
enterable = _msg.enterable--是否可以参加 竞技场100名以内参加
end
--推送更新
function this.IndicationHightLadderData(_msg)
@ -69,6 +72,9 @@ end
function this.GetHightLadderDataOldMyRank()
return oldMyRank
end
function this.GetHightLadderDataEnterable()
return enterable ~= -1
end
-- 获取剩余挑战次数 特权
function this.GetCanBattleCount()
return PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_MIANFEINUM)
@ -109,7 +115,7 @@ function this.StarFightHightLadder(personInfo,skipFight,callBack)
if callBack then
callBack(msg)
end
end, 1)
end)
end
end)
end
@ -164,6 +170,9 @@ function this.JumpServerHightLadderMianFeiNumRedPoint()
if not isOpen then
return false
end
if not this.GetHightLadderDataEnterable() then
return false
end
if this.GetCanBattleCount() > 0 then
LogPink("跨服天梯剩余免费挑战次数红点true")
return true

View File

@ -126,8 +126,6 @@ function this.UpdateCarbonContent()
Util.AddOnceClick(v,function()
this.BtnClick(data.id)
end)
end
if data.id == -1 then
Util.SetGray(v,true)
@ -144,6 +142,15 @@ function this.BtnClick(id)
PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(JumpServer_Type.HightLadder))
return
end
local conFigWorldLevel = ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).WorldLevel
if PlayerManager.worldLeve < conFigWorldLevel then --如果世界等级不足
PopupTipPanel.ShowTip(string.format("世界等级到达%s后开启",conFigWorldLevel))
return
end
if JumpServerManager.GetHightLadderDatastage() == JumpServer_Stage.NoStar then
PopupTipPanel.ShowTip("未划分跨服分组,无法参与!")
return
end
UIManager.OpenPanel(UIName.JumpServerHightLadderPanel)
else
PopupTipPanel.ShowTip("敬请期待")
@ -166,6 +173,7 @@ end
--界面销毁时调用(用于子类重写)
function JumpServerPanel:OnDestroy()
carbons = {}
end
return JumpServerPanel

View File

@ -714,12 +714,12 @@ function this:BindEvent()
this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ENDLESS)
end)
Util.AddClick(this.btnJumpServer, function()
-- if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.JumpServer) then
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.JumpServer) then
UIManager.OpenPanel(UIName.JumpServerPanel)
-- else
-- local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.JumpServer)
-- PopupTipPanel.ShowTip(string.format(Language[12297],config.OpenRules[2]))
-- end
else
local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.JumpServer)
PopupTipPanel.ShowTip(string.format(Language[12297],config.OpenRules[2]))
end
this.ScenceBtnClick(FUNCTION_OPEN_TYPE.JumpServer)
end)
Util.AddClick(this.btnFenjie, function()

View File

@ -117,6 +117,7 @@ function this.RegisterMessage(network)
socket:RegistNetMessage(MessageTypeProto_pb.HERO_SKIN_USE_INDICATION, this.HeroSkinUseIndication)
--跨服天梯信息推送
-- socket:RegistNetMessage(MessageTypeProto_pb.HERO_SKIN_USE_INDICATION, this.GetWorldArenaInfoIndication)
socket:RegistNetMessage(MessageTypeProto_pb.WorldLevelIndication, this.WorldLevelIndication)
end
function this.HeroSkinUseIndication(buffer)
@ -802,7 +803,14 @@ function this.GetWorldArenaInfoIndication(buffer)
local data = buffer:DataByte()
local msg = WorldProto_pb.GetWorldArenaInfoIndication()
msg:ParseFromString(data)
LogPink("%%%%%%%%%%%msg.arenaInfo: "..#msg.arenaInfo.arenaEnemys.." msg.stage: "..msg.stage.." msg.endTime: "..msg.endTime)
-- LogPink("%%%%%%%%%%%msg.arenaInfo: "..#msg.arenaInfo.arenaEnemys.." msg.stage: "..msg.stage.." msg.endTime: "..msg.endTime)
JumpServerManager.IndicationHightLadderData(msg)
end
function this.WorldLevelIndication(buffer)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.WorldLevelIndication()
msg:ParseFromString(data)
LogError("%%%%%%%%%%世界等级推送 "..msg.worldLeve)
PlayerManager.RefreshWorldLeveData(msg.worldLeve)
end
return this

View File

@ -211,6 +211,7 @@ function this.PlayerInfoRequest(func)
-- LogGreen("GetPlayerInfoResponse.treasureLevel:"..msg.treasureLevel)
QinglongSerectTreasureManager.SetLevel(msg.treasureLevel)
QinglongSerectTreasureManager.SetTreasureBuyStatus(msg.hadBuyTreasure)
PlayerManager.RefreshWorldLeveData(msg.worldLeve)
if func then
func(msg)
end
@ -2748,10 +2749,11 @@ function this.RequestSignIn(dayIndex, func)
end
-- 获取玩家信息
function this.RequestPlayerInfo(uid, teamId, func)
function this.RequestPlayerInfo(uid, teamId,serverName, func)
local data = PlayerInfoProto_pb.GetPlayerOneTeamInfoRequest()
data.playerId = uid
data.teamId = teamId
data.serverId = serverName and 1 or 0
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.GET_PLAYER_ONE_TEAM_INFO_REQUEST, MessageTypeProto_pb.GET_PLAYER_ONE_TEAM_INFO_RESPONSE, msg, function(buffer)
local data = buffer:DataByte()
@ -3317,10 +3319,11 @@ end
--好友上阵英雄预览信息
function this.ViewHeroInfoRequest(targetUid,heroId,func)
function this.ViewHeroInfoRequest(targetUid,heroId,serverName,func)
local data = PlayerInfoProto_pb.ViewHeroInfoRequest()
data.targetUid = targetUid
data.heroId = heroId
data.serverId = serverName and 1 or 0
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.VIEW_HERO_INFO_REQUEST, MessageTypeProto_pb.VIEW_HERO_INFO_RESPONSE, msg, function(buffer)
local data = buffer:DataByte()

View File

@ -10,6 +10,7 @@ this.singleAddTimeGap = gameSetting[1].EnergyRecoverSpeed[2]
this.exp = 0
this.level = 0
this.maxForce = 0
this.worldLeve = 0
-- 每次重置的时间
this.startTime = 0
-- 已经计时的时间
@ -445,4 +446,7 @@ function this.StopBattleUpLvTipTime()
battleUpLvTipTime = nil
end
end
function this.RefreshWorldLeveData(worldLeve)
this.worldLeve = worldLeve
end
return this

View File

@ -1,7 +1,7 @@
require("Base/BasePanel")
local PlayerInfoPopup = Inherit(BasePanel)
local this = PlayerInfoPopup
local netserverName = nil
local _ViewConfig = {
[PLAYER_INFO_VIEW_TYPE.NORMAL] = {
formationType = FormationTypeDef.FORMATION_NORMAL,
@ -124,9 +124,10 @@ function PlayerInfoPopup:RemoveListener()
end
--界面打开时调用(用于子类重写)
function PlayerInfoPopup:OnOpen(playerId, viewType)
function PlayerInfoPopup:OnOpen(playerId, viewType,serverName)
this._PlayerId = playerId
this._ViewType = viewType or PLAYER_INFO_VIEW_TYPE.NORMAL
this.serverName = serverName--跨服加的服务器数据
-- 界面类型修正
if this._ViewType == PLAYER_INFO_VIEW_TYPE.NORMAL and GoodFriendManager.IsInBlackList(this._PlayerId) then
this._ViewType = PLAYER_INFO_VIEW_TYPE.GO_TO_BLACK
@ -154,7 +155,11 @@ function PlayerInfoPopup:OnShow()
this.RefreshBtnShow()
-- 请求数据
-- LogGreen(this._PlayerId.." "..this._Config.formationType)
NetManager.RequestPlayerInfo(this._PlayerId, this._Config.formationType, function(msg)
netserverName = nil
if this.serverName and this.serverName ~= PlayerManager.serverInfo.name then
netserverName = 1
end
NetManager.RequestPlayerInfo(this._PlayerId, this._Config.formationType,netserverName, function(msg)
-- 如果是好友更新好友数据
GoodFriendManager.UpdateFriendData(this._PlayerId, msg.teamInfo.level, msg.teamInfo.name, msg.teamInfo.head, msg.teamInfo.headFrame)
this._PlayerData = msg.teamInfo
@ -242,7 +247,7 @@ function this.FormationAdapter(teamInfo)
local frameBtn = Util.GetGameObject(this.Demons[hero.position], "frame")
local heroData = {}
Util.AddOnceClick(frameBtn, function()
NetManager.ViewHeroInfoRequest(this._PlayerId,hero.heroid,function(msg)
NetManager.ViewHeroInfoRequest(this._PlayerId,hero.heroid,netserverName,function(msg)
heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill)
GoodFriendManager.InitEquipData(msg.equip,heroData)--HeroManager.GetSingleHeroData(heroData.dynamicId)
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true)

View File

@ -145,7 +145,7 @@ function this.SetRankingInfo()
score = myRankData.param1}
elseif sData.rankType == RANK_TYPE.JUMPSERVER_HIGHTLADDER then
dData = { rankInfo = {param1 = myRankData.param1},
force = myRankData.param1}
force = myRankData.param1,}
end
this.SetInfoShow(this.infoGo,dData,sData.rankType)
--数据拆分
@ -156,7 +156,8 @@ function this.SetRankingInfo()
if sData.rankType == RANK_TYPE.CELEBRATION_GUILD or sData.rankType == RANK_TYPE.GUILD_FORCE_RANK then
dt[1].userName = dt[1].guildName
end
this.SetHeadsInfo(dt[1],this.firstHeadinfoGo,1,dt[1].userName,dt[1].level)
local dtUserName = sData.rankType == RANK_TYPE.JUMPSERVER_HIGHTLADDER and dt[1].serverName .. " " .. dt[1].userName or dt[1].userName
this.SetHeadsInfo(dt[1],this.firstHeadinfoGo,1,dtUserName,dt[1].level)
--设置滚动区信息
this.scrollView:SetData(db,function(index,root)
this.ShowWarPowerInfo(root,db[index],myRankData)
@ -206,7 +207,8 @@ function this.SetHeadsInfo(data,root,index,name,level)
SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)
end
Util.AddOnceClick(this.firstheadClick,function()
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid)
LogGreen("data.serverName "..data.serverName)
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,nil,data.serverName and data.serverName or nil)
end)
end
@ -411,7 +413,7 @@ function this.SetInfoShow(go,data,rankType,Value0)
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
warPower:SetActive(true)
if Value0 then
Value0:GetComponent("Text").text = "<size=40%>"..data.userName.."</size>"
Value0:GetComponent("Text").text = "<size=40%>"..data.serverName.." "..data.userName.."</size>"
end
Util.GetGameObject(go,"warPower/Text"):GetComponent("Text").text = data.rankInfo.param1
end

View File

@ -2,6 +2,7 @@
local ShopBuyPopup = Inherit(BasePanel)
local this = ShopBuyPopup
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
this.backFun = nil
--初始化组件(用于子类重写)
function ShopBuyPopup:InitComponent()
this.itemBg = Util.GetGameObject(self.gameObject, "tipImage/item/bg"):GetComponent("Image")
@ -90,11 +91,12 @@ function ShopBuyPopup:RemoveListener()
end
--界面打开时调用(用于子类重写)
function ShopBuyPopup:OnOpen(shopType, shopItemId)
function ShopBuyPopup:OnOpen(shopType, shopItemId,backFun)
-- 获取数据
this.shopType = shopType
this.shopItemId = shopItemId
this.shopItemInfo = ShopManager.GetShopItemInfo(shopItemId)
this.backFun = backFun
LogGreen(shopItemId..":shopItemId")
this.shopItemData = ShopManager.GetShopItemData(shopType, shopItemId)
@ -181,6 +183,10 @@ end
--界面关闭时调用(用于子类重写)
function ShopBuyPopup:OnClose()
if this.backFun then
this.backFun()
this.backFun = nil
end
end
--界面销毁时调用(用于子类重写)