Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
4a696f3ec0
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c3a6856840ebd9642ad750223fed0c08
|
||||
guid: 12e56bc5a2215d544abd425232c4bf72
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -568,10 +568,10 @@ RectTransform:
|
|||
m_Father: {fileID: 778723007}
|
||||
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: 70.51857, y: -27.75}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -425.1864, y: 0}
|
||||
m_SizeDelta: {x: 99.99997, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &422259127
|
||||
CanvasRenderer:
|
||||
|
|
@ -741,7 +741,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 778723006}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
|
|
@ -873,10 +873,10 @@ RectTransform:
|
|||
m_Father: {fileID: 778723007}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 941.41003, y: -27.75}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 445.70508, y: 0}
|
||||
m_SizeDelta: {x: 99.99997, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &849504933
|
||||
CanvasRenderer:
|
||||
|
|
@ -1064,10 +1064,10 @@ RectTransform:
|
|||
m_Father: {fileID: 778723007}
|
||||
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: 796.2614, y: -27.75}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 300.55646, y: 0}
|
||||
m_SizeDelta: {x: 99.99997, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &996626933
|
||||
CanvasRenderer:
|
||||
|
|
@ -1330,10 +1330,10 @@ RectTransform:
|
|||
m_Father: {fileID: 778723007}
|
||||
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: 360.81573, y: -27.75}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -134.88925, y: 0}
|
||||
m_SizeDelta: {x: 99.99997, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1294817241
|
||||
CanvasRenderer:
|
||||
|
|
@ -1442,10 +1442,10 @@ RectTransform:
|
|||
m_Father: {fileID: 778723007}
|
||||
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: 505.9643, y: -27.75}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 10.259323, y: 0}
|
||||
m_SizeDelta: {x: 99.99997, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1311195236
|
||||
CanvasRenderer:
|
||||
|
|
@ -1630,10 +1630,10 @@ RectTransform:
|
|||
m_Father: {fileID: 778723007}
|
||||
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: 651.11285, y: -27.75}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 155.40788, y: 0}
|
||||
m_SizeDelta: {x: 99.99997, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1863541597
|
||||
CanvasRenderer:
|
||||
|
|
@ -1742,10 +1742,10 @@ RectTransform:
|
|||
m_Father: {fileID: 778723007}
|
||||
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: 215.66714, y: -27.75}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -280.03784, y: 0}
|
||||
m_SizeDelta: {x: 99.99997, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1977301508
|
||||
CanvasRenderer:
|
||||
|
|
|
|||
|
|
@ -1677,6 +1677,86 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: 672}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1902493317592025725
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5102867911860676314}
|
||||
- component: {fileID: 4929236181800039330}
|
||||
- component: {fileID: 2347750445167593321}
|
||||
m_Layer: 5
|
||||
m_Name: arenaScore
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &5102867911860676314
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1902493317592025725}
|
||||
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: 3128544740893925850}
|
||||
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: -0.000006914139, y: 0.0000021457672}
|
||||
m_SizeDelta: {x: 300.59998, y: 41.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4929236181800039330
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1902493317592025725}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2347750445167593321
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1902493317592025725}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9372549, g: 0.8, b: 0.7411765, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 36
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u70BC\u72F15-5"
|
||||
LanguageIndex: 11440
|
||||
--- !u!1 &2038844224890316750
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1783,6 +1863,7 @@ RectTransform:
|
|||
- {fileID: 3574257153817449386}
|
||||
- {fileID: 2636399030825652164}
|
||||
- {fileID: 6343858779078722984}
|
||||
- {fileID: 7874033753268375199}
|
||||
m_Father: {fileID: 6913215175904765234}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -2988,6 +3069,7 @@ RectTransform:
|
|||
- {fileID: 1323843675036142031}
|
||||
- {fileID: 8982232778493311718}
|
||||
- {fileID: 6619555056324006340}
|
||||
- {fileID: 2886390000781381518}
|
||||
m_Father: {fileID: 3542290585148391186}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -3375,6 +3457,86 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &4487017081131425909
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7874033753268375199}
|
||||
- component: {fileID: 8799657971638144051}
|
||||
- component: {fileID: 2632570842379578499}
|
||||
m_Layer: 5
|
||||
m_Name: arenaScore
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7874033753268375199
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4487017081131425909}
|
||||
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: 8790539866172688193}
|
||||
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: 0.000010967255, y: 0.0000021457672}
|
||||
m_SizeDelta: {x: 300.59998, y: 41.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8799657971638144051
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4487017081131425909}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2632570842379578499
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4487017081131425909}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9372549, g: 0.8, b: 0.7411765, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 36
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u70BC\u72F15-5"
|
||||
LanguageIndex: 11440
|
||||
--- !u!1 &4529726933452628595
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4169,6 +4331,86 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_Delegates: []
|
||||
delegates: []
|
||||
--- !u!1 &5496183595523988309
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2886390000781381518}
|
||||
- component: {fileID: 5261976870595917203}
|
||||
- component: {fileID: 8088748264479296521}
|
||||
m_Layer: 5
|
||||
m_Name: arenaScore
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &2886390000781381518
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5496183595523988309}
|
||||
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: 1661457884122057613}
|
||||
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: -0.00000047683716, y: 0.000012040138}
|
||||
m_SizeDelta: {x: 300.59998, y: 41.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5261976870595917203
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5496183595523988309}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8088748264479296521
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5496183595523988309}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9372549, g: 0.8, b: 0.7411765, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 36
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u70BC\u72F15-5"
|
||||
LanguageIndex: 11440
|
||||
--- !u!1 &5506042280547655900
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -6606,6 +6848,7 @@ RectTransform:
|
|||
- {fileID: 4440706391705485068}
|
||||
- {fileID: 4935494681454572907}
|
||||
- {fileID: 3939068427722580484}
|
||||
- {fileID: 5102867911860676314}
|
||||
m_Father: {fileID: 8830212790296371356}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
|
|||
|
|
@ -1665,6 +1665,7 @@ RANK_TYPE = {
|
|||
GUILD_FORCE_RANK=20,-- 公会
|
||||
GOLD_EXPER=21,-- 点金
|
||||
FORCE_CURR_RANK=22,-- 实时战力排行
|
||||
ARENA_RANK=23,-- 竞技场积分排名 前端自己添加
|
||||
}
|
||||
|
||||
--东海寻仙弹窗类型
|
||||
|
|
@ -1926,11 +1927,12 @@ BATTLE_TYPE = {
|
|||
Senro = 12, --森罗幻境
|
||||
|
||||
}
|
||||
rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04", name = Language[12164] ,Id = 26 ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0},
|
||||
[2] = { bgImage = "r_zjm_paihangbang_banner02", name = Language[12165] ,Id = 55,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0},
|
||||
[3] = { bgImage = "r_zjm_paihangbang_banner03", name = Language[12166] ,Id = 4,rankType = RANK_TYPE.GUILD_FORCE_RANK,activiteId = 0},
|
||||
[4] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12167] ,Id = 44,rankType = RANK_TYPE.MONSTER_RANK,activiteId = 0},
|
||||
[5] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12168] ,Id = 42,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.GoldExper},
|
||||
rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04", name = Language[12164] ,Id = 26 ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = true},
|
||||
[2] = { bgImage = "r_zjm_paihangbang_banner02", name = Language[12165] ,Id = 55,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = true},
|
||||
[3] = { bgImage = "r_zjm_paihangbang_banner03", name = Language[12166] ,Id = 4,rankType = RANK_TYPE.GUILD_FORCE_RANK,activiteId = 0,isRankingMainPanelShow = true},
|
||||
[4] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12167] ,Id = 44,rankType = RANK_TYPE.MONSTER_RANK,activiteId = 0,isRankingMainPanelShow = true},
|
||||
[5] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12168] ,Id = 42,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.GoldExper,isRankingMainPanelShow = false},
|
||||
[6] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12240] ,Id = 8,rankType = RANK_TYPE.ARENA_RANK,activiteId = 0,isRankingMainPanelShow = false},
|
||||
}
|
||||
|
||||
SoulPrintSpriteByQuantity={
|
||||
|
|
|
|||
|
|
@ -2238,4 +2238,7 @@
|
|||
[12237] = "1星",
|
||||
[12238] = "没有得到equipData",
|
||||
[12239] = "召唤 次必得红色魂印",
|
||||
[12240] = "竞技排名",
|
||||
[12241] = "积分:",
|
||||
[12242] = "次",
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,15 +9,15 @@ local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
|
|||
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1) }
|
||||
local _TabData = {
|
||||
[1]= {txt = Language[10079]},
|
||||
[2]= {txt = Language[10030]},
|
||||
[3]= {txt = Language[10080]},
|
||||
[4]= {txt = Language[10081]},
|
||||
-- [2]= {txt = Language[10030]},
|
||||
[2]= {txt = Language[10080]},
|
||||
[3]= {txt = Language[10081]},
|
||||
}
|
||||
-- 内容数据
|
||||
local _ViewData = {
|
||||
[1] = {script = "Modules/Arena/View/ArenaView"},
|
||||
[2] = {script = "Modules/Arena/View/RankView"},
|
||||
[3] = {script = "Modules/Arena/View/RewardView"},
|
||||
-- [2] = {script = "Modules/Arena/View/RankView"},
|
||||
[2] = {script = "Modules/Arena/View/RewardView"},
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -29,8 +29,8 @@ function ArenaMainPanel:InitComponent()
|
|||
|
||||
this.ViewList = {}
|
||||
this.ViewList[1] = Util.GetGameObject(self.gameObject, "content/ArenaView")
|
||||
this.ViewList[2] = Util.GetGameObject(self.gameObject, "content/RankView")
|
||||
this.ViewList[3] = Util.GetGameObject(self.gameObject, "content/RewardView")
|
||||
-- this.ViewList[2] = Util.GetGameObject(self.gameObject, "content/RankView")
|
||||
this.ViewList[2] = Util.GetGameObject(self.gameObject, "content/RewardView")
|
||||
|
||||
this.ViewLogicList = {}
|
||||
|
||||
|
|
@ -123,7 +123,7 @@ function this.TabAdapter(tab, index, status)
|
|||
|
||||
-- 判断是否需要检测红点
|
||||
local redpot = Util.GetGameObject(tab, "redpot")
|
||||
if index == 4 then
|
||||
if index == 3 then
|
||||
BindRedPointObject(RedPointType.Arena_Shop, redpot)
|
||||
end
|
||||
end
|
||||
|
|
@ -141,7 +141,7 @@ function this.OpenView(index)
|
|||
this._CurLogicIndex = index
|
||||
this._CurTabIndex = index
|
||||
-- 商店界面特殊处理
|
||||
if index == 4 then
|
||||
if index == 3 then
|
||||
if not this.shopView then
|
||||
this.shopView = SubUIManager.Open(SubUIConfig.ShopView, this.content.transform)
|
||||
end
|
||||
|
|
@ -183,7 +183,7 @@ function this.CloseView(index)
|
|||
if this._CurLogicIndex ~= index then return end
|
||||
|
||||
-- 商店界面特殊处理
|
||||
if index == 4 then
|
||||
if index == 3 then
|
||||
if this.shopView then
|
||||
this.shopView.gameObject:SetActive(false)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
local ArenaView = {}
|
||||
local this = ArenaView
|
||||
local rewardBoxBtn = {}
|
||||
|
||||
local arenaBattleReward = ConfigManager.GetConfig(ConfigName.ArenaBattleReward)
|
||||
--初始化组件(用于子类重写)
|
||||
function ArenaView:InitComponent()
|
||||
this.ArenaName = Util.GetGameObject(self.gameObject, "name")
|
||||
|
|
@ -47,6 +47,7 @@ function ArenaView:InitComponent()
|
|||
rewardBoxBtn = {}
|
||||
for i = 1, 7 do
|
||||
rewardBoxBtn[i] = Util.GetGameObject(self.gameObject, "finalTarget/rewardProgress/rewardBoxBtn (" .. i .. ")")
|
||||
rewardBoxBtn[i].transform.localPosition = Vector3.New(arenaBattleReward[i].Position[1], arenaBattleReward[i].Position[2] ,0)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -98,8 +99,7 @@ function ArenaView:BindEvent()
|
|||
end
|
||||
--排行
|
||||
Util.AddClick(this.sortBtn, function()
|
||||
return
|
||||
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[5])
|
||||
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[6])
|
||||
end)
|
||||
-- 刷新按钮
|
||||
Util.AddClick(this.RefreshBtn, function()
|
||||
|
|
@ -324,7 +324,6 @@ function this.ShowRewardBoxProgressData()
|
|||
maxNum = configInfo.BattleTimes
|
||||
end
|
||||
end
|
||||
local arenaBattleReward = ConfigManager.GetConfig(ConfigName.ArenaBattleReward)
|
||||
for i = 1, #rewardBoxBtn do
|
||||
if arenaBattleReward[i] then
|
||||
local state = 1--1 未完成 2 未领取 3 已完成allNums >= arenaBattleReward[i].BattleTimes and false
|
||||
|
|
@ -336,7 +335,7 @@ function this.ShowRewardBoxProgressData()
|
|||
state = 3
|
||||
end
|
||||
Util.GetGameObject(rewardBoxBtn[i], "redPoint"):SetActive(state == 2)
|
||||
Util.GetGameObject(rewardBoxBtn[i], "Text"):GetComponent("Text").text = arenaBattleReward[i].BattleTimes
|
||||
Util.GetGameObject(rewardBoxBtn[i], "Text"):GetComponent("Text").text = arenaBattleReward[i].BattleTimes..Language[12242]
|
||||
Util.GetGameObject(rewardBoxBtn[i], "getFinish"):SetActive(state == 3)
|
||||
Util.AddOnceClick(rewardBoxBtn[i], function()
|
||||
if state == 1 then
|
||||
|
|
|
|||
|
|
@ -712,8 +712,10 @@ function this:BindEvent()
|
|||
local types = {}
|
||||
local activiteIds = {}
|
||||
for i = 1, #rankKingList do
|
||||
table.insert(types,rankKingList[i].rankType)
|
||||
table.insert(activiteIds,rankKingList[i].activiteId)
|
||||
if rankKingList[i].isRankingMainPanelShow then
|
||||
table.insert(types,rankKingList[i].rankType)
|
||||
table.insert(activiteIds,rankKingList[i].activiteId)
|
||||
end
|
||||
end
|
||||
NetManager.RankFirstRequest(types,activiteIds,function (msg)
|
||||
UIManager.OpenPanel(UIName.RankingListMainPanel,msg)
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ function this.SwitchView(index)
|
|||
proud = RankingManager.GetRankProud()
|
||||
--先执行上一面板关闭逻辑
|
||||
for i = 1, math.max(#rankKingListGo, #rankKingList) do
|
||||
if rankKingList[i].rankType ~= RANK_TYPE.GOLD_EXPER then
|
||||
if rankKingList[i].isRankingMainPanelShow then
|
||||
local go = rankKingListGo[i]
|
||||
if not go then
|
||||
go=newObject(this.ItemPre)
|
||||
|
|
@ -85,7 +85,7 @@ function this.SwitchView(index)
|
|||
end
|
||||
|
||||
for i = 1, #rankKingList do
|
||||
if rankKingList[i].rankType ~= RANK_TYPE.GOLD_EXPER then
|
||||
if rankKingList[i].isRankingMainPanelShow then
|
||||
rankKingListGo[i]:SetActive(true)
|
||||
this.SingleRankKingListShow(i)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ function this.SetArenaInfo()
|
|||
this.SetNotRollingInfo(Language[11713],Language[11717],Language[10104],Language[11718],myRankData.myRank,Language[10041],"",myRankData.myRank,myRankData.myScore)
|
||||
local dData = {
|
||||
rankInfo = {param1 = myRankData.myScore},
|
||||
force = myRankData.myScore
|
||||
score = myRankData.myScore
|
||||
}
|
||||
this.SetInfoShow(this.infoGo,dData,sData.rankType)
|
||||
--数据拆分
|
||||
|
|
@ -660,10 +660,12 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
|||
local warPower = Util.GetGameObject(go,"warPower")
|
||||
local trial = Util.GetGameObject(go,"trial")
|
||||
local goldExper = Util.GetGameObject(go,"goldExper")
|
||||
local arenaScore = Util.GetGameObject(go,"arenaScore")
|
||||
fight:SetActive(false)
|
||||
warPower:SetActive(false)
|
||||
trial:SetActive(false)
|
||||
goldExper:SetActive(false)
|
||||
arenaScore:SetActive(false)
|
||||
if rankType == RANK_TYPE.FIGHT_LEVEL_RANK then
|
||||
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
||||
fight:SetActive(true)
|
||||
|
|
@ -705,6 +707,16 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
|||
end
|
||||
Util.GetGameObject(go,"goldExper/Text"):GetComponent("Text").text = data.rankInfo.param1
|
||||
end
|
||||
elseif rankType == RANK_TYPE.ARENA_RANK then
|
||||
-- if data.personInfo.score and data.personInfo.score > 0 then
|
||||
arenaScore:SetActive(true)
|
||||
if Value0 then
|
||||
Value0:GetComponent("Text").text = "<size=40%>"..data.personInfo.name .."</size>"
|
||||
Util.GetGameObject(go,"arenaScore"):GetComponent("Text").text = Language[12241] .. data.personInfo.score
|
||||
else
|
||||
Util.GetGameObject(go,"arenaScore"):GetComponent("Text").text = Language[12241] .. data.score
|
||||
end
|
||||
-- end
|
||||
end
|
||||
end
|
||||
return RankingSingleListPanel
|
||||
|
|
@ -2237,3 +2237,6 @@
|
|||
12237,1星
|
||||
12238,没有得到equipData
|
||||
12239,召唤 次必得红色魂印
|
||||
12240,竞技排名
|
||||
12241,积分:
|
||||
12242,次
|
||||
|
|
|
|||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue