罗浮提交
parent
5423b926e7
commit
031c5bf667
|
@ -348,7 +348,7 @@ MonoBehaviour:
|
|||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u672A\u4E0A\u699C"
|
||||
|
@ -502,7 +502,7 @@ MonoBehaviour:
|
|||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "*\u8D5B\u5B63\u7ED3\u675F\u65F6\u5C06\u901A\u8FC7\u90AE\u4EF6\u53D1\u653E\u6392\u540D\u5956\u52B1*"
|
||||
|
@ -582,7 +582,7 @@ MonoBehaviour:
|
|||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: 11.15-11.28
|
||||
|
@ -1059,7 +1059,7 @@ MonoBehaviour:
|
|||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u9009\u62D4\u8D5B"
|
||||
|
@ -3141,7 +3141,7 @@ MonoBehaviour:
|
|||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: 11.15-11.28
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e6ebce0cec6132f4abe24fef81771d3b
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -1383,7 +1383,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1006421095
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -8893,10 +8893,10 @@ RectTransform:
|
|||
m_Father: {fileID: 1175549617002944358}
|
||||
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: 650, y: -50}
|
||||
m_SizeDelta: {x: 60, y: 88}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8682382969320885722
|
||||
CanvasRenderer:
|
||||
|
@ -10569,10 +10569,10 @@ RectTransform:
|
|||
m_Father: {fileID: 1175549617002944358}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 90, y: -50}
|
||||
m_SizeDelta: {x: 60, y: 88}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6092259711825454753
|
||||
CanvasRenderer:
|
||||
|
@ -13960,9 +13960,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3670451248567414134}
|
||||
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: 36, y: -18}
|
||||
m_SizeDelta: {x: 254.2, y: 63.5}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &5210253197636820229
|
||||
|
@ -17323,9 +17323,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3670451248567414134}
|
||||
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: 786.59503, y: -43.08}
|
||||
m_SizeDelta: {x: 159.39, y: 50.16}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1420070111345050450
|
||||
|
@ -21665,7 +21665,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: c7ed3cfdac6f31f4ca3c91d269d735b2, type: 3}
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -25185,10 +25185,10 @@ RectTransform:
|
|||
m_Father: {fileID: 215920149304938626}
|
||||
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_SizeDelta: {x: 855.1, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 465.55, y: -26.5}
|
||||
m_SizeDelta: {x: 855.1, y: 39}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5392194319038496384
|
||||
CanvasRenderer:
|
||||
|
@ -26456,10 +26456,10 @@ RectTransform:
|
|||
m_Father: {fileID: 8863448297139295757}
|
||||
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: 435, y: 0}
|
||||
m_SizeDelta: {x: 870, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 435, y: -38.75}
|
||||
m_SizeDelta: {x: 870, y: 77.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5915642200145091643
|
||||
CanvasRenderer:
|
||||
|
@ -26709,10 +26709,10 @@ RectTransform:
|
|||
m_Father: {fileID: 1175549617002944358}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 230, y: -50}
|
||||
m_SizeDelta: {x: 60, y: 88}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &802173059697613313
|
||||
CanvasRenderer:
|
||||
|
@ -31318,9 +31318,9 @@ RectTransform:
|
|||
m_Father: {fileID: 8863448297139295757}
|
||||
m_RootOrder: 5
|
||||
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: 435, y: -837}
|
||||
m_SizeDelta: {x: 870, y: 309.7}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &5688548084432830598
|
||||
|
@ -31653,10 +31653,10 @@ RectTransform:
|
|||
m_Father: {fileID: 8863448297139295757}
|
||||
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: 435, y: 0}
|
||||
m_SizeDelta: {x: 870, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 435, y: -331.75}
|
||||
m_SizeDelta: {x: 870, y: 72.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5183859335168644090
|
||||
CanvasRenderer:
|
||||
|
@ -32039,8 +32039,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 458.5, y: -0.000045776367}
|
||||
m_SizeDelta: {x: 917, y: 0}
|
||||
m_AnchoredPosition: {x: 458.5, y: 0.000015258789}
|
||||
m_SizeDelta: {x: 917, y: 46}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &2354951152359418691
|
||||
CanvasRenderer:
|
||||
|
@ -32336,7 +32336,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 3f37d7ac984537748bf692eddc6b65c8, type: 3}
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -32386,7 +32386,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0.5, y: -427.2}
|
||||
m_SizeDelta: {x: 870, y: 0}
|
||||
m_SizeDelta: {x: 870, y: 1146.7}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &2484587132639556036
|
||||
MonoBehaviour:
|
||||
|
@ -33860,9 +33860,9 @@ RectTransform:
|
|||
m_Father: {fileID: 7494134846245643573}
|
||||
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: 36, y: -18}
|
||||
m_SizeDelta: {x: 254.2, y: 63.5}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &3010712499452228185
|
||||
|
@ -43528,10 +43528,10 @@ RectTransform:
|
|||
m_Father: {fileID: 8863448297139295757}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 435, y: 0}
|
||||
m_SizeDelta: {x: 870, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 435, y: -796.25}
|
||||
m_SizeDelta: {x: 870, y: 81.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4863705341942113372
|
||||
CanvasRenderer:
|
||||
|
@ -45721,7 +45721,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &475247785733533137
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -46907,7 +46907,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: accb60060a0b1d4489647f56be959e4b, type: 3}
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -48815,10 +48815,10 @@ RectTransform:
|
|||
m_Father: {fileID: 1175549617002944358}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 510, y: -50}
|
||||
m_SizeDelta: {x: 60, y: 88}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8034457653546168121
|
||||
CanvasRenderer:
|
||||
|
@ -48943,9 +48943,9 @@ RectTransform:
|
|||
m_Father: {fileID: 8863448297139295757}
|
||||
m_RootOrder: 3
|
||||
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: 435, y: -561.75}
|
||||
m_SizeDelta: {x: 870, y: 387.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &530755074506280210
|
||||
|
@ -49987,9 +49987,9 @@ RectTransform:
|
|||
m_Father: {fileID: 8863448297139295757}
|
||||
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: 435, y: -186.5}
|
||||
m_SizeDelta: {x: 870, y: 218}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &5453380272156850861
|
||||
|
@ -50672,9 +50672,9 @@ RectTransform:
|
|||
m_Father: {fileID: 1724954233501732768}
|
||||
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: 36, y: -14}
|
||||
m_SizeDelta: {x: 254.2, y: 63.5}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &3903058791224746062
|
||||
|
@ -50834,7 +50834,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -0.000019445808}
|
||||
m_SizeDelta: {x: 916, y: 0}
|
||||
m_SizeDelta: {x: 916, y: 51}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &2233394732319046138
|
||||
MonoBehaviour:
|
||||
|
@ -53718,10 +53718,10 @@ RectTransform:
|
|||
m_Father: {fileID: 1175549617002944358}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 370, y: -50}
|
||||
m_SizeDelta: {x: 60, y: 88}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5103303198843134740
|
||||
CanvasRenderer:
|
||||
|
@ -55474,10 +55474,10 @@ RectTransform:
|
|||
m_Father: {fileID: 1175549617002944358}
|
||||
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: 790, y: -50}
|
||||
m_SizeDelta: {x: 60, y: 88}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5340892954920088993
|
||||
CanvasRenderer:
|
||||
|
|
|
@ -2195,6 +2195,10 @@ FormationTypeDef = {
|
|||
|
||||
FORMATION_TEMPORARY = 10000, --临时编队, 编队用
|
||||
FORMATION_TEMPORARY_PROP = 10001, -- 临时编队, 属性计算用
|
||||
LuoFuZhengFeng1 = 3208,
|
||||
LuoFuZhengFeng2 = 3209,
|
||||
LuoFuZhengFeng3 = 3210,
|
||||
LuoFuZhengFeng4 = 3211,
|
||||
}
|
||||
|
||||
--编队需要拉取主线
|
||||
|
|
|
@ -21,6 +21,7 @@ function ArenaTypePanel:InitComponent()
|
|||
this.TopMatch_Normal = Util.GetGameObject(this.btnTopMatch, "normal")
|
||||
this.TopMatch_NormalBG = Util.GetGameObject(this.btnTopMatch, "nBg")
|
||||
this.TopMatch_Name = Util.GetGameObject(this.btnTopMatch, "Name"):GetComponent("Text")
|
||||
this.TopMatch_SeasonState=Util.GetGameObject(this.TopMatch_Normal, "Season"):GetComponent("Text")
|
||||
this.TopMatch_Season = Util.GetGameObject(this.TopMatch_Normal, "Season/Text"):GetComponent("Text")
|
||||
this.TopMatch_SeasonTime = Util.GetGameObject(this.TopMatch_Normal, "Season/Time"):GetComponent("Text")
|
||||
this.TopMatch_StageObj = Util.GetGameObject(this.TopMatch_Normal, "Stage")
|
||||
|
@ -57,7 +58,10 @@ function ArenaTypePanel:BindEvent()
|
|||
PopupTipPanel.ShowTip(tipStr)
|
||||
return
|
||||
end
|
||||
UIManager.OpenPanel(UIName.JumpServerHightLadderPanel)
|
||||
if JumpServerManager.stage==1 or JumpServerManager.stage==3 then
|
||||
UIManager.OpenPanel(UIName.JumpServerHightLadderPanel)
|
||||
end
|
||||
|
||||
end)
|
||||
Util.AddClick(this.btnBack, function()
|
||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||
|
@ -116,14 +120,23 @@ function ArenaTypePanel:OnShow()
|
|||
end)
|
||||
--罗浮争锋
|
||||
--this.RefreshTopMatchShow()
|
||||
JumpServerManager.GetWorldArenaInfoRequest(1,function()
|
||||
this.RefreshTopMatchShow()
|
||||
-- 计时器
|
||||
if this.TimeCounter then return end
|
||||
this.TimeCounter = Timer.New(this.TimeUpdate, 1, -1, true)
|
||||
this.TimeCounter:Start()
|
||||
this.TimeUpdate()
|
||||
NetManager.QueryLuofuRegisterInfoRequest(function ()
|
||||
if JumpServerManager.stage==1 or JumpServerManager.stage==3 then
|
||||
JumpServerManager.GetWorldArenaInfoRequest(JumpServerManager.arenaType,function()
|
||||
this.RefreshTopMatchShow()
|
||||
-- 计时器
|
||||
if this.TimeCounter then return end
|
||||
this.TimeCounter = Timer.New(this.TimeUpdate, 1, -1, true)
|
||||
this.TimeCounter:Start()
|
||||
this.TimeUpdate()
|
||||
end)
|
||||
else
|
||||
this.RefreshTopMatchShow()
|
||||
end
|
||||
|
||||
|
||||
end)
|
||||
|
||||
-- 巅峰战
|
||||
-- ArenaTopMatchManager.RequestTopMatchBaseInfo(function()
|
||||
-- this.RefreshTopMatchShow()
|
||||
|
@ -235,6 +248,18 @@ function this.RefreshTopMatchShow()
|
|||
if serData then
|
||||
local startDate = os.date("%m.%d", serData.startTime)
|
||||
local endDate = os.date("%m.%d", serData.endTime)
|
||||
local state=JumpServerManager.stage
|
||||
local str=""
|
||||
if state==JumpServer_Stage.NoStar then
|
||||
str="赛季报名期:"
|
||||
elseif state==JumpServer_Stage.RankInit then
|
||||
str="战斗初始化:"
|
||||
elseif state==JumpServer_Stage.Attack then
|
||||
str="赛季对战期:"
|
||||
elseif state==JumpServer_Stage.End then
|
||||
str="赛季结算中:"
|
||||
end
|
||||
this.TopMatch_SeasonState.text=str
|
||||
this.TopMatch_Season.text = string.format("%s-%s", startDate, endDate)
|
||||
this.TopMatch_StageObj:SetActive(false)
|
||||
this.TopMatch_BestRankObj:SetActive(false)
|
||||
|
|
|
@ -20,6 +20,15 @@ function this.Init(root,_isDemonstrateTheir,_pData)--isDemonstrateTheir是否是
|
|||
end
|
||||
--- 获取需要显示的编队id
|
||||
function this.GetFormationIndex()
|
||||
if JumpServerManager.arenaType==1 then
|
||||
return FormationTypeDef.LuoFuZhengFeng1
|
||||
elseif JumpServerManager.arenaType==2 then
|
||||
return FormationTypeDef.LuoFuZhengFeng2
|
||||
elseif JumpServerManager.arenaType==3 then
|
||||
return FormationTypeDef.LuoFuZhengFeng3
|
||||
elseif JumpServerManager.arenaType==4 then
|
||||
return FormationTypeDef.LuoFuZhengFeng4
|
||||
end
|
||||
return FormationTypeDef.JUMPSERVER_HIGHTLADDER
|
||||
end
|
||||
|
||||
|
@ -49,6 +58,31 @@ function this.GetHeroList(proId)
|
|||
return allHero
|
||||
end
|
||||
|
||||
-- 获取一键上阵所需要的英雄列表
|
||||
function this.GetOneKeyUpHeroList()
|
||||
local heros = {}
|
||||
local currHeros=HeroManager.GetAllHeroDatas()
|
||||
table.sort(currHeros,function(a,b)
|
||||
return this.root.NaturalSort(true,a,b)
|
||||
end)
|
||||
local allHero={}
|
||||
local num=0
|
||||
for i = 1,#currHeros do
|
||||
local hero = currHeros[i]
|
||||
if hero and (hero.heroConfig.PropertyName==JumpServerManager.arenaType or (hero.heroConfig.PropertyName==5 and num<=limitNum)) then
|
||||
if hero.heroConfig.PropertyName==5 then
|
||||
num=num+1
|
||||
end
|
||||
table.insert(heros,hero)
|
||||
end
|
||||
end
|
||||
return heros
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
function this.HeroUpDownCheck(params, checkFail, CheckSuccess)
|
||||
if params.action == FORMATION_ACTION.UP then
|
||||
local chooseList=params.choosedList
|
||||
|
@ -91,8 +125,10 @@ function this.On_Btn2_Click()
|
|||
for i=1, #this.root.choosedList do
|
||||
local heroId=this.root.choosedList[i].heroId
|
||||
local heroData=HeroManager.GetSingleHeroData(heroId)
|
||||
--LogError("JumpServerManager.arenaType=="..JumpServerManager.arenaType)
|
||||
if heroData then
|
||||
if heroData.heroConfig.PropertyName~=JumpServerManager.arenaType or heroData.heroConfig.PropertyName~=5 then
|
||||
--LogError("heroData.heroConfig.PropertyName=="..heroData.heroConfig.PropertyName)
|
||||
if heroData.heroConfig.PropertyName~=JumpServerManager.arenaType and heroData.heroConfig.PropertyName~=5 then
|
||||
isSame=false
|
||||
end
|
||||
end
|
||||
|
|
|
@ -42,20 +42,20 @@ function this.InitData(msg)
|
|||
--LogError("cd============================"..cd)
|
||||
if cd<=0 then
|
||||
if UIManager.GetOpenPanel(UIName.FightPointPassMainPanel)==nil then
|
||||
--LogError("发送小兵挂机战斗请求======================================================")
|
||||
LogError("发送小兵挂机战斗请求======================================================")
|
||||
NetManager.SoldierFightCheckRequest(0,function (msg)
|
||||
local lvConfig=ConfigManager.GetConfigData(ConfigName.SoldierStageConfig,FightPointPassManager.soldierLayerId)
|
||||
if msg.result==1 then
|
||||
if lvConfig and lvConfig.NextId and lvConfig.NextId~=0 then
|
||||
FightPointPassManager.soldierLayerId = lvConfig.NextId
|
||||
local curConfig=ConfigManager.GetConfigData(ConfigName.SoldierStageConfig,FightPointPassManager.soldierLayerId)
|
||||
if curConfig then
|
||||
cd=curConfig.Time
|
||||
if lvConfig and lvConfig.NextId and lvConfig.NextId~=0 then
|
||||
FightPointPassManager.soldierLayerId = lvConfig.NextId
|
||||
local curConfig=ConfigManager.GetConfigData(ConfigName.SoldierStageConfig,FightPointPassManager.soldierLayerId)
|
||||
if curConfig then
|
||||
cd=curConfig.Time
|
||||
end
|
||||
end
|
||||
if cd==0 then
|
||||
cd=lvConfig.Time
|
||||
end
|
||||
end
|
||||
if cd==0 then
|
||||
cd=lvConfig.Time
|
||||
end
|
||||
else
|
||||
cd=lvConfig.Time
|
||||
end
|
||||
|
|
|
@ -156,9 +156,9 @@ Func_Prop_Func = {
|
|||
[Func_Prop_Type.Solider] = function()
|
||||
|
||||
local allPro = SmallSoldierManager.GetAllHeroAddPro()
|
||||
for k, v in pairs(allPro) do
|
||||
LogError("k===================================="..k.." v.."..#v)
|
||||
end
|
||||
-- for k, v in pairs(allPro) do
|
||||
-- LogError("k===================================="..k.." v.."..#v)
|
||||
-- end
|
||||
return allPro
|
||||
end,
|
||||
--助战属性加成
|
||||
|
|
|
@ -164,6 +164,7 @@ end
|
|||
--跨服
|
||||
function JumpServerHightLadderPanel:OnOpen()
|
||||
FormationManager.GetFormationByID(FormationTypeDef.JUMPSERVER_HIGHTLADDER)
|
||||
curPos=JumpServerManager.arenaType
|
||||
this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.JumpServerHightLadder})
|
||||
this.RefreshOnOpen()
|
||||
isFirstRefresh = false
|
||||
|
@ -177,10 +178,9 @@ function JumpServerHightLadderPanel:OnShow()
|
|||
elseif stage == JumpServer_Stage.End then
|
||||
timeStr = "后开始"
|
||||
end
|
||||
this.SetSignBtnShow()
|
||||
|
||||
this.RemainTimeDown(this.timeText,this.timeText:GetComponent("Text"),JumpServerManager.GetHightLadderDataEndTime(),timeStr)
|
||||
--攻击阶段不显示膜拜信息
|
||||
this.signObj:SetActive(stage~=JumpServer_Stage.Attack)
|
||||
|
||||
end
|
||||
|
||||
function this.SetSelectPos()
|
||||
|
@ -189,6 +189,8 @@ function this.SetSelectPos()
|
|||
end
|
||||
|
||||
function this.SetSignBtnShow()
|
||||
--攻击阶段不显示膜拜信息
|
||||
this.signObj:SetActive(stage~=JumpServer_Stage.Attack)
|
||||
for i=1,#this.signBtnList do
|
||||
this.signBtnList[i].btn_sign:SetActive(JumpServerManager.arenaType==0)
|
||||
this.signBtnList[i].info.gameObject:SetActive(false)
|
||||
|
@ -213,7 +215,8 @@ function this.OnShowPanel()
|
|||
local curData = datas.arenaEnemys[i] or {}
|
||||
this.ShowSingleData(goList[i],curData,i)
|
||||
end
|
||||
|
||||
this.SetSignBtnShow()
|
||||
this.SetSelectPos()
|
||||
LogError("JumpServerManager.arenaType=="..JumpServerManager.arenaType)
|
||||
this.canPlayerTipText:SetActive(false)
|
||||
this.mySortText:SetActive(false)
|
||||
|
|
|
@ -7,6 +7,15 @@ local expertSortDataTabs = {}--排行
|
|||
local expertRewardSortTabs = {}--排行奖励
|
||||
-- 头像对象管理
|
||||
local activeIndext
|
||||
local TabBox = require("Modules/Common/TabBox")
|
||||
local _TabData={
|
||||
[1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "人" },
|
||||
[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "佛" },
|
||||
[3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "妖" },
|
||||
[4] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "道" },
|
||||
}
|
||||
local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
|
||||
select = Color.New(154 / 255, 78 / 255, 36 / 255, 1)}
|
||||
--初始化组件(用于子类重写)
|
||||
function JumpServerHightLadderRewardSortPanel:InitComponent()
|
||||
|
||||
|
@ -35,11 +44,30 @@ function JumpServerHightLadderRewardSortPanel:InitComponent()
|
|||
expertRewardSortTabs[i] = Util.GetGameObject(self.gameObject, "content3/scrollRect/grid/item ("..i..")")
|
||||
end
|
||||
this.myActivityRewardGo = Util.GetGameObject(self.gameObject, "content3/Record")
|
||||
|
||||
this.TabCtrl = TabBox.New()
|
||||
this.TabCtrl:SetTabAdapter(this.TabAdapter)
|
||||
this.TabCtrl:SetChangeTabCallBack(this.SwitchView)
|
||||
this.TabCtrl:Init(this.tabbox, _TabData)
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
function JumpServerHightLadderRewardSortPanel:BindEvent()
|
||||
|
||||
-- tab节点显示自定义
|
||||
function this.TabAdapter(tab, index, status)
|
||||
local tabLab = Util.GetGameObject(tab, "Text")
|
||||
Util.GetGameObject(tab,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite(_TabData[index][status])
|
||||
tabLab:GetComponent("Text").text = _TabData[index].name
|
||||
tabLab:GetComponent("Text").color = _TabFontColor[status]
|
||||
end
|
||||
|
||||
--切换视图
|
||||
function this.SwitchView(index)
|
||||
|
||||
type=_TabData[index].id
|
||||
|
||||
end
|
||||
Util.AddClick(self.btnBack, function()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
|
|
|
@ -16,7 +16,7 @@ this.shopGoodId = 10035--挑战价格
|
|||
|
||||
function this.Initialize()
|
||||
this.isGroup = -1
|
||||
this.arenaType=0
|
||||
this.arenaType=1
|
||||
this.stage=0
|
||||
end
|
||||
---------------------------------------------
|
||||
|
@ -25,7 +25,7 @@ end
|
|||
------登录初始化
|
||||
function this.LoginGetWorldArenaInfoRequest(fun)
|
||||
-- if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.JumpServer) then
|
||||
NetManager.GetWorldArenaInfoRequest(1,function(_msg)
|
||||
NetManager.GetWorldArenaInfoRequest(JumpServerManager.arenaType,function(_msg)
|
||||
this.InithightLadderData(_msg)
|
||||
if fun then
|
||||
fun()
|
||||
|
@ -52,6 +52,9 @@ function this.GetWorldArenaInfoRequest(type, fun)
|
|||
end)
|
||||
end
|
||||
function this.InithightLadderData(_msg)
|
||||
if _msg==nil then
|
||||
return
|
||||
end
|
||||
-- LogPink("_msg.arenaInfo.arenaEnemys "..#_msg.arenaInfo.arenaEnemys)
|
||||
for i = 1, #_msg.arenaInfo.arenaEnemys do
|
||||
-- LogPink("_msg.arenaInfo.arenaEnemys[i].hadProud "..tostring(_msg.arenaInfo.arenaEnemys[i].hadProud) )
|
||||
|
@ -152,7 +155,17 @@ end
|
|||
--天梯开始战斗
|
||||
this.curBattleDrop = {}
|
||||
function this.StarFightHightLadder(personInfo,skipFight,callBack)
|
||||
NetManager.GetWorldArenaChallengeRequest(FormationTypeDef.JUMPSERVER_HIGHTLADDER,personInfo,skipFight,function (msg)
|
||||
local formaType=FormationTypeDef.LuoFuZhengFeng1
|
||||
if JumpServerManager.arenaType==1 then
|
||||
formaType= FormationTypeDef.LuoFuZhengFeng1
|
||||
elseif JumpServerManager.arenaType==2 then
|
||||
formaType= FormationTypeDef.LuoFuZhengFeng2
|
||||
elseif JumpServerManager.arenaType==3 then
|
||||
formaType= FormationTypeDef.LuoFuZhengFeng3
|
||||
elseif JumpServerManager.arenaType==4 then
|
||||
formaType= FormationTypeDef.LuoFuZhengFeng4
|
||||
end
|
||||
NetManager.GetWorldArenaChallengeRequest(formaType,personInfo,skipFight,function (msg)
|
||||
oldMyRank = myRank
|
||||
-- if msg and msg.drop and msg.drop.itemlist and #msg.drop.itemlist > 0 then
|
||||
-- LogPink(" #msg.drop.itemlist ".. #msg.drop.itemlist)
|
||||
|
@ -164,7 +177,7 @@ function this.StarFightHightLadder(personInfo,skipFight,callBack)
|
|||
if skipFight == 0 then--挑战
|
||||
if msg.err== -2 then
|
||||
-- this.BattleHightLadderData(msg)--后端没给数据 前端自己请求
|
||||
JumpServerManager.GetWorldArenaInfoRequest(1)
|
||||
JumpServerManager.GetWorldArenaInfoRequest(JumpServerManager.arenaType)
|
||||
PopupTipPanel.ShowTip("无法挑战,目标玩家排名出现变化,已重新匹配对手!")
|
||||
if callBack then
|
||||
callBack()
|
||||
|
@ -173,7 +186,7 @@ function this.StarFightHightLadder(personInfo,skipFight,callBack)
|
|||
end
|
||||
if msg.err== -3 then
|
||||
-- this.BattleHightLadderData(msg)--后端没给数据 前端自己请求
|
||||
JumpServerManager.GetWorldArenaInfoRequest(1)
|
||||
JumpServerManager.GetWorldArenaInfoRequest(JumpServerManager.arenaType)
|
||||
PopupTipPanel.ShowTip("无法挑战,玩家排名出现变化,已重新匹配对手!")
|
||||
if callBack then
|
||||
callBack()
|
||||
|
|
|
@ -124,7 +124,7 @@ function JumpServerPanel:OnShow(...)
|
|||
CheckRedPointStatus(v.redPointType)
|
||||
end
|
||||
end
|
||||
JumpServerManager.GetWorldArenaInfoRequest(1,function()
|
||||
JumpServerManager.GetWorldArenaInfoRequest(JumpServerManager.arenaType,function()
|
||||
self:UpdateCarbonContent()
|
||||
end)
|
||||
|
||||
|
|
|
@ -714,7 +714,6 @@ function this.ExecuteLoading()
|
|||
--[[[41] =]]function() MyGuildManager.ReuqsetRedPackage(LoadingPanel.OnStep) end, --请求红包
|
||||
--[[[42] =]]function() NetManager.HardStageRequest(LoadingPanel.OnStep) end, --山河社稷图
|
||||
--[[[43] =]]function() NetManager.VipLevelStateRequset(LoadingPanel.OnStep) end, --vip
|
||||
function() JumpServerManager.LoginGetWorldArenaInfoRequest(LoadingPanel.OnStep) end,--跨服天梯
|
||||
--[[[44] =]]function() NetManager.RequestRedPacketData(LoadingPanel.OnStep) end, --福利红包
|
||||
--[[[45] =]]function() NetManager.BeautyBagWishEquipRequest(nil,LoadingPanel.OnStep) end,--心愿魂印
|
||||
--[[[46] =]]function() LingLongBaoJingManager.InitData(LoadingPanel.OnStep) end, --玲珑宝镜
|
||||
|
@ -742,6 +741,7 @@ function this.ExecuteLoading()
|
|||
function() NetManager.QueryBookImageRequest(7,LoadingPanel.OnStep) end,
|
||||
function() NetManager.QueryBookImageRequest(8,LoadingPanel.OnStep) end,
|
||||
function() NetManager.QueryLuofuRegisterInfoRequest(LoadingPanel.OnStep) end,
|
||||
function() JumpServerManager.LoginGetWorldArenaInfoRequest(LoadingPanel.OnStep) end,--跨服天梯
|
||||
function() -- 登录请求最终接口,所有请求放在此接口之前
|
||||
-- 登录成功确认
|
||||
NetManager.LoginConfimRequest()
|
||||
|
|
|
@ -5146,6 +5146,12 @@ end
|
|||
function this.GetWorldArenaInfoRequest(_type,func)
|
||||
local data = gtwprotos.WorldProto_pb.GetWorldArenaInfoRequest()
|
||||
data.type = _type
|
||||
local isOpen=CheckFunctionOpen(FUNCTION_OPEN_TYPE.JumpServer_HightLadder)
|
||||
if isOpen==false or JumpServerManager.stage==2 or JumpServerManager.stage==4 then
|
||||
func()
|
||||
return
|
||||
end
|
||||
LogError("request type===============================================".._type)
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.GetWorldArenaInfoRequest, MessageTypeProto_pb.GetWorldArenaInfoResponse, msg, function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
|
@ -8126,6 +8132,8 @@ function NetManager.QueryLuofuRegisterInfoRequest(_func)
|
|||
local msg= gtwprotos.WorldProto_pb.LuofuStatusInfoResponse()
|
||||
msg:ParseFromString(data)
|
||||
JumpServerManager.arenaType=msg.type
|
||||
|
||||
LogError("msg.type=========================================="..msg.type.." state=============="..msg.status)
|
||||
JumpServerManager.stage=msg.status
|
||||
if _func then
|
||||
_func(msg)
|
||||
|
|
|
@ -763,7 +763,7 @@ local jumpDic = {
|
|||
PopupTipPanel.ShowTip("赛季过渡中!")
|
||||
return
|
||||
end
|
||||
JumpServerManager.GetWorldArenaInfoRequest(1,function()
|
||||
JumpServerManager.GetWorldArenaInfoRequest(JumpServerManager.arenaType,function()
|
||||
if not JumpServerManager.GetHightLadderDataIsStart() then
|
||||
PopupTipPanel.ShowTip(string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).OpenWeek))
|
||||
return
|
||||
|
|
|
@ -94,13 +94,14 @@ function SettingInfo:SetReslutionTipShow()
|
|||
local value = PlayerPrefs.GetInt("ResLution")
|
||||
this.selectResolution.value = value
|
||||
if value == 0 then
|
||||
UnityEngine.Application.targetFrameRate = 30;
|
||||
this.selectResolutionText.text = "普通帧率"
|
||||
this.selectResolutionTip.gameObject:SetActive(false)
|
||||
else
|
||||
UnityEngine.Application.targetFrameRate = 60;
|
||||
this.selectResolutionText.text = "高帧率"
|
||||
this.selectResolutionTip.gameObject:SetActive(true)
|
||||
|
||||
else
|
||||
UnityEngine.Application.targetFrameRate = 30;
|
||||
this.selectResolutionText.text = "普通帧率"
|
||||
this.selectResolutionTip.gameObject:SetActive(false)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -136,7 +136,7 @@ function this.CheckFetterStatus(fetterType)
|
|||
elseif fetterType==6 then
|
||||
local curPokemonSidList = PlayerManager.handBook[6]
|
||||
if curPokemonSidList then
|
||||
LogError("curPokemonSidList=====================len11111111111111111111111111================="..#curPokemonSidList)
|
||||
--LogError("curPokemonSidList=====================len11111111111111111111111111================="..#curPokemonSidList)
|
||||
end
|
||||
|
||||
this.GetAllPokemonFetterDatas(fetterType,curPokemonSidList)
|
||||
|
@ -161,13 +161,13 @@ function this.GetAllPokemonFetterDatas(fetterType,curPokemonSidList)
|
|||
end
|
||||
for k,v in pairs(this.fetterData) do
|
||||
if fetterType==6 then
|
||||
LogError("fetterType=="..fetterType.." v.fettertype=="..v.fetterType.." v.enabled=="..v.enabled)
|
||||
--LogError("fetterType=="..fetterType.." v.fettertype=="..v.fetterType.." v.enabled=="..v.enabled)
|
||||
end
|
||||
|
||||
if v.fetterType == fetterType and v.enabled == -1 then
|
||||
if this.IsCompound(v.teamers,curPokemonSidList,v.fetterType) then
|
||||
v.enabled = 0
|
||||
LogError(" open==========")
|
||||
--LogError(" open==========")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue