diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab index d29935f9..5caf683a 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab @@ -440,7 +440,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4082915278807493230} - - {fileID: 4082915278879672977} - {fileID: 4082915279096126313} m_Father: {fileID: 4082915279116682333} m_RootOrder: 0 @@ -1171,13 +1170,14 @@ MonoBehaviour: cancelButton: {fileID: 4082915278942985871} deliveredButton: {fileID: 4082915279019759811} disabledButtonObject: {fileID: 3717552158352820819} - achievedObject: {fileID: 4082915278879672978} messageText: {fileID: 4082915277970689977} coinText: {fileID: 4082915277569352110} heartText: {fileID: 4082915279101330553} itemView1: {fileID: 7927160839000454040} itemView2: {fileID: 6685489803199069635} itemView3: {fileID: 6685489803297445835} + bulkOrderCharacter: {fileID: 8433712159216882074} + orderCharacterImage: {fileID: 4082915278807493229} --- !u!1 &4082915278807493231 GameObject: m_ObjectHideFlags: 0 @@ -1190,7 +1190,7 @@ GameObject: - component: {fileID: 4082915278807493228} - component: {fileID: 4082915278807493229} m_Layer: 5 - m_Name: icon_usually + m_Name: icon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1364,80 +1364,6 @@ RectTransform: m_AnchoredPosition: {x: 1, y: -338} m_SizeDelta: {x: 730, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &4082915278879672978 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4082915278879672977} - - component: {fileID: 4082915278879672983} - - component: {fileID: 4082915278879672976} - m_Layer: 5 - m_Name: 'icon_Achievement ' - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &4082915278879672977 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4082915278879672978} - 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: 4082915277828884816} - 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: -301, y: 0} - m_SizeDelta: {x: 118, y: 118} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4082915278879672983 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4082915278879672978} - m_CullTransparentMesh: 0 ---- !u!114 &4082915278879672976 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4082915278879672978} - 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: c4906f546dcdf97458df56e84bc2e6d2, 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 &4082915278942985865 GameObject: m_ObjectHideFlags: 0 @@ -1876,7 +1802,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4082915277828884816} - m_RootOrder: 2 + 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} @@ -2310,6 +2236,7 @@ RectTransform: m_Children: - {fileID: 4082915279313483618} - {fileID: 4082915278546610718} + - {fileID: 6706831019667254522} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3095,3 +3022,140 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 4082915279389395765} m_PrefabAsset: {fileID: 0} +--- !u!1001 &9179171686329286665 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4082915279371560212} + m_Modifications: + - target: {fileID: 1830184679245544905, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_Name + value: CharacterManager + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 52bd3419e2fe64f899244ed3ae0d41d0, type: 3} +--- !u!224 &6706831019667254522 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + m_PrefabInstance: {fileID: 9179171686329286665} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8433712159216882074 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 749964260611248531, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + m_PrefabInstance: {fileID: 9179171686329286665} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6c5a52384784446ae7d757bd7007b88, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab index 8554fba5..b0b8342c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab @@ -151,6 +151,8 @@ MonoBehaviour: coinText: {fileID: 2377818823929203721} bonusCoinText: {fileID: 2377818823802633425} messageText: {fileID: 2377818823780007094} + bulkOrderCharacter: {fileID: 4080359802288886363} + orderCharacterImage: {fileID: 2377818823009469880} --- !u!1 &2377818823009469882 GameObject: m_ObjectHideFlags: 0 @@ -695,6 +697,7 @@ RectTransform: m_Children: - {fileID: 2377818822785157574} - {fileID: 2377818822852436376} + - {fileID: 1205199289679343419} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2079,3 +2082,140 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &3659228687541109704 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2377818823490934338} + m_Modifications: + - target: {fileID: 1830184679245544905, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_Name + value: CharacterManager + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 52bd3419e2fe64f899244ed3ae0d41d0, type: 3} +--- !u!224 &1205199289679343419 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + m_PrefabInstance: {fileID: 3659228687541109704} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4080359802288886363 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 749964260611248531, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + m_PrefabInstance: {fileID: 3659228687541109704} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6c5a52384784446ae7d757bd7007b88, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab index 3bc6e40f..4254223d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab @@ -411,6 +411,8 @@ MonoBehaviour: itemView3: {fileID: 1755114094215964333} coinText: {fileID: 4315754686580462760} heartText: {fileID: 4315754688005591447} + bulkOrderCharacter: {fileID: 3195309312249131840} + orderCharacterImage: {fileID: 4315754688350645384} --- !u!1 &4315754687099534942 GameObject: m_ObjectHideFlags: 0 @@ -786,6 +788,7 @@ RectTransform: m_Children: - {fileID: 4315754688243439425} - {fileID: 4315754686943043844} + - {fileID: 306780385466830368} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1688,6 +1691,143 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &2751818559207482067 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4315754687615340680} + m_Modifications: + - target: {fileID: 1830184679245544905, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_Name + value: CharacterManager + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 52bd3419e2fe64f899244ed3ae0d41d0, type: 3} +--- !u!224 &306780385466830368 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2481917997056093427, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + m_PrefabInstance: {fileID: 2751818559207482067} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3195309312249131840 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 749964260611248531, guid: 52bd3419e2fe64f899244ed3ae0d41d0, + type: 3} + m_PrefabInstance: {fileID: 2751818559207482067} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6c5a52384784446ae7d757bd7007b88, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &3058138225154535967 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CharacterManager.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CharacterManager.prefab new file mode 100644 index 00000000..daed13ab --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CharacterManager.prefab @@ -0,0 +1,82 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1830184679245544905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2481917997056093427} + - component: {fileID: 749964260611248531} + m_Layer: 5 + m_Name: CharacterManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2481917997056093427 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1830184679245544905} + 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: 0} + 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!114 &749964260611248531 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1830184679245544905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6c5a52384784446ae7d757bd7007b88, type: 3} + m_Name: + m_EditorClassIdentifier: + normalIconList: + - {fileID: 21300000, guid: 34b365f4d93bfac4fb472f0a176ec998, type: 3} + - {fileID: 21300000, guid: ba7d92ccd23c646478c1e3c72b3d785e, type: 3} + - {fileID: 21300000, guid: 8a2f666358cc53d45903f5987d2ef501, type: 3} + - {fileID: 21300000, guid: 408504ea7c68fc9478479613b168cfd2, type: 3} + - {fileID: 21300000, guid: e452ae9067014cd44a90af3697772892, type: 3} + - {fileID: 21300000, guid: 0bca8d2876cd69a48b0d38a003a744c0, type: 3} + - {fileID: 21300000, guid: b86ccfed571d2f34f89ba1ee4503ee5d, type: 3} + - {fileID: 21300000, guid: 7d7577ef978da6a4a9336b31bd09d1e2, type: 3} + - {fileID: 21300000, guid: b2ea445fb275e33469f4880fdca91bbf, type: 3} + - {fileID: 21300000, guid: 25ffa16ce136405488bb42e4429ae4ad, type: 3} + - {fileID: 21300000, guid: 0a0eb90b30f9ee54c98813de8f2f58e0, type: 3} + - {fileID: 21300000, guid: 22f873f412ac71d438fc9a5998441a6b, type: 3} + - {fileID: 21300000, guid: e62ad8fd7c48acb4c9eaa10bf21cd72b, type: 3} + - {fileID: 21300000, guid: f50c03202f347854196410cdd22e000c, type: 3} + - {fileID: 21300000, guid: 1e7638d868e69d34c927f62ce18fe375, type: 3} + thanksIconList: + - {fileID: 21300000, guid: c4906f546dcdf97458df56e84bc2e6d2, type: 3} + - {fileID: 21300000, guid: 38e810885d0282f4b8fdc138b12678bc, type: 3} + - {fileID: 21300000, guid: d79ff43507e4edc46800ea10d0b95d12, type: 3} + - {fileID: 21300000, guid: b3ba92a9081db314288220838b82a3b2, type: 3} + - {fileID: 21300000, guid: c8414a32a23e29d4e90255533d97183f, type: 3} + - {fileID: 21300000, guid: b7fcfe5dfd32eb64698fae4b728a9a0a, type: 3} + - {fileID: 21300000, guid: c87fe43073dd41548b2e48bcd2ca1c44, type: 3} + - {fileID: 21300000, guid: 6908a3714d73b4e43ac5499510fd19de, type: 3} + - {fileID: 21300000, guid: 0d227e07dd16af6458bfecccfe437347, type: 3} + - {fileID: 21300000, guid: 3e74ba66987a8d140b2ac61be4260b7a, type: 3} + - {fileID: 21300000, guid: 7d09b91dda88b724ba55cc211400db36, type: 3} + - {fileID: 21300000, guid: c5f926880ae62b042ada2283f3655171, type: 3} + - {fileID: 21300000, guid: bd8f66ea814716845a9929793310d330, type: 3} + - {fileID: 21300000, guid: bdcc60e8484458248afeda4c2b7de0db, type: 3} + - {fileID: 21300000, guid: 54f2d531949506d49a89cb73f72cc2c4, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CharacterManager.prefab.meta b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CharacterManager.prefab.meta new file mode 100644 index 00000000..acebe530 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CharacterManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 52bd3419e2fe64f899244ed3ae0d41d0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs index 0450ec8a..16d4c56c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs @@ -24,13 +24,14 @@ public class BulkOrder : MonoBehaviour [SerializeField] private Button cancelButton; [SerializeField] private Button deliveredButton; [SerializeField] private GameObject disabledButtonObject; - [SerializeField] private GameObject achievedObject; [SerializeField] private Text messageText; [SerializeField] private Text coinText; [SerializeField] private Text heartText; [SerializeField] private BulkOrderItemView itemView1; [SerializeField] private BulkOrderItemView itemView2; [SerializeField] private BulkOrderItemView itemView3; + [SerializeField] private BulkOrderCharacter bulkOrderCharacter; + [SerializeField] private Image orderCharacterImage; private void Start() { @@ -53,6 +54,7 @@ public class BulkOrder : MonoBehaviour messageText.text = messageList.First(data => data.id == gameData.OrderTextId).requestText; coinText.text = bulkOrderData.rewardCoin.ToString(); heartText.text = bulkOrderData.rewardHeart.ToString(); + orderCharacterImage.sprite = bulkOrderCharacter.GetNormalIcon(gameData.OrderIconIndex); LocalCacheManager.Save(DataTag, bulkOrderData); cancelButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => @@ -84,7 +86,10 @@ public class BulkOrder : MonoBehaviour }; var completed = gameData.CompletedProductList.Count == orderList.Count(x => x != 0); var delivered = gameData.DeliveredOrder.Contains(bulkOrderData.id); - achievedObject.SetActive(completed); + if (completed) + { + orderCharacterImage.sprite = bulkOrderCharacter.GetThanksIcon(gameData.OrderIconIndex); + } deliveredButton.interactable = completed && !delivered; disabledButtonObject.SetActive(!deliveredButton.interactable); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs index 4c6947b2..299397e1 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs @@ -15,6 +15,8 @@ public class BulkOrderAchievedView : MonoBehaviour [SerializeField] private Text coinText; [SerializeField] private Text bonusCoinText; [SerializeField] private Text messageText; + [SerializeField] private BulkOrderCharacter bulkOrderCharacter; + [SerializeField] private Image orderCharacterImage; private void Start() { @@ -28,6 +30,7 @@ public class BulkOrderAchievedView : MonoBehaviour coinText.text = orderData.rewardCoin.ToString(); bonusCoinText.text = bonus.ToString(); messageText.text = messageList.First(data => data.id == gameData.OrderTextId).thanksText; + orderCharacterImage.sprite = bulkOrderCharacter.GetThanksIcon(gameData.OrderIconIndex); } closeButton.OnClickAsObservable().Subscribe(_ => { diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCharacter.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCharacter.cs new file mode 100644 index 00000000..f2a01c73 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCharacter.cs @@ -0,0 +1,23 @@ +using System.Collections.Generic; +using UnityEngine; + +public class BulkOrderCharacter : MonoBehaviour +{ + [SerializeField] private List normalIconList; + [SerializeField] private List thanksIconList; + + public Sprite GetNormalIcon(int index) + { + return normalIconList[index]; + } + + public Sprite GetThanksIcon(int index) + { + return thanksIconList[index]; + } + + public int GetRandomIndex() + { + return Random.Range(0, normalIconList.Count); + } +} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCharacter.cs.meta b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCharacter.cs.meta new file mode 100644 index 00000000..fb5d11e6 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCharacter.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f6c5a52384784446ae7d757bd7007b88 +timeCreated: 1634881384 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs index 7dc22792..f8ef649b 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs @@ -18,6 +18,8 @@ public class BulkOrderNotifyView : MonoBehaviour [SerializeField] private BulkOrderNotifyItemView itemView3; [SerializeField] private Text coinText; [SerializeField] private Text heartText; + [SerializeField] private BulkOrderCharacter bulkOrderCharacter; + [SerializeField] private Image orderCharacterImage; private void Start() { @@ -28,6 +30,10 @@ public class BulkOrderNotifyView : MonoBehaviour messageText.text = messageList.First(data => data.id == gameData.OrderTextId).requestText; coinText.text = orderData.rewardCoin.ToString(); heartText.text = orderData.rewardHeart.ToString(); + + gameData.OrderIconIndex = bulkOrderCharacter.GetRandomIndex(); + GameDataManager.SaveGameData(); + orderCharacterImage.sprite = bulkOrderCharacter.GetNormalIcon(gameData.OrderIconIndex); var productList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet); if (productList.FirstOrDefault(data => data.id == orderData.productId1) is ProductData data1) diff --git a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs index 9824b98f..7a6dd8fb 100644 --- a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs +++ b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs @@ -100,9 +100,10 @@ public sealed class GameData { public List AchievedMission; // [DataMember(Name = "Data26")] - // [DataMember(Name = "Data27")] // BulkOrder + [DataMember(Name = "Data27")] + public int OrderIconIndex; [DataMember(Name = "Data28")] public int OrderIdInProgress; [DataMember(Name = "Data29")]