探索提交
parent
29a3faa8c0
commit
978689d9a7
|
@ -1272,6 +1272,7 @@ RectTransform:
|
|||
- {fileID: 8640258453947894423}
|
||||
- {fileID: 830083511673587919}
|
||||
- {fileID: 5190378739448930435}
|
||||
- {fileID: 8546165598943355784}
|
||||
m_Father: {fileID: 6278899851612589502}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -2838,6 +2839,123 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u65E0\u8FB9\u6389\u843D"
|
||||
--- !u!1 &7036335890109415029
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8546165598943355784}
|
||||
- component: {fileID: 9072527345079398483}
|
||||
- component: {fileID: 8387742053752922386}
|
||||
- component: {fileID: 1217466485992169014}
|
||||
m_Layer: 5
|
||||
m_Name: helpBtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8546165598943355784
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7036335890109415029}
|
||||
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: 1731085366901955660}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -59, y: -78}
|
||||
m_SizeDelta: {x: 68, y: 68}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &9072527345079398483
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7036335890109415029}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8387742053752922386
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7036335890109415029}
|
||||
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: 47b0d71d3c8ef79468a5fb4d8ec5f365, 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 &1217466485992169014
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7036335890109415029}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 8387742053752922386}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!1 &7365034574822972270
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -3184,7 +3302,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -161.6, y: 24.9}
|
||||
m_AnchoredPosition: {x: -17.3, y: 24.9}
|
||||
m_SizeDelta: {x: 174, y: 174}
|
||||
m_Pivot: {x: 1, y: 0}
|
||||
--- !u!222 &6526611771904387564
|
||||
|
@ -3366,7 +3484,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -17, y: 40.8}
|
||||
m_AnchoredPosition: {x: -27.5, y: 228}
|
||||
m_SizeDelta: {x: 127, y: 135}
|
||||
m_Pivot: {x: 1, y: 0}
|
||||
--- !u!222 &5087118223710356840
|
||||
|
|
|
@ -37,8 +37,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: 0}
|
||||
m_SizeDelta: {x: 1081.2, y: 0}
|
||||
m_AnchoredPosition: {x: 0.9, y: 0}
|
||||
m_SizeDelta: {x: 1190.7, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6558828224914611059
|
||||
CanvasRenderer:
|
||||
|
@ -675,7 +675,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.29803923}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -815,11 +815,11 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 69
|
||||
m_Left: 120
|
||||
m_Right: 0
|
||||
m_Top: -17
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 1
|
||||
m_Bottom: 27
|
||||
m_ChildAlignment: 0
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 99.78, y: 100}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1721,8 +1721,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: -1.46}
|
||||
m_SizeDelta: {x: 900, y: 3.05}
|
||||
m_AnchoredPosition: {x: 0, y: -0.000076293945}
|
||||
m_SizeDelta: {x: 900, y: 5}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &3352581906189306360
|
||||
CanvasRenderer:
|
||||
|
@ -1746,7 +1746,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
@ -2019,8 +2019,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 27.8, y: -32.2}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_AnchoredPosition: {x: 27.8, y: -9.6599}
|
||||
m_SizeDelta: {x: 160, y: 51.51}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &1124979048482131543
|
||||
CanvasRenderer:
|
||||
|
@ -2261,10 +2261,10 @@ RectTransform:
|
|||
m_Father: {fileID: 5457873113540345585}
|
||||
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: -3.3, y: 0}
|
||||
m_SizeDelta: {x: 893.4, y: 250}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: -3.3, y: -93.8}
|
||||
m_SizeDelta: {x: 893.4, y: 189}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1388094534513899425
|
||||
GameObject:
|
||||
|
@ -2678,7 +2678,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 450, y: -104}
|
||||
m_SizeDelta: {x: 900, y: 250}
|
||||
m_SizeDelta: {x: 900, y: 197.7}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &4991609003910263707
|
||||
MonoBehaviour:
|
||||
|
@ -2698,7 +2698,7 @@ MonoBehaviour:
|
|||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: -29.8
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
|
@ -3245,7 +3245,7 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 63
|
||||
m_FontSize: 37
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
|
@ -3564,7 +3564,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8609091337126958581
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -3581,10 +3581,10 @@ RectTransform:
|
|||
m_Father: {fileID: 5568991561432925223}
|
||||
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: 316.62, y: -33.71}
|
||||
m_SizeDelta: {x: 203.85, y: 58.03}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -130.38, y: -140.5}
|
||||
m_SizeDelta: {x: 203.84998, y: 58.03}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3222076879814346723
|
||||
CanvasRenderer:
|
||||
|
@ -3699,10 +3699,10 @@ RectTransform:
|
|||
m_Father: {fileID: 5568991561432925223}
|
||||
m_RootOrder: 6
|
||||
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: 316.62, y: -33.71}
|
||||
m_SizeDelta: {x: 203.85, y: 58.03}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -130.38, y: -141.5}
|
||||
m_SizeDelta: {x: 203.84998, y: 58.03}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7563001748029032217
|
||||
CanvasRenderer:
|
||||
|
@ -4723,10 +4723,10 @@ RectTransform:
|
|||
m_Father: {fileID: 5568991561432925223}
|
||||
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: 7.14, y: 79.38096}
|
||||
m_SizeDelta: {x: 901.79, y: 51.51}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 454.14, y: -33.940002}
|
||||
m_SizeDelta: {x: 901.79, y: 51.509995}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6238209311415372031
|
||||
CanvasRenderer:
|
||||
|
@ -5968,10 +5968,10 @@ RectTransform:
|
|||
m_Father: {fileID: 5568991561432925223}
|
||||
m_RootOrder: 5
|
||||
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: 316.62, y: -33.71}
|
||||
m_SizeDelta: {x: 203.85, y: 58.03}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -130.38, y: -141.5}
|
||||
m_SizeDelta: {x: 203.84998, y: 58.03}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7693763141959272963
|
||||
CanvasRenderer:
|
||||
|
@ -6389,9 +6389,9 @@ RectTransform:
|
|||
m_Father: {fileID: 5568991561432925223}
|
||||
m_RootOrder: 2
|
||||
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.46, y: 74.7}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -134.54001, y: -35.6}
|
||||
m_SizeDelta: {x: 218, y: 88}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5814188985522218443
|
||||
|
@ -7685,10 +7685,10 @@ RectTransform:
|
|||
m_Father: {fileID: 5568991561432925223}
|
||||
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: -117, y: -19}
|
||||
m_SizeDelta: {x: 643.18, y: 135.2}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 340.11, y: -128.295}
|
||||
m_SizeDelta: {x: 643.18, y: 135.20001}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2860327502804025555
|
||||
MonoBehaviour:
|
||||
|
@ -9448,8 +9448,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 202.8, y: -33.52}
|
||||
m_SizeDelta: {x: 317.6, y: 52.87}
|
||||
m_AnchoredPosition: {x: 218.52, y: -33.52}
|
||||
m_SizeDelta: {x: 286.15, y: 52.87}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &45783679607002300
|
||||
CanvasRenderer:
|
||||
|
@ -11054,7 +11054,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &5457873113540345585
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -11074,8 +11074,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 450, y: -125}
|
||||
m_SizeDelta: {x: 900, y: 250}
|
||||
m_AnchoredPosition: {x: 450, y: -98.85}
|
||||
m_SizeDelta: {x: 900, y: 197.7}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &8107894537552319360
|
||||
GameObject:
|
||||
|
@ -11095,7 +11095,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &9159548010215061646
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -3892,8 +3892,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 412.5, y: -50}
|
||||
m_SizeDelta: {x: 409, y: 30}
|
||||
m_AnchoredPosition: {x: 332.5, y: -50}
|
||||
m_SizeDelta: {x: 305, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2540190257137457087
|
||||
CanvasRenderer:
|
||||
|
@ -3925,10 +3925,10 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 54
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 82
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
|
@ -16873,7 +16873,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: 158, y: -50}
|
||||
m_AnchoredPosition: {x: 130, y: -50}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &669657226228892406
|
||||
|
@ -16928,8 +16928,8 @@ MonoBehaviour:
|
|||
m_IgnoreLayout: 0
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: -1
|
||||
m_PreferredWidth: 75
|
||||
m_PreferredHeight: 75
|
||||
m_PreferredWidth: 50
|
||||
m_PreferredHeight: 50
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
|
@ -27960,8 +27960,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 54, y: -50}
|
||||
m_SizeDelta: {x: 108, y: 30}
|
||||
m_AnchoredPosition: {x: 40, y: -50}
|
||||
m_SizeDelta: {x: 80, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3100220663330659500
|
||||
CanvasRenderer:
|
||||
|
@ -27993,10 +27993,10 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 54
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MinSize: 4
|
||||
m_MaxSize: 82
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
|
@ -52787,7 +52787,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -84.5}
|
||||
m_SizeDelta: {x: 617, y: 100}
|
||||
m_SizeDelta: {x: 485, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &4179867446813545189
|
||||
MonoBehaviour:
|
||||
|
@ -53418,8 +53418,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: 337, y: 67}
|
||||
m_SizeDelta: {x: 67.93, y: 50}
|
||||
m_AnchoredPosition: {x: 331.48, y: 67}
|
||||
m_SizeDelta: {x: 78.965, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6834781439805235509
|
||||
CanvasRenderer:
|
||||
|
@ -53450,19 +53450,19 @@ MonoBehaviour:
|
|||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: 999
|
||||
m_Text: "999\u5C0F\u65F6"
|
||||
--- !u!1 &8637437793354094815
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -483,6 +483,7 @@ PanelType = {
|
|||
LingMai = {14,16,1273},--御剑行
|
||||
tiandihonglu = {16,1287,1289},
|
||||
fagncunxunbao = {16,1288,1290},
|
||||
ExploreFun = { 14, 16, 12061 }, -- 体力 2
|
||||
}
|
||||
|
||||
|
||||
|
@ -557,6 +558,7 @@ UpViewRechargeType = {
|
|||
LingMaiCoin = 1273,--灵脉币
|
||||
yonghengzhiyao = 1287,
|
||||
qianmianhuan = 1288,
|
||||
exploreCost = 12061,
|
||||
}
|
||||
|
||||
SHOP_PAGE = {
|
||||
|
|
|
@ -83,10 +83,16 @@ function ExploreMainPanel:InitComponent()
|
|||
self.trigger.onPointerUp = self.trigger.onPointerUp + function()
|
||||
self:SetTip(self.tipRoot,self.mapId)
|
||||
end
|
||||
|
||||
self.helpBtn = Util.GetGameObject(self.gameObject, "btns/helpBtn")
|
||||
self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
function ExploreMainPanel:BindEvent()
|
||||
Util.AddClick(self.helpBtn,function()
|
||||
UIManager.OpenPanel(UIName.HelpPopup,125,self.helpPosition.x,self.helpPosition.y)
|
||||
end)
|
||||
Util.AddClick(self.backBtn,function()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
|
@ -139,7 +145,7 @@ function ExploreMainPanel:OnShow()
|
|||
ForceRebuildLayout(self.Bg.transform)
|
||||
self.data = ExploreManager.ExploreMapData
|
||||
self.tip.gameObject:SetActive(false)
|
||||
self.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main })
|
||||
self.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.ExploreFun })
|
||||
self:SetMapData()
|
||||
self:SetMapState()
|
||||
end
|
||||
|
@ -178,7 +184,7 @@ function ExploreMainPanel:SetMapData()
|
|||
SetNumShow(self.mapList[k].minForce,self.mapList[k].force.gameObject,v.force)
|
||||
if PlayerManager.level < v.openLevel then
|
||||
self.mapList[k].condition.gameObject:SetActive(true)
|
||||
if v.openLevel == 999 then
|
||||
if v.openLevel ~= 999 then
|
||||
self.mapList[k].conditionTip.text = v.openLevel.."级解锁"
|
||||
else
|
||||
self.mapList[k].conditionTip.text = "地图暂未开放"
|
||||
|
|
|
@ -23,33 +23,40 @@ function ExplorePanel:BindEvent()
|
|||
end)
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重
|
||||
--添加事件监听(用于子类重写)
|
||||
function ExplorePanel:AddListener()
|
||||
fightMap:AddListener()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Explore.UpdateFormation,this.OnShow)
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function ExplorePanel:RemoveListener()
|
||||
fightMap:RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Explore.UpdateFormation,this.OnShow)
|
||||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function ExplorePanel:OnOpen(data)
|
||||
this.mapData = data
|
||||
fightMap:Init()
|
||||
end
|
||||
|
||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
function ExplorePanel:OnShow()
|
||||
fightMap:Init()
|
||||
function ExplorePanel:OnShow()
|
||||
this.data = ExploreManager.GetFormationDataByMapId(this.mapData.mapId)
|
||||
if not this.data or #this.data < 1 then
|
||||
this:ClosePanel()
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function ExplorePanel:OnClose()
|
||||
fightMap:OnClose()
|
||||
end
|
||||
|
||||
function ExplorePanel:OnSortingOrderChange()
|
||||
fightMap:OnSortingOrderChange(this.sortingOrder)
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function ExplorePanel:OnDestroy()
|
||||
SubUIManager.Close(this.upView)
|
||||
|
|
|
@ -101,7 +101,7 @@ function this:Refresh(_item,_data)
|
|||
_item.reward[i] = SubUIManager.Open(SubUIConfig.ItemView,_item.grid.transform)
|
||||
end
|
||||
_item.reward[i].gameObject:SetActive(true)
|
||||
_item.reward[i]:OnOpen(false, {_data.dropReward[i].key,_data.dropReward[i].value},0.73,false,false,false,orginLayer)
|
||||
_item.reward[i]:OnOpen(false, {_data.dropReward[i].key,_data.dropReward[i].val},0.73,false,false,false,orginLayer)
|
||||
end
|
||||
end
|
||||
Util.AddOnceClick(_item.exploring,function()
|
||||
|
|
|
@ -196,21 +196,20 @@ function this.ReleaseIconList()
|
|||
end
|
||||
|
||||
function this.AsideTriggerJudge(data,isSelf,_userData)
|
||||
--Log("data:"..tostring(data).." pos:"..tostring(Map_UV2Pos(data.u - 1, data.v).. " isSelf:"..tostring(isSelf).. " Self:"..tostring(_userData).. " Self:".." "..tostring(_userData.userId)))
|
||||
local isGetIconList = false
|
||||
local iconList = this.iconList
|
||||
if not this.threads then
|
||||
this.threads = {}
|
||||
end
|
||||
if this.threads[_userData.userId] then
|
||||
coroutine.stop(this.threads[_userData.userId])
|
||||
this.threads[_userData.userId] = nil
|
||||
if this.threads[_userData.data.formationId] then
|
||||
coroutine.stop(this.threads[_userData.data.formationId])
|
||||
this.threads[_userData.data.formationId] = nil
|
||||
end
|
||||
this.threads[_userData.userId] = coroutine.start(function()
|
||||
this.threads[_userData.data.formationId] = coroutine.start(function()
|
||||
while(not isGetIconList) do
|
||||
if this.isClose and this.isClose == true then
|
||||
coroutine.stop(this.threads[_userData.userId])
|
||||
this.threads[_userData.userId] = nil
|
||||
coroutine.stop(this.threads[_userData.data.formationId])
|
||||
this.threads[_userData.data.formationId] = nil
|
||||
this.ReleaseIconList()
|
||||
coroutine.yield()
|
||||
end
|
||||
|
@ -238,35 +237,21 @@ function this.AsideTriggerJudge(data,isSelf,_userData)
|
|||
posList[4] = Map_UV2Pos(data.u, data.v + 1)
|
||||
for k,pos in pairs(posList) do
|
||||
--Log("posList pos:"..tostring(pos))
|
||||
if iconList[pos] and this.HasSelectIconList(pos,_userData.userId) then
|
||||
if iconList[pos] and this.HasSelectIconList(pos,_userData.data.formationId) then
|
||||
this.RemoveSelectIconList(_userData.eventPointPos)
|
||||
this.AddSelectIconList(pos,_userData.userId)
|
||||
this.AddSelectIconList(pos,_userData.data.formationId)
|
||||
--Log("发送了消息")
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.GuaJi.getEvent,{goData = _userData, event = iconList[pos], pos = pos})
|
||||
coroutine.stop(this.threads[_userData.userId])
|
||||
this.threads[_userData.userId] = nil
|
||||
coroutine.stop(this.threads[_userData.data.formationId])
|
||||
this.threads[_userData.data.formationId] = nil
|
||||
this.ReleaseIconList()
|
||||
coroutine.yield()
|
||||
elseif FightPointPassManager.talkingTime == 0 or (GetTimeStamp() - FightPointPassManager.talkingTime >= 60) then
|
||||
if isSelf and this.playerViews and LengthOfTable(this.playerViews) > 1 then
|
||||
for k,v in pairs(this.playerViews) do
|
||||
if not v.isSelf and Map_UV2Pos(v.roleCurPos.u, v.roleCurPos.v) == pos and v.state == 0 then
|
||||
FightPointPassManager.talkingTime = GetTimeStamp()
|
||||
--Log("发送了消息")
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.GuaJi.getEvent,{goData = _userData,event = v,pos = pos})
|
||||
coroutine.stop(this.threads[_userData.userId])
|
||||
this.threads[_userData.userId] = nil
|
||||
this.ReleaseIconList()
|
||||
coroutine.yield()
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
--Log("周围没有事件")
|
||||
if this.threads[_userData.userId] then
|
||||
coroutine.stop( this.threads[_userData.userId])
|
||||
this.threads[_userData.userId] = nil
|
||||
if this.threads[_userData.data.formationId] then
|
||||
coroutine.stop( this.threads[_userData.data.formationId])
|
||||
this.threads[_userData.data.formationId] = nil
|
||||
end
|
||||
this.ReleaseIconList()
|
||||
coroutine.yield()
|
||||
|
|
|
@ -66,6 +66,7 @@ function this.On_Btn2_Click()
|
|||
end
|
||||
end
|
||||
end
|
||||
this.root:ClosePanel()
|
||||
end
|
||||
|
||||
function this.SortHeroDatas(_roleDatas)
|
||||
|
|
|
@ -1086,11 +1086,10 @@ function this.LingMaiIndication(buffer)
|
|||
end
|
||||
|
||||
--刷新探索编队
|
||||
function NetManager.ExplorerMapIndicationResponse(buffer)
|
||||
function this.ExplorerMapIndicationResponse(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = PlayerInfoProto_pb.ExplorerMapIndicationResponse()
|
||||
msg:ParseFromString(data)
|
||||
LogGreen("收到了刷新探索编队的indication")
|
||||
ExploreManager.UpdateFormationData(msg.exploreInfo)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Explore.UpdateFormation)
|
||||
end
|
||||
|
|
|
@ -36,7 +36,7 @@ function this:BindEvent()
|
|||
end
|
||||
end)
|
||||
Util.AddOnceClick(this.reduce,function()
|
||||
if this.slider.value - 1 >= 0 then
|
||||
if this.slider.value - 1 > 0 then
|
||||
this.slider.value = this.slider.value - 1
|
||||
this:Refresh()
|
||||
end
|
||||
|
@ -75,13 +75,13 @@ function this:OnShow(_parent,...)
|
|||
local args = {...}
|
||||
this.mapData = args[1]
|
||||
this.formation = args[2]
|
||||
this.slider.minValue = 0
|
||||
this.slider.minValue = 1
|
||||
this.slider.maxValue = #this.timeList
|
||||
this.name.text = string.format("探索目标:%s",this.mapData.name)
|
||||
this.icon.sprite = this.spLoader:LoadSprite(GetSpriteNameByItemId(this.mapData.cost[1]))
|
||||
this.haveNum = BagManager.GetItemCountById(this.mapData.cost[1])
|
||||
local num = math.floor(this.haveNum/(this.mapData.cost[2]*60))
|
||||
local sliderValue = 0
|
||||
local sliderValue = 1
|
||||
for i = 1,#this.timeList do
|
||||
if num >= this.timeList[i] then
|
||||
sliderValue = i
|
||||
|
|
|
@ -23,14 +23,10 @@ function SingleExplorePlayerView:AddListener()
|
|||
end
|
||||
|
||||
function SingleExplorePlayerView:ReciveData(data)
|
||||
if data.goData.userId == self.userId then
|
||||
if data.goData.data.formationId == self.data.formationId then
|
||||
self.eventPointPos = data.event
|
||||
self.state = 1
|
||||
self:RoleWalkEnd(data)
|
||||
elseif (data.event and data.event.userId and data.event.userId == self.userId) then
|
||||
self.eventPointPos = data.goData
|
||||
self.state = 1
|
||||
self:RoleWalkEnd(data)
|
||||
end
|
||||
return
|
||||
end
|
||||
|
@ -351,7 +347,7 @@ function SingleExplorePlayerView:SelectTargetPos()
|
|||
local targetPos = 0
|
||||
--LogGreen("#selectIconList:"..#selectIconList.." self.uid:"..self.userId)
|
||||
if #selectIconList > 1 then
|
||||
self.parent.AddSelectIconList(selectIconList[1].pos,self.userId)
|
||||
self.parent.AddSelectIconList(selectIconList[1].pos,self.data.formationId)
|
||||
targetPos = self:GetTargetPos(selectIconList[1].pos)
|
||||
self.parent.RemoveSelectIconList(self.eventPointPos)
|
||||
else
|
||||
|
|
|
@ -66,6 +66,7 @@ local _ShowPlusType = {
|
|||
UpViewRechargeType.LingMaiCoin,
|
||||
UpViewRechargeType.yonghengzhiyao,
|
||||
UpViewRechargeType.qianmianhuan,
|
||||
UpViewRechargeType.exploreCost,
|
||||
}
|
||||
|
||||
-- 判断是否显示加号
|
||||
|
@ -412,6 +413,7 @@ function UpView:RechargeType(_type)
|
|||
_type == UpViewRechargeType.LingMaiCoin or
|
||||
_type == UpViewRechargeType.godEquipStone or
|
||||
_type == UpViewRechargeType.yonghengzhiyao or
|
||||
_type == UpViewRechargeType.exploreCost or
|
||||
_type == UpViewRechargeType.qianmianhuan then
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _type)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue