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

tcx_xiyou_solider
PC-202302260912\Administrator 2024-03-21 10:33:25 +08:00
commit ff56cb4233
4 changed files with 174 additions and 174 deletions

View File

@ -12092,8 +12092,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: 70, y: 90}
m_SizeDelta: {x: 140, y: 121}
m_AnchoredPosition: {x: 55, y: 90}
m_SizeDelta: {x: 116, y: 121}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5864279975241509289
CanvasRenderer:
@ -14971,61 +14971,6 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 4437600977647621456}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 1424338125224582353}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 8523301263739179630}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 9068643097587649240}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 3592314898061774466}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 1532634743424408239}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 8449563865205609026}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 8398667022943706122}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 562193232071614603}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 8107702030262535273}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 4437600977647621456}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
@ -15081,6 +15026,61 @@ PrefabInstance:
propertyPath: m_RootBone
value:
objectReference: {fileID: 6447125663100292221}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 4437600977647621456}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 1424338125224582353}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 8523301263739179630}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 9068643097587649240}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 3592314898061774466}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 1532634743424408239}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 8449563865205609026}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 8398667022943706122}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 562193232071614603}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 8107702030262535273}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 4437600977647621456}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!4 &1424338125224582353 stripped
@ -15331,61 +15331,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 108444629137817996}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 3445395248339830797}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 5358186331490748082}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 4741878753537383940}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 994930611963763294}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 2977372411208928883}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 5284449500228568734}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 5231718680891164886}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 4312632630686397527}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 5517080283118096565}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 108444629137817996}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
@ -15441,6 +15386,61 @@ PrefabInstance:
propertyPath: m_RootBone
value:
objectReference: {fileID: 7308227165633779873}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 108444629137817996}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 3445395248339830797}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 5358186331490748082}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 4741878753537383940}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 994930611963763294}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 2977372411208928883}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 5284449500228568734}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 5231718680891164886}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 4312632630686397527}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 5517080283118096565}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 108444629137817996}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!4 &2067392625425250234 stripped
@ -15691,61 +15691,6 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 2229287739125031260}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 3504293137159563485}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 6137661543132522082}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 6827396740961812180}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 1351067438097267342}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 3900258964432580259}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 6208038782315013710}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 6335312160677849094}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 2641585708450665607}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 6044354044207673445}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 2229287739125031260}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
@ -15801,6 +15746,61 @@ PrefabInstance:
propertyPath: m_RootBone
value:
objectReference: {fileID: 8799269859400054897}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 2229287739125031260}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 3504293137159563485}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 6137661543132522082}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 6827396740961812180}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 1351067438097267342}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 3900258964432580259}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 6208038782315013710}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 6335312160677849094}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 2641585708450665607}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 6044354044207673445}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 2229287739125031260}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!4 &3762414482627664437 stripped

View File

@ -14247,7 +14247,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: bb880b14f2456f347836e48a5ae490de, type: 3}
m_Sprite: {fileID: 21300000, guid: 9eb616bde89052047ae1d9f20103daa7, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -221126,8 +221126,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 67, y: 73}
m_SizeDelta: {x: 140, y: 121}
m_AnchoredPosition: {x: 55, y: 73}
m_SizeDelta: {x: 116, y: 121}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8918600171810824958
CanvasRenderer:

View File

@ -22591,7 +22591,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2249479841007689904
RectTransform:
m_ObjectHideFlags: 0
@ -23272,8 +23272,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: 0, y: -22.1}
m_SizeDelta: {x: 994, y: 578.3}
m_AnchoredPosition: {x: 0, y: -29}
m_SizeDelta: {x: 1008, y: 402}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4033881209679693389
CanvasRenderer:
@ -23303,7 +23303,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 41527d5e84518df418675e04377a024b, type: 3}
m_Sprite: {fileID: 21300000, guid: a8a53346c4fcc1a478550cf144abd6dd, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1