diff --git a/Assets/ManagedResources/Prefabs/UI/EightDayGift/ZeroPointOneMissionPanel.prefab b/Assets/ManagedResources/Prefabs/UI/EightDayGift/ZeroPointOneMissionPanel.prefab index 116c58ea42..afb44b3c70 100644 --- a/Assets/ManagedResources/Prefabs/UI/EightDayGift/ZeroPointOneMissionPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/EightDayGift/ZeroPointOneMissionPanel.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &218809189948356403 +--- !u!1 &939292615496588645 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,9 +8,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8291864254158927938} - - component: {fileID: 3118794346266889050} - - component: {fileID: 8592210100608592861} + - component: {fileID: 939292615496588644} + - component: {fileID: 939292615496588646} + - component: {fileID: 939292615496588647} m_Layer: 5 m_Name: info m_TagString: Untagged @@ -18,13 +18,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8291864254158927938 +--- !u!224 &939292615496588644 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 218809189948356403} + m_GameObject: {fileID: 939292615496588645} 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} @@ -37,21 +37,21 @@ RectTransform: m_AnchoredPosition: {x: -196, y: 323} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3118794346266889050 +--- !u!222 &939292615496588646 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 218809189948356403} + m_GameObject: {fileID: 939292615496588645} m_CullTransparentMesh: 0 ---- !u!114 &8592210100608592861 +--- !u!114 &939292615496588647 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 218809189948356403} + m_GameObject: {fileID: 939292615496588645} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -218,7 +218,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3344380155906293596} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: @@ -226,9 +226,9 @@ RectTransform: - {fileID: 4558396108167158997} - {fileID: 3695524975965647850} - {fileID: 3003317230655257774} - - {fileID: 8291864254158927938} + - {fileID: 939292615496588644} m_Father: {fileID: 3380683485130715011} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -357,10 +357,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3380683485130715011} - - component: {fileID: 3972642409871185790} - - component: {fileID: 3952779935398738887} - - component: {fileID: 6745581692250373686} - - component: {fileID: 7518715192675423549} + - component: {fileID: 558409213211096011} + - component: {fileID: 1799118655784326401} + - component: {fileID: 7251171650305145413} + - component: {fileID: 7602761660219714464} m_Layer: 5 m_Name: ZeroPointOneMissionPanel m_TagString: Untagged @@ -379,16 +379,54 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 9087383225253195429} - {fileID: 4386142345502020838} m_Father: {fileID: 0} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &3972642409871185790 +--- !u!222 &558409213211096011 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4932779956086951127} + m_CullTransparentMesh: 0 +--- !u!114 &1799118655784326401 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4932779956086951127} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: dc6190fbb1bf99c4ab8bf257a77a5955, 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 +--- !u!223 &7251171650305145413 Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -402,14 +440,14 @@ Canvas: m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 - m_OverrideSorting: 0 + m_OverrideSorting: 1 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!114 &3952779935398738887 +--- !u!114 &7602761660219714464 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -426,28 +464,65 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!222 &6745581692250373686 +--- !u!1 &5221994435036276767 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9087383225253195429} + - component: {fileID: 348596231657524938} + - component: {fileID: 2064487438609410215} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9087383225253195429 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5221994435036276767} + 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: 3380683485130715011} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &348596231657524938 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4932779956086951127} + m_GameObject: {fileID: 5221994435036276767} m_CullTransparentMesh: 0 ---- !u!114 &7518715192675423549 +--- !u!114 &2064487438609410215 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4932779956086951127} + m_GameObject: {fileID: 5221994435036276767} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.03773582, g: 0.03577783, b: 0.03577783, a: 0.6509804} + m_Color: {r: 0, g: 0, b: 0, a: 0.8627451} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/Prefabs/UI/EightDayGift/ZeroPointOnePanel.prefab b/Assets/ManagedResources/Prefabs/UI/EightDayGift/ZeroPointOnePanel.prefab index 9ebc5f95d3..481cc6383f 100644 --- a/Assets/ManagedResources/Prefabs/UI/EightDayGift/ZeroPointOnePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/EightDayGift/ZeroPointOnePanel.prefab @@ -117,7 +117,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: -105.000046} + m_AnchoredPosition: {x: 0, y: -121} m_SizeDelta: {x: 173, y: 63.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &673231811 @@ -251,7 +251,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: -2.4, y: -0.6} + m_AnchoredPosition: {x: -2.4, y: 8.1} m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1403729248 @@ -422,8 +422,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: 25.8} - m_SizeDelta: {x: 168, y: 216.4} + m_AnchoredPosition: {x: 0, y: 32.850006} + m_SizeDelta: {x: 206.3, y: 240.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1519832862 CanvasRenderer: @@ -5633,8 +5633,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: -1} - m_SizeDelta: {x: 170, y: 268} + m_AnchoredPosition: {x: 0.0000023842, y: -0.000016212} + m_SizeDelta: {x: 226.2, y: 306} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &182884995648467119 CanvasRenderer: @@ -6016,7 +6016,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: -665} + m_AnchoredPosition: {x: 0, y: -696} m_SizeDelta: {x: 384, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6454889608471836892 @@ -6231,7 +6231,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.0754717, g: 0.07297971, b: 0.07297971, a: 0.5019608} + m_Color: {r: 0.028301895, g: 0.021760419, b: 0.021760419, a: 0.3254902} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -6358,7 +6358,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: -58.9} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &965125489361885568 @@ -16354,7 +16354,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: 49, y: 49} + m_AnchoredPosition: {x: 54.2, y: 57.69999} m_SizeDelta: {x: 100, y: 59.49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2927722622111955728 @@ -16888,7 +16888,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 10} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -78.3} + m_AnchoredPosition: {x: 1.7, y: -88} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5054502621466253122 @@ -22001,8 +22001,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1559, y: -290} - m_SizeDelta: {x: 170, y: 270} + m_AnchoredPosition: {x: 1587.1, y: -308} + m_SizeDelta: {x: 226.2, y: 306} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4378045324430123750 CanvasRenderer: @@ -22047,7 +22047,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: 8.857498, y: 89} + m_AnchoredPosition: {x: 8.857498, y: 64} m_SizeDelta: {x: 367.28, y: 49.32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6150216360578148273 @@ -27085,8 +27085,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: -249} - m_SizeDelta: {x: 385, y: 491} + m_AnchoredPosition: {x: 0, y: -320.2} + m_SizeDelta: {x: 488.9, y: 586} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1740481921477327890 CanvasRenderer: @@ -27160,7 +27160,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: 13, y: 213} + m_AnchoredPosition: {x: 0, y: 213} m_SizeDelta: {x: 600, y: 187.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1859304769061198684 @@ -27204,7 +27204,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "0.1\u6298\u5546\u5E97" + m_Text: "\u5929\u59290.1\u6298" --- !u!114 &4979155710283278654 MonoBehaviour: m_ObjectHideFlags: 0 @@ -27256,7 +27256,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -290} - m_SizeDelta: {x: 850, y: 600} + m_SizeDelta: {x: 693.4, y: 600} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3258777718055325936 CanvasRenderer: @@ -27306,7 +27306,7 @@ MonoBehaviour: m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 170, y: 270} + m_CellSize: {x: 226, y: 306} m_Spacing: {x: 10, y: 30} m_Constraint: 1 m_ConstraintCount: 4 @@ -27462,7 +27462,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: -78.3} + m_AnchoredPosition: {x: 0, y: -84.6} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4611256894719328565