Merge branch 'tcx_xiyou_dev' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_dev

tcx_xiyou_dev
PC-202302260912\Administrator 2024-05-08 14:43:27 +08:00
commit 0014938817
1 changed files with 91 additions and 16 deletions

View File

@ -31,7 +31,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 798015173237835578}
m_RootOrder: 14
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -371,7 +371,6 @@ RectTransform:
- {fileID: 1855684337203459319}
- {fileID: 4916578286602834989}
- {fileID: 949214042014083134}
- {fileID: 6542905183589923407}
- {fileID: 4802209639077060581}
- {fileID: 627185284009965664}
- {fileID: 5126282984618141853}
@ -382,6 +381,7 @@ RectTransform:
- {fileID: 7188556017412337773}
- {fileID: 6076024389542462233}
- {fileID: 738883362}
- {fileID: 4721833582655835306}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -615,7 +615,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 798015173237835578}
m_RootOrder: 13
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -692,7 +692,7 @@ RectTransform:
m_Children:
- {fileID: 1921545391724587691}
m_Father: {fileID: 798015173237835578}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1817,7 +1817,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 798015173237835578}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1964,13 +1964,88 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 798015173237835578}
m_RootOrder: 6
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: 162.59973, y: -207.40039}
m_SizeDelta: {x: 321.2, y: 406.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3904307731424294723
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4721833582655835306}
- component: {fileID: 558516988823572137}
- component: {fileID: 301971664220282576}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4721833582655835306
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3904307731424294723}
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: 6542905183589923407}
m_Father: {fileID: 798015173237835578}
m_RootOrder: 14
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: 25.75, y: 194}
m_SizeDelta: {x: 850, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &558516988823572137
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3904307731424294723}
m_CullTransparentMesh: 0
--- !u!114 &301971664220282576
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3904307731424294723}
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: 7a37c8663d7814543baf6de1e8b993be, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &4294001925723325660
GameObject:
m_ObjectHideFlags: 0
@ -2080,7 +2155,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 798015173237835578}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -2384,7 +2459,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 798015173237835578}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@ -2727,7 +2802,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 798015173237835578}
m_RootOrder: 12
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -3807,7 +3882,7 @@ RectTransform:
m_Children:
- {fileID: 2638102834562654791}
m_Father: {fileID: 798015173237835578}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -3924,7 +3999,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 798015173237835578}
m_RootOrder: 11
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -4058,12 +4133,12 @@ RectTransform:
m_Children:
- {fileID: 8338664383111317243}
- {fileID: 7400317597170588235}
m_Father: {fileID: 798015173237835578}
m_RootOrder: 4
m_Father: {fileID: 4721833582655835306}
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: -271, y: 151}
m_AnchoredPosition: {x: -276.75, y: -21}
m_SizeDelta: {x: 166.19, y: 36.72998}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2068715149087712646
@ -4087,7 +4162,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.4, g: 0.27450982, b: 0.15686275, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -4107,7 +4182,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u6BCF\u5F00\u542F\u4E00\u4E2A\u9635\u4F4D\u5E76\u52A9\u9635,\u52A9\u9635\u5C5E\u6027\u6574\u4F53\u63D0\u534720%"
m_Text: "\u521D\u59CB4\u9635\u4F4D\u4E4B\u5916,\u6BCF\u989D\u5916\u5F00\u542F\u4E00\u4E2A\u9635\u4F4D\u5E76\u52A9\u9635,\n\u52A9\u9635\u5C5E\u6027\u6574\u4F53\u63D0\u534720%"
LanguageIndex: 10145
--- !u!1 &8835364443203700819
GameObject: