Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
commit
2cecece74d
|
@ -4835,7 +4835,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: -36.2, y: 50.1}
|
||||
m_AnchoredPosition: {x: 23.4, y: -45.5}
|
||||
m_SizeDelta: {x: 61.84, y: 27.336}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222622639373068266
|
||||
|
@ -4873,7 +4873,7 @@ MonoBehaviour:
|
|||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 50
|
||||
m_Alignment: 3
|
||||
m_Alignment: 8
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
|
@ -74109,16 +74109,6 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 4523474928375603261}
|
||||
m_Modifications:
|
||||
- target: {fileID: 8904198713981393339, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: c_ui_qinyan_duan
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8904198713981393339, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
@ -74234,6 +74224,16 @@ PrefabInstance:
|
|||
propertyPath: m_LocalScale.y
|
||||
value: 0.9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8904198713981393339, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: c_ui_qinyan_duan
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8904198713981393339, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8904198714480050047, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
||||
type: 3}
|
||||
propertyPath: m_MaskInteraction
|
||||
|
@ -74244,12 +74244,12 @@ PrefabInstance:
|
|||
propertyPath: m_MaskInteraction
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8904198713654882537, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
||||
- target: {fileID: 8904198713641915434, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
||||
type: 3}
|
||||
propertyPath: m_MaskInteraction
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8904198713641915434, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
||||
- target: {fileID: 8904198713654882537, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
||||
type: 3}
|
||||
propertyPath: m_MaskInteraction
|
||||
value: 1
|
||||
|
|
Loading…
Reference in New Issue