多队塔修改提交

dev_chengFeng
wangzhenxing 2023-03-21 16:12:57 +08:00
parent 91b1bbb82c
commit 4848d707ff
5 changed files with 348 additions and 323 deletions

View File

@ -1,5 +1,79 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &390639993
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 390639994}
- component: {fileID: 390639996}
- component: {fileID: 390639995}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &390639994
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 390639993}
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: 2778119602345671483}
m_RootOrder: 3
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: 1.1, y: -336}
m_SizeDelta: {x: 989.09, y: 4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &390639996
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 390639993}
m_CullTransparentMesh: 0
--- !u!114 &390639995
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 390639993}
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: d76bc0d44fec6ef49a1671ebc472dc3d, 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!1 &7759398919246813
GameObject:
m_ObjectHideFlags: 0
@ -1442,6 +1516,80 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 100
--- !u!1 &584630669360648264
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8257425786362260425}
- component: {fileID: 2561179435539480329}
- component: {fileID: 5574688772759151654}
m_Layer: 5
m_Name: Image (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8257425786362260425
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 584630669360648264}
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: 2778119602345671483}
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: 1.1, y: -632}
m_SizeDelta: {x: 989.09, y: 4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2561179435539480329
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 584630669360648264}
m_CullTransparentMesh: 0
--- !u!114 &5574688772759151654
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 584630669360648264}
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: d76bc0d44fec6ef49a1671ebc472dc3d, 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!1 &623337099968036107
GameObject:
m_ObjectHideFlags: 0
@ -1477,7 +1625,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 113.2583, y: -114.15}
m_AnchoredPosition: {x: 113.25832, y: -114.15}
m_SizeDelta: {x: 206.78, y: 205.21}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &634708497654174890
@ -1857,7 +2005,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 417.2, y: 66}
m_AnchoredPosition: {x: 458.8, y: 69.3}
m_SizeDelta: {x: 142, y: 131}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &697118250466200742
@ -2631,85 +2779,6 @@ MonoBehaviour:
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!1 &986886272692340427
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7236035587429049075}
- component: {fileID: 5736121182784742389}
- component: {fileID: 2893881986781171993}
m_Layer: 0
m_Name: num
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7236035587429049075
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 986886272692340427}
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: 124666416754824053}
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: 75, y: -2.8}
m_SizeDelta: {x: 53.2, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5736121182784742389
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 986886272692340427}
m_CullTransparentMesh: 0
--- !u!114 &2893881986781171993
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 986886272692340427}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.08627451, g: 0.12156863, b: 0.14901961, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 45
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 45
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: x1
--- !u!1 &1027339881397383768
GameObject:
m_ObjectHideFlags: 0
@ -5606,10 +5675,10 @@ RectTransform:
m_Father: {fileID: 2778119602345671483}
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: 510.35, y: 0}
m_SizeDelta: {x: 976.7, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 510.35004, y: -818.0501}
m_SizeDelta: {x: 1020.7, y: 1469.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3898314206317427175
MonoBehaviour:
@ -5618,7 +5687,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2453878810572281153}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -5641,7 +5710,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2453878810572281153}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -6286,9 +6355,9 @@ RectTransform:
m_Father: {fileID: 5895856323007929039}
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: 507, y: -570}
m_SizeDelta: {x: 910, y: 1076.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6466083547730226912
@ -6312,7 +6381,7 @@ MonoBehaviour:
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 977, y: 286}
m_Spacing: {x: 0, y: 10}
m_Spacing: {x: 0, y: 12}
m_Constraint: 1
m_ConstraintCount: 1
--- !u!222 &2304906550961292227
@ -6721,7 +6790,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -312, y: 84}
m_AnchoredPosition: {x: -396, y: 84}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8611311101701149222
@ -6745,7 +6814,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8301887, g: 0.58942956, b: 0.30936277, a: 1}
m_Color: {r: 1, g: 0.9568628, b: 0.8000001, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -6754,7 +6823,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
@ -8412,9 +8481,9 @@ RectTransform:
m_Father: {fileID: 2778119602345671483}
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: 510.35, y: -100}
m_SizeDelta: {x: 100, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3787231434654199887
@ -8678,7 +8747,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -312, y: 84}
m_AnchoredPosition: {x: -395, y: 78.8}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2434907178668518197
@ -8702,7 +8771,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8301887, g: 0.58942956, b: 0.30936277, a: 1}
m_Color: {r: 1, g: 0.9568628, b: 0.8000001, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -8711,7 +8780,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
@ -8722,7 +8791,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u7B2C\u4E00\u961F"
m_Text: "\u7B2C\u4E09\u961F"
LanguageIndex: 0
--- !u!1 &3912105060901263797
GameObject:
@ -9080,10 +9149,10 @@ RectTransform:
m_Father: {fileID: 1290847290199451447}
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: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 468, y: -122}
m_SizeDelta: {x: 910, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5615003411173237942
MonoBehaviour:
@ -9106,7 +9175,7 @@ MonoBehaviour:
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 140, y: 140}
m_Spacing: {x: 20, y: 10}
m_Spacing: {x: 45, y: 0}
m_Constraint: 1
m_ConstraintCount: 5
--- !u!1 &4068343112374304320
@ -10887,7 +10956,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -312, y: 84}
m_AnchoredPosition: {x: -396.1, y: 81.1}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3174659778943649503
@ -10911,7 +10980,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8301887, g: 0.58942956, b: 0.30936277, a: 1}
m_Color: {r: 0.9843138, g: 0.9294118, b: 0.7725491, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -10920,7 +10989,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
@ -10931,7 +11000,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u7B2C\u4E00\u961F"
m_Text: "\u7B2C\u4E8C\u961F"
LanguageIndex: 0
--- !u!1 &5015047708629671096
GameObject:
@ -10966,9 +11035,9 @@ RectTransform:
m_Father: {fileID: 5895856323007929039}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 488.35, y: -1203.9501}
m_SizeDelta: {x: 910, y: 254.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7076006150527824184
@ -10978,7 +11047,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5015047708629671096}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -11148,8 +11217,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -39}
m_SizeDelta: {x: 911, y: 78}
m_AnchoredPosition: {x: 25.1, y: -6.5999985}
m_SizeDelta: {x: 277.3, y: 49.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1510126380560650291
CanvasRenderer:
@ -11179,7 +11248,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: 66bbab0812b3c0c47849ca9e06509e53, type: 3}
m_Sprite: {fileID: 21300000, guid: bd7a57f276ba53d4c96e6deac8863adc, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -13396,81 +13465,6 @@ RectTransform:
m_AnchoredPosition: {x: 792.8083, y: -114.15}
m_SizeDelta: {x: 206.78, y: 205.21}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6645945141241978042
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 124666416754824053}
- component: {fileID: 808032539837590336}
- component: {fileID: 121060328482058433}
m_Layer: 0
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &124666416754824053
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6645945141241978042}
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:
- {fileID: 7236035587429049075}
m_Father: {fileID: 2041658285895753670}
m_RootOrder: 1
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: -44.4, y: 5.3}
m_SizeDelta: {x: 80, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &808032539837590336
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6645945141241978042}
m_CullTransparentMesh: 0
--- !u!114 &121060328482058433
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6645945141241978042}
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: c73de4e5979e0fe48830d01fdfdc477b, 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!1 &6650686481579215998
GameObject:
m_ObjectHideFlags: 0
@ -14643,13 +14637,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4924777543454380687}
- {fileID: 124666416754824053}
m_Father: {fileID: 2778119602345671483}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 506.5, y: -1481.1}
m_SizeDelta: {x: 260, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6760836772324445785
@ -14823,13 +14816,15 @@ RectTransform:
- {fileID: 6233933400349217064}
- {fileID: 5895856323007929039}
- {fileID: 2041658285895753670}
- {fileID: 390639994}
- {fileID: 8257425786362260425}
m_Father: {fileID: 694931557968458218}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 2.3, y: -19}
m_SizeDelta: {x: 1020.7, y: 0}
m_AnchoredPosition: {x: 2.3, y: 2.4}
m_SizeDelta: {x: 1020.7, y: 1552.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2546993476903879026
CanvasRenderer:
@ -14904,7 +14899,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7433469143862602047}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -14927,7 +14922,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7433469143862602047}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -16103,8 +16098,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 10.024994, y: 0}
m_SizeDelta: {x: -19.95, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6606581156521228174
CanvasRenderer:
@ -16127,7 +16122,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.97647065, g: 0.7490196, b: 0.47450984, a: 1}
m_Color: {r: 1, g: 0.8627451, b: 0.59607846, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -16136,18 +16131,18 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 50
m_Alignment: 3
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u7D2B\u5E9C\u795E\u5370\uFF1A"
m_Text: "\u5956\u52B1"
LanguageIndex: 0
--- !u!1 &7901502050478000874
GameObject:
@ -16183,7 +16178,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 1}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1778086654513235393
@ -16207,7 +16202,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_Color: {r: 0.10196079, g: 0.14901961, b: 0.18823531, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -16216,18 +16211,18 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 40
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
m_Text: "\u6311 \u6218"
--- !u!1 &7913789869702294302
GameObject:
m_ObjectHideFlags: 0

View File

@ -20450,8 +20450,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 34.95}
m_SizeDelta: {x: 246, y: 299.98}
m_AnchoredPosition: {x: 1.5, y: -0.5}
m_SizeDelta: {x: 477.1, y: 256.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5026953602875523087
CanvasRenderer:
@ -67178,7 +67178,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1719991210506140705
RectTransform:
m_ObjectHideFlags: 0

View File

@ -70,8 +70,12 @@ function GodsWayListPanel:OnShow(...)
rankTxt.text="暂无排名"
end
Util.AddClick(btn, function()
UIManager.OpenPanel(UIName.GodsWayTowerPanel,i)
self:ClosePanel()
local isOpen=CheckFunctionOpen(138+i)
if isOpen then
UIManager.OpenPanel(UIName.GodsWayTowerPanel,i)
self:ClosePanel()
end
end)
end
end

View File

@ -2,6 +2,7 @@ require("Base/BasePanel")
local GodsWayOtherTeamPanel = Inherit(BasePanel)
local XiuXianSkillConfig = ConfigManager.GetConfig(ConfigName.XiuXianSkillConfig)
local endLess=ConfigManager.GetConfig(ConfigName.EndlessHeroProp)
local heroConfig=ConfigManager.GetConfig(ConfigName.HeroConfig)
local type=0 --1:挑战 2详情
local floor=0
local itemId, needNum
@ -12,11 +13,10 @@ local curMsg=nil
function GodsWayOtherTeamPanel:InitComponent()
self.spLoader = SpriteLoader.New()
self.btnBack = Util.GetGameObject(self.gameObject, "Frame/other/BackBtn")
self.titleTxt=Util.GetGameObject(self.gameObject, "Frame/other/title"):GetComponent("Text")
self.mask = Util.GetGameObject(self.gameObject, "mask")
self.Frame = Util.GetGameObject(self.gameObject, "Frame")
self.content = Util.GetGameObject(self.gameObject, "Frame/Content")
self.costImg=Util.GetGameObject(self.gameObject, "Frame/Button/Image"):GetComponent("Image")
self.costTxt=Util.GetGameObject(self.gameObject, "Frame/Button/Image/num"):GetComponent("Text")
--队伍信息
self.teamInfo = Util.GetGameObject(self.content, "teamInfo")
@ -25,6 +25,7 @@ function GodsWayOtherTeamPanel:InitComponent()
self.teamList[i] = {}
self.teamList[i].title = Util.GetGameObject(self.teamInfo, "Team ("..i..")/Title")
self.teamList[i].go = Util.GetGameObject(self.teamInfo, "Team ("..i..")")
self.teamList[i].warPower = Util.GetGameObject(self.teamInfo, "Team ("..i..")/WarPower/Text"):GetComponent("Text")
self.teamList[i].heroList = {}
for j = 1, 6 do
@ -37,6 +38,7 @@ function GodsWayOtherTeamPanel:InitComponent()
self.teamList[i].heroList[j].levelText = Util.GetGameObject(self.teamList[i].heroList[j].hero, "lvbg/levelText"):GetComponent("Text")
self.teamList[i].heroList[j].icon = Util.GetGameObject(self.teamList[i].heroList[j].hero, "icon"):GetComponent("Image")
end
self.teamList[i].go:SetActive(false)
end
--灵兽信息
self.pokemonInfo = Util.GetGameObject(self.content, "pokemonInfo")
@ -57,28 +59,89 @@ end
--绑定事件(用于子类重写)
function GodsWayOtherTeamPanelBindEvent()
function GodsWayOtherTeamPanel:BindEvent()
Util.AddClick(self.mask, function()
self:ClosePanel()
end)
Util.AddClick(self.btnBack, function()
LogError("点击关闭按钮")
self:ClosePanel()
end)
Util.AddClick(self.btnChallenge, function()
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_YuXu) then
PopupTipPanel.ShowTip(Language[10075])
return
end
if time==0 and haveNum<needNum then
PopupTipPanel.ShowTip("挑战券不足!")
return
end
NetManager.CrossYuXuLunDaoChallengeBeforeRequest(PlayerManager.uid,self.playerId,function(msg)
LogError("open battleinfo ???")
UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,msg,1, function()
--self:RefreshChallengeList()
end)
end)
LogError("显示开展信息")
local myTeams=GodsWayTeam[type]
--local floor=GodsWayTowerManager.GetTowerFloorByType(type)
-- if self.trailData.canFightTime > 0 then
local windData={}
--我的队伍
local myTeamInfo={}
--敌方队伍
local enTeamInfo={}
--获取双方队伍数据
local allHeroTeam={}
local allEnTeam={}
local myTeamNum=0
for i = 1, #myTeams do
--local fightData=fightDataList[i]
local heroTeam={}
heroTeam.team={}
heroTeam.totalForce=FormationManager.GetFormationPower(myTeams[i])
--LogError("myforce=="..msg.recordData.yxldMyForce[i])
local enTeam={}
enTeam.team={}
--LogError("en force=="..msg.recordData.yxldDefForce[i])
local myteam=FormationManager.GetFormationByID(myTeams[i])
for j = 1, #myteam.teamHeroInfos do
myTeamNum=myTeamNum+1
local hero=myteam.teamHeroInfos[j]
local newHero={}
local heroData=HeroManager.GetSingleHeroData(hero.heroId)
newHero.heroTid=heroData.heroConfig.Id
--local pro=string.split(hero.property,"#")
newHero.level=heroData.lv
newHero.heroid=heroData.dynamicId
newHero.star=heroData.star
--newHero.godSoulLv = hero.godSoulLv
newHero.position=hero.position
newHero.skinId=heroData.skinId
table.insert(heroTeam.team,newHero)
end
LogError("Type====="..type.." TowerNumber====="..floor.." TowerWave1"..i)
local monsterData=ConfigManager.TryGetConfigDataByThreeKey(ConfigName.DuoDuiTower,"Type",type,"TowerNumber",floor,"TowerWave1",i)
if monsterData then
enTeam.totalForce=monsterData.Force
for j = 1, #monsterData.Hero do
local hero=monsterData.Hero[j]
local config=ConfigManager.GetConfigData(ConfigName.DuoDuiTowerHero,hero)
local newHero={}
newHero.heroTid=config.Hero
--local pro=string.split(hero.property,"#")
newHero.level=monsterData.Level
--newHero.heroid=hero.realId
newHero.star=monsterData.Star
--newHero.godSoulLv = hero.godSoulLv
newHero.position=j
--newHero.skinId=hero.skinId
table.insert(enTeam.team,newHero)
end
end
table.insert(allHeroTeam,heroTeam)
table.insert(allEnTeam,enTeam)
-- allHeroTeam[i]=heroTeam
-- allEnTeam[i]=enTeam
end
if myTeamNum==0 then
PopupTipPanel.ShowTip("编对为空,无法开战")
return
end
myTeamInfo.crossTeam=allHeroTeam
enTeamInfo.crossTeam=allEnTeam
windData.myTeamInfo=myTeamInfo
windData.defTeamInfo=enTeamInfo
--windData.fightData=fightDataList
UIManager.OpenPanel(UIName.GodsWayBattleInfoPanel,windData,1,type)
--显示挑战界面
self:ClosePanel()
end)
@ -99,18 +162,55 @@ end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function GodsWayOtherTeamPanel:OnShow()
LogError("floor==="..floor)
self.titleTxt.text=""..floor..""
local towers=ConfigManager.TryGetAllConfigsDataByDoubleKey(ConfigName.DuoDuiTower,"Type",type,"TowerNumber",floor)
itemId, needNum = WorldArenaManager.GetArenaChallengeCost()
haveNum = BagManager.GetItemCountById(itemId)
--设置挑战按钮显示
self.costImg.sprite = SetIcon(self.spLoader, itemId)
self.costTxt.text = "×"..needNum
self.costTxt.color = haveNum < needNum and UIColor.NOT_ENOUGH_RED or UIColor.BTN_TEXT
time=WorldArenaManager.GetFreeTime()
self.costImg.gameObject:SetActive(time<=0)
self.challengeTxt.gameObject:SetActive(time>0)
self.challengeTxt.text="免费挑战"
local reward=towers[1].Item
for i = 1, #towers do
self.teamList[i].go:SetActive(true)
self.teamList[i].warPower.text=towers[i].Force
for j = 1, 6 do
self.teamList[i].heroList[j].go:SetActive(false)
end
for j=1,#towers[i].Hero do
self.teamList[i].heroList[j].go:SetActive(true)
local id=towers[i].Hero[j]
local aaa=ConfigManager.GetConfigData(ConfigName.DuoDuiTowerHero,id)
self.teamList[i].heroList[j].frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig[aaa.Hero].Quality,towers[i].Star))
local star,starType = GetStarOrGodSoulLv(1,{star=towers[i].Star})
local starScale = -15
local starSize = Vector2.New(32,32)
if starType == 3 then
starScale = -16
starSize = Vector2.New(0.8,-15)
elseif starType == 2 then
starSize = Vector2.New(48,48)
end
SetHeroStars(self.spLoader, self.teamList[i].heroList[j].starGrid, star,nil,nil,-10)
Util.SetParticleSortLayer(self.teamList[i].heroList[j].starGrid,self.sortingOrder + 1)
self.teamList[i].heroList[j].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig[aaa.Hero].PropertyName))
self.teamList[i].heroList[j].levelText.text = towers[i].Level
self.teamList[i].heroList[j].icon.sprite=self.spLoader:LoadSprite(GetResourcePath(heroConfig[aaa.Hero].Icon))
end
end
-- if self.imprintItemList and #self.imprintItemList>0 then
-- end
local len=#reward-#self.imprintItemList
if len>0 then
for i = 1, len do
local obj=SubUIManager.Open(SubUIConfig.ItemView,self.imprintGrid.transform)
table.insert(self.imprintItemList,obj)
end
end
for i = 1, #self.imprintItemList do
if i<=#reward then
self.imprintItemList[i]:OnOpen(false,reward[i],1,true,false,false,self.sortingOrder)
else
self.imprintItemList[i]:SetActive(false)
end
end
end
@ -125,23 +225,7 @@ function GodsWayOtherTeamPanel:OnSortingOrderChange()
end
end
function GodsWayOtherTeamPanel:Refresh()
LogError("self.playerid=="..self.playerId)
--NetManager.GetPlayerCrossYxldOneTeamInfoRequest(self.playerId,0,function(msg)
--WorldArenaOtherTeamPanel:SetPlayerInfo(self.playerInfo,curMsg.teamInfo)
WorldArenaOtherTeamPanel:SetTeamInfo(self.teamInfo,{curMsg.teamInfo.crossTeam[1],curMsg.teamInfo.crossTeam[2],curMsg.teamInfo.crossTeam[3]})
WorldArenaOtherTeamPanel:SetPokemonInfo(self.pokemonInfo,curMsg.teamInfo.crossTeam[1].PokemonInfos)
-- WorldArenaOtherTeamPanel:SetImprintInfo(self.imprintInfo,curMsg.teamInfo.crossTeam[1].sealShow)
if type==1 then
self.btnChallenge:SetActive(true)
else
self.btnChallenge:SetActive(false)
end
ForceRebuildLayout(self.content.transform)
ForceRebuildLayout(self.Frame.transform)
--end)
end
--实在不想算了,直接写死吧,毁灭吧
function GodsWayOtherTeamPanel:SetImgPos(_go,data)
@ -174,62 +258,7 @@ end
local serverName=nil
--编队信息
function GodsWayOtherTeamPanel:SetTeamInfo(_go,teamData)
for index = 1, 3 do
local go = Util.GetGameObject(_go,"Team ("..index..")")
local data = teamData[index]
local title = Util.GetGameObject(go,"Title"):GetComponent("Text")
local teamList = Util.GetGameObject(go,"TeamList")
title.text = string.format( "第%s队",NumToChinese[index])
--self:SetImgPos(go,data.totalForce)
Util.GetGameObject(go,"WarPower/Text"):GetComponent("Text").text=data.totalForce
for i, demon in ipairs(self.teamList[index].heroList) do
demon.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(1))
demon.hero:SetActive(false)
end
--队伍阵容
for i, hero in ipairs(data.team) do
local heroTid = data.team[i].heroTid
if heroTid then
self.teamList[index].heroList[hero.position].hero:SetActive(true)
local star,starType = GetStarOrGodSoulLv(1,hero)
local starScale = -15
local starSize = Vector2.New(32,32)
if starType == 3 then
starScale = -16
starSize = Vector2.New(0.8,-15)
elseif starType == 2 then
starSize = Vector2.New(48,48)
end
SetHeroStars(self.spLoader, self.teamList[index].heroList[hero.position].starGrid, star,nil,nil,-10)
Util.SetParticleSortLayer(self.teamList[index].heroList[hero.position].starGrid,self.sortingOrder + 1)
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroTid)
self.teamList[index].heroList[hero.position].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(hero.propertyId))
self.teamList[index].heroList[hero.position].levelText.text =endLess[heroTid].Level or hero.level
self.teamList[index].heroList[hero.position].frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality, star))
SetHeroIcon(self.spLoader,hero, self.teamList[index].heroList[hero.position].icon,heroConfig)
SetHeroFlyEffect(self.teamList[index].heroList[hero.position].hero,self.spLoader,star,self.sortingOrder+1,0.8,2)
local heroData = {}
Util.AddOnceClick(self.teamList[index].heroList[hero.position].frame.gameObject, function()
-- LogError("playerid=="..self.playerId.." heroid=="..hero.heroid.." servername=="..serverName.." arrayid=="..2000+index)
NetManager.ViewHeroInfoRequest(self.playerId,hero.heroid,serverName,2000+index,function(msg)
if not hero.heroid then
return
end
heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill)
heroData.star=star
heroData.lv=endLess[heroTid].Level
GoodFriendManager.InitEquipData(msg.equip,heroData)--HeroManager.GetSingleHeroData(heroData.dynamicId)
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true)
end)
end)
end
end
end
end
--灵兽信息
function GodsWayOtherTeamPanel:SetPokemonInfo(go,pokemonData)
@ -267,22 +296,19 @@ end
function GodsWayOtherTeamPanel:OnClose()
end
--界面销毁时调用(用于子类重写)
function GodsWayOtherTeamPanel:OnDestroy()
self.spLoader:Destroy()
if self.PlayerHead then
self.PlayerHead:Recycle()
self.PlayerHead = nil
end
self.InfoList = {}
self.dragViewList = {}
self.triggerList = {}
self.gridList = {}
self.teamList = {}
self.pokemonList = {}
self.imprintItemList = {}
self.imprintItemList={}
end
return GodsWayOtherTeamPanel

View File

@ -88,8 +88,8 @@ function GodsWaySingleSingleWave:OnOpen()
-- UIManager.OpenPanel(UIName.ExpeditionMonsterInfoPopup,EXPEDITON_POPUP_TYPE.FourElementMonster,self.trailData.fourElementType,self.data.wave)
-- end)
Util.AddOnceClick(self.btn, function()
--UIManager.OpenPanel(UIName.ExpeditionMonsterInfoPopup,EXPEDITON_POPUP_TYPE.FourElementMonster,self.trailData.fourElementType,self.data.wave)
UIManager.OpenPanel(UIName.GodsWayOtherTeamPanel,curType,curFloor)
LogError("self.data.wave=="..self.data.wave)
UIManager.OpenPanel(UIName.GodsWayOtherTeamPanel,curType,self.data.wave)
end)
Util.AddOnceClick(self.fight, function()
local x = function()