Commit febc5334 authored by Ruidong's avatar Ruidong

UI修复

parent 551d8b9b
...@@ -466,7 +466,7 @@ RectTransform: ...@@ -466,7 +466,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1338799328} m_Father: {fileID: 1338799328}
m_RootOrder: 1 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -494,19 +494,19 @@ MonoBehaviour: ...@@ -494,19 +494,19 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_Font: {fileID: 12800000, guid: dca7afcde023a8a4a8aa8debbdbd5427, type: 3}
m_FontSize: 77 m_FontSize: 78
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 10 m_MinSize: 7
m_MaxSize: 77 m_MaxSize: 78
m_Alignment: 3 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
...@@ -788,6 +788,7 @@ RectTransform: ...@@ -788,6 +788,7 @@ RectTransform:
- {fileID: 7517467193513759518} - {fileID: 7517467193513759518}
- {fileID: 7517467193919910557} - {fileID: 7517467193919910557}
- {fileID: 6961770179157745393} - {fileID: 6961770179157745393}
- {fileID: 2910779964225188738}
m_Father: {fileID: 6064464677632144690} m_Father: {fileID: 6064464677632144690}
m_RootOrder: 8 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -1324,15 +1325,14 @@ RectTransform: ...@@ -1324,15 +1325,14 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 8583335472386491063}
- {fileID: 605753004} - {fileID: 605753004}
m_Father: {fileID: 3235784849534517948} m_Father: {fileID: 3235784849534517948}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 75.002, y: -2.0174} m_AnchoredPosition: {x: 116, y: -390}
m_SizeDelta: {x: 150.00436, y: 150.00436} m_SizeDelta: {x: 160, y: 160}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1338799327 --- !u!222 &1338799327
CanvasRenderer: CanvasRenderer:
...@@ -9214,6 +9214,129 @@ MonoBehaviour: ...@@ -9214,6 +9214,129 @@ MonoBehaviour:
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: near m_Text: near
--- !u!1 &2910779964225178715
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2910779964225188750}
- component: {fileID: 2910779964225188764}
- component: {fileID: 2910779964225191059}
- component: {fileID: 2910779964225178716}
m_Layer: 5
m_Name: 100c
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2910779964225188750
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2910779964225178715}
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_Children: []
m_Father: {fileID: 2910779964225188738}
m_RootOrder: 0
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_SizeDelta: {x: 201.353, y: 52.68376}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2910779964225188764
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2910779964225178715}
m_CullTransparentMesh: 0
--- !u!114 &2910779964225191059
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2910779964225178715}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: bafdcfb8288258542bb1c6643e182b33, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!225 &2910779964225178716
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2910779964225178715}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &2910779964225178834
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2910779964225188738}
m_Layer: 5
m_Name: 100cTest
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &2910779964225188738
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2910779964225178834}
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_Children:
- {fileID: 2910779964225188750}
m_Father: {fileID: 767122297}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -240, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2999854762554508888 --- !u!1 &2999854762554508888
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -9888,8 +10011,6 @@ GameObject: ...@@ -9888,8 +10011,6 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 3235784849534517948} - component: {fileID: 3235784849534517948}
- component: {fileID: 4622846462715863175}
- component: {fileID: 9161863949892852354}
- component: {fileID: 8663326081962974003} - component: {fileID: 8663326081962974003}
m_Layer: 5 m_Layer: 5
m_Name: BgPurseImage m_Name: BgPurseImage
...@@ -9910,51 +10031,15 @@ RectTransform: ...@@ -9910,51 +10031,15 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 1338799328} - {fileID: 1338799328}
- {fileID: 8583335472386491063}
m_Father: {fileID: 673864175} m_Father: {fileID: 673864175}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 200, y: 624} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 341.32303, y: 119.364136} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4622846462715863175
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4744510048724276499}
m_CullTransparentMesh: 0
--- !u!114 &9161863949892852354
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4744510048724276499}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.6415094, g: 0.6415094, b: 0.6415094, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: d222cb0073af0314c94f0b969989936d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &8663326081962974003 --- !u!114 &8663326081962974003
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -14786,14 +14871,14 @@ MonoBehaviour: ...@@ -14786,14 +14871,14 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 0
m_Maskable: 1 m_Maskable: 0
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 50a52f7b8fb156940b6612a2799540a1, type: 3} m_Sprite: {fileID: 21300000, guid: 1e613fb3fafc3a24b84dbc69d3d9f55d, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 1
m_FillCenter: 1 m_FillCenter: 1
m_FillMethod: 4 m_FillMethod: 4
m_FillAmount: 1 m_FillAmount: 1
...@@ -15700,7 +15785,7 @@ PrefabInstance: ...@@ -15700,7 +15785,7 @@ PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 1338799328} m_TransformParent: {fileID: 3235784849534517948}
m_Modifications: m_Modifications:
- target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620, - target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620,
type: 3} type: 3}
...@@ -15720,17 +15805,17 @@ PrefabInstance: ...@@ -15720,17 +15805,17 @@ PrefabInstance:
- target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620, - target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620,
type: 3} type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620, - target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620,
type: 3} type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620, - target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620,
type: 3} type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620, - target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620,
type: 3} type: 3}
...@@ -15740,7 +15825,7 @@ PrefabInstance: ...@@ -15740,7 +15825,7 @@ PrefabInstance:
- target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620, - target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620, - target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620,
type: 3} type: 3}
...@@ -15760,12 +15845,12 @@ PrefabInstance: ...@@ -15760,12 +15845,12 @@ PrefabInstance:
- target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620, - target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 787 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620, - target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -1332 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620, - target: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620,
type: 3} type: 3}
...@@ -15819,15 +15904,15 @@ PrefabInstance: ...@@ -15819,15 +15904,15 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 13cf4ffbaee8b5345aae4334d263f620, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 13cf4ffbaee8b5345aae4334d263f620, type: 3}
--- !u!1 &7905703235052740184 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4046205740538686783, guid: 13cf4ffbaee8b5345aae4334d263f620,
type: 3}
m_PrefabInstance: {fileID: 6165904640569111399}
m_PrefabAsset: {fileID: 0}
--- !u!224 &8583335472386491063 stripped --- !u!224 &8583335472386491063 stripped
RectTransform: RectTransform:
m_CorrespondingSourceObject: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620, m_CorrespondingSourceObject: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620,
type: 3} type: 3}
m_PrefabInstance: {fileID: 6165904640569111399} m_PrefabInstance: {fileID: 6165904640569111399}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &7905703235052740184 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4046205740538686783, guid: 13cf4ffbaee8b5345aae4334d263f620,
type: 3}
m_PrefabInstance: {fileID: 6165904640569111399}
m_PrefabAsset: {fileID: 0}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment