From b62a6a42f0d9808d5e5212c3bd6aaf9cf54c0028 Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 15 Aug 2022 15:47:20 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=B9=E3=83=86=E3=83=BC=E3=82=B8=E9=81=B8?= =?UTF-8?q?=E6=8A=9E=E7=94=BB=E9=9D=A2=E3=81=A7=E3=81=AE=E3=82=AB=E3=82=B9?= =?UTF-8?q?=E3=82=BF=E3=83=9E=E3=82=A4=E3=82=BA=E3=82=A2=E3=82=A4=E3=82=B3?= =?UTF-8?q?=E3=83=B3=E8=A1=A8=E7=A4=BA=E5=88=87=E3=82=8A=E6=9B=BF=E3=81=88?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/MiniGame/Prefabs/Selection.prefab | 168 ++++++++++++++---- .../MiniGame/Scripts/StageSelectView.cs | 6 + 2 files changed, 136 insertions(+), 38 deletions(-) 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); } }