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

DESKTOP-MMO982B\User 2024-12-18 10:59:57 +08:00
commit 05cc4c601b
3 changed files with 39 additions and 39 deletions

View File

@ -97855,8 +97855,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: 168.8, y: -90.628}
m_SizeDelta: {x: 125.4, y: 30.745}
m_AnchoredPosition: {x: 168.8, y: -88.7}
m_SizeDelta: {x: 125.4, y: 43.72}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1280937550451923215
CanvasRenderer:
@ -98674,11 +98674,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6951213042224787071, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
@ -98689,6 +98684,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3}
--- !u!4 &5193385769038219363 stripped
@ -98914,11 +98914,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6951213042224787071, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
@ -98929,6 +98924,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3}
--- !u!4 &8990599829511114571 stripped
@ -99009,11 +99009,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6951213042224787071, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
@ -99024,6 +99019,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3}
--- !u!4 &8203008183752308637 stripped
@ -99099,11 +99099,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6951213042224787071, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
@ -99114,6 +99109,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3}
--- !u!4 &318771728336289081 stripped
@ -99189,11 +99189,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6951213042224787071, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
@ -99204,6 +99199,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3}
--- !u!4 &327077116440716071 stripped

View File

@ -346,7 +346,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -0.000013918065, y: -0.089157104}
m_AnchoredPosition: {x: -0.000015258789, y: -0.089157104}
m_SizeDelta: {x: 0, y: 73.4}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &744132200954143323
@ -1113,8 +1113,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: -207.32, y: 90}
m_SizeDelta: {x: 225.36, y: 59.3}
m_AnchoredPosition: {x: -185, y: 86}
m_SizeDelta: {x: 180, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7747267131128849521
CanvasRenderer:
@ -1198,7 +1198,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -231}
m_SizeDelta: {x: 300, y: 100}
m_SizeDelta: {x: 310, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4037022011939362827
CanvasRenderer:
@ -1662,7 +1662,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -284}
m_SizeDelta: {x: 300, y: 100}
m_SizeDelta: {x: 310, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4220599613183303875
CanvasRenderer:
@ -2181,7 +2181,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -0.000013918065, y: -0.089157104}
m_AnchoredPosition: {x: -0.000015258789, y: -0.089157104}
m_SizeDelta: {x: 0, y: 73.4}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &8361129838433844735
@ -2610,8 +2610,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: -204.27, y: 90}
m_SizeDelta: {x: 219.26, y: 59.3}
m_AnchoredPosition: {x: -185, y: 86}
m_SizeDelta: {x: 180, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5009150299254546974
CanvasRenderer:

View File

@ -1811,8 +1811,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: 276, y: 34}
m_SizeDelta: {x: 1000, y: 30}
m_AnchoredPosition: {x: 276, y: 31.84}
m_SizeDelta: {x: 1000, y: 72.58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2569204044902728451
CanvasRenderer:
@ -1844,11 +1844,11 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 0
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_MaxSize: 50
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1