diff --git a/yyzl/01Mergeorder/MainDecoratePanel.prefab b/yyzl/01Mergeorder/MainDecoratePanel.prefab index cdc6c7b5..2a4d9b45 100644 --- a/yyzl/01Mergeorder/MainDecoratePanel.prefab +++ b/yyzl/01Mergeorder/MainDecoratePanel.prefab @@ -25257,6 +25257,9 @@ GameObject: - component: {fileID: 8443699253287059778} - component: {fileID: 7756696266860663809} - component: {fileID: 6010681396335933783} + - component: {fileID: 5182822577887318631} + - component: {fileID: 7177785769891856090} + - component: {fileID: 2679939290535820039} m_Layer: 5 m_Name: MainDecoratePanel m_TagString: Untagged @@ -25277,6 +25280,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5263560070906486784} + - {fileID: 8302855219091869513} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -25337,6 +25341,7 @@ MonoBehaviour: base_multiple: 0 border_gap: 0 IsShowPet: 0 + banTouchS: {fileID: 0} ImageBg: {fileID: 0} cat_sg: {fileID: 0} dog_sg: {fileID: 0} @@ -25366,6 +25371,58 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 +--- !u!225 &5182822577887318631 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4232448925053836624} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!223 &7177785769891856090 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4232448925053836624} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &2679939290535820039 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4232448925053836624} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 --- !u!1 &4402635946008779963 GameObject: m_ObjectHideFlags: 0 @@ -26206,6 +26263,81 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &4991655348175278118 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8302855219091869513} + - component: {fileID: 4122874370720102597} + - component: {fileID: 5657667999337107407} + m_Layer: 5 + m_Name: banTouchS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8302855219091869513 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4991655348175278118} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 248207602492355743} + 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 &4122874370720102597 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4991655348175278118} + m_CullTransparentMesh: 1 +--- !u!114 &5657667999337107407 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4991655348175278118} + 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, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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!1 &5056452130275216372 GameObject: m_ObjectHideFlags: 0 diff --git a/yyzl/01Mergeorder/MainMergePanel.prefab b/yyzl/01Mergeorder/MainMergePanel.prefab index 149bfdeb..6f5fdac5 100644 --- a/yyzl/01Mergeorder/MainMergePanel.prefab +++ b/yyzl/01Mergeorder/MainMergePanel.prefab @@ -2419,6 +2419,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 318959986884134882} + - {fileID: 6116598065948259447} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2478,6 +2479,7 @@ MonoBehaviour: m_EditorClassIdentifier: base_multiple: 0 border_gap: 0 + banTouchS: {fileID: 0} bottom_coffee_bg: {fileID: 21300000, guid: 85c94b49bdcd8c244bbab6a81ec3109e, type: 3} bottom_normal_bg: {fileID: 21300000, guid: 067b62db22f6bd84799e4fcaac1b7111, type: 3} pack_close_sp: {fileID: 21300000, guid: 0ccaeba925c810d48bc8d738dbeee151, type: 3} @@ -141638,6 +141640,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7410802790563713586 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6116598065948259447} + - component: {fileID: 1115795878291115567} + - component: {fileID: 5146793651245178200} + m_Layer: 5 + m_Name: banTouchS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6116598065948259447 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7410802790563713586} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 318959988688778366} + 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 &1115795878291115567 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7410802790563713586} + m_CullTransparentMesh: 1 +--- !u!114 &5146793651245178200 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7410802790563713586} + 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, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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!1 &7419026983340736521 GameObject: m_ObjectHideFlags: 0 diff --git a/yyzl/02MainHome/MainHomeUI.prefab b/yyzl/02MainHome/MainHomeUI.prefab index 467b1d82..1c2f4de7 100644 --- a/yyzl/02MainHome/MainHomeUI.prefab +++ b/yyzl/02MainHome/MainHomeUI.prefab @@ -1124,7 +1124,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -65} - m_SizeDelta: {x: 190, y: 72} + m_SizeDelta: {x: 179, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5017319376821532956 CanvasRenderer: @@ -1154,7 +1154,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bc057d683bc18174896d195cd5b16b23, type: 3} + m_Sprite: {fileID: 21300000, guid: 0cb46cf6dbe55d44184716abd77f12f1, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1802,7 +1802,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -64} - m_SizeDelta: {x: 190, y: 72} + m_SizeDelta: {x: 179, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4551332889402383722 CanvasRenderer: @@ -1832,7 +1832,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bc057d683bc18174896d195cd5b16b23, type: 3} + m_Sprite: {fileID: 21300000, guid: 0cb46cf6dbe55d44184716abd77f12f1, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1878,7 +1878,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: 16.4} + m_AnchoredPosition: {x: 0, y: 30.8} m_SizeDelta: {x: 45, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8184533519015505818 @@ -1989,7 +1989,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -64} - m_SizeDelta: {x: 190, y: 72} + m_SizeDelta: {x: 179, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2070946945210643972 CanvasRenderer: @@ -2019,7 +2019,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bc057d683bc18174896d195cd5b16b23, type: 3} + m_Sprite: {fileID: 21300000, guid: 0cb46cf6dbe55d44184716abd77f12f1, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9817,7 +9817,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 15} - m_SizeDelta: {x: 194, y: 200} + m_SizeDelta: {x: 187, y: 187} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1489134178124472903 CanvasRenderer: @@ -11246,7 +11246,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 15} - m_SizeDelta: {x: 194, y: 200} + m_SizeDelta: {x: 187, y: 187} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &188207847811991028 CanvasRenderer: @@ -11276,7 +11276,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 38acc2573c4286c4f99d8b6cb40741b5, type: 3} + m_Sprite: {fileID: 21300000, guid: b768c5a2ba4ea4d40976683ccdf8bacf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11321,7 +11321,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -80} - m_SizeDelta: {x: 190, y: 72} + m_SizeDelta: {x: 179, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7771970926774114882 CanvasRenderer: @@ -11351,7 +11351,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bc057d683bc18174896d195cd5b16b23, type: 3} + m_Sprite: {fileID: 21300000, guid: 0cb46cf6dbe55d44184716abd77f12f1, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -17555,10 +17555,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 3949804793561896570} 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: -61.5} - m_SizeDelta: {x: -22, y: -163} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -63} + m_SizeDelta: {x: 174, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2692998898587538870 CanvasRenderer: @@ -17588,7 +17588,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 00:00:00 + m_text: 3d 23h m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} m_sharedMaterial: {fileID: -6186801479491972736, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} @@ -17597,8 +17597,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281940353 - m_fontColor: {r: 0.5058824, g: 0.22352941, b: 0.22352941, a: 1} + rgba: 4289032274 + m_fontColor: {r: 0.32156864, g: 0.4392157, b: 0.64705884, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -17615,12 +17615,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 + m_fontSize: 36 m_fontSizeBase: 28 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 2 - m_fontSizeMax: 28 + m_fontSizeMax: 36 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -18063,7 +18063,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: -40} + m_AnchoredPosition: {x: 0, y: -35} m_SizeDelta: {x: 120, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2577140410328034750 @@ -58684,7 +58684,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: 18.6} + m_AnchoredPosition: {x: 0, y: 5} m_SizeDelta: {x: 180, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7314340188937044279 @@ -71954,8 +71954,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: -67} - m_SizeDelta: {x: 190, y: 72} + m_AnchoredPosition: {x: 0, y: -65} + m_SizeDelta: {x: 179, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &690687660787135608 CanvasRenderer: @@ -71985,7 +71985,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bc057d683bc18174896d195cd5b16b23, type: 3} + m_Sprite: {fileID: 21300000, guid: 0cb46cf6dbe55d44184716abd77f12f1, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -72748,8 +72748,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: -66} - m_SizeDelta: {x: 190, y: 72} + m_AnchoredPosition: {x: 0, y: -65} + m_SizeDelta: {x: 179, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2724527037496954870 CanvasRenderer: @@ -72779,7 +72779,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bc057d683bc18174896d195cd5b16b23, type: 3} + m_Sprite: {fileID: 21300000, guid: 0cb46cf6dbe55d44184716abd77f12f1, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -73347,7 +73347,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 15} - m_SizeDelta: {x: 194, y: 200} + m_SizeDelta: {x: 187, y: 187} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4464643031166635054 CanvasRenderer: @@ -73377,7 +73377,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5c83cd40b1d556a4aa58a81edafec6a4, type: 3} + m_Sprite: {fileID: 21300000, guid: b515f73c7f17ca44aaa8d69fe708483b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -74027,10 +74027,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 310212375841959186} 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: -61.5} - m_SizeDelta: {x: -22, y: -163} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -63} + m_SizeDelta: {x: 154, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7959272821137707511 CanvasRenderer: @@ -74060,7 +74060,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 00:00:00 + m_text: 3d 23h m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} m_sharedMaterial: {fileID: -6186801479491972736, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} @@ -74069,8 +74069,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281940353 - m_fontColor: {r: 0.5058824, g: 0.22352941, b: 0.22352941, a: 1} + rgba: 4289032274 + m_fontColor: {r: 0.32156864, g: 0.4392157, b: 0.64705884, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -74087,12 +74087,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 + m_fontSize: 36 m_fontSizeBase: 28 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 2 - m_fontSizeMax: 28 + m_fontSizeMax: 36 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -74314,7 +74314,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2890580070263143167 RectTransform: m_ObjectHideFlags: 0 @@ -75201,7 +75201,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: -77.3} + m_AnchoredPosition: {x: 0, y: -78} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1439097145629269937 @@ -75255,7 +75255,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 0H 0d + m_text: 3d 23h m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} m_sharedMaterial: {fileID: -6186801479491972736, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} @@ -75264,8 +75264,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281940353 - m_fontColor: {r: 0.5058824, g: 0.22352941, b: 0.22352941, a: 1} + rgba: 4289032274 + m_fontColor: {r: 0.32156864, g: 0.4392157, b: 0.64705884, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -75282,12 +75282,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 + m_fontSize: 36 m_fontSizeBase: 28 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 2 - m_fontSizeMax: 28 + m_fontSizeMax: 36 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -75829,7 +75829,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -65} - m_SizeDelta: {x: 190, y: 72} + m_SizeDelta: {x: 179, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7733700340265427662 CanvasRenderer: @@ -75859,7 +75859,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bc057d683bc18174896d195cd5b16b23, type: 3} + m_Sprite: {fileID: 21300000, guid: 0cb46cf6dbe55d44184716abd77f12f1, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -75969,7 +75969,7 @@ Transform: m_GameObject: {fileID: 4718847675136243365} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: -0.0037347625, w: 0.999993} - m_LocalPosition: {x: -0.015913036, y: -0.556128, z: 0} + m_LocalPosition: {x: 0, y: -0.4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -76051,12 +76051,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 4 - m_Sprite: {fileID: 21300000, guid: f1716d0c86f1d604795c27e4a5244527, type: 3} + m_Sprite: {fileID: 21300000, guid: 0cb46cf6dbe55d44184716abd77f12f1, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 2.56, y: 1.28} + m_DrawMode: 1 + m_Size: {x: 1.79, y: 0.5} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -76341,7 +76341,7 @@ Transform: m_GameObject: {fileID: 4718847676173499928} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0.1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -76388,7 +76388,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 28ed82b3d64f1bb4a907ae5312811a94, type: 3} + m_Sprite: {fileID: 21300000, guid: 05d21806814483b4fa190df8e4a48691, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -76967,7 +76967,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: -14.6} + m_AnchoredPosition: {x: 0, y: -35} m_SizeDelta: {x: 200, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4920697764570377928 @@ -87627,10 +87627,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6185185437543048086} 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: -61.5} - m_SizeDelta: {x: -22, y: -163} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -63} + m_SizeDelta: {x: 154, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2061950799390322555 CanvasRenderer: @@ -87660,7 +87660,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 00:00:00 + m_text: 3d 23h m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} m_sharedMaterial: {fileID: -6186801479491972736, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} @@ -87669,8 +87669,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281940353 - m_fontColor: {r: 0.5058824, g: 0.22352941, b: 0.22352941, a: 1} + rgba: 4289032274 + m_fontColor: {r: 0.32156864, g: 0.4392157, b: 0.64705884, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -87687,12 +87687,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 + m_fontSize: 36 m_fontSizeBase: 28 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 2 - m_fontSizeMax: 28 + m_fontSizeMax: 36 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -88205,7 +88205,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 15} - m_SizeDelta: {x: 194, y: 200} + m_SizeDelta: {x: 187, y: 187} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2830483651233561791 CanvasRenderer: @@ -88235,7 +88235,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f3cb6765d09f7b44caf479aae25bf92f, type: 3} + m_Sprite: {fileID: 21300000, guid: 476e69d9970b4c14dab0ff87a721b78d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -88723,6 +88723,7 @@ RectTransform: - {fileID: 5180817701717553415} - {fileID: 1618758155269122502} - {fileID: 7858179673153658368} + - {fileID: 2969158629010271528} - {fileID: 5332493274705523395} - {fileID: 4732644782515163996} - {fileID: 2920434072681575065} @@ -89199,10 +89200,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2808402922537912107} 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: -60.5} - m_SizeDelta: {x: -22, y: -165} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -63} + m_SizeDelta: {x: 154, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8767836193832687724 CanvasRenderer: @@ -89232,7 +89233,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 01:02:59 + m_text: 3d 23h m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} m_sharedMaterial: {fileID: -6186801479491972736, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} @@ -89241,8 +89242,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281940353 - m_fontColor: {r: 0.5058824, g: 0.22352941, b: 0.22352941, a: 1} + rgba: 4289032274 + m_fontColor: {r: 0.32156864, g: 0.4392157, b: 0.64705884, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -89259,12 +89260,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 + m_fontSize: 36 m_fontSizeBase: 28 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 2 - m_fontSizeMax: 28 + m_fontSizeMax: 36 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -89844,6 +89845,145 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5479146879967781458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2969158629010271528} + - component: {fileID: 3549520399750148215} + - component: {fileID: 6572260922681061919} + - component: {fileID: 4691156554055043547} + - component: {fileID: 546410952612651578} + m_Layer: 5 + m_Name: mapBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2969158629010271528 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5479146879967781458} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -20} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1344519004488699252} + - {fileID: 8579896880017684678} + m_Father: {fileID: 5180817702973727834} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 120, y: 0} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3549520399750148215 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5479146879967781458} + m_CullTransparentMesh: 1 +--- !u!114 &6572260922681061919 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5479146879967781458} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e8bf350e81b245a4f85c1e969db80a08, 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 &4691156554055043547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5479146879967781458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6572260922681061919} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &546410952612651578 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5479146879967781458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44ee9be70023ffb44b3675c769a2a429, type: 3} + m_Name: + m_EditorClassIdentifier: + ColorNoChange: 0 + IsSqueezeDown: 0 + IsEffectOperate: 1 + BindGos: [] --- !u!1 &5515079602373577418 GameObject: m_ObjectHideFlags: 0 @@ -95999,7 +96139,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 76} + m_AnchoredPosition: {x: 0, y: 82} m_SizeDelta: {x: 150, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2171505884925962783 @@ -103064,7 +103204,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 15} - m_SizeDelta: {x: 194, y: 200} + m_SizeDelta: {x: 187, y: 187} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1250994132808996644 CanvasRenderer: @@ -103094,7 +103234,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f3cb6765d09f7b44caf479aae25bf92f, type: 3} + m_Sprite: {fileID: 21300000, guid: 476e69d9970b4c14dab0ff87a721b78d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -103435,6 +103575,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6405806593291393406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1344519004488699252} + - component: {fileID: 5702729115770486681} + - component: {fileID: 5529923296731999038} + m_Layer: 5 + m_Name: iconS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1344519004488699252 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6405806593291393406} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2969158629010271528} + 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: 8} + m_SizeDelta: {x: 165, y: 165} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5702729115770486681 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6405806593291393406} + m_CullTransparentMesh: 1 +--- !u!114 &5529923296731999038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6405806593291393406} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 6a179ca29b2d1874b93d2d1a164a4276, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &6436185717118165757 GameObject: m_ObjectHideFlags: 0 @@ -113923,7 +114138,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 15} - m_SizeDelta: {x: 194, y: 200} + m_SizeDelta: {x: 187, y: 187} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5365981263022361120 CanvasRenderer: @@ -113953,7 +114168,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8d1f51b52cd3eeb438d0a392fb64d833, type: 3} + m_Sprite: {fileID: 21300000, guid: b515f73c7f17ca44aaa8d69fe708483b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -118963,7 +119178,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: 18.9} + m_AnchoredPosition: {x: 0, y: 37.1} m_SizeDelta: {x: 80, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2532372742068982026 @@ -119358,6 +119573,153 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &6771359435369181741 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6375246474459437135} + - component: {fileID: 129395432757761147} + - component: {fileID: 8509791676222312925} + - component: {fileID: 719149930706703365} + m_Layer: 5 + m_Name: Cnt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6375246474459437135 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6771359435369181741} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8579896880017684678} + 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: 70, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &129395432757761147 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6771359435369181741} + m_CullTransparentMesh: 1 +--- !u!114 &8509791676222312925 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6771359435369181741} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 762a1c76c61ff6f44864797c01cf0c88, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 66 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 9590211d1ac2e904988c83a15ebf6554, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 0 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 38 + m_fontSizeBase: 38 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 2 + m_fontSizeMax: 38 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &719149930706703365 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6771359435369181741} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 18363789288cc944c8a340692f2367ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6821302872160685034 GameObject: m_ObjectHideFlags: 0 @@ -119394,7 +119756,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: -77.3} + m_AnchoredPosition: {x: 0, y: -78} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9031330755587181859 @@ -119448,7 +119810,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 0H 0d + m_text: 3d 23h m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} m_sharedMaterial: {fileID: -6186801479491972736, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} @@ -119457,8 +119819,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281940353 - m_fontColor: {r: 0.5058824, g: 0.22352941, b: 0.22352941, a: 1} + rgba: 4289032274 + m_fontColor: {r: 0.32156864, g: 0.4392157, b: 0.64705884, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -119475,12 +119837,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 + m_fontSize: 36 m_fontSizeBase: 28 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 2 - m_fontSizeMax: 28 + m_fontSizeMax: 36 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -120245,10 +120607,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 392555714632636739} 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: -61.5} - m_SizeDelta: {x: -22, y: -163} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -63} + m_SizeDelta: {x: 154, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3594377446248284366 CanvasRenderer: @@ -120278,7 +120640,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 00:00:00 + m_text: 3d 23h m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} m_sharedMaterial: {fileID: -6186801479491972736, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} @@ -120287,8 +120649,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281940353 - m_fontColor: {r: 0.5058824, g: 0.22352941, b: 0.22352941, a: 1} + rgba: 4289032274 + m_fontColor: {r: 0.32156864, g: 0.4392157, b: 0.64705884, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -120305,12 +120667,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 + m_fontSize: 36 m_fontSizeBase: 28 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 2 - m_fontSizeMax: 28 + m_fontSizeMax: 36 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -142021,6 +142383,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7411562375164017091 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8579896880017684678} + - component: {fileID: 3552987390713666558} + - component: {fileID: 7661111701643395204} + m_Layer: 5 + m_Name: redS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8579896880017684678 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411562375164017091} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6375246474459437135} + m_Father: {fileID: 2969158629010271528} + 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: 65, y: 52} + m_SizeDelta: {x: 63, y: 63} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &3552987390713666558 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411562375164017091} + m_CullTransparentMesh: 1 +--- !u!114 &7661111701643395204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411562375164017091} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 24501424a2847f846b843d538ab477fc, 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!1 &7468837719570122935 GameObject: m_ObjectHideFlags: 0 @@ -142578,7 +143016,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: -28} + m_AnchoredPosition: {x: 0, y: -26} m_SizeDelta: {x: 150, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4190846463953202065 @@ -142730,10 +143168,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 553449475230170686} 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: -61.5} - m_SizeDelta: {x: -22, y: -163} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -63} + m_SizeDelta: {x: 154, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7342521466729345703 CanvasRenderer: @@ -142763,7 +143201,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 00:00:00 + m_text: 3d 23h m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} m_sharedMaterial: {fileID: -6186801479491972736, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} @@ -142772,8 +143210,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281940353 - m_fontColor: {r: 0.5058824, g: 0.22352941, b: 0.22352941, a: 1} + rgba: 4289032274 + m_fontColor: {r: 0.32156864, g: 0.4392157, b: 0.64705884, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -142790,12 +143228,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 + m_fontSize: 36 m_fontSizeBase: 28 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 2 - m_fontSizeMax: 28 + m_fontSizeMax: 36 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -149420,10 +149858,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 714544122395648239} 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: -60.5} - m_SizeDelta: {x: -22, y: -165} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -63} + m_SizeDelta: {x: 154, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &817212596794924181 CanvasRenderer: @@ -149453,7 +149891,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 01:02:59 + m_text: 3d 23h m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} m_sharedMaterial: {fileID: -6186801479491972736, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} @@ -149462,8 +149900,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281940353 - m_fontColor: {r: 0.5058824, g: 0.22352941, b: 0.22352941, a: 1} + rgba: 4289032274 + m_fontColor: {r: 0.32156864, g: 0.4392157, b: 0.64705884, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -149480,12 +149918,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 + m_fontSize: 36 m_fontSizeBase: 28 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 2 - m_fontSizeMax: 28 + m_fontSizeMax: 36 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -149715,8 +150153,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: -66.3} - m_SizeDelta: {x: 190, y: 72} + m_AnchoredPosition: {x: 0, y: -65} + m_SizeDelta: {x: 179, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3122980511031850493 CanvasRenderer: @@ -149746,7 +150184,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bc057d683bc18174896d195cd5b16b23, type: 3} + m_Sprite: {fileID: 21300000, guid: 0cb46cf6dbe55d44184716abd77f12f1, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -161189,7 +161627,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -320} - m_SizeDelta: {x: 179, y: 179} + m_SizeDelta: {x: 187, y: 187} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4550709017928666254 CanvasRenderer: @@ -161219,7 +161657,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1090d4aa1f2a79448a2836b5c383e2ef, type: 3} + m_Sprite: {fileID: 21300000, guid: b515f73c7f17ca44aaa8d69fe708483b, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -162115,7 +162553,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 15} - m_SizeDelta: {x: 194, y: 200} + m_SizeDelta: {x: 187, y: 187} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3299930999531255785 CanvasRenderer: @@ -162145,7 +162583,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f3cb6765d09f7b44caf479aae25bf92f, type: 3} + m_Sprite: {fileID: 21300000, guid: 476e69d9970b4c14dab0ff87a721b78d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/yyzl/02MainHome/image/merge_icon_circlebg_purple.png b/yyzl/02MainHome/image/merge_icon_circlebg_purple.png new file mode 100644 index 00000000..2f7ba0f6 Binary files /dev/null and b/yyzl/02MainHome/image/merge_icon_circlebg_purple.png differ diff --git a/yyzl/02MainHome/image/merge_icon_circlebg_purple.png.meta b/yyzl/02MainHome/image/merge_icon_circlebg_purple.png.meta new file mode 100644 index 00000000..4fa9da28 --- /dev/null +++ b/yyzl/02MainHome/image/merge_icon_circlebg_purple.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: b768c5a2ba4ea4d40976683ccdf8bacf +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/yyzl/12PetHome/PetHomePanel.prefab b/yyzl/12PetHome/PetHomePanel.prefab index 26c87018..325bf8de 100644 --- a/yyzl/12PetHome/PetHomePanel.prefab +++ b/yyzl/12PetHome/PetHomePanel.prefab @@ -6769,14 +6769,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7977466834362221926} - - {fileID: 656973472985323429} - {fileID: 3933020737151769719} m_Father: {fileID: 4610923303960538460} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -421, y: 166} - m_SizeDelta: {x: 194, y: 193} + m_SizeDelta: {x: 205, y: 205} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2882305493144402673 CanvasRenderer: @@ -6806,8 +6805,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 17c42f077e106b04895ad1b159dc0e61, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: e8bf350e81b245a4f85c1e969db80a08, type: 3} + m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 @@ -10698,81 +10697,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1115167168337224436 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 656973472985323429} - - component: {fileID: 6154273716346301325} - - component: {fileID: 6949125054887427071} - m_Layer: 5 - m_Name: arrorS - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &656973472985323429 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1115167168337224436} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1059506205894758485} - 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: 10} - m_SizeDelta: {x: 104, y: 76} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6154273716346301325 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1115167168337224436} - m_CullTransparentMesh: 1 ---- !u!114 &6949125054887427071 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1115167168337224436} - 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: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - 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!1 &1127149811415845126 GameObject: m_ObjectHideFlags: 0 @@ -13985,7 +13909,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2799982678691893776 RectTransform: m_ObjectHideFlags: 0 @@ -16844,7 +16768,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3933020737151769719 RectTransform: m_ObjectHideFlags: 0 @@ -41512,8 +41436,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: 2.2572, y: 3} - m_SizeDelta: {x: 166.5145, y: 162} + m_AnchoredPosition: {x: 0, y: 8} + m_SizeDelta: {x: 170, y: 170} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6865135355346193743 CanvasRenderer: @@ -41543,9 +41467,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 83dc3dcbbe7d18a43b522113563bb16b, type: 3} - m_Type: 1 - m_PreserveAspect: 0 + m_Sprite: {fileID: 21300000, guid: 6a179ca29b2d1874b93d2d1a164a4276, type: 3} + m_Type: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -60797,7 +60721,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 8.189697, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 10} m_Pivot: {x: 0, y: 1} --- !u!114 &4152344566777190930 MonoBehaviour: diff --git a/yyzl/23MapBuilding/MapBuildItemUI.prefab b/yyzl/23MapBuilding/MapBuildItemUI.prefab index c95e2ccd..17ece4af 100644 --- a/yyzl/23MapBuilding/MapBuildItemUI.prefab +++ b/yyzl/23MapBuilding/MapBuildItemUI.prefab @@ -102,14 +102,14 @@ RectTransform: m_GameObject: {fileID: 3760708063020603931} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.85, y: 0.85, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1399263765442035777} 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: 88} + m_AnchoredPosition: {x: 0, y: 105} m_SizeDelta: {x: 262, y: 258} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8373245128777902091 @@ -140,7 +140,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 45a2a05032be1b549a268d171e7e5234, type: 3} + m_Sprite: {fileID: 21300000, guid: 360e65b99a83f6c478db9e170fc5b4af, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -941,6 +941,8 @@ GameObject: - component: {fileID: 4926574162843174886} - component: {fileID: 2104420275575832952} - component: {fileID: 8508499152517867125} + - component: {fileID: 3943797809799897883} + - component: {fileID: 6514630167919335854} m_Layer: 27 m_Name: MapBuildItemUI m_TagString: Untagged @@ -1033,3 +1035,65 @@ MonoBehaviour: lvT: {fileID: 4413038388871458616} upgradeT: {fileID: 8905473624956039726} pgS: {fileID: 4563117836487162552} + fillS: {fileID: 2542063163804237462} + fillT: {fileID: 4992579528196015448} +--- !u!114 &3943797809799897883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8382001746373021041} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2104420275575832952} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &6514630167919335854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8382001746373021041} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44ee9be70023ffb44b3675c769a2a429, type: 3} + m_Name: + m_EditorClassIdentifier: + ColorNoChange: 0 + IsSqueezeDown: 0 + IsEffectOperate: 1 + BindGos: [] diff --git a/yyzl/23MapBuilding/MapBuildPanelUI.prefab b/yyzl/23MapBuilding/MapBuildPanelUI.prefab index 5646ead5..dd6e5d1a 100644 --- a/yyzl/23MapBuilding/MapBuildPanelUI.prefab +++ b/yyzl/23MapBuilding/MapBuildPanelUI.prefab @@ -458,7 +458,7 @@ RectTransform: 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: 120, y: 120} + m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1979114064095664213 CanvasRenderer: @@ -488,7 +488,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d0a7ee43b6662df4dadde8585a87180d, type: 3} + m_Sprite: {fileID: 21300000, guid: 5b67b00fb2534264e9decd10656c0791, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -701,6 +701,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 8405843773296579507} - {fileID: 3440366804264787732} - {fileID: 2320890946731367891} - {fileID: 3662443509449119591} @@ -1067,6 +1068,8 @@ GameObject: - component: {fileID: 5674124668298742870} - component: {fileID: 3154689865551490413} - component: {fileID: 6227993068060408021} + - component: {fileID: 4370824159967384425} + - component: {fileID: 8587254470402123036} m_Layer: 0 m_Name: btn m_TagString: Untagged @@ -1134,6 +1137,66 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4370824159967384425 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3865768870187932935} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6227993068060408021} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &8587254470402123036 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3865768870187932935} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44ee9be70023ffb44b3675c769a2a429, type: 3} + m_Name: + m_EditorClassIdentifier: + ColorNoChange: 0 + IsSqueezeDown: 0 + IsEffectOperate: 1 + BindGos: [] --- !u!1 &4053243904486723014 GameObject: m_ObjectHideFlags: 0 @@ -1318,8 +1381,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: 0} - m_SizeDelta: {x: 120, y: 120} + m_AnchoredPosition: {x: 0, y: 20} + m_SizeDelta: {x: 180, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1888308815282805112 CanvasRenderer: @@ -1349,7 +1412,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a576654216908a7479a4872342fa38f6, type: 3} + m_Sprite: {fileID: 21300000, guid: 360e65b99a83f6c478db9e170fc5b4af, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1523,6 +1586,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 4190745080461661537} - {fileID: 7812657491654706872} - {fileID: 6170875010750321329} - {fileID: 5053730134685750584} @@ -1613,7 +1677,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: 1468, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 788, y: 1080} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &800822451663944375 @@ -1680,6 +1744,9 @@ MonoBehaviour: starS: {fileID: 7083466483664545687} costT: {fileID: 2016593535651217333} infoBtn: {fileID: 2811752446880893104} + closeBtn: {fileID: 728256355691560258} + green_btn_sp: {fileID: 21300000, guid: 585cb7385bcbec5458c936c082e24f20, type: 3} + gray_btn_sp: {fileID: 21300000, guid: 112487d2e1ac2034189bf5611193c056, type: 3} --- !u!1 &5046296327858314291 GameObject: m_ObjectHideFlags: 0 @@ -1862,6 +1929,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1454672431995385118} - {fileID: 8307752826219667644} - {fileID: 388495395456780945} - {fileID: 4784141980579344128} @@ -2687,6 +2755,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6853163927251658639 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8405843773296579507} + - component: {fileID: 3853173593256494728} + - component: {fileID: 1973779612150269645} + m_Layer: 5 + m_Name: greenS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8405843773296579507 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6853163927251658639} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2319198657458014454} + 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: 145, y: 145} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3853173593256494728 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6853163927251658639} + m_CullTransparentMesh: 1 +--- !u!114 &1973779612150269645 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6853163927251658639} + 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.72156864, g: 0.9882353, b: 0.34117648, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 58ae3973aa7713f4cb970944bdd45deb, type: 3} + m_Type: 1 + 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!1 &6976742095531885157 GameObject: m_ObjectHideFlags: 0 @@ -2973,6 +3116,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7276172637531534079 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1454672431995385118} + - component: {fileID: 1166221492662613172} + - component: {fileID: 6014032152101103253} + m_Layer: 5 + m_Name: greenS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1454672431995385118 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7276172637531534079} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7311429336431736467} + 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: 145, y: 145} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1166221492662613172 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7276172637531534079} + m_CullTransparentMesh: 1 +--- !u!114 &6014032152101103253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7276172637531534079} + 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.72156864, g: 0.9882353, b: 0.34117648, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 58ae3973aa7713f4cb970944bdd45deb, type: 3} + m_Type: 1 + 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!1 &7545890207378511215 GameObject: m_ObjectHideFlags: 0 @@ -3123,6 +3341,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8250077544022102676 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4190745080461661537} + - component: {fileID: 8831984641544431368} + - component: {fileID: 3027301789849596876} + m_Layer: 5 + m_Name: greenS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4190745080461661537 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8250077544022102676} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4606449006117087808} + 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: 145, y: 145} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8831984641544431368 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8250077544022102676} + m_CullTransparentMesh: 1 +--- !u!114 &3027301789849596876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8250077544022102676} + 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.72156864, g: 0.9882353, b: 0.34117648, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 58ae3973aa7713f4cb970944bdd45deb, type: 3} + m_Type: 1 + 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!1 &8364807995376275511 GameObject: m_ObjectHideFlags: 0 @@ -3494,6 +3787,8 @@ GameObject: - component: {fileID: 2811752446880893104} - component: {fileID: 2989122495161663542} - component: {fileID: 1115383612071085163} + - component: {fileID: 2949394052226169554} + - component: {fileID: 4325892471478293046} m_Layer: 0 m_Name: infoBtn m_TagString: Untagged @@ -3558,6 +3853,66 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2949394052226169554 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8739805146383509388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1115383612071085163} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &4325892471478293046 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8739805146383509388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44ee9be70023ffb44b3675c769a2a429, type: 3} + m_Name: + m_EditorClassIdentifier: + ColorNoChange: 0 + IsSqueezeDown: 0 + IsEffectOperate: 1 + BindGos: [] --- !u!1 &8911878214653391665 GameObject: m_ObjectHideFlags: 0 @@ -3588,6 +3943,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 883168266793890426} - {fileID: 2188210772464511365} - {fileID: 2338998929246367815} - {fileID: 7986659545041761396} @@ -3647,6 +4003,8 @@ GameObject: - component: {fileID: 728256355691560258} - component: {fileID: 2647131704546456089} - component: {fileID: 5452479369336520003} + - component: {fileID: 8408952594955559999} + - component: {fileID: 7175141909678192697} m_Layer: 0 m_Name: closeBtn m_TagString: Untagged @@ -3711,3 +4069,138 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8408952594955559999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8978572684423153427} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5452479369336520003} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &7175141909678192697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8978572684423153427} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44ee9be70023ffb44b3675c769a2a429, type: 3} + m_Name: + m_EditorClassIdentifier: + ColorNoChange: 0 + IsSqueezeDown: 0 + IsEffectOperate: 1 + BindGos: [] +--- !u!1 &9110943729108823188 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 883168266793890426} + - component: {fileID: 8734636788592854111} + - component: {fileID: 1388504531311801331} + m_Layer: 5 + m_Name: greenS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &883168266793890426 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9110943729108823188} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2709763835440820411} + 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: 145, y: 145} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8734636788592854111 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9110943729108823188} + m_CullTransparentMesh: 1 +--- !u!114 &1388504531311801331 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9110943729108823188} + 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.72156864, g: 0.9882353, b: 0.34117648, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 58ae3973aa7713f4cb970944bdd45deb, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/yyzl/Common/Small/common_pic_plate.png b/yyzl/Common/Small/common_pic_plate.png new file mode 100644 index 00000000..cc7a4d43 Binary files /dev/null and b/yyzl/Common/Small/common_pic_plate.png differ diff --git a/yyzl/Common/Small/common_pic_plate.png.meta b/yyzl/Common/Small/common_pic_plate.png.meta new file mode 100644 index 00000000..cf926671 --- /dev/null +++ b/yyzl/Common/Small/common_pic_plate.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 0cb46cf6dbe55d44184716abd77f12f1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 30, y: 26, z: 30, w: 26} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: