diff --git a/Assets/Resources/UIs/PanelMain.prefab b/Assets/Resources/UIs/PanelMain.prefab index 116329fe..9f1d54fb 100644 --- a/Assets/Resources/UIs/PanelMain.prefab +++ b/Assets/Resources/UIs/PanelMain.prefab @@ -1,79 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &6938199816447230232 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6938199816447230239} - - component: {fileID: 6938199816447230237} - - component: {fileID: 6938199816447230238} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6938199816447230239 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6938199816447230232} - 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: 6938199816549116886} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 71, y: 57} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6938199816447230237 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6938199816447230232} - m_CullTransparentMesh: 0 ---- !u!114 &6938199816447230238 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6938199816447230232} - 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_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e0fca139db8ce43e1889dd8deb82f728, 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 &6938199816541010256 GameObject: m_ObjectHideFlags: 0 @@ -146,7 +72,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6938199816447230239} + - {fileID: 7888613480040321736} m_Father: {fileID: 6938199816541010263} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -300,7 +226,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 880, y: 138} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6938199816566601594 @@ -508,7 +434,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6938199816757883051 RectTransform: m_ObjectHideFlags: 0 @@ -554,6 +480,8 @@ MonoBehaviour: - {fileID: 7888613480538940027} - {fileID: 7888613480423364701} - {fileID: 7888613481509338366} + mCtnBubble: {fileID: 7674450577725422325} + mTplBubble: {fileID: 7674450577730284664} mBtnLast: {fileID: 6938199816549116459} mBtnNext: {fileID: 6938199817809458837} mBtnStart: {fileID: 6938199817936171397} @@ -673,7 +601,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7888613480723290482} + - {fileID: 7674450578586731393} - {fileID: 7888613481625633230} - {fileID: 7888613481584773598} m_Father: {fileID: 6938199817710454683} @@ -1058,6 +986,7 @@ RectTransform: - {fileID: 6938199817047076120} - {fileID: 6938199816566601572} - {fileID: 6938199818254313810} + - {fileID: 7674450577725422325} m_Father: {fileID: 6938199816541010263} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1172,7 +1101,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7888613480086186301} + - {fileID: 7674450577879708622} m_Father: {fileID: 6938199816541010263} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1320,8 +1249,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7888613479746097857} - - {fileID: 7888613480040321736} + - {fileID: 7674450577408215090} + - {fileID: 7674450577899898939} - {fileID: 6938199817990204641} m_Father: {fileID: 6938199816757883051} m_RootOrder: 1 @@ -1680,7 +1609,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7888613479746097862 +--- !u!1 &7674450576922989318 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1688,10 +1617,158 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7888613479746097857} - - component: {fileID: 7888613479746097859} - - component: {fileID: 7888613479746097856} - - component: {fileID: 7888613479746097858} + - component: {fileID: 7674450576922989319} + - component: {fileID: 7674450576922989317} + - component: {fileID: 7674450576922989316} + m_Layer: 5 + m_Name: Bubble2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7674450576922989319 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450576922989318} + 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: 7674450577730284665} + 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} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 148, y: 148} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7674450576922989317 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450576922989318} + m_CullTransparentMesh: 0 +--- !u!114 &7674450576922989316 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450576922989318} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 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 &7674450577042710109 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7674450577042710106} + - component: {fileID: 7674450577042710104} + - component: {fileID: 7674450577042710107} + m_Layer: 5 + m_Name: Bubble1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7674450577042710106 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450577042710109} + 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: 7674450577730284665} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 148, y: 148} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7674450577042710104 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450577042710109} + m_CullTransparentMesh: 0 +--- !u!114 &7674450577042710107 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450577042710109} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 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 &7674450577408215093 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7674450577408215090} + - component: {fileID: 7674450577408215088} + - component: {fileID: 7674450577408215091} + - component: {fileID: 7674450577408215089} m_Layer: 5 m_Name: BG m_TagString: Untagged @@ -1699,13 +1776,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7888613479746097857 +--- !u!224 &7674450577408215090 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7888613479746097862} + m_GameObject: {fileID: 7674450577408215093} 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} @@ -1718,21 +1795,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 880, y: 1420} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7888613479746097859 +--- !u!222 &7674450577408215088 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7888613479746097862} + m_GameObject: {fileID: 7674450577408215093} m_CullTransparentMesh: 0 ---- !u!114 &7888613479746097856 +--- !u!114 &7674450577408215091 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7888613479746097862} + m_GameObject: {fileID: 7674450577408215093} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1755,13 +1832,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &7888613479746097858 +--- !u!114 &7674450577408215089 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7888613479746097862} + m_GameObject: {fileID: 7674450577408215093} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -1794,10 +1871,398 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 7888613479746097856} + m_TargetGraphic: {fileID: 7674450577408215091} m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &7674450577725422324 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7674450577725422325} + m_Layer: 5 + m_Name: Ctn_Bubble + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7674450577725422325 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450577725422324} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7674450577730284665} + m_Father: {fileID: 6938199817710454683} + m_RootOrder: 3 + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7674450577730284664 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7674450577730284665} + - component: {fileID: 7674450577730284662} + m_Layer: 5 + m_Name: Tpl_Bubble + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7674450577730284665 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450577730284664} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7674450577042710106} + - {fileID: 7674450576922989319} + - {fileID: 7674450577906440811} + m_Father: {fileID: 7674450577725422325} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7674450577730284662 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450577730284664} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 314603b3a2d6240c49af23398c9825d0, type: 3} + m_Name: + m_EditorClassIdentifier: + mImgBubbles: + - {fileID: 7674450577042710107} + - {fileID: 7674450576922989316} + - {fileID: 7674450577906440808} + mRadius: 135 +--- !u!1 &7674450577879708625 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7674450577879708622} + - component: {fileID: 7674450577879708620} + - component: {fileID: 7674450577879708623} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7674450577879708622 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450577879708625} + 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: 6938199817809458832} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 71, y: 57} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7674450577879708620 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450577879708625} + m_CullTransparentMesh: 0 +--- !u!114 &7674450577879708623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450577879708625} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e0fca139db8ce43e1889dd8deb82f728, 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 &7674450577899898938 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7674450577899898939} + - component: {fileID: 7674450577899898937} + - component: {fileID: 7674450577899898936} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7674450577899898939 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450577899898938} + 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: 6938199817848291392} + 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} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: 551, y: 452} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7674450577899898937 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450577899898938} + m_CullTransparentMesh: 0 +--- !u!114 &7674450577899898936 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450577899898938} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: f22b88cc81e0d43d39b89f6acd039e50, 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 &7674450577906440810 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7674450577906440811} + - component: {fileID: 7674450577906440809} + - component: {fileID: 7674450577906440808} + m_Layer: 5 + m_Name: Bubble3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7674450577906440811 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450577906440810} + 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: 7674450577730284665} + m_RootOrder: 2 + 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: 148, y: 148} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7674450577906440809 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450577906440810} + m_CullTransparentMesh: 0 +--- !u!114 &7674450577906440808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450577906440810} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 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 &7674450578586731392 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7674450578586731393} + - component: {fileID: 7674450578586731519} + - component: {fileID: 7674450578586731518} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7674450578586731393 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450578586731392} + 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: 6938199817047076120} + 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 &7674450578586731519 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450578586731392} + m_CullTransparentMesh: 0 +--- !u!114 &7674450578586731518 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674450578586731392} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 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 &7888613479780144382 GameObject: m_ObjectHideFlags: 0 @@ -1899,15 +2364,15 @@ RectTransform: m_GameObject: {fileID: 7888613480040321737} 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_LocalScale: {x: -1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6938199817848291392} - m_RootOrder: 1 + m_Father: {fileID: 6938199816549116886} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 50} - m_SizeDelta: {x: 551, y: 452} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 71, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7888613480040321738 CanvasRenderer: @@ -1933,80 +2398,6 @@ MonoBehaviour: m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f22b88cc81e0d43d39b89f6acd039e50, 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 &7888613480086186274 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7888613480086186301} - - component: {fileID: 7888613480086186303} - - component: {fileID: 7888613480086186300} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7888613480086186301 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7888613480086186274} - 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: 6938199817809458832} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 71, y: 57} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7888613480086186303 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7888613480086186274} - m_CullTransparentMesh: 0 ---- !u!114 &7888613480086186300 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7888613480086186274} - 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_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -2242,80 +2633,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7888613480723290483 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7888613480723290482} - - component: {fileID: 7888613480723290380} - - component: {fileID: 7888613480723290381} - m_Layer: 5 - m_Name: BG - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7888613480723290482 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7888613480723290483} - 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: 6938199817047076120} - 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 &7888613480723290380 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7888613480723290483} - m_CullTransparentMesh: 0 ---- !u!114 &7888613480723290381 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7888613480723290483} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 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 &7888613481509338364 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 4dd742dc..1aad50ba 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -248,6 +248,11 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 40 objectReference: {fileID: 0} + - target: {fileID: 7274106815721414707, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.29992676 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 30cc95837c5a74b1ca4757bb85a4abfa, type: 3} --- !u!224 &64581554 stripped @@ -256,12 +261,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 64581553} m_PrefabAsset: {fileID: 0} ---- !u!224 &665617792 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6938199816757883051, guid: 554b6baf1c0144af492b0a2123d42fd1, - type: 3} - m_PrefabInstance: {fileID: 7888613480130404557} - m_PrefabAsset: {fileID: 0} --- !u!1 &1404456744 GameObject: m_ObjectHideFlags: 0 @@ -305,6 +304,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eea13a3abf319425394d0eebefd89201, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &950422056880525414 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6938199816757883051, guid: 554b6baf1c0144af492b0a2123d42fd1, + type: 3} + m_PrefabInstance: {fileID: 7674450577860688446} + m_PrefabAsset: {fileID: 0} --- !u!224 &3333527423029586801 RectTransform: m_ObjectHideFlags: 0 @@ -445,7 +450,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 665617792} + - {fileID: 950422056880525414} - {fileID: 64581554} m_Father: {fileID: 3333527423029586801} m_RootOrder: 1 @@ -627,7 +632,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1001 &7888613480130404557 +--- !u!1001 &7674450577860688446 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -639,6 +644,11 @@ PrefabInstance: propertyPath: m_Name value: PanelMain objectReference: {fileID: 0} + - target: {fileID: 6938199816757882964, guid: 554b6baf1c0144af492b0a2123d42fd1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6938199816757883051, guid: 554b6baf1c0144af492b0a2123d42fd1, type: 3} propertyPath: m_Pivot.x diff --git a/Assets/Scripts/UI/CustomControl/SoundBubble.cs b/Assets/Scripts/UI/CustomControl/SoundBubble.cs new file mode 100644 index 00000000..66800470 --- /dev/null +++ b/Assets/Scripts/UI/CustomControl/SoundBubble.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using DG.Tweening; + +public class SoundBubble : MonoBehaviour +{ + [SerializeField] Image[] mImgBubbles; + [SerializeField] float mRadius = 120; + + public void Show(int pLevelID) + { + Vector2 tStartPos = Quaternion.AngleAxis(Random.Range(0, 360), Vector3.back) * (Vector2.up * mRadius); + for (int i = 0; i < mImgBubbles.Length; i++) + { + mImgBubbles[i].sprite = ResourceManager.Instance.LoadRes(Const.Path.GetSoundPic(pLevelID, i)); + mImgBubbles[i].color = Color.white; + mImgBubbles[i].rectTransform.anchoredPosition = Vector2.zero; + mImgBubbles[i].rectTransform.localScale = Vector3.zero; + + mImgBubbles[i].rectTransform.DOAnchorPos(Quaternion.AngleAxis(120 * i, Vector3.back) * tStartPos, 0.3f).SetEase(Ease.OutBack); + mImgBubbles[i].rectTransform.DOScale(Vector3.one, 0.3f).SetEase(Ease.OutBack); + } + } + + public void Hide() + { + for (int i = 0; i < mImgBubbles.Length; i++) + { + mImgBubbles[i].DOFade(0, 0.8f).SetEase(Ease.Linear); + mImgBubbles[i].rectTransform.DOScale(Vector3.one * 1.1f, 0.8f).SetEase(Ease.InBack); + } + + Destroy(gameObject, 1); + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/CustomControl/SoundBubble.cs.meta b/Assets/Scripts/UI/CustomControl/SoundBubble.cs.meta new file mode 100644 index 00000000..4c6b12a4 --- /dev/null +++ b/Assets/Scripts/UI/CustomControl/SoundBubble.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 314603b3a2d6240c49af23398c9825d0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/PanelMain.cs b/Assets/Scripts/UI/PanelMain.cs index 99d2d391..3e92f084 100644 --- a/Assets/Scripts/UI/PanelMain.cs +++ b/Assets/Scripts/UI/PanelMain.cs @@ -9,6 +9,9 @@ public class PanelMain : BasePanel [SerializeField] float[] mIconPosX; [SerializeField] Image[] mImgLevelIcons; + [SerializeField] Transform mCtnBubble; + [SerializeField] GameObject mTplBubble; + [SerializeField] Button mBtnLast; [SerializeField] Button mBtnNext; @@ -27,6 +30,8 @@ public class PanelMain : BasePanel private bool mIsRolling = false; private TimerUnit mRollTimer; + private SoundBubble mCurrentBubble; + private const float FIX_DURATION = 0.2f; private const float FIX_WAIT = 10; @@ -112,11 +117,13 @@ public class PanelMain : BasePanel for (int i = 1; i < mLevelIconList.Count - 1; i++) { - mLevelIconList[i].GetComponent().DOKill(); - mLevelIconList[i].GetComponent().DOAnchorPosX(mIconPosX[i], FIX_DURATION).SetEase(Ease.OutSine); + mLevelIconList[i].rectTransform.DOKill(); + mLevelIconList[i].rectTransform.DOAnchorPosX(mIconPosX[i], FIX_DURATION).SetEase(Ease.OutSine); } mRollTimer.StartTimer(Waft, FIX_WAIT); + + ShowBubble(); } private void Waft() @@ -126,8 +133,8 @@ public class PanelMain : BasePanel for (int i = 1; i < mLevelIconList.Count - 1; i++) { - mLevelIconList[i].GetComponent().DOKill(); - mLevelIconList[i].GetComponent().DOAnchorPosX(mIconPosX[i] + mWaftDir * 80, WAFT_DURATION).SetEase(Ease.Linear); + mLevelIconList[i].rectTransform.DOKill(); + mLevelIconList[i].rectTransform.DOAnchorPosX(mIconPosX[i] + mWaftDir * 80, WAFT_DURATION).SetEase(Ease.Linear); } if (mWaftDir == 1) @@ -155,13 +162,14 @@ public class PanelMain : BasePanel int tLastIndex = (i - 1) % mLevelIconList.Count; mLevelIconList[tLastIndex] = mLevelIconList[i]; - mLevelIconList[tLastIndex].GetComponent().DOKill(); - mLevelIconList[tLastIndex].GetComponent().DOAnchorPosX(mIconPosX[tLastIndex], ROLL_DURATION).SetEase(Ease.OutSine); + mLevelIconList[tLastIndex].rectTransform.DOKill(); + mLevelIconList[tLastIndex].rectTransform.DOAnchorPosX(mIconPosX[tLastIndex], ROLL_DURATION).SetEase(Ease.OutSine); } mLevelIconList[mLevelIconList.Count - 1] = tStartImg; mLevelIconList[mLevelIconList.Count - 1].sprite = ResourceManager.Instance.LoadRes(Const.Path.GetLevelIconBig(GameConfig.Instance.LevelSort[mLevelList[mLevelIconList.Count - 1] - 1])); - mLevelIconList[mLevelIconList.Count - 1].GetComponent().anchoredPosition = new Vector2(mIconPosX[mLevelIconList.Count - 1], 0); + mLevelIconList[mLevelIconList.Count - 1].rectTransform.anchoredPosition = new Vector2(mIconPosX[mLevelIconList.Count - 1], 0); + HideBubble(); mRollTimer.StartTimer(RollOver, ROLL_DURATION); } @@ -180,13 +188,14 @@ public class PanelMain : BasePanel int tNextIndex = (i + 1) % mLevelIconList.Count; mLevelIconList[tNextIndex] = mLevelIconList[i]; - mLevelIconList[tNextIndex].GetComponent().DOKill(); - mLevelIconList[tNextIndex].GetComponent().DOAnchorPosX(mIconPosX[tNextIndex], ROLL_DURATION).SetEase(Ease.OutSine); + mLevelIconList[tNextIndex].rectTransform.DOKill(); + mLevelIconList[tNextIndex].rectTransform.DOAnchorPosX(mIconPosX[tNextIndex], ROLL_DURATION).SetEase(Ease.OutSine); } mLevelIconList[0] = tEndImg; mLevelIconList[0].sprite = ResourceManager.Instance.LoadRes(Const.Path.GetLevelIconBig(GameConfig.Instance.LevelSort[mLevelList[0] - 1])); - mLevelIconList[0].GetComponent().anchoredPosition = new Vector2(mIconPosX[0], 0); + mLevelIconList[0].rectTransform.anchoredPosition = new Vector2(mIconPosX[0], 0); + HideBubble(); mRollTimer.StartTimer(RollOver, ROLL_DURATION); } @@ -194,6 +203,29 @@ public class PanelMain : BasePanel { mIsRolling = false; mRollTimer.StartTimer(Waft, mIsWafting ? -1 : FIX_WAIT); + + ShowBubble(); + } + + private void ShowBubble() + { + HideBubble(); + + mCurrentBubble = Instantiate(mTplBubble, mCtnBubble).GetComponent(); + mCurrentBubble.gameObject.SetActive(true); + mCurrentBubble.GetComponent().anchoredPosition = Vector2.zero; + mCurrentBubble.transform.localScale = Vector3.one; + + mCurrentBubble.Show(mLevelList[FOCUS_IDX]); + } + + private void HideBubble() + { + if (mCurrentBubble != null) + { + mCurrentBubble.Hide(); + mCurrentBubble = null; + } } private void OnClickLast()