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

tcx_xiyou_dev
wangzhenxing 2024-05-22 19:06:21 +08:00
commit e5be5f55d9
1 changed files with 53 additions and 203 deletions

View File

@ -762,7 +762,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: -221.00928}
m_AnchoredPosition: {x: 0, y: -221.00903}
m_SizeDelta: {x: 0, y: -642.03}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5573981752961039407
@ -2057,7 +2057,7 @@ RectTransform:
- {fileID: 5029969114594271562}
- {fileID: 6525001842231941428}
m_Father: {fileID: 4582380774234793141}
m_RootOrder: 9
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
@ -2739,9 +2739,7 @@ RectTransform:
- {fileID: 600079498660936705}
- {fileID: 6334397144791350490}
- {fileID: 8235242126773269290}
- {fileID: 818048423618081512}
- {fileID: 6061645141470258472}
- {fileID: 3649966427434176771}
- {fileID: 5015499777800791733}
- {fileID: 7583128554704766529}
- {fileID: 6859356168919729670}
@ -4200,80 +4198,6 @@ MonoBehaviour:
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 0
--- !u!1 &2314761917605405840
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3649966427434176771}
- component: {fileID: 542121234047010481}
- component: {fileID: 1413757566722179179}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3649966427434176771
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2314761917605405840}
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: 4582380774234793141}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 410}
m_SizeDelta: {x: 0, y: 19}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &542121234047010481
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2314761917605405840}
m_CullTransparentMesh: 0
--- !u!114 &1413757566722179179
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2314761917605405840}
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: a88f779e75f23d444939266ff1b08939, 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 &2346445986064312280
GameObject:
m_ObjectHideFlags: 0
@ -5570,7 +5494,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4582380774234793141}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -5953,7 +5877,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: -221.00928}
m_AnchoredPosition: {x: 0, y: -221.00903}
m_SizeDelta: {x: 0, y: -642.03}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8813358707150584317
@ -8035,10 +7959,10 @@ RectTransform:
m_Father: {fileID: 6334397144791350490}
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: 0, y: -332}
m_SizeDelta: {x: 1082, y: 802}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 411}
m_SizeDelta: {x: 0, y: 822}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5741085643663257333
CanvasRenderer:
@ -8788,7 +8712,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: -221.00928}
m_AnchoredPosition: {x: 0, y: -221.00903}
m_SizeDelta: {x: 0, y: -642.03}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5606679999640292056
@ -9040,80 +8964,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &5018076793774233013
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 818048423618081512}
- component: {fileID: 5844668397619153858}
- component: {fileID: 2862274600355369057}
m_Layer: 5
m_Name: Image (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &818048423618081512
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5018076793774233013}
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: 4582380774234793141}
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: 0, y: 468}
m_SizeDelta: {x: 1500, y: 105}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5844668397619153858
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5018076793774233013}
m_CullTransparentMesh: 0
--- !u!114 &2862274600355369057
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5018076793774233013}
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: 0
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: 2535727c0a01d8443856ae394701eada, 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 &5019502383030232373
GameObject:
m_ObjectHideFlags: 0
@ -9394,7 +9244,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: -221.00928}
m_AnchoredPosition: {x: 0, y: -221.00903}
m_SizeDelta: {x: 0, y: -642.03}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6969432255223412503
@ -10964,7 +10814,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: -221.00928}
m_AnchoredPosition: {x: 0, y: -221.00903}
m_SizeDelta: {x: 0, y: -642.03}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5403932857053366508
@ -13689,15 +13539,15 @@ RectTransform:
m_GameObject: {fileID: 6698392907551047934}
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_LocalScale: {x: 0.9, y: 0.9, z: 1}
m_Children: []
m_Father: {fileID: 6859356168919729670}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -0.0024872, y: 50.4}
m_SizeDelta: {x: 1200, y: 105.56}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -408.6, y: 53.300034}
m_SizeDelta: {x: 908, y: 115.56}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3622489286463543318
MonoBehaviour:
@ -14383,10 +14233,10 @@ RectTransform:
m_Father: {fileID: 4582380774234793141}
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: 0, y: 0}
m_SizeDelta: {x: 1188, y: 2112}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 15.5}
m_SizeDelta: {x: 0, y: -31}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8580902987550828103
CanvasRenderer:
@ -15569,7 +15419,7 @@ RectTransform:
m_Children:
- {fileID: 7583128554374283393}
m_Father: {fileID: 4582380774234793141}
m_RootOrder: 11
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}
@ -15746,11 +15596,11 @@ RectTransform:
- {fileID: 7583128555168219079}
- {fileID: 7797228343144369139}
m_Father: {fileID: 4582380774234793141}
m_RootOrder: 8
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}
m_AnchoredPosition: {x: 18.400003, y: -186}
m_AnchoredPosition: {x: 18.400003, y: -186.00024}
m_SizeDelta: {x: 1000.3, y: 80.099976}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2763553048870337111
@ -16288,11 +16138,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4582380774234793141}
m_RootOrder: 10
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_AnchoredPosition: {x: 0, y: 27}
m_SizeDelta: {x: 116, y: 121}
m_Pivot: {x: 0, y: 0}
--- !u!222 &7334383538081438696
@ -16576,7 +16426,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: -221.00928}
m_AnchoredPosition: {x: 0, y: -221.00903}
m_SizeDelta: {x: 0, y: -642.03}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &896066299314135039
@ -18644,7 +18494,7 @@ RectTransform:
m_Children:
- {fileID: 6994287445406608232}
m_Father: {fileID: 4582380774234793141}
m_RootOrder: 7
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}
@ -19168,8 +19018,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: -251}
m_SizeDelta: {x: 0, y: 1340}
m_AnchoredPosition: {x: 0, y: -334.1}
m_SizeDelta: {x: 0, y: 1505.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4972352812197211438
CanvasRenderer:
@ -20147,11 +19997,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 5008217291552125824}
m_Modifications:
- target: {fileID: 763750802367487446, guid: a05d87d3deb77324799a769473e7c4e8,
type: 3}
propertyPath: m_Name
value: live2d_c_0042
objectReference: {fileID: 0}
- target: {fileID: 7626389589213615499, guid: a05d87d3deb77324799a769473e7c4e8,
type: 3}
propertyPath: m_LocalPosition.x
@ -20267,6 +20112,11 @@ PrefabInstance:
propertyPath: m_LocalScale.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 763750802367487446, guid: a05d87d3deb77324799a769473e7c4e8,
type: 3}
propertyPath: m_Name
value: live2d_c_0042
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a05d87d3deb77324799a769473e7c4e8, type: 3}
--- !u!224 &7063164869706856198 stripped
@ -20282,11 +20132,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1508773176926603313}
m_Modifications:
- target: {fileID: 7587481080470141872, guid: a39a189b001ccd24bbea530751213628,
type: 3}
propertyPath: m_Name
value: live2d_c_swk_00015
objectReference: {fileID: 0}
- target: {fileID: 6184718666747757121, guid: a39a189b001ccd24bbea530751213628,
type: 3}
propertyPath: m_LocalPosition.x
@ -20402,6 +20247,11 @@ PrefabInstance:
propertyPath: m_LocalScale.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7587481080470141872, guid: a39a189b001ccd24bbea530751213628,
type: 3}
propertyPath: m_Name
value: live2d_c_swk_00015
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a39a189b001ccd24bbea530751213628, type: 3}
--- !u!224 &6491293039634285271 stripped
@ -20417,10 +20267,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 6630273786794472594}
m_Modifications:
- target: {fileID: 1598983314, guid: a3b229f28f71bbe42b3732e4a4a9eb10, type: 3}
propertyPath: m_Name
value: live2d_c_nz_00029
objectReference: {fileID: 0}
- target: {fileID: 1598983315, guid: a3b229f28f71bbe42b3732e4a4a9eb10, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@ -20513,6 +20359,10 @@ PrefabInstance:
propertyPath: m_LocalScale.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1598983314, guid: a3b229f28f71bbe42b3732e4a4a9eb10, type: 3}
propertyPath: m_Name
value: live2d_c_nz_00029
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a3b229f28f71bbe42b3732e4a4a9eb10, type: 3}
--- !u!224 &3805017693707936371 stripped
@ -20528,11 +20378,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 9213049277214412281}
m_Modifications:
- target: {fileID: 763750802367487446, guid: a05d87d3deb77324799a769473e7c4e8,
type: 3}
propertyPath: m_Name
value: live2d_c_0042
objectReference: {fileID: 0}
- target: {fileID: 7626389589213615499, guid: a05d87d3deb77324799a769473e7c4e8,
type: 3}
propertyPath: m_LocalPosition.x
@ -20648,6 +20493,11 @@ PrefabInstance:
propertyPath: m_LocalScale.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 763750802367487446, guid: a05d87d3deb77324799a769473e7c4e8,
type: 3}
propertyPath: m_Name
value: live2d_c_0042
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a05d87d3deb77324799a769473e7c4e8, type: 3}
--- !u!224 &3280455645950173632 stripped
@ -20663,11 +20513,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 5709844313583256937}
m_Modifications:
- target: {fileID: 4221264890559318090, guid: 6906397a7e2ad8f4ab156026723a2806,
type: 3}
propertyPath: m_Name
value: live2d_c_0049
objectReference: {fileID: 0}
- target: {fileID: 7709331535692801212, guid: 6906397a7e2ad8f4ab156026723a2806,
type: 3}
propertyPath: m_LocalPosition.x
@ -20783,6 +20628,11 @@ PrefabInstance:
propertyPath: m_LocalScale.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4221264890559318090, guid: 6906397a7e2ad8f4ab156026723a2806,
type: 3}
propertyPath: m_Name
value: live2d_c_0049
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6906397a7e2ad8f4ab156026723a2806, type: 3}
--- !u!224 &42754497497618463 stripped