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

zhangjiannan 2024-11-19 17:42:11 +08:00
commit f6eb939836
2 changed files with 63 additions and 63 deletions

View File

@ -668,7 +668,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -246.29, y: 0.5}
m_SizeDelta: {x: 260.61, y: 74}
m_SizeDelta: {x: 350, y: 90}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5430246485127341836
CanvasRenderer:
@ -807,7 +807,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 253, y: -1}
m_SizeDelta: {x: 260, y: 74}
m_SizeDelta: {x: 350, y: 90}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7919996903531968358
CanvasRenderer:

View File

@ -8272,7 +8272,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: 47.05001, y: -13}
m_AnchoredPosition: {x: 57.99996, y: -6.700012}
m_SizeDelta: {x: 205.9, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1842701775875376456
@ -8818,8 +8818,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: 47.100025, y: -12.2}
m_SizeDelta: {x: 205.8, y: 46.78}
m_AnchoredPosition: {x: 76.7, y: -5.1}
m_SizeDelta: {x: 250, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2011600873467811454
CanvasRenderer:
@ -9089,8 +9089,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: 51, y: -10}
m_SizeDelta: {x: 198, y: 46.78}
m_AnchoredPosition: {x: 76.8, y: -6.8}
m_SizeDelta: {x: 250, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8723966969178913910
CanvasRenderer:
@ -9368,7 +9368,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: 46.849995, y: -10.1}
m_AnchoredPosition: {x: 50.999958, y: -6.1000004}
m_SizeDelta: {x: 206.3, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3859927645981631331
@ -15148,8 +15148,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: -5.9, y: -13.8}
m_SizeDelta: {x: 139.26, y: 46.78}
m_AnchoredPosition: {x: 6, y: -9.1}
m_SizeDelta: {x: 250, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7626178527062072780
CanvasRenderer:
@ -15962,8 +15962,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: 50.150005, y: -10}
m_SizeDelta: {x: 199.7, y: 46.78}
m_AnchoredPosition: {x: 75.8, y: -6.3}
m_SizeDelta: {x: 250, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6326406441220435593
CanvasRenderer:
@ -24813,8 +24813,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: 47, y: -10.5}
m_SizeDelta: {x: 206, y: 46.78}
m_AnchoredPosition: {x: 75.70001, y: -6.6000977}
m_SizeDelta: {x: 250, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8814415700857881006
CanvasRenderer:
@ -35491,8 +35491,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: 46.5, y: -12.2}
m_SizeDelta: {x: 207, y: 46.78}
m_AnchoredPosition: {x: 74.49997, y: -7.5000486}
m_SizeDelta: {x: 250, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5798366888369609125
CanvasRenderer:
@ -52904,8 +52904,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: 53.44999, y: -13}
m_SizeDelta: {x: 193.1, y: 46.78}
m_AnchoredPosition: {x: 82.70005, y: -7.699951}
m_SizeDelta: {x: 250, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6656074704414808788
CanvasRenderer:
@ -58982,8 +58982,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: 51, y: -11}
m_SizeDelta: {x: 198, y: 46.78}
m_AnchoredPosition: {x: 77.8, y: -6}
m_SizeDelta: {x: 250, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &478839670799549824
CanvasRenderer:
@ -59078,8 +59078,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: -7, y: -15}
m_SizeDelta: {x: 139.26, y: 46.78}
m_AnchoredPosition: {x: 4.9000244, y: -10.299927}
m_SizeDelta: {x: 250, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7395952869030803135
CanvasRenderer:
@ -70555,7 +70555,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: 47.150005, y: -11}
m_AnchoredPosition: {x: 51.3, y: -7}
m_SizeDelta: {x: 205.7, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &377582146742255520
@ -70726,8 +70726,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: 52.80001, y: -12.3}
m_SizeDelta: {x: 194.4, y: 46.78}
m_AnchoredPosition: {x: 83.3, y: -8.3}
m_SizeDelta: {x: 250, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3429807639091622898
CanvasRenderer:
@ -71037,8 +71037,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: 46.20002, y: -12.6}
m_SizeDelta: {x: 207.6, y: 46.78}
m_AnchoredPosition: {x: 74.2, y: -7.9}
m_SizeDelta: {x: 250, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8228481055377524517
CanvasRenderer:
@ -71281,7 +71281,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: 46.55001, y: -12.3}
m_AnchoredPosition: {x: 57.5, y: -6}
m_SizeDelta: {x: 206.9, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &174882412009063878
@ -73706,8 +73706,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: 46.5, y: -11.7}
m_SizeDelta: {x: 207, y: 46.78}
m_AnchoredPosition: {x: 75.2, y: -7.8}
m_SizeDelta: {x: 250, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5792934229358099400
CanvasRenderer:
@ -74202,8 +74202,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: 52.099964, y: -13}
m_SizeDelta: {x: 195.8, y: 46.78}
m_AnchoredPosition: {x: 82.59996, y: -9}
m_SizeDelta: {x: 250, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4409277268617309811
CanvasRenderer:
@ -82919,8 +82919,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: 49.849995, y: -10}
m_SizeDelta: {x: 200.3, y: 46.78}
m_AnchoredPosition: {x: 76.2, y: -4.8}
m_SizeDelta: {x: 250, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8520820373169482529
CanvasRenderer:
@ -85478,8 +85478,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: 47.100025, y: -11}
m_SizeDelta: {x: 205.8, y: 46.78}
m_AnchoredPosition: {x: 76.7, y: -3.9000244}
m_SizeDelta: {x: 250, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6680066994809800995
CanvasRenderer:
@ -91908,8 +91908,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: 53.44999, y: -11.4}
m_SizeDelta: {x: 193.1, y: 46.78}
m_AnchoredPosition: {x: 82.7, y: -6.1}
m_SizeDelta: {x: 250, y: 46.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &303296056544243684
CanvasRenderer:
@ -98674,6 +98674,11 @@ 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
@ -98684,11 +98689,6 @@ 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,6 +98914,11 @@ 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
@ -98924,11 +98929,6 @@ 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,6 +99009,11 @@ 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
@ -99019,11 +99024,6 @@ 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,6 +99099,11 @@ 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
@ -99109,11 +99114,6 @@ 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,6 +99189,11 @@ 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
@ -99199,11 +99204,6 @@ 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