Merge branch 'tcx_xiyou_dev' of https://miduohuyu.com/root/miduo_client into tcx_xiyou_dev

tcx_xiyou_test
sean 2024-01-12 13:23:10 +08:00
commit f6f7e5e6f5
4 changed files with 303 additions and 214 deletions

View File

@ -34,7 +34,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: 326, y: 330}
m_AnchoredPosition: {x: 326, y: 243}
m_SizeDelta: {x: 471.04, y: 75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3244900247026593242
@ -116,7 +116,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: 40.86998, y: 330}
m_AnchoredPosition: {x: 40.86998, y: 243}
m_SizeDelta: {x: 39.6, y: 28.88}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9152440419557078273
@ -335,7 +335,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: 45.45498, y: 412}
m_AnchoredPosition: {x: 45.45498, y: 325}
m_SizeDelta: {x: 85, y: 102}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5624456641661415722
@ -545,7 +545,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: 280, y: 330}
m_AnchoredPosition: {x: 280, y: 243}
m_SizeDelta: {x: 554.09, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &922132345960057215

View File

@ -321,7 +321,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: 963, y: 54}
m_AnchoredPosition: {x: 175, y: -81}
m_SizeDelta: {x: 300, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &743071139
@ -1452,7 +1452,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4060255815899203278
RectTransform:
m_ObjectHideFlags: 0
@ -2039,7 +2039,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4245613151721811979
RectTransform:
m_ObjectHideFlags: 0
@ -2113,7 +2113,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5419709690071869381
RectTransform:
m_ObjectHideFlags: 0
@ -7128,7 +7128,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: 0, y: 0}
m_AnchoredPosition: {x: 9, y: 73}
m_SizeDelta: {x: 252.3, y: 0}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1414705437977451223
@ -7145,11 +7145,11 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: -20
m_Right: 16
m_Top: 0
m_Bottom: 81
m_ChildAlignment: 8
m_Spacing: -67.38
m_Spacing: 13.5
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -7524,7 +7524,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6043214957532339539
RectTransform:
m_ObjectHideFlags: 0
@ -7598,7 +7598,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &19914098443950123
RectTransform:
m_ObjectHideFlags: 0
@ -7843,13 +7843,14 @@ RectTransform:
- {fileID: 3592899958745824746}
- {fileID: 9219313834026371389}
- {fileID: 5256860760602564221}
- {fileID: 7049949823326162394}
m_Father: {fileID: 7019400324678272696}
m_RootOrder: 8
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: 200, y: 200}
m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3338101039952214484
CanvasRenderer:
@ -13919,7 +13920,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5140623084141600730
RectTransform:
m_ObjectHideFlags: 0
@ -14374,7 +14375,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5992617561437324323
RectTransform:
m_ObjectHideFlags: 0
@ -14894,7 +14895,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3318586181261443113
RectTransform:
m_ObjectHideFlags: 0
@ -19922,7 +19923,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 200, y: 200}
m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2875914181687123874
CanvasRenderer:
@ -20055,7 +20056,7 @@ RectTransform:
- {fileID: 3308324163435656426}
- {fileID: 4732707291673769315}
m_Father: {fileID: 986452627335843391}
m_RootOrder: 3
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}
@ -20473,8 +20474,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3124962570895569612}
- component: {fileID: 2991396558019827056}
- component: {fileID: 8447453777592073735}
m_Layer: 5
m_Name: layer7
m_TagString: Untagged
@ -20511,44 +20510,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &2991396558019827056
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2102301823679114759}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 2
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 1
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder: -3
m_TargetDisplay: 0
--- !u!114 &8447453777592073735
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2102301823679114759}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!1 &2107080272549364849
GameObject:
m_ObjectHideFlags: 0
@ -21262,7 +21223,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4280671607868311395
RectTransform:
m_ObjectHideFlags: 0
@ -21594,7 +21555,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &279880732089306119
RectTransform:
m_ObjectHideFlags: 0
@ -22108,7 +22069,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &60415515071199676
RectTransform:
m_ObjectHideFlags: 0
@ -22639,7 +22600,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 2.175, y: 0}
m_SizeDelta: {x: 200, y: 200}
m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9007943773351537917
CanvasRenderer:
@ -23275,7 +23236,7 @@ RectTransform:
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: 148, y: 149}
m_SizeDelta: {x: 128, y: 128}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1871536213553410038
CanvasRenderer:
@ -24230,7 +24191,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5280834466267576732
RectTransform:
m_ObjectHideFlags: 0
@ -29564,7 +29525,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5749431481947614733
RectTransform:
m_ObjectHideFlags: 0
@ -34904,7 +34865,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: -216.49998, y: -50}
m_AnchoredPosition: {x: -216.49998, y: -225.86002}
m_SizeDelta: {x: 977.6, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3661387098794875674
@ -35164,7 +35125,7 @@ RectTransform:
- {fileID: 1877704359351138992}
- {fileID: 7458032753472600294}
m_Father: {fileID: 986452627335843391}
m_RootOrder: 2
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}
@ -51196,6 +51157,7 @@ RectTransform:
- {fileID: 2143439897358225204}
- {fileID: 3476783521668318209}
- {fileID: 1749422462585656995}
- {fileID: 8005049326956350503}
m_Father: {fileID: 1612271237950830011}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -51430,7 +51392,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2924911159897313432
RectTransform:
m_ObjectHideFlags: 0
@ -57412,7 +57374,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 200, y: 200}
m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9159988997322425420
CanvasRenderer:
@ -57603,7 +57565,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1376009373367168558
RectTransform:
m_ObjectHideFlags: 0
@ -57675,7 +57637,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8498032547740482708
RectTransform:
m_ObjectHideFlags: 0
@ -62640,7 +62602,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: -451, y: 146}
m_AnchoredPosition: {x: -306.1, y: 114}
m_SizeDelta: {x: 300, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5752923341379510209
@ -62848,7 +62810,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 200, y: 200}
m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8445632292948232348
CanvasRenderer:
@ -67859,8 +67821,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: 301.5, y: -35}
m_SizeDelta: {x: 55, y: 68.95}
m_AnchoredPosition: {x: 305, y: -35}
m_SizeDelta: {x: 48, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4888453323599395195
CanvasRenderer:
@ -68910,7 +68872,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3447029376430720743
RectTransform:
m_ObjectHideFlags: 0
@ -69058,7 +69020,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4218270652747845447
RectTransform:
m_ObjectHideFlags: 0
@ -69453,7 +69415,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &664796012841267352
RectTransform:
m_ObjectHideFlags: 0
@ -69551,7 +69513,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: 264, y: 320}
m_AnchoredPosition: {x: 257.5, y: 253}
m_SizeDelta: {x: 300, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2549606708986302677
@ -70009,7 +69971,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &237215524254390691
RectTransform:
m_ObjectHideFlags: 0
@ -70083,7 +70045,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7192552044960768237
RectTransform:
m_ObjectHideFlags: 0
@ -70157,7 +70119,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6621367355616418162
RectTransform:
m_ObjectHideFlags: 0
@ -71197,6 +71159,101 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &6398729953179135213
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8005049326956350503}
- component: {fileID: 8652449792236434773}
- component: {fileID: 2111547759435241797}
- component: {fileID: 754321927795401421}
m_Layer: 5
m_Name: name
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8005049326956350503
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6398729953179135213}
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: 5034612710644007650}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -87.1}
m_SizeDelta: {x: 127, y: 30}
m_Pivot: {x: 0, y: 1}
--- !u!222 &8652449792236434773
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6398729953179135213}
m_CullTransparentMesh: 0
--- !u!114 &2111547759435241797
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6398729953179135213}
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: 1, g: 0.9764151, b: 0.9764151, 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: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 47
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 0
m_Text: "\u9996\u5145"
--- !u!114 &754321927795401421
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6398729953179135213}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.054901965, g: 0.21568629, b: 0.32941177, a: 1}
m_EffectDistance: {x: 2, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &6426808438879899325
GameObject:
m_ObjectHideFlags: 0
@ -71776,7 +71833,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7882963723000738564
RectTransform:
m_ObjectHideFlags: 0
@ -71836,7 +71893,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 208.70001, y: 187.80005}
m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1398406927188027337
CanvasRenderer:
@ -71966,7 +72023,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 986452627335843391}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -72027,7 +72084,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6268880426419405386
RectTransform:
m_ObjectHideFlags: 0
@ -72254,7 +72311,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8821241542300944117
RectTransform:
m_ObjectHideFlags: 0
@ -72615,7 +72672,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 167.95, y: -93.900024}
m_SizeDelta: {x: 200, y: 200}
m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4144326890380073377
CanvasRenderer:
@ -72841,7 +72898,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2906059734384628762
RectTransform:
m_ObjectHideFlags: 0
@ -73121,7 +73178,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 986452627335843391}
m_RootOrder: 4
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -73694,11 +73751,11 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1672733935988337368}
- {fileID: 1473827928010218247}
- {fileID: 2034316355286400179}
- {fileID: 7094943317510879996}
- {fileID: 1508767087665272957}
- {fileID: 1672733935988337368}
- {fileID: 1470640894515440942}
- {fileID: 1612271237950830011}
- {fileID: 2763478119683056422}
@ -73858,7 +73915,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6104279046714086550
RectTransform:
m_ObjectHideFlags: 0
@ -79009,7 +79066,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 200, y: 200}
m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3006110700099534767
CanvasRenderer:
@ -82319,7 +82376,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1122909796598849892
RectTransform:
m_ObjectHideFlags: 0
@ -82596,7 +82653,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &111066593179679761
RectTransform:
m_ObjectHideFlags: 0
@ -83114,6 +83171,101 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &8104034878086742689
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7049949823326162394}
- component: {fileID: 6743277290496644718}
- component: {fileID: 3469689544277285442}
- component: {fileID: 2671043676030138232}
m_Layer: 5
m_Name: name
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7049949823326162394
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8104034878086742689}
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: 7718091128414328679}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -87.1}
m_SizeDelta: {x: 127, y: 30}
m_Pivot: {x: 0, y: 1}
--- !u!222 &6743277290496644718
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8104034878086742689}
m_CullTransparentMesh: 0
--- !u!114 &3469689544277285442
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8104034878086742689}
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: 1, g: 0.9764151, b: 0.9764151, 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: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 47
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 0
m_Text: "\u795E\u5C06\u70ED\u699C"
--- !u!114 &2671043676030138232
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8104034878086742689}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.054901965, g: 0.21568629, b: 0.32941177, a: 1}
m_EffectDistance: {x: 2, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &8108491486839889576
GameObject:
m_ObjectHideFlags: 0
@ -87895,7 +88047,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5260332697946394125
RectTransform:
m_ObjectHideFlags: 0
@ -87949,7 +88101,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1631121790323343848
RectTransform:
m_ObjectHideFlags: 0
@ -88428,7 +88580,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 200, y: 200}
m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2501439414024540677
CanvasRenderer:
@ -93571,7 +93723,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1246011003512383303
RectTransform:
m_ObjectHideFlags: 0
@ -93637,16 +93789,13 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1473827928010218247}
- component: {fileID: 8551940974177766047}
- component: {fileID: 4924907184593616207}
- component: {fileID: 894444622324405887}
m_Layer: 5
m_Name: scene
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1473827928010218247
RectTransform:
m_ObjectHideFlags: 0
@ -93668,80 +93817,13 @@ RectTransform:
- {fileID: 3124962570895569612}
- {fileID: 5260332697946394125}
m_Father: {fileID: 986452627335843391}
m_RootOrder: 0
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_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &8551940974177766047
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8655889500530449547}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 2
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 1
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder: -4
m_TargetDisplay: 0
--- !u!114 &4924907184593616207
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8655889500530449547}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &894444622324405887
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8655889500530449547}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue:
- initV3: {x: 1.1, y: 1.1, z: 1.1}
initFloat: 0
isInit: 1
changeV3: {x: 1, y: 1, z: 1}
changeFloat: 0
duration: 0.2
delay: 0
curveType: 1
changeType: 4
sequeueType: 0
loop: 0
loopType: 0
targetObj: {fileID: 0}
isPlayAudio: 0
isHaveCloseBtn: 0
isPlayOnOpen: 1
--- !u!1 &8666513369155251672
GameObject:
m_ObjectHideFlags: 0
@ -93947,7 +94029,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 6.1}
m_SizeDelta: {x: 148, y: 149}
m_SizeDelta: {x: 200, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6988001231396661349
CanvasRenderer:
@ -93977,7 +94059,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: f2920e687911009478aaf7c9b2175eba, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -94621,8 +94703,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: 159, y: -35}
m_SizeDelta: {x: 230, y: 68.95}
m_AnchoredPosition: {x: 161, y: -35}
m_SizeDelta: {x: 240, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6388664606995184780
CanvasRenderer:
@ -94698,7 +94780,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2014715291779895607
RectTransform:
m_ObjectHideFlags: 0
@ -95331,6 +95413,11 @@ PrefabInstance:
propertyPath: m_Name
value: UI_Effect_jinkuang_Yuan
objectReference: {fileID: 0}
- target: {fileID: 8304511335248722024, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalPosition.x

View File

@ -559,9 +559,9 @@ RectTransform:
m_Father: {fileID: 7086677512586395648}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -427}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 132, y: 127}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222245335330091708
@ -5525,9 +5525,9 @@ RectTransform:
m_Father: {fileID: 8221946263362407270}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 66, y: -591.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 132, y: 127}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222809709876260760
@ -54976,9 +54976,9 @@ RectTransform:
m_Father: {fileID: 8221946263362407270}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 66, y: -723.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 132, y: 127}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4573707849151150779
@ -57569,9 +57569,9 @@ RectTransform:
m_Father: {fileID: 7086677512586395648}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -691}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 132, y: 127}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1097575822381158458
@ -59751,9 +59751,9 @@ RectTransform:
m_Father: {fileID: 8221946263362407270}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 66, y: -195.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 132, y: 127}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1681640149729514025
@ -59892,9 +59892,9 @@ RectTransform:
m_Father: {fileID: 8221946263362407270}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 66, y: -63.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 132, y: 127}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5028296040494449829
@ -60078,9 +60078,9 @@ RectTransform:
m_Father: {fileID: 7086677512586395648}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -295}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 132, y: 127}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6738602295776649712
@ -61486,7 +61486,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &2450709575765110374
RectTransform:
m_ObjectHideFlags: 0
@ -61551,9 +61551,9 @@ RectTransform:
m_Father: {fileID: 7086677512586395648}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -559}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 132, y: 127}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8440567242530909706
@ -61708,7 +61708,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 116, y: 1008}
m_SizeDelta: {x: 132, y: 787}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &7854679572375693773
MonoBehaviour:
@ -62171,9 +62171,9 @@ RectTransform:
m_Father: {fileID: 8221946263362407270}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 66, y: -459.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 132, y: 127}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6680247330700798719
@ -62420,9 +62420,9 @@ RectTransform:
m_Father: {fileID: 8221946263362407270}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 66, y: -327.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 132, y: 127}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6159701963710832051

