diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab index fa7921a1..bf1db386 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab @@ -663,9 +663,8 @@ GameObject: m_Component: - component: {fileID: 5034752974552429102} - component: {fileID: 5034752974552429100} - - component: {fileID: 5034752974552429101} m_Layer: 5 - m_Name: Image + m_Name: ImageTarget m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -680,8 +679,9 @@ RectTransform: m_GameObject: {fileID: 5034752974552429103} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} - m_Children: [] + m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_Children: + - {fileID: 148374488373059191} m_Father: {fileID: 5034752974931089886} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -698,35 +698,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5034752974552429103} m_CullTransparentMesh: 0 ---- !u!114 &5034752974552429101 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5034752974552429103} - 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: 21300000, guid: f0ea4185a8343ea40ae7c242ef1c3a0b, 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 &5034752974795311006 GameObject: m_ObjectHideFlags: 0 @@ -1111,7 +1082,7 @@ MonoBehaviour: meterProgressImage: {fileID: 5034752975781299947} meterProgressText: {fileID: 5034752974341280191} materialNameText: {fileID: 5034752974366334720} - materialImage: {fileID: 5034752974552429102} + materialImageTarget: {fileID: 5034752974552429102} materialAmountText: {fileID: 5034752974931089885} detailOffset: 250 progressDuration: 1.5 @@ -6487,3 +6458,128 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1001 &1667406642911963614 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5034752974552429102} + m_Modifications: + - target: {fileID: 1135206952446428548, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_Name + value: mala + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_SizeDelta.x + value: 56 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_SizeDelta.y + value: 56 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a92fea75dfb77478cbddfb1648a0fde8, type: 3} +--- !u!224 &148374488373059191 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1525858592774698921, guid: a92fea75dfb77478cbddfb1648a0fde8, + type: 3} + m_PrefabInstance: {fileID: 1667406642911963614} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs index c3ddbab8..e94559c0 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs @@ -18,7 +18,7 @@ namespace MyGame.Scenes.MiniGame.Scripts [SerializeField] private Image meterProgressImage; [SerializeField] private TextMeshProUGUI meterProgressText; [SerializeField] private Text materialNameText; - [SerializeField] private Transform materialImage; + [SerializeField] private Transform materialImageTarget; [SerializeField] private Text materialAmountText; [SerializeField] private float detailOffset; [SerializeField] private float progressDuration = .5f; @@ -70,7 +70,8 @@ namespace MyGame.Scenes.MiniGame.Scripts var amount = Mathf.FloorToInt((float)score / placeData.needScore); var shopData = shopDataList.FirstOrDefault(data => data.itemId == placeData.itemId && data.Category == ItemCategory.Material); materialNameText.text = shopData.Name; - // materialImage + materialImageTarget.DestroyAllChildrens(); + Instantiate(shopData.GetIconPrefab(), materialImageTarget); materialAmountText.text = $"x{amount}"; Shopping.AddItem(shopData, amount); }