diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab index 4df79a33..22174735 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab @@ -307,83 +307,7 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 1 - m_FillAmount: 0.336 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4579972720661114246 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1159984599177168895} - - component: {fileID: 3719888159246893929} - - component: {fileID: 8714688166120878966} - m_Layer: 5 - m_Name: silhouette - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1159984599177168895 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4579972720661114246} - 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: 4844176698673166344} - 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 &3719888159246893929 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4579972720661114246} - m_CullTransparentMesh: 1 ---- !u!114 &8714688166120878966 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4579972720661114246} - 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.34901962, g: 0.19607845, b: 0.08235294, 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: 316fe626d2dfa490ca675da5c1c648b4, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 1 - m_FillAmount: 1 + m_FillAmount: 0.425 m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 @@ -522,7 +446,7 @@ GameObject: - component: {fileID: 4844176698673166344} - component: {fileID: 4844176698673166342} - component: {fileID: 4844176698673166343} - - component: {fileID: 9222118806017849220} + - component: {fileID: 6644899334651174083} m_Layer: 5 m_Name: maskImage m_TagString: Untagged @@ -539,10 +463,9 @@ RectTransform: m_GameObject: {fileID: 4844176698673166345} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.01, y: 1.01, z: 1.01} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 1159984599177168895} + m_Children: [] m_Father: {fileID: 6125558402687396155} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -572,7 +495,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.011764706} + m_Color: {r: 0.34901962, g: 0.19607845, b: 0.08235294, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -589,7 +512,7 @@ MonoBehaviour: m_FillOrigin: 1 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &9222118806017849220 +--- !u!114 &6644899334651174083 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -598,10 +521,16 @@ MonoBehaviour: m_GameObject: {fileID: 4844176698673166345} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3} m_Name: m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 + m_EffectFactor: 0 + m_ColorFactor: 1 + m_BlurFactor: 0 + m_EffectMode: 0 + m_ColorMode: 1 + m_BlurMode: 0 + m_AdvancedBlur: 0 --- !u!1 &5034752974110700447 GameObject: m_ObjectHideFlags: 0 @@ -2571,7 +2500,6 @@ GameObject: m_Component: - component: {fileID: 6125558402687396155} - component: {fileID: 6125558402687396149} - - component: {fileID: 6125558402687396148} m_Layer: 5 m_Name: progress m_TagString: Untagged @@ -2629,36 +2557,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6125558402687396154} m_CullTransparentMesh: 0 ---- !u!114 &6125558402687396148 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6125558402687396154} - 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: a934d540ed2297749bb40573afe647d8, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 1 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &6546516869825252536 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab index 0c643f08..d1fbd4c1 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab @@ -420,6 +420,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2917093101918098399} m_CullTransparentMesh: 1 +--- !u!1 &3072565834298304451 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1416279198029748623} + - component: {fileID: 2926055590599607697} + - component: {fileID: 8997835653073553694} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1416279198029748623 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3072565834298304451} + 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: 1063551938279083278} + 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: 230, y: 230} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2926055590599607697 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3072565834298304451} + m_CullTransparentMesh: 1 +--- !u!114 &8997835653073553694 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3072565834298304451} + 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: 98dcd0a8caac5c7409c38aaf69654aa1, 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 &3559633555434933897 GameObject: m_ObjectHideFlags: 0 @@ -582,7 +658,6 @@ GameObject: m_Component: - component: {fileID: 2502369596155588842} - component: {fileID: 7127012562587308353} - - component: {fileID: 3825059466962104633} m_Layer: 5 m_Name: icon_popcorm m_TagString: Untagged @@ -601,7 +676,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 712901810088688816} m_Father: {fileID: 4559813504322426655} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -618,36 +694,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4435066310782463576} m_CullTransparentMesh: 0 ---- !u!114 &3825059466962104633 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4435066310782463576} - 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: a84adedae5c64c74ca2d83c4a9b5228e, 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 &4559813504027829706 GameObject: m_ObjectHideFlags: 0 @@ -1783,14 +1829,13 @@ GameObject: m_Component: - component: {fileID: 1063551938279083278} - component: {fileID: 3738834574718379056} - - component: {fileID: 1234038823809246482} m_Layer: 5 m_Name: icon_customization m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1063551938279083278 RectTransform: m_ObjectHideFlags: 0 @@ -1802,7 +1847,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1416279198029748623} m_Father: {fileID: 4559813504322426655} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1819,13 +1865,59 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6775270207942942085} m_CullTransparentMesh: 0 ---- !u!114 &1234038823809246482 +--- !u!1 &7579086623926589423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 712901810088688816} + - component: {fileID: 172966387117665867} + - component: {fileID: 4610619757020856675} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &712901810088688816 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7579086623926589423} + 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: 2502369596155588842} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &172966387117665867 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7579086623926589423} + m_CullTransparentMesh: 1 +--- !u!114 &4610619757020856675 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6775270207942942085} + m_GameObject: {fileID: 7579086623926589423} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1839,7 +1931,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 98dcd0a8caac5c7409c38aaf69654aa1, type: 3} + m_Sprite: {fileID: 21300000, guid: a84adedae5c64c74ca2d83c4a9b5228e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectView.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectView.cs index cb78e6b2..7987302f 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectView.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectView.cs @@ -69,11 +69,17 @@ namespace MyGame.Scenes.MiniGame.Scripts { var productData = productDataList.FirstOrDefault(data => data.id == placeData.recipeId); SetAchievementText(productData.Name, placeData.NeedScore); + var rt = recipeObject.transform; + rt.DestroyAllChildrens(); + Instantiate(productData.GetIconPrefab(), rt); } else if (placeData.customizeId != 0) { var customizeData = customizeDataList.FirstOrDefault(data => data.id == placeData.customizeId); SetAchievementText(customizeData.Name, placeData.NeedScore); + var ct = customizeObject.transform; + ct.DestroyAllChildrens(); + Instantiate(customizeData.GetIconPrefab(), ct); } } diff --git a/popcorn/Packages/manifest.json b/popcorn/Packages/manifest.json index 872c6251..da85a2e8 100644 --- a/popcorn/Packages/manifest.json +++ b/popcorn/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.coffee.ui-effect": "https://github.com/mob-sakai/UIEffect.git", "com.coffee.unmask": "https://github.com/mob-sakai/UnmaskForUGUI.git", "com.unity.2d.animation": "7.0.5", "com.unity.2d.pixel-perfect": "5.0.1", @@ -11,8 +12,8 @@ "com.unity.collab-proxy": "1.15.16", "com.unity.collections": "1.2.3", "com.unity.ide.rider": "3.0.14", - "com.unity.ide.vscode": "1.2.5", "com.unity.ide.visualstudio": "2.0.15", + "com.unity.ide.vscode": "1.2.5", "com.unity.recorder": "3.0.3", "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", diff --git a/popcorn/Packages/packages-lock.json b/popcorn/Packages/packages-lock.json index 3650e292..71a142be 100644 --- a/popcorn/Packages/packages-lock.json +++ b/popcorn/Packages/packages-lock.json @@ -1,5 +1,12 @@ { "dependencies": { + "com.coffee.ui-effect": { + "version": "https://github.com/mob-sakai/UIEffect.git", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "b43e40508b167d143330d8b9eff0d5c9965cdf3c" + }, "com.coffee.unmask": { "version": "https://github.com/mob-sakai/UnmaskForUGUI.git", "depth": 0, @@ -124,13 +131,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.ide.vscode": { - "version": "1.2.5", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.ide.visualstudio": { "version": "2.0.15", "depth": 0, @@ -140,6 +140,13 @@ }, "url": "https://packages.unity.com" }, + "com.unity.ide.vscode": { + "version": "1.2.5", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.mathematics": { "version": "1.2.6", "depth": 1,