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-10 15:58:23 +08:00
commit 0265e37554
1 changed files with 71 additions and 71 deletions

View File

@ -948,7 +948,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -205.70001, y: 87.5}
m_AnchoredPosition: {x: -205.70001, y: 113.5}
m_SizeDelta: {x: 237.8, y: 51.97}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6591395417836585818
@ -2032,7 +2032,7 @@ RectTransform:
m_GameObject: {fileID: 3975016549193012962}
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: 1.3, y: 1.3, z: 1}
m_Children:
- {fileID: 492116964678045022}
- {fileID: 8435518324864956274}
@ -2041,7 +2041,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -63.400146, y: -66.6001}
m_AnchoredPosition: {x: -94, y: -300}
m_SizeDelta: {x: 105, y: 101.01}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4622886451193467291
@ -2151,7 +2151,7 @@ RectTransform:
m_GameObject: {fileID: 4071810621341026756}
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: 1.3, y: 1.3, z: 1}
m_Children:
- {fileID: 6073768836667626403}
- {fileID: 5334307116617071531}
@ -2161,7 +2161,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -63.400146, y: -182.8999}
m_AnchoredPosition: {x: -94, y: -455}
m_SizeDelta: {x: 105, y: 101.01}
m_Pivot: {x: 0.49999994, y: 0.5}
--- !u!222 &1683592697163630181
@ -2271,7 +2271,7 @@ RectTransform:
m_GameObject: {fileID: 4482921096108805422}
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: 1.3, y: 1.3, z: 1}
m_Children:
- {fileID: 739471539887371315}
- {fileID: 7465681379981958504}
@ -2280,7 +2280,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -169.59009, y: -66.6001}
m_AnchoredPosition: {x: -94, y: -145}
m_SizeDelta: {x: 105, y: 101.01}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6463827078984438942
@ -2556,7 +2556,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -205.70001, y: 41.5}
m_AnchoredPosition: {x: -205.70001, y: 67.5}
m_SizeDelta: {x: 237.8, y: 51.97}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1724864480878716896
@ -2690,7 +2690,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: 0}
m_AnchoredPosition: {x: 0, y: 26}
m_SizeDelta: {x: 310.8, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5206245779681697149
@ -3902,7 +3902,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -96.5, y: 91.3}
m_AnchoredPosition: {x: -96.5, y: 117.3}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &462496069192377845
@ -4042,7 +4042,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.95294124, g: 0.7254902, b: 0.21960786, a: 1}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -4488,6 +4488,11 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 16
objectReference: {fileID: 0}
- target: {fileID: 5731619939437485109, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
@ -4498,66 +4503,6 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5731619939437485109, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 272606939306848659}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 7535775316978415161}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 8218664706754911691}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 8363257201524967884}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 134712767994979535}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 6394707123396274470}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 5612610801638118359}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 8796847083114798728}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 2685122275388404978}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 4059876004828611866}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 272606939306848659}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
@ -4613,6 +4558,61 @@ PrefabInstance:
propertyPath: m_RootBone
value:
objectReference: {fileID: 7432402436113426622}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 272606939306848659}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 7535775316978415161}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 8218664706754911691}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 8363257201524967884}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 134712767994979535}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 6394707123396274470}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 5612610801638118359}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 8796847083114798728}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 2685122275388404978}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 4059876004828611866}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 272606939306848659}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!4 &7432402436113426622 stripped