View File

@ -911,8 +911,8 @@ function this.GetSuperManReward()
end
function this:OnSortingOrderChange()
self.sceneTran.gameObject:GetComponent("Canvas").sortingOrder = self.sortingOrder - 4
Util.GetGameObject(self.sceneTran.gameObject, "layer7"):GetComponent("Canvas").sortingOrder = self.sortingOrder - 3
-- self.sceneTran.gameObject:GetComponent("Canvas").sortingOrder = self.sortingOrder - 4
-- Util.GetGameObject(self.sceneTran.gameObject, "layer7"):GetComponent("Canvas").sortingOrder = self.sortingOrder - 3
this.npcRoot:GetComponent("Canvas").sortingOrder = self.sortingOrder - 2
this.decorateRoot:GetComponent("Canvas").sortingOrder = self.sortingOrder - 1
-- Util.AddParticleSortLayer(this.btnClickMove, self.sortingOrder - orginLayer)
@ -1004,9 +1004,11 @@ function this.CreatActivity()
end
activityTabs[k].go = newObjToParent(this.activityTabPrefab,root)
activityTabs[k].img = Util.GetGameObject(activityTabs[k].go, "icon"):GetComponent("Image")
activityTabs[k].nameText = Util.GetGameObject(activityTabs[k].go, "name"):GetComponent("Text")
activityTabs[k].timeImg = Util.GetGameObject(activityTabs[k].go, "Image_1")
activityTabs[k].timeText = Util.GetGameObject(activityTabs[k].timeImg, "time"):GetComponent("Text")
activityTabs[k].redpot = Util.GetGameObject(activityTabs[k].go, "redPoint")
activityTabs[k].nameText.text=v.Sesc
-- 限时折扣显示特效
if v.Id == 13 then
local effect = poolManager:LoadAsset("UI_Effect_jinkuang_Yuan", PoolManager.AssetType.GameObject)