罗浮争锋编队显示修改

tcx_xiyou_dev
wangzhenxing 2024-06-11 15:40:07 +08:00
parent 3fd039f90d
commit 18999a02ce
8 changed files with 912 additions and 67 deletions

View File

@ -9680,6 +9680,7 @@ RectTransform:
- {fileID: 7648199791539559019}
- {fileID: 6530900630981275397}
- {fileID: 7827283738704849095}
- {fileID: 800780439584189104}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -10591,6 +10592,124 @@ MonoBehaviour:
m_LineSpacing: 0.9
m_Text: "\u89E3\u5C01"
LanguageIndex: 10615
--- !u!1 &600034012148359451
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 800780439584189104}
- component: {fileID: 4127326175205184195}
- component: {fileID: 2142065268795750062}
- component: {fileID: 5199458074166766750}
- component: {fileID: 4891333912400542803}
m_Layer: 5
m_Name: selectBar
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &800780439584189104
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 600034012148359451}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 100}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1637203439386440570}
- {fileID: 3108355803860678918}
- {fileID: 8534794954379117726}
- {fileID: 1469665196002901085}
- {fileID: 9178938250147596667}
m_Father: {fileID: 224946850722905528}
m_RootOrder: 19
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: -3.1000981, y: -78}
m_SizeDelta: {x: 0, y: 90}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4127326175205184195
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 600034012148359451}
m_CullTransparentMesh: 0
--- !u!114 &2142065268795750062
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 600034012148359451}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 6253e3364aa642840b7b6ca6ac30239b, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &5199458074166766750
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 600034012148359451}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 0
--- !u!114 &4891333912400542803
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 600034012148359451}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!1 &602700709857838626
GameObject:
m_ObjectHideFlags: 0
@ -27233,6 +27352,144 @@ MonoBehaviour:
m_Spacing: {x: 0, y: 0}
m_Constraint: 2
m_ConstraintCount: 1
--- !u!1 &1829249372684406558
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8534794954379117726}
- component: {fileID: 2421102600572263918}
- component: {fileID: 3215216256555068319}
- component: {fileID: 7650040133183495038}
- component: {fileID: 8562678981923158076}
m_Layer: 5
m_Name: btn2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8534794954379117726
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1829249372684406558}
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: 800780439584189104}
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_SizeDelta: {x: 0, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2421102600572263918
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1829249372684406558}
m_CullTransparentMesh: 0
--- !u!114 &3215216256555068319
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1829249372684406558}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &7650040133183495038
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1829249372684406558}
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: 3
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: 3215216256555068319}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &8562678981923158076
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1829249372684406558}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: 150
m_MinHeight: 150
m_PreferredWidth: 150
m_PreferredHeight: 150
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &1866226321299450935
GameObject:
m_ObjectHideFlags: 0
@ -34772,6 +35029,101 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3337399345879481361}
m_CullTransparentMesh: 0
--- !u!1 &3434368207719547143
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1637203439386440570}
- component: {fileID: 8105571871649381725}
- component: {fileID: 6736198897698408195}
- component: {fileID: 3994389678105938522}
m_Layer: 5
m_Name: selectBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1637203439386440570
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3434368207719547143}
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: 800780439584189104}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -631, y: 0}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8105571871649381725
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3434368207719547143}
m_CullTransparentMesh: 0
--- !u!114 &6736198897698408195
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3434368207719547143}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 1500190407b1b62499540cddb1f4d445, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &3994389678105938522
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3434368207719547143}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &3443980318440178374
GameObject:
m_ObjectHideFlags: 0
@ -41836,6 +42188,144 @@ RectTransform:
m_AnchoredPosition: {x: -253, y: 46}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4813364151016230772
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3108355803860678918}
- component: {fileID: 2504113174330759465}
- component: {fileID: 1875115002750783206}
- component: {fileID: 2466730181640132216}
- component: {fileID: 6786362285076510167}
m_Layer: 5
m_Name: btn1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3108355803860678918
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4813364151016230772}
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: 800780439584189104}
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_SizeDelta: {x: 0, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2504113174330759465
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4813364151016230772}
m_CullTransparentMesh: 0
--- !u!114 &1875115002750783206
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4813364151016230772}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &2466730181640132216
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4813364151016230772}
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: 3
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: 1875115002750783206}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &6786362285076510167
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4813364151016230772}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: 150
m_MinHeight: 150
m_PreferredWidth: 150
m_PreferredHeight: 150
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &4842893579147045644
GameObject:
m_ObjectHideFlags: 0
@ -58104,6 +58594,144 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &8036569087035636173
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9178938250147596667}
- component: {fileID: 366538944765415108}
- component: {fileID: 110126058376330891}
- component: {fileID: 4180366940171812095}
- component: {fileID: 6592698308455086444}
m_Layer: 5
m_Name: btn4
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &9178938250147596667
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8036569087035636173}
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: 800780439584189104}
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: 0, y: 0}
m_SizeDelta: {x: 0, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &366538944765415108
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8036569087035636173}
m_CullTransparentMesh: 0
--- !u!114 &110126058376330891
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8036569087035636173}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &4180366940171812095
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8036569087035636173}
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: 3
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: 110126058376330891}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &6592698308455086444
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8036569087035636173}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: 150
m_MinHeight: 150
m_PreferredWidth: 150
m_PreferredHeight: 150
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &8071900068484968138
GameObject:
m_ObjectHideFlags: 0
@ -69241,6 +69869,144 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &8835810703414363779
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1469665196002901085}
- component: {fileID: 595769531875502382}
- component: {fileID: 3300680106349440481}
- component: {fileID: 327061409863435512}
- component: {fileID: 5606972096348523543}
m_Layer: 5
m_Name: btn3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1469665196002901085
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8835810703414363779}
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: 800780439584189104}
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_SizeDelta: {x: 0, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &595769531875502382
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8835810703414363779}
m_CullTransparentMesh: 0
--- !u!114 &3300680106349440481
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8835810703414363779}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &327061409863435512
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8835810703414363779}
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: 3
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: 3300680106349440481}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &5606972096348523543
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8835810703414363779}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: 150
m_MinHeight: 150
m_PreferredWidth: 150
m_PreferredHeight: 150
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &8854060577879310284
GameObject:
m_ObjectHideFlags: 0
@ -70122,11 +70888,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 9150473775991467309}
m_Modifications:
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero3
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_LocalPosition.x
@ -70232,6 +70993,11 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero3
objectReference: {fileID: 0}
- target: {fileID: 7379223515494313326, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_SizeDelta.y
@ -70387,11 +71153,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 8529720924324740287}
m_Modifications:
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero5
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_LocalPosition.x
@ -70497,6 +71258,11 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero5
objectReference: {fileID: 0}
- target: {fileID: 7379223515494313326, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_SizeDelta.y
@ -70652,11 +71418,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 9217593613593484662}
m_Modifications:
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero4
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_LocalPosition.x
@ -70762,6 +71523,11 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero4
objectReference: {fileID: 0}
- target: {fileID: 7379223515494313326, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_SizeDelta.y
@ -70917,11 +71683,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 8666194580951687547}
m_Modifications:
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero2
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_LocalPosition.x
@ -71027,6 +71788,11 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero2
objectReference: {fileID: 0}
- target: {fileID: 7379223515494313326, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_SizeDelta.y
@ -71182,11 +71948,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 5148286579852869320}
m_Modifications:
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero6
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_LocalPosition.x
@ -71292,6 +72053,11 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero6
objectReference: {fileID: 0}
- target: {fileID: 7379223515494313326, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_SizeDelta.y
@ -71447,11 +72213,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 224384744912223984}
m_Modifications:
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero1
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_LocalPosition.x
@ -71557,6 +72318,11 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero1
objectReference: {fileID: 0}
- target: {fileID: 7379223515494313326, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_SizeDelta.y

View File

@ -38,7 +38,11 @@ function this.MakeAEmptyTeam(teamId)
oTeam.teamName = Language[10685]-- 1001
elseif teamId == FormationTypeDef.ARENA_TOM_MATCH then
oTeam.teamName = Language[10678]-- 1301
elseif teamId == FormationTypeDef.JUMPSERVER_HIGHTLADDER then
elseif teamId == FormationTypeDef.JUMPSERVER_HIGHTLADDER or
teamId==FormationTypeDef.LuoFuZhengFeng1 or
teamId==FormationTypeDef.LuoFuZhengFeng2 or
teamId==FormationTypeDef.LuoFuZhengFeng3 or
teamId==FormationTypeDef.LuoFuZhengFeng4 then
oTeam.teamName = "罗浮争锋"-- 1601
elseif teamId == FormationTypeDef.FIGHT_LEVEL then
oTeam.teamName = "山河社稷图"-- 1701
@ -84,30 +88,32 @@ function this.UpdateFormation(msg)
for i, team in ipairs(msg.TeamPosInfo) do
local isRefresh = false
local oTeam = this.MakeAEmptyTeam(team.teamId)
for j = 1, #team.teamHeroInfos do
local teamHeroInfo = team.teamHeroInfos[j]
-- TODO: 四灵试炼编队特殊处理
if team.teamId == FormationTypeDef.FourElement_PEOPLE
or team.teamId == FormationTypeDef.FourElement_MAGIC
or team.teamId == FormationTypeDef.FourElement_BUDDHIST
or team.teamId == FormationTypeDef.FourElement_TAOIST then
if HeroManager.GetSingleHeroData(teamHeroInfo.heroId) then
table.insert(oTeam.teamHeroInfos, teamHeroInfo)
HeroManager.SetHeroFormationList(teamHeroInfo.heroId,team.teamId,1)
else
isRefresh = true
--if team.teamId ~= 1601 then --老罗浮争锋特殊处理 不保存这个编队
for j = 1, #team.teamHeroInfos do
local teamHeroInfo = team.teamHeroInfos[j]
-- TODO: 四灵试炼编队特殊处理
if team.teamId == FormationTypeDef.FourElement_PEOPLE
or team.teamId == FormationTypeDef.FourElement_MAGIC
or team.teamId == FormationTypeDef.FourElement_BUDDHIST
or team.teamId == FormationTypeDef.FourElement_TAOIST then
if HeroManager.GetSingleHeroData(teamHeroInfo.heroId) then
table.insert(oTeam.teamHeroInfos, teamHeroInfo)
HeroManager.SetHeroFormationList(teamHeroInfo.heroId,team.teamId,1)
else
isRefresh = true
end
else
table.insert(oTeam.teamHeroInfos, teamHeroInfo)
HeroManager.SetHeroFormationList(teamHeroInfo.heroId,team.teamId,1)
end
end
else
table.insert(oTeam.teamHeroInfos, teamHeroInfo)
HeroManager.SetHeroFormationList(teamHeroInfo.heroId,team.teamId,1)
oTeam.teamPokemonInfos = {}
this.formationList[team.teamId] = oTeam
if isRefresh then
FormationManager.SaveFormation(team.teamId, this.formationList[team.teamId].teamHeroInfos, {})
end
end
oTeam.teamPokemonInfos = {}
this.formationList[team.teamId] = oTeam
if isRefresh then
FormationManager.SaveFormation(team.teamId, this.formationList[team.teamId].teamHeroInfos, {})
end
-- end
end
if #msg.TeamPosInfo == 0 then

View File

@ -185,6 +185,19 @@ function this:InitComponent()
this.jumpFightBtn=Util.GetGameObject(self.transform, "jumpFight/btn")
this.jumpFightGou=Util.GetGameObject(self.transform, "jumpFight/Image")
this.ProListObj=Util.GetGameObject(self.gameObject, "selectBar")
this.selectObj=Util.GetGameObject(self.gameObject, "selectBar/selectBtn")
this.signBtnList={}
for i=1,4 do
local proObj={}
local btn=Util.GetGameObject(self.gameObject, "selectBar/btn"..i)
proObj.img=btn:GetComponent("Image")
proObj.img.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(i))
proObj.btn=btn
this.signBtnList[i]=proObj
end
this.ProListObj:SetActive(false)
end
function this:BindEvent()

View File

@ -12,11 +12,19 @@ this.IsNeedChangeFormation = false
--- 初始化
this.isDemonstrateTheir = false
this.pData = nil
local proType
function this.Init(root,_isDemonstrateTheir,_pData)--isDemonstrateTheir是否是切磋
this.root = root
this.isDemonstrateTheir = _isDemonstrateTheir or false
this.pData = _pData or nil
proType=JumpServerManager.arenaType
if proType==0 then
proType=1
end
this.signBtnList=this.root.signBtnList
this.InitView()
this.root.ProListObj:SetActive(true)
end
--- 获取需要显示的编队id
function this.GetFormationIndex()
@ -116,19 +124,21 @@ function this.HeroUpDownCheck(params, checkFail, CheckSuccess)
end
end
local team=0
--- 提交按钮点击事件
function this.On_Btn2_Click()
local team=0
if JumpServerManager.arenaType==1 then
team=FormationTypeDef.LuoFuZhengFeng1
elseif JumpServerManager.arenaType==2 then
team=FormationTypeDef.LuoFuZhengFeng2
elseif JumpServerManager.arenaType==3 then
team=FormationTypeDef.LuoFuZhengFeng3
elseif JumpServerManager.arenaType==4 then
team=FormationTypeDef.LuoFuZhengFeng4
if team==0 then
if JumpServerManager.arenaType==1 then
team=FormationTypeDef.LuoFuZhengFeng1
elseif JumpServerManager.arenaType==2 then
team=FormationTypeDef.LuoFuZhengFeng2
elseif JumpServerManager.arenaType==3 then
team=FormationTypeDef.LuoFuZhengFeng3
elseif JumpServerManager.arenaType==4 then
team=FormationTypeDef.LuoFuZhengFeng4
end
end
--local formation = FormationManager.GetFormationByID(team)
-- if #formation.teamHeroInfos == 0 then
-- PopupTipPanel.ShowTip(Language[10711])
@ -143,7 +153,7 @@ function this.On_Btn2_Click()
--LogError("JumpServerManager.arenaType=="..JumpServerManager.arenaType)
if heroData then
--LogError("heroData.heroConfig.PropertyName=="..heroData.heroConfig.PropertyName)
if heroData.heroConfig.PropertyName~=JumpServerManager.arenaType and heroData.heroConfig.PropertyName~=5 then
if heroData.heroConfig.PropertyName~=proType and heroData.heroConfig.PropertyName~=5 then
isSame=false
end
end
@ -153,6 +163,7 @@ function this.On_Btn2_Click()
return
end
--保存编队
LogError("this.root.curFormationIndex=="..this.root.curFormationIndex)
FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList,
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
else
@ -197,6 +208,27 @@ function this.InitView()
this.root.btn_1:SetActive(true)
this.root.btn_1_lab.text = Language[10710]
this.root.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.JumpServerHightLadder })
this.root.selectObj.transform:SetParent(this.signBtnList[proType].btn.transform)
this.root.selectObj.transform.localPosition = Vector3.zero
for i=1,#this.signBtnList do
Util.AddClick(this.signBtnList[i].btn,function()
proType=i
local formation=FormationTypeDef.LuoFuZhengFeng1
if proType==1 then
formation= FormationTypeDef.LuoFuZhengFeng1
elseif proType==2 then
formation= FormationTypeDef.LuoFuZhengFeng2
elseif proType==3 then
formation= FormationTypeDef.LuoFuZhengFeng3
elseif proType==4 then
formation= FormationTypeDef.LuoFuZhengFeng4
end
this.root.SetCurFormationIndex(formation)
this.root.selectObj.transform:SetParent(this.signBtnList[i].btn.transform)
this.root.selectObj.transform.localPosition = Vector3.zero
end)
end
end
function this.On_Btn1_Click()

View File

@ -759,6 +759,14 @@ function this.GetHeroFormationStr(teamId)
return Language[11104]
elseif teamId == FormationTypeDef.JUMPSERVER_HIGHTLADDER then
return"该神将在罗浮争锋阵容中已上阵"
elseif teamId == FormationTypeDef.LuoFuZhengFeng1 then
return"该神将在罗浮争锋阵容中已上阵"
elseif teamId == FormationTypeDef.LuoFuZhengFeng2 then
return"该神将在罗浮争锋阵容中已上阵"
elseif teamId == FormationTypeDef.LuoFuZhengFeng3 then
return"该神将在罗浮争锋阵容中已上阵"
elseif teamId == FormationTypeDef.LuoFuZhengFeng4 then
return"该神将在罗浮争锋阵容中已上阵"
end
end
return ""
@ -785,6 +793,14 @@ function this.GetHeroFormationStr2(teamId)
return Language[11110], FormationTypeDef.ARENA_TOM_MATCH
elseif teamId == FormationTypeDef.JUMPSERVER_HIGHTLADDER then
return "罗浮争锋", FormationTypeDef.JUMPSERVER_HIGHTLADDER
elseif teamId == FormationTypeDef.LuoFuZhengFeng1 then
return "罗浮争锋", FormationTypeDef.LuoFuZhengFeng1
elseif teamId == FormationTypeDef.LuoFuZhengFeng2 then
return "罗浮争锋", FormationTypeDef.LuoFuZhengFeng2
elseif teamId == FormationTypeDef.LuoFuZhengFeng3 then
return "罗浮争锋", FormationTypeDef.LuoFuZhengFeng3
elseif teamId == FormationTypeDef.LuoFuZhengFeng4 then
return "罗浮争锋", FormationTypeDef.LuoFuZhengFeng4
end
end
return ""

View File

@ -191,7 +191,11 @@ function this.SingleHeroDataShow(go,_heroData)
elseif heroData.isFormations[1] == FormationTypeDef.ARENA_TOM_MATCH then
-- JumpManager.GoJump(57001)
UIManager.OpenPanel(UIName.ArenaTopMatchPanel)
elseif heroData.isFormations[1] == FormationTypeDef.JUMPSERVER_HIGHTLADDER then
elseif heroData.isFormations[1] == FormationTypeDef.JUMPSERVER_HIGHTLADDER
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng1
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng2
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng3
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng4 then
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.JUMPSERVER_HIGHTLADDER)
end
end

View File

@ -258,7 +258,11 @@ function this.SingleHeroDataShow(go,_heroData)
elseif heroData.isFormations[1] == FormationTypeDef.ARENA_TOM_MATCH then
-- JumpManager.GoJump(57001)
UIManager.OpenPanel(UIName.ArenaTopMatchPanel)
elseif heroData.isFormations[1] == FormationTypeDef.JUMPSERVER_HIGHTLADDER then
elseif heroData.isFormations[1] == FormationTypeDef.JUMPSERVER_HIGHTLADDER
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng1
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng2
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng3
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng4 then
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.JUMPSERVER_HIGHTLADDER)
end
end

View File

@ -192,7 +192,11 @@ function this.SingleHeroDataShow(go,_heroData)
elseif heroData.isFormations[1] == FormationTypeDef.ARENA_TOM_MATCH then
-- JumpManager.GoJump(57001)
UIManager.OpenPanel(UIName.ArenaTopMatchPanel)
elseif heroData.isFormations[1] == FormationTypeDef.JUMPSERVER_HIGHTLADDER then
elseif heroData.isFormations[1] == FormationTypeDef.JUMPSERVER_HIGHTLADDER
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng1
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng2
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng3
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng4 then
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.JUMPSERVER_HIGHTLADDER)
end
end