Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-05-10 16:12:19 +08:00
commit ea33322ce8
1 changed files with 119 additions and 65 deletions

View File

@ -28,11 +28,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4140903068977959804}
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_AnchoredPosition: {x: -70, y: -123}
m_AnchoredPosition: {x: -71, y: 414}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &84365479177264505
@ -65,11 +65,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4140903068977959804}
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}
m_AnchoredPosition: {x: 8, y: -239.00006}
m_AnchoredPosition: {x: 8, y: 298}
m_SizeDelta: {x: 710, y: 265}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4520080734756669645
@ -296,7 +296,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: -106.70001, y: 199.6001}
m_AnchoredPosition: {x: -106.70001, y: 221}
m_SizeDelta: {x: 660.4, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9017161663807510294
@ -325,7 +325,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_Spacing: 0
m_Spacing: 0.1
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -505,7 +505,7 @@ GameObject:
- component: {fileID: 1514387076519238599}
- component: {fileID: 7541317504563176895}
m_Layer: 5
m_Name: bg
m_Name: bg1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -523,12 +523,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4140903068977959804}
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}
m_AnchoredPosition: {x: 0, y: -963}
m_SizeDelta: {x: 1080, y: 1536.5}
m_AnchoredPosition: {x: 0, y: -536.2}
m_SizeDelta: {x: 1080, y: 1544}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1514387076519238599
CanvasRenderer:
@ -888,7 +888,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: 1.5, y: -178}
m_AnchoredPosition: {x: 1.4300003, y: -149.80005}
m_SizeDelta: {x: 68, y: 68}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7295620224619699087
@ -966,7 +966,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: 551, y: -379.4}
m_AnchoredPosition: {x: 506.65, y: -389}
m_SizeDelta: {x: 260, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7325075372172070154
@ -1102,7 +1102,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: 0, y: 212}
m_AnchoredPosition: {x: 0, y: 206}
m_SizeDelta: {x: 382, y: 102}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8109455269844738230
@ -1182,9 +1182,9 @@ 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: -399, y: 677.19995}
m_SizeDelta: {x: 83, y: 414.3}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -427.3, y: 710.5}
m_SizeDelta: {x: 78, y: 360}
m_Pivot: {x: 0.49999997, y: 0.50000024}
--- !u!222 &5940851063988180384
CanvasRenderer:
m_ObjectHideFlags: 0
@ -1256,7 +1256,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: -0.5, y: -43}
m_AnchoredPosition: {x: -0.5, y: -27.8}
m_SizeDelta: {x: 57.945, y: 197.31}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6923504938779899333
@ -1484,8 +1484,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: -251.58, y: -698.35}
m_SizeDelta: {x: 294.92, y: 148.06}
m_AnchoredPosition: {x: -276.8, y: -698.35}
m_SizeDelta: {x: 293.4, y: 148.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8003749908686302696
CanvasRenderer:
@ -2165,7 +2165,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: 4.4000015, y: -0.40000153}
m_AnchoredPosition: {x: 4.399994, y: -0.40000153}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8522855149125427555
@ -2478,6 +2478,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &6956104208507032662
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6865277180793097681}
- component: {fileID: 8483141149572975339}
- component: {fileID: 7100480852367919666}
m_Layer: 5
m_Name: bg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6865277180793097681
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6956104208507032662}
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: 4140903068977959804}
m_RootOrder: 0
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: 0}
m_SizeDelta: {x: 1080, y: 840}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &8483141149572975339
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6956104208507032662}
m_CullTransparentMesh: 0
--- !u!114 &7100480852367919666
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6956104208507032662}
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: d1795e166fb0f3b4699ab0a7dd751caf, 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 &7163875156173701027
GameObject:
m_ObjectHideFlags: 0
@ -2517,7 +2591,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: 0.84000003, y: -550.55}
m_AnchoredPosition: {x: -0.000026822, y: -543}
m_SizeDelta: {x: 1013.3, y: 474.91}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7878801070616683574
@ -2647,7 +2721,6 @@ GameObject:
m_Component:
- component: {fileID: 4140903068977959804}
- component: {fileID: 1145264877415282113}
- component: {fileID: 3630093783079650847}
m_Layer: 5
m_Name: bg
m_TagString: Untagged
@ -2666,6 +2739,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6865277180793097681}
- {fileID: 7408228094363030855}
- {fileID: 5608728017460667749}
- {fileID: 2937637846396242709}
@ -2673,11 +2747,11 @@ RectTransform:
m_Father: {fileID: 2159386775367720863}
m_RootOrder: 0
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: -416}
m_SizeDelta: {x: 1080, y: 1085}
m_Pivot: {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: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1145264877415282113
CanvasRenderer:
m_ObjectHideFlags: 0
@ -2686,35 +2760,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7485659371861007459}
m_CullTransparentMesh: 0
--- !u!114 &3630093783079650847
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7485659371861007459}
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: d1795e166fb0f3b4699ab0a7dd751caf, 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 &7696812982773216015
GameObject:
m_ObjectHideFlags: 0
@ -2750,7 +2795,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: 9.8, y: 163.1}
m_AnchoredPosition: {x: 10.8, y: 143}
m_SizeDelta: {x: 134.96, y: 46.09}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4117132595011401192
@ -2844,7 +2889,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: 0.84, y: -76.56}
m_AnchoredPosition: {x: -0.000026882, y: -75}
m_SizeDelta: {x: 1013.3, y: 417.81}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2598040128190690903
@ -2893,6 +2938,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2159386775367720863}
- component: {fileID: 4470266353158796513}
m_Layer: 5
m_Name: page8
m_TagString: Untagged
@ -2924,6 +2970,14 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4470266353158796513
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8259426229285020878}
m_CullTransparentMesh: 0
--- !u!1 &8359854397875708807
GameObject:
m_ObjectHideFlags: 0
@ -2995,7 +3049,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: 0.59, y: 106.7}
m_AnchoredPosition: {x: 0, y: 79.9}
m_SizeDelta: {x: 74, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3227443621453193766
@ -3026,7 +3080,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: 1c666beff78f70943be2712a7f73f982, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -3065,12 +3119,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4140903068977959804}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 816}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 960}
m_SizeDelta: {x: 1080, y: 816}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &831422249700567835
CanvasRenderer: