From 1857833041605489ac8c5d76aefa4ccb627f2986 Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 5 Oct 2021 19:03:28 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A3=9C=E5=85=85=E5=87=A6=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3/=E8=A3=9C=E5=85=85=E3=82=A2=E3=83=8B?= =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?/=E3=82=AD=E3=83=A9=E3=82=AD=E3=83=A9=E6=BC=94=E5=87=BA?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0/=E8=B2=A9=E5=A3=B2=E3=82=B7=E3=83=BC?= =?UTF-8?q?=E3=83=B3=E3=81=AE=E3=83=9D=E3=83=83=E3=83=97=E3=82=B3=E3=83=BC?= =?UTF-8?q?=E3=83=B3=E3=82=B9=E3=82=AD=E3=83=B3=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Prefabs.meta | 8 + .../icon_Rare.prefab} | 621 +++++++---------- .../MyGame/Prefabs/icon_Rare.prefab.meta | 7 + .../Assets/MyGame/Prefabs/rare_Canvas.prefab | 431 ++++++++++++ .../MyGame/Prefabs/rare_Canvas.prefab.meta | 7 + .../Animation/package_a_salt.controller | 92 ++- .../Resources/Avatars/customer_normal.prefab | 78 ++- popcorn/Assets/MyGame/Resources/Popcorns.meta | 8 + .../Resources/Popcorns/cart_popcorn.prefab | 108 +++ .../Popcorns/cart_popcorn.prefab.meta} | 0 .../Resources/Popcorns/package_salt.prefab | 256 +++++++ .../Popcorns/package_salt.prefab.meta | 7 + .../Cooking/Prefabs/Rare_details.prefab | 623 ++++-------------- .../Scenes/Cooking/Scripts/RarityView.cs | 15 +- .../Scenes/Main/Scripts/KitchenManager.cs | 1 - .../marketing/Scripts/CustomerAnimator.cs | 32 +- .../MyGame/Scenes/marketing/Scripts/Market.cs | 8 +- .../marketing/Scripts/MarketCartView.cs | 29 +- .../Scenes/marketing/Scripts/MarketManager.cs | 25 +- .../marketing/Scripts/MarketPopcornView.cs | 22 +- .../Scenes/marketing/Scripts/StorageTank.cs | 32 +- .../MyGame/Scenes/marketing/marketing.unity | 281 +------- .../Assets/MyGame/Scripts/SpreadsheetData.cs | 10 + 23 files changed, 1451 insertions(+), 1250 deletions(-) create mode 100644 popcorn/Assets/MyGame/Prefabs.meta rename popcorn/Assets/MyGame/{Scenes/marketing/Prefabs/popcorn.prefab => Prefabs/icon_Rare.prefab} (79%) create mode 100644 popcorn/Assets/MyGame/Prefabs/icon_Rare.prefab.meta create mode 100644 popcorn/Assets/MyGame/Prefabs/rare_Canvas.prefab create mode 100644 popcorn/Assets/MyGame/Prefabs/rare_Canvas.prefab.meta create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns.meta create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/cart_popcorn.prefab rename popcorn/Assets/MyGame/{Scenes/marketing/Prefabs/popcorn.prefab.meta => Resources/Popcorns/cart_popcorn.prefab.meta} (100%) create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_salt.prefab create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_salt.prefab.meta diff --git a/popcorn/Assets/MyGame/Prefabs.meta b/popcorn/Assets/MyGame/Prefabs.meta new file mode 100644 index 00000000..fd49c9cc --- /dev/null +++ b/popcorn/Assets/MyGame/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d8a24cd6173ee458989691c03d52ccfa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/popcorn.prefab b/popcorn/Assets/MyGame/Prefabs/icon_Rare.prefab similarity index 79% rename from popcorn/Assets/MyGame/Scenes/marketing/Prefabs/popcorn.prefab rename to popcorn/Assets/MyGame/Prefabs/icon_Rare.prefab index 4b5d7abf..ee14732f 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/popcorn.prefab +++ b/popcorn/Assets/MyGame/Prefabs/icon_Rare.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1163131967622414029 +--- !u!1 &24149180325685413 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,81 +8,58 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3078343786930970471} - - component: {fileID: 3497344001095066012} + - component: {fileID: 5841351845785292974} + - component: {fileID: 3987647017087399524} m_Layer: 0 - m_Name: copper + m_Name: icon_Rare m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &3078343786930970471 -Transform: + m_IsActive: 1 +--- !u!224 &5841351845785292974 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163131967622414029} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 24149180325685413} + 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: 3929065037688066005} - m_Father: {fileID: 8672693391663156330} - m_RootOrder: 1 + - {fileID: 5163271794299328350} + - {fileID: 284649695394005923} + - {fileID: 6713394296414383131} + - {fileID: 6646658077033513493} + - {fileID: 3090000121968039495} + m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &3497344001095066012 -SpriteRenderer: + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -0.291, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3987647017087399524 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163131967622414029} + m_GameObject: {fileID: 24149180325685413} m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 10 - m_Sprite: {fileID: 21300000, guid: 55a9ae6dba49c3940865bd76918cbddf, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.34, y: 0.34} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &1740954476645375330 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01738374a494495b82539c6ff39c1a3a, type: 3} + m_Name: + m_EditorClassIdentifier: + normalObject: {fileID: 0} + yellowObject: {fileID: 6976988917483718688} + copperObject: {fileID: 4138658945598743049} + silverObject: {fileID: 7007805946474947487} + goldObject: {fileID: 3558445008987996582} + rainbowObject: {fileID: 6138085113245748136} +--- !u!1 &3558445008987996582 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -90,8 +67,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8464113562627825361} - - component: {fileID: 8647915206056487584} + - component: {fileID: 6646658077033513493} + - component: {fileID: 5857123941312444004} m_Layer: 0 m_Name: gold m_TagString: Untagged @@ -99,28 +76,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8464113562627825361 +--- !u!4 &6646658077033513493 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1740954476645375330} + m_GameObject: {fileID: 3558445008987996582} 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: 219721263525030306} - m_Father: {fileID: 8672693391663156330} + - {fileID: 3046585563494577510} + m_Father: {fileID: 5841351845785292974} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &8647915206056487584 +--- !u!212 &5857123941312444004 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1740954476645375330} + m_GameObject: {fileID: 3558445008987996582} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -164,7 +141,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2963075757041185889 +--- !u!1 &4138658945598743049 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -172,77 +149,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8672693391663156330} + - component: {fileID: 284649695394005923} + - component: {fileID: 1856100870500023640} m_Layer: 0 - m_Name: icon_Rare - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8672693391663156330 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2963075757041185889} - 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: 5738095271717293117} - - {fileID: 3078343786930970471} - - {fileID: 8386259639205277919} - - {fileID: 8464113562627825361} - - {fileID: 264265986813627011} - m_Father: {fileID: 648528851945481441} - m_RootOrder: 0 - 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.291, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &5191388541605478235 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8386259639205277919} - - component: {fileID: 5515815923504194614} - m_Layer: 0 - m_Name: silver + m_Name: copper m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!4 &8386259639205277919 +--- !u!4 &284649695394005923 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5191388541605478235} + m_GameObject: {fileID: 4138658945598743049} 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: 2720007053823694494} - m_Father: {fileID: 8672693391663156330} - m_RootOrder: 2 + - {fileID: 2291744981618184977} + m_Father: {fileID: 5841351845785292974} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &5515815923504194614 +--- !u!212 &1856100870500023640 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5191388541605478235} + m_GameObject: {fileID: 4138658945598743049} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -275,7 +212,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 10 - m_Sprite: {fileID: 21300000, guid: 8f60e4d8c7b90414caf6447ff0fda4d8, type: 3} + m_Sprite: {fileID: 21300000, guid: 55a9ae6dba49c3940865bd76918cbddf, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -286,7 +223,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &5302988883009164516 +--- !u!1 &6138085113245748136 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -294,243 +231,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5738095271717293117} - - component: {fileID: 9159487004534136725} - m_Layer: 0 - m_Name: yellow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &5738095271717293117 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5302988883009164516} - 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: 8672693391663156330} - 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: 1, y: 1} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!212 &9159487004534136725 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5302988883009164516} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 10 - m_Sprite: {fileID: 21300000, guid: e97f9c209502fae42ba9fe6c73d0875a, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.34, y: 0.34} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &6654275607504121913 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 648528851945481441} - - component: {fileID: 2301097158442999248} - - component: {fileID: 856520055824150402} - m_Layer: 0 - m_Name: package_a_salt - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &648528851945481441 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6654275607504121913} - 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: 8672693391663156330} - m_Father: {fileID: 7689040401039027174} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2301097158442999248 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6654275607504121913} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 7 - m_Sprite: {fileID: 21300000, guid: 99d426990eeb08d4d85ae03f04609196, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.92, y: 1.36} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!95 &856520055824150402 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6654275607504121913} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: b9e306c9dd9a867409caee4d882fd445, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &7689040401039027175 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7689040401039027174} - - component: {fileID: 3788453926216569065} - m_Layer: 0 - m_Name: popcorn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7689040401039027174 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7689040401039027175} - 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: 648528851945481441} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3788453926216569065 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7689040401039027175} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: - animator: {fileID: 856520055824150402} - popcornRenderer: {fileID: 2301097158442999248} - caramelSprite: {fileID: 21300000, guid: 469b78432f101024aa1a2060a57231d8, type: 3} ---- !u!1 &8963823371771926380 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 264265986813627011} - - component: {fileID: 4053384767913183147} + - component: {fileID: 3090000121968039495} + - component: {fileID: 1228283985694481263} m_Layer: 0 m_Name: rainbow m_TagString: Untagged @@ -538,28 +240,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!4 &264265986813627011 +--- !u!4 &3090000121968039495 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8963823371771926380} + m_GameObject: {fileID: 6138085113245748136} 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: 6301724139818425926} - m_Father: {fileID: 8672693391663156330} + - {fileID: 9096996958287856258} + m_Father: {fileID: 5841351845785292974} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &4053384767913183147 +--- !u!212 &1228283985694481263 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8963823371771926380} + m_GameObject: {fileID: 6138085113245748136} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -603,12 +305,175 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1001 &177515594093521866 +--- !u!1 &6976988917483718688 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5163271794299328350} + - component: {fileID: 6221220237841220433} + m_Layer: 0 + m_Name: yellow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &5163271794299328350 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6976988917483718688} + 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: 5841351845785292974} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6221220237841220433 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6976988917483718688} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 10 + m_Sprite: {fileID: 21300000, guid: e97f9c209502fae42ba9fe6c73d0875a, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.34, y: 0.34} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &7007805946474947487 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6713394296414383131} + - component: {fileID: 7333869435851520242} + m_Layer: 0 + m_Name: silver + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &6713394296414383131 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7007805946474947487} + 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: 933465853810756186} + m_Father: {fileID: 5841351845785292974} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7333869435851520242 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7007805946474947487} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 10 + m_Sprite: {fileID: 21300000, guid: 8f60e4d8c7b90414caf6447ff0fda4d8, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.34, y: 0.34} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1001 &2213479385714512249 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 3078343786930970471} + m_TransformParent: {fileID: 6646658077033513493} m_Modifications: - target: {fileID: 2766725442730909358, guid: db966de52df9e004b96bb4bc77c41b5e, type: 3} @@ -707,18 +572,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: db966de52df9e004b96bb4bc77c41b5e, type: 3} ---- !u!4 &3929065037688066005 stripped +--- !u!4 &3046585563494577510 stripped Transform: m_CorrespondingSourceObject: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, type: 3} - m_PrefabInstance: {fileID: 177515594093521866} + m_PrefabInstance: {fileID: 2213479385714512249} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1247240544215855745 +--- !u!1001 &3115812820758198030 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 8386259639205277919} + m_TransformParent: {fileID: 284649695394005923} m_Modifications: - target: {fileID: 2766725442730909358, guid: db966de52df9e004b96bb4bc77c41b5e, type: 3} @@ -817,18 +682,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: db966de52df9e004b96bb4bc77c41b5e, type: 3} ---- !u!4 &2720007053823694494 stripped +--- !u!4 &2291744981618184977 stripped Transform: m_CorrespondingSourceObject: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, type: 3} - m_PrefabInstance: {fileID: 1247240544215855745} + m_PrefabInstance: {fileID: 3115812820758198030} m_PrefabAsset: {fileID: 0} ---- !u!1001 &4034352221960719805 +--- !u!1001 &4036395783033744965 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 8464113562627825361} + m_TransformParent: {fileID: 6713394296414383131} m_Modifications: - target: {fileID: 2766725442730909358, guid: db966de52df9e004b96bb4bc77c41b5e, type: 3} @@ -927,18 +792,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: db966de52df9e004b96bb4bc77c41b5e, type: 3} ---- !u!4 &219721263525030306 stripped +--- !u!4 &933465853810756186 stripped Transform: m_CorrespondingSourceObject: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, type: 3} - m_PrefabInstance: {fileID: 4034352221960719805} + m_PrefabInstance: {fileID: 4036395783033744965} m_PrefabAsset: {fileID: 0} ---- !u!1001 &7170933593771162201 +--- !u!1001 &5390659369552193181 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 264265986813627011} + m_TransformParent: {fileID: 3090000121968039495} m_Modifications: - target: {fileID: 2766725442730909358, guid: db966de52df9e004b96bb4bc77c41b5e, type: 3} @@ -1037,9 +902,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: db966de52df9e004b96bb4bc77c41b5e, type: 3} ---- !u!4 &6301724139818425926 stripped +--- !u!4 &9096996958287856258 stripped Transform: m_CorrespondingSourceObject: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, type: 3} - m_PrefabInstance: {fileID: 7170933593771162201} + m_PrefabInstance: {fileID: 5390659369552193181} m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Prefabs/icon_Rare.prefab.meta b/popcorn/Assets/MyGame/Prefabs/icon_Rare.prefab.meta new file mode 100644 index 00000000..0d081f5f --- /dev/null +++ b/popcorn/Assets/MyGame/Prefabs/icon_Rare.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cb4e7b1baf6f44c17bba72dfd7f73825 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Prefabs/rare_Canvas.prefab b/popcorn/Assets/MyGame/Prefabs/rare_Canvas.prefab new file mode 100644 index 00000000..3220bcc7 --- /dev/null +++ b/popcorn/Assets/MyGame/Prefabs/rare_Canvas.prefab @@ -0,0 +1,431 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &592905858270211531 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 592905858270211530} + - component: {fileID: 592905858270211528} + - component: {fileID: 592905858270211529} + m_Layer: 5 + m_Name: rare_copper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &592905858270211530 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592905858270211531} + 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: 592905858299255810} + 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: 60, y: 58} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &592905858270211528 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592905858270211531} + m_CullTransparentMesh: 0 +--- !u!114 &592905858270211529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592905858270211531} + 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: 159022d28443b654a81362c923c14664, 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 &592905858299255811 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 592905858299255810} + - component: {fileID: 592905858299255809} + m_Layer: 5 + m_Name: rare + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &592905858299255810 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592905858299255811} + 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: 592905859906714104} + - {fileID: 592905858270211530} + - {fileID: 592905858709072378} + - {fileID: 592905859427273352} + - {fileID: 592905858453892995} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &592905858299255809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592905858299255811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01738374a494495b82539c6ff39c1a3a, type: 3} + m_Name: + m_EditorClassIdentifier: + normalObject: {fileID: 0} + yellowObject: {fileID: 592905859906714105} + copperObject: {fileID: 592905858270211531} + silverObject: {fileID: 592905858709072379} + goldObject: {fileID: 592905859427273353} + rainbowObject: {fileID: 592905858453892996} +--- !u!1 &592905858453892996 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 592905858453892995} + - component: {fileID: 592905858453892993} + - component: {fileID: 592905858453892994} + m_Layer: 5 + m_Name: rare_Rainbow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &592905858453892995 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592905858453892996} + 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: 592905858299255810} + m_RootOrder: 4 + 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: 60, y: 58} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &592905858453892993 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592905858453892996} + m_CullTransparentMesh: 0 +--- !u!114 &592905858453892994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592905858453892996} + 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: 6a21644e9914e3c45bae6b293edf2973, 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 &592905858709072379 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 592905858709072378} + - component: {fileID: 592905858709072376} + - component: {fileID: 592905858709072377} + m_Layer: 5 + m_Name: rare_Silver + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &592905858709072378 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592905858709072379} + 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: 592905858299255810} + 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: 60, y: 58} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &592905858709072376 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592905858709072379} + m_CullTransparentMesh: 0 +--- !u!114 &592905858709072377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592905858709072379} + 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: 7654e044ece88164dbee09bf458961d6, 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 &592905859427273353 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 592905859427273352} + - component: {fileID: 592905859427273366} + - component: {fileID: 592905859427273367} + m_Layer: 5 + m_Name: rare_gold + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &592905859427273352 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592905859427273353} + 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: 592905858299255810} + 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: 60, y: 58} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &592905859427273366 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592905859427273353} + m_CullTransparentMesh: 0 +--- !u!114 &592905859427273367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592905859427273353} + 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: a168a9e02e4621345a96d19959a7e04b, 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 &592905859906714105 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 592905859906714104} + - component: {fileID: 592905859906714054} + - component: {fileID: 592905859906714055} + m_Layer: 5 + m_Name: rare_yellow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &592905859906714104 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592905859906714105} + 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: 592905858299255810} + 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: 60, y: 58} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &592905859906714054 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592905859906714105} + m_CullTransparentMesh: 0 +--- !u!114 &592905859906714055 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592905859906714105} + 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: e8cfd4afcd59ebe4a9a500ec4f1a7ec4, 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 diff --git a/popcorn/Assets/MyGame/Prefabs/rare_Canvas.prefab.meta b/popcorn/Assets/MyGame/Prefabs/rare_Canvas.prefab.meta new file mode 100644 index 00000000..20250450 --- /dev/null +++ b/popcorn/Assets/MyGame/Prefabs/rare_Canvas.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2c82036225f2d453cac3ff9fb07fae4d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Animation/package_a_salt.controller b/popcorn/Assets/MyGame/Resource/Animation/package_a_salt.controller index 15903d3f..5d91cafc 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/package_a_salt.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/package_a_salt.controller @@ -1,5 +1,52 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8422753441239707306 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3234791033028266292} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-5961560975127805505 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Place + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6444347054925097954} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -8,7 +55,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: package_a_salt serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Place + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -33,7 +86,10 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 6444347054925097954} - m_Position: {x: 190, y: 0, z: 0} + m_Position: {x: 310, y: 10, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3234791033028266292} + m_Position: {x: 310, y: 120, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -43,7 +99,34 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 6444347054925097954} + m_DefaultState: {fileID: 3234791033028266292} +--- !u!1102 &3234791033028266292 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Wait + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -5961560975127805505} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &6444347054925097954 AnimatorState: serializedVersion: 5 @@ -54,7 +137,8 @@ AnimatorState: m_Name: popcorn_package m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -8422753441239707306} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab b/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab index 00ecf450..9c6d1698 100644 --- a/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab +++ b/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab @@ -4862,6 +4862,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8759972247495498057} + - component: {fileID: 2558996577959358363} m_Layer: 0 m_Name: popcorn_right_eat m_TagString: Untagged @@ -4884,6 +4885,17 @@ Transform: m_Father: {fileID: 4886416729068509252} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -134.11101} +--- !u!210 &2558996577959358363 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 471339744374256983} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 19 --- !u!1 &2471704596236347950 GameObject: m_ObjectHideFlags: 0 @@ -5417,12 +5429,6 @@ MonoBehaviour: rightPopcornTarget: {fileID: 8759972247495498057} frontPopcornTarget: {fileID: 2262857044639259982} wantFlavorSpriteTarget: {fileID: 4886416730275037410} - leftPopcorn: {fileID: 683463888876420084} - rightPopcorn: {fileID: 1428887861146841382} - frontPopcorn: {fileID: 1428887861354145305} - wantFlavorSprite: {fileID: 4357274076670330661} - defaultSprite: {fileID: 21300000, guid: 99d426990eeb08d4d85ae03f04609196, type: 3} - caramelSprite: {fileID: 21300000, guid: 469b78432f101024aa1a2060a57231d8, type: 3} --- !u!114 &7213583640106143312 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7417,6 +7423,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4886416730275037410} + - component: {fileID: 8589314661898912695} m_Layer: 0 m_Name: order m_TagString: Untagged @@ -7439,6 +7446,17 @@ Transform: m_Father: {fileID: 4886416729748261545} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15} +--- !u!210 &8589314661898912695 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4886416730275037409} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 21 --- !u!1 &4886416730294442468 GameObject: m_ObjectHideFlags: 0 @@ -7689,6 +7707,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2262857044639259982} + - component: {fileID: 3038335626170087769} m_Layer: 0 m_Name: popcorn_front_eat m_TagString: Untagged @@ -7711,6 +7730,17 @@ Transform: m_Father: {fileID: 4886416729796178190} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!210 &3038335626170087769 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6952551938940088656} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 25 --- !u!1 &7358655632798716600 GameObject: m_ObjectHideFlags: 0 @@ -7903,6 +7933,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 864454890252178187} + - component: {fileID: 2761228477808397434} m_Layer: 0 m_Name: popcorn_left_eat m_TagString: Untagged @@ -7925,6 +7956,17 @@ Transform: m_Father: {fileID: 4886416729645955359} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!210 &2761228477808397434 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8422870931014696725} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 6 --- !u!1001 &4886416729869589980 PrefabInstance: m_ObjectHideFlags: 0 @@ -8004,12 +8046,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0a807afb08578f048850b990e00884b1, type: 3} ---- !u!212 &1428887861354145305 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 5765847566386641861, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - m_PrefabInstance: {fileID: 4886416729869589980} - m_PrefabAsset: {fileID: 0} --- !u!4 &864454890883285588 stripped Transform: m_CorrespondingSourceObject: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, @@ -8095,12 +8131,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0a807afb08578f048850b990e00884b1, type: 3} ---- !u!212 &1428887861146841382 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 5765847566386641861, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - m_PrefabInstance: {fileID: 4886416730332646115} - m_PrefabAsset: {fileID: 0} --- !u!4 &864454891212723563 stripped Transform: m_CorrespondingSourceObject: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, @@ -8186,12 +8216,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0a807afb08578f048850b990e00884b1, type: 3} ---- !u!212 &683463888876420084 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 5765847566386641861, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - m_PrefabInstance: {fileID: 6446974443264639025} - m_PrefabAsset: {fileID: 0} --- !u!4 &1249575302503997369 stripped Transform: m_CorrespondingSourceObject: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, @@ -8292,12 +8316,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0a807afb08578f048850b990e00884b1, type: 3} ---- !u!212 &4357274076670330661 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 5765847566386641861, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - m_PrefabInstance: {fileID: 7817196169917021408} - m_PrefabAsset: {fileID: 0} --- !u!4 &2617542989482238824 stripped Transform: m_CorrespondingSourceObject: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, diff --git a/popcorn/Assets/MyGame/Resources/Popcorns.meta b/popcorn/Assets/MyGame/Resources/Popcorns.meta new file mode 100644 index 00000000..d63b866f --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f6ddd63a34f9046fab123efd0c212d0d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/cart_popcorn.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/cart_popcorn.prefab new file mode 100644 index 00000000..a288a81a --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/cart_popcorn.prefab @@ -0,0 +1,108 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7689040401039027175 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7689040401039027174} + m_Layer: 0 + m_Name: cart_popcorn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7689040401039027174 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7689040401039027175} + 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: 648528851945481441} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &8660466488599942182 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7689040401039027174} + m_Modifications: + - target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Name + value: package_a_salt + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3} +--- !u!4 &648528851945481441 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + m_PrefabInstance: {fileID: 8660466488599942182} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/popcorn.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/cart_popcorn.prefab.meta similarity index 100% rename from popcorn/Assets/MyGame/Scenes/marketing/Prefabs/popcorn.prefab.meta rename to popcorn/Assets/MyGame/Resources/Popcorns/cart_popcorn.prefab.meta diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_salt.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/package_salt.prefab new file mode 100644 index 00000000..e24257c0 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_salt.prefab @@ -0,0 +1,256 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2623509555173712927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8156056226503979207} + - component: {fileID: 7484714086723963382} + - component: {fileID: 8345961830975929252} + - component: {fileID: 8955923947763766273} + m_Layer: 0 + m_Name: package_salt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8156056226503979207 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2623509555173712927} + 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: 30312240474839116} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7484714086723963382 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2623509555173712927} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 7 + m_Sprite: {fileID: 21300000, guid: 99d426990eeb08d4d85ae03f04609196, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.92, y: 1.36} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &8345961830975929252 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2623509555173712927} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b9e306c9dd9a867409caee4d882fd445, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &8955923947763766273 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2623509555173712927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 8345961830975929252} + rarityView: {fileID: 7362788947616890502} +--- !u!1001 &5871311125307689186 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8156056226503979207} + m_Modifications: + - target: {fileID: 24149180325685413, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_Name + value: icon_Rare + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.291 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cb4e7b1baf6f44c17bba72dfd7f73825, type: 3} +--- !u!224 &30312240474839116 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5841351845785292974, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + m_PrefabInstance: {fileID: 5871311125307689186} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7362788947616890502 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3987647017087399524, guid: cb4e7b1baf6f44c17bba72dfd7f73825, + type: 3} + m_PrefabInstance: {fileID: 5871311125307689186} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01738374a494495b82539c6ff39c1a3a, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_salt.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/package_salt.prefab.meta new file mode 100644 index 00000000..712d8f13 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_salt.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d6338849f97cc4b2e80f40eecd881ae9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Rare_details.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Rare_details.prefab index e7944a4c..9af4e5c2 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Rare_details.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Rare_details.prefab @@ -1,213 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &5853024401507007234 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4157042672128902012} - - component: {fileID: 985412216225010988} - - component: {fileID: 3360096301814823619} - m_Layer: 5 - m_Name: rare_normal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4157042672128902012 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5853024401507007234} - 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: 8869708493288692344} - 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: 60, y: 58} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &985412216225010988 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5853024401507007234} - m_CullTransparentMesh: 0 ---- !u!114 &3360096301814823619 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5853024401507007234} - 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: 041ad2539ff56d945ab2da4be6a02f04, 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 &8869708493288692345 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8869708493288692344} - - component: {fileID: 8869708493288692347} - m_Layer: 5 - m_Name: rare - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8869708493288692344 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8869708493288692345} - 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: 4157042672128902012} - - {fileID: 8869708494877278082} - - {fileID: 8869708493324659632} - - {fileID: 8869708493948071808} - - {fileID: 8869708495356234994} - - {fileID: 8869708494181526009} - m_Father: {fileID: 8869708493630406831} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8869708493288692347 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8869708493288692345} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01738374a494495b82539c6ff39c1a3a, type: 3} - m_Name: - m_EditorClassIdentifier: - normalObject: {fileID: 5853024401507007234} - yellowObject: {fileID: 8869708494877278083} - copperObject: {fileID: 8869708493324659633} - silverObject: {fileID: 8869708493948071809} - goldObject: {fileID: 8869708495356234995} - rainbowObject: {fileID: 8869708494181526014} ---- !u!1 &8869708493324659633 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8869708493324659632} - - component: {fileID: 8869708493324659634} - - component: {fileID: 8869708493324659635} - m_Layer: 5 - m_Name: rare_copper - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8869708493324659632 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8869708493324659633} - 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: 8869708493288692344} - 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: 60, y: 58} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8869708493324659634 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8869708493324659633} - m_CullTransparentMesh: 0 ---- !u!114 &8869708493324659635 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8869708493324659633} - 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: 159022d28443b654a81362c923c14664, 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 &8869708493587088499 GameObject: m_ObjectHideFlags: 0 @@ -364,299 +156,128 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 ---- !u!1 &8869708493948071809 -GameObject: +--- !u!1001 &8299540776909538938 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8869708493948071808} - - component: {fileID: 8869708493948071810} - - component: {fileID: 8869708493948071811} - m_Layer: 5 - m_Name: rare_Silver - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8869708493948071808 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8869708493630406831} + m_Modifications: + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255811, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_Name + value: rare + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2c82036225f2d453cac3ff9fb07fae4d, type: 3} +--- !u!224 &8869708493288692344 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + m_PrefabInstance: {fileID: 8299540776909538938} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8869708493948071809} - 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: 8869708493288692344} - 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: 60, y: 58} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8869708493948071810 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8869708493948071809} - m_CullTransparentMesh: 0 ---- !u!114 &8869708493948071811 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8869708493948071809} - 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: 7654e044ece88164dbee09bf458961d6, 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 &8869708494181526014 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8869708494181526009} - - component: {fileID: 8869708494181526011} - - component: {fileID: 8869708494181526008} - m_Layer: 5 - m_Name: rare_Rainbow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8869708494181526009 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8869708494181526014} - 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: 8869708493288692344} - m_RootOrder: 5 - 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: 60, y: 58} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8869708494181526011 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8869708494181526014} - m_CullTransparentMesh: 0 ---- !u!114 &8869708494181526008 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8869708494181526014} - 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: 6a21644e9914e3c45bae6b293edf2973, 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 &8869708494877278083 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8869708494877278082} - - component: {fileID: 8869708494877278140} - - component: {fileID: 8869708494877278141} - m_Layer: 5 - m_Name: rare_yellow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8869708494877278082 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8869708494877278083} - 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: 8869708493288692344} - 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: 60, y: 58} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8869708494877278140 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8869708494877278083} - m_CullTransparentMesh: 0 ---- !u!114 &8869708494877278141 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8869708494877278083} - 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: e8cfd4afcd59ebe4a9a500ec4f1a7ec4, 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 &8869708495356234995 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8869708495356234994} - - component: {fileID: 8869708495356234988} - - component: {fileID: 8869708495356234989} - m_Layer: 5 - m_Name: rare_gold - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8869708495356234994 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8869708495356234995} - 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: 8869708493288692344} - m_RootOrder: 4 - 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: 60, y: 58} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8869708495356234988 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8869708495356234995} - m_CullTransparentMesh: 0 ---- !u!114 &8869708495356234989 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8869708495356234995} - 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: a168a9e02e4621345a96d19959a7e04b, 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 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/RarityView.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/RarityView.cs index 842cfa43..6d7235bd 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/RarityView.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/RarityView.cs @@ -11,11 +11,14 @@ public class RarityView : MonoBehaviour public void SetRarity(ProductRarity rarity) { - normalObject?.SetActive(rarity == ProductRarity.Normal); - yellowObject?.SetActive(rarity == ProductRarity.Yellow); - copperObject?.SetActive(rarity == ProductRarity.Copper); - silverObject?.SetActive(rarity == ProductRarity.Silver); - goldObject?.SetActive(rarity == ProductRarity.Gold); - rainbowObject?.SetActive(rarity == ProductRarity.Rainbow); + if (normalObject != null) + { + normalObject.SetActive(rarity == ProductRarity.Normal); + } + yellowObject.SetActive(rarity == ProductRarity.Yellow); + copperObject.SetActive(rarity == ProductRarity.Copper); + silverObject.SetActive(rarity == ProductRarity.Silver); + goldObject.SetActive(rarity == ProductRarity.Gold); + rainbowObject.SetActive(rarity == ProductRarity.Rainbow); } } diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 9c8c44f9..de932318 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -81,7 +81,6 @@ public class KitchenManager : MonoBehaviour Id = 1, Capacity = 50, FlavorId = -1, - Stock = 0, } }; } diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerAnimator.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerAnimator.cs index dc746743..d70db6d6 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerAnimator.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerAnimator.cs @@ -22,12 +22,6 @@ public class CustomerAnimator : MonoBehaviour [SerializeField] private Transform rightPopcornTarget; [SerializeField] private Transform frontPopcornTarget; [SerializeField] private Transform wantFlavorSpriteTarget; - [SerializeField] private SpriteRenderer leftPopcorn; - [SerializeField] private SpriteRenderer rightPopcorn; - [SerializeField] private SpriteRenderer frontPopcorn; - [SerializeField] private SpriteRenderer wantFlavorSprite; - [SerializeField] private Sprite defaultSprite; - [SerializeField] private Sprite caramelSprite; private readonly ReactiveProperty triggerName = new ReactiveProperty(); @@ -89,25 +83,19 @@ public class CustomerAnimator : MonoBehaviour } } - public void SetWantFlavor(ProductStockData stockData) + public void SetWantFlavor(MarketPopcornView prefab, ProductRarity rarity) { - // if (stockData.FlavorId == 2) - // { - // leftPopcorn.sprite = caramelSprite; - // rightPopcorn.sprite = caramelSprite; - // frontPopcorn.sprite = caramelSprite; - // wantFlavorSprite.sprite = caramelSprite; - // } - // else - // { - // leftPopcorn.sprite = defaultSprite; - // rightPopcorn.sprite = defaultSprite; - // frontPopcorn.sprite = defaultSprite; - // wantFlavorSprite.sprite = defaultSprite; - // } + leftPopcornTarget.DestroyAllChildrens(); + rightPopcornTarget.DestroyAllChildrens(); + frontPopcornTarget.DestroyAllChildrens(); + wantFlavorSpriteTarget.DestroyAllChildrens(); + Instantiate(prefab, leftPopcornTarget).ChangeRarity(rarity); + Instantiate(prefab, rightPopcornTarget).ChangeRarity(rarity); + Instantiate(prefab, frontPopcornTarget).ChangeRarity(rarity); + Instantiate(prefab, wantFlavorSpriteTarget).ChangeRarity(rarity); orderPopup.SetActive(true); } - + public void ShowComplain() { orderAnimator.SetTrigger(Complain); diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs index 606e872e..fbbd85bb 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs @@ -421,12 +421,10 @@ public class Market : SingletonMonoBehaviour break; } var tank = gameData.StorageTanks[index]; - var stockCount = Mathf.Min(shopSpace, tank.Stock); - // 追加処理 + var stockList = tank.GetStock(shopSpace); // レアの設定入れる - gameData.ShopStock.AddRange(Enumerable.Repeat(tank.FlavorId, stockCount)); - shopSpace -= stockCount; - tank.Stock -= stockCount; + gameData.ShopStock.AddRange(stockList.Select(x => x.FlavorId)); + shopSpace -= stockList.Count; gameData.StorageTanks[index] = tank; index++; } diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketCartView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketCartView.cs index 4c59bd31..ddb97f46 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketCartView.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketCartView.cs @@ -1,16 +1,22 @@ using System; using System.Collections.Generic; +using System.Linq; using UnityEngine; public class MarketCartView : MonoBehaviour { - [SerializeField] private List popcornPositions; + [SerializeField] private List popcornPositions; + private List productDataList = new List(); + public void Initialize() + { + productDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet); + } - public void ResetDisplay() + private void ResetDisplay() { foreach (var popcorn in popcornPositions) { - popcorn.SetActive(false); + popcorn.DestroyAllChildrens(); } } @@ -25,7 +31,7 @@ public class MarketCartView : MonoBehaviour { this.CallWaitForSeconds(.05f * i, () => { - Refill(stock.index, stock.stockData.FlavorId, animate); + Refill(stock.index, stock.stockData, animate); }); i++; } @@ -34,19 +40,24 @@ public class MarketCartView : MonoBehaviour { foreach (var stock in shopStocks) { - Refill(stock.index, stock.stockData.FlavorId, animate); + Refill(stock.index, stock.stockData, animate); } } } - public void Refill(int index, int flavor, bool animate = true) + public void Refill(int index, ProductStockData stockData, bool animate = true) { - popcornPositions[index].ChangeSkin(flavor); - popcornPositions[index].SetActive(true, animate); + popcornPositions[index].DestroyAllChildrens(); + if (productDataList.FirstOrDefault(data => data.id == stockData.FlavorId)?.GetProductPrefab() is MarketPopcornView prefab) + { + var view = Instantiate(prefab, popcornPositions[index]); + view.ChangeRarity(stockData.Rarity); + view.SetActive(true, animate); + } } public void SellStock(int index) { - popcornPositions[index].SetActive(false); + popcornPositions[index].DestroyAllChildrens(); } } diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs index 0bfdf08f..fa4dd489 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Linq; using TMPro; using UniRx; @@ -15,6 +16,7 @@ public class MarketManager : MonoBehaviour [SerializeField] private Transform coinPrefab; [SerializeField] private Transform rootTransform; private Market market; + List productDataList; private void Start() { @@ -22,8 +24,9 @@ public class MarketManager : MonoBehaviour CoinManager.Instance.ChangeCoin(gameData.Coin); HeartMeter.Instance.Initialize(); HeartMeter.Instance.SetHeart(gameData.Heart); - + market = Market.Instance; + productDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet); stockView.SetStock(gameData.StorageTanks); var startStocks = market.DisplayFlavors .Select((flavor, index) => (flavor, index)) @@ -31,13 +34,13 @@ public class MarketManager : MonoBehaviour .Select(data => (data.index, new ProductStockData { FlavorId = data.flavor, - Rarity = ProductRarity.Normal, - Stock = 1 + Rarity = ProductRarity.Gold, })) .ToList(); + cartView.Initialize(); cartView.SetStock(startStocks, false); pinkView.Initialize(); - + // Customerの各アニメーション設定 foreach (var controller in market.CustomerControllerList) { @@ -75,7 +78,11 @@ public class MarketManager : MonoBehaviour // 補充したフレーバーのスキンを設定 foreach (var order in x.orders) { - cartView.Refill(order, market.DisplayFlavors[order]); + cartView.Refill(order, new ProductStockData + { + FlavorId = market.DisplayFlavors[order], + Rarity = ProductRarity.Normal, + }); } } else if (x.isReorder) @@ -91,7 +98,6 @@ public class MarketManager : MonoBehaviour { FlavorId = data.flavor, Rarity = ProductRarity.Normal, - Stock = 1 })) .ToList(); cartView.SetStock(stocks, true); @@ -187,9 +193,12 @@ public class MarketManager : MonoBehaviour }).AddTo(customerAnimator); controller.WantFlavor .SkipLatestValueOnSubscribe() - .Subscribe(data => + .Subscribe(wantData => { - customerAnimator.SetWantFlavor(data); + if (productDataList.FirstOrDefault(data => data.id == wantData.FlavorId)?.GetProductPrefab() is MarketPopcornView prefab) + { + customerAnimator.SetWantFlavor(prefab, wantData.Rarity); + } }).AddTo(customerAnimator); controller.IsComplain .SkipLatestValueOnSubscribe() diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketPopcornView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketPopcornView.cs index 2d48cd6a..d8662b37 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketPopcornView.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketPopcornView.cs @@ -5,16 +5,9 @@ public class MarketPopcornView : MonoBehaviour { private static readonly int Place = Animator.StringToHash("Place"); [SerializeField] private Animator animator; - [SerializeField] private SpriteRenderer popcornRenderer; - [SerializeField] private Sprite caramelSprite; - private Sprite defaultSkin; + [SerializeField] private RarityView rarityView; - private void Awake() - { - defaultSkin = popcornRenderer.sprite; - } - - public void SetActive(bool active, bool animate = true) + public void SetActive(bool active, bool animate = false) { gameObject.SetActive(active); if (active && animate) @@ -23,15 +16,8 @@ public class MarketPopcornView : MonoBehaviour } } - public void ChangeSkin(int flavor) + public void ChangeRarity(ProductRarity rarity) { - if (flavor == 2) - { - popcornRenderer.sprite = caramelSprite; - } - else - { - popcornRenderer.sprite = defaultSkin; - } + rarityView.SetRarity(rarity); } } diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/StorageTank.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/StorageTank.cs index 42128716..8c8096b1 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/StorageTank.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/StorageTank.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using UnityEngine.Internal.VR; +using UnityEngine; public class StorageTank { @@ -11,17 +11,11 @@ public class StorageTank public int Stock { get => Stocks.Sum(x => x.Stock); - set => SetStock(ProductRarity.Normal, value); } public List Stocks = new List(); public bool IsEmpty => Stock == 0; public bool IsFull => Stock == Capacity; - public void SetStock(ProductRarity rarity, int stock) - { - - } - public void AddStock(ProductRarity rarity, int stock) { var stockData = Stocks.FirstOrDefault(x => x.Rarity == rarity); @@ -33,6 +27,30 @@ public class StorageTank stockData.Stock += stock; } + public List GetStock(int wantStock) + { + var list = new List(); + var stockCount = Mathf.Min(wantStock, Stock); + foreach (var stockData in Stocks) + { + if (stockCount == 0) + { + continue; + } + var data = new ProductStockData + { + FlavorId = FlavorId, + Rarity = stockData.Rarity, + Stock = 1 + }; + var getCount = Mathf.Min(stockCount, stockData.Stock); + list.AddRange(Enumerable.Repeat(data, getCount)); + stockData.Stock -= getCount; + stockCount -= getCount; + } + return list; + } + public void ClearStock() { Stocks.Clear(); diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index 7f8781cd..23a2debb 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -749,18 +749,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 204377775} m_PrefabAsset: {fileID: 0} ---- !u!114 &204377777 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 204377775} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &208416664 PrefabInstance: m_ObjectHideFlags: 0 @@ -836,18 +824,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 208416664} m_PrefabAsset: {fileID: 0} ---- !u!114 &208416666 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 208416664} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &220821819 GameObject: m_ObjectHideFlags: 0 @@ -1004,18 +980,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 223592692} m_PrefabAsset: {fileID: 0} ---- !u!114 &223592694 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 223592692} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &240851456 GameObject: m_ObjectHideFlags: 0 @@ -1206,18 +1170,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 291408121} m_PrefabAsset: {fileID: 0} ---- !u!114 &291408123 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 291408121} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &363149699 GameObject: m_ObjectHideFlags: 0 @@ -1853,18 +1805,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 699350948} m_PrefabAsset: {fileID: 0} ---- !u!114 &699350950 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 699350948} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &699827848 GameObject: m_ObjectHideFlags: 0 @@ -2800,18 +2740,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 969975202} m_PrefabAsset: {fileID: 0} ---- !u!114 &969975204 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 969975202} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &995339916 GameObject: m_ObjectHideFlags: 0 @@ -2968,18 +2896,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1023351033} m_PrefabAsset: {fileID: 0} ---- !u!114 &1023351035 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 1023351033} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1025201113 GameObject: m_ObjectHideFlags: 0 @@ -3023,7 +2939,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2acf7c5ed16d4e3890013ca7519535d5, type: 3} m_Name: m_EditorClassIdentifier: - market: {fileID: 0} closeSign: {fileID: 1199276394} stockView: {fileID: 438315601} cartView: {fileID: 2048621276} @@ -3188,18 +3103,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1044373331} m_PrefabAsset: {fileID: 0} ---- !u!114 &1044373333 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 1044373331} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1075915152 PrefabInstance: m_ObjectHideFlags: 0 @@ -3275,18 +3178,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1075915152} m_PrefabAsset: {fileID: 0} ---- !u!114 &1075915154 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 1075915152} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1102296789 GameObject: m_ObjectHideFlags: 0 @@ -4125,18 +4016,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1444432614} m_PrefabAsset: {fileID: 0} ---- !u!114 &1444432616 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 1444432614} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1482901210 GameObject: m_ObjectHideFlags: 0 @@ -4394,18 +4273,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1492176969} m_PrefabAsset: {fileID: 0} ---- !u!114 &1492176971 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 1492176969} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1506158579 GameObject: m_ObjectHideFlags: 0 @@ -4527,18 +4394,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1515102455} m_PrefabAsset: {fileID: 0} ---- !u!114 &1515102457 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 1515102455} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1556091576 PrefabInstance: m_ObjectHideFlags: 0 @@ -4614,18 +4469,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1556091576} m_PrefabAsset: {fileID: 0} ---- !u!114 &1556091578 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 1556091576} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1563148346 GameObject: m_ObjectHideFlags: 0 @@ -4895,18 +4738,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1615446477} m_PrefabAsset: {fileID: 0} ---- !u!114 &1615446479 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 1615446477} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1640594305 PrefabInstance: m_ObjectHideFlags: 0 @@ -4982,18 +4813,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1640594305} m_PrefabAsset: {fileID: 0} ---- !u!114 &1640594307 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 1640594305} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1717315654 PrefabInstance: m_ObjectHideFlags: 0 @@ -5236,18 +5055,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1775193988} m_PrefabAsset: {fileID: 0} ---- !u!114 &1775193990 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 1775193988} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1791987849 GameObject: m_ObjectHideFlags: 0 @@ -5566,18 +5373,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1857525120} m_PrefabAsset: {fileID: 0} ---- !u!114 &1857525122 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 1857525120} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1866673242 GameObject: m_ObjectHideFlags: 0 @@ -6007,18 +5802,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2011193247} m_PrefabAsset: {fileID: 0} ---- !u!114 &2011193249 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 2011193247} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &2031857953 GameObject: m_ObjectHideFlags: 0 @@ -6134,26 +5917,26 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: popcornPositions: - - {fileID: 7689040400970721154} - - {fileID: 1075915154} - - {fileID: 223592694} - - {fileID: 1556091578} - - {fileID: 1615446479} - - {fileID: 1444432616} - - {fileID: 1640594307} - - {fileID: 1492176971} - - {fileID: 2064880680} - - {fileID: 969975204} - - {fileID: 1044373333} - - {fileID: 1023351035} - - {fileID: 699350950} - - {fileID: 291408123} - - {fileID: 208416666} - - {fileID: 1775193990} - - {fileID: 2011193249} - - {fileID: 1515102457} - - {fileID: 204377777} - - {fileID: 1857525122} + - {fileID: 82988135} + - {fileID: 1075915153} + - {fileID: 223592693} + - {fileID: 1556091577} + - {fileID: 1615446478} + - {fileID: 1444432615} + - {fileID: 1640594306} + - {fileID: 1492176970} + - {fileID: 2064880679} + - {fileID: 969975203} + - {fileID: 1044373332} + - {fileID: 1023351034} + - {fileID: 699350949} + - {fileID: 291408122} + - {fileID: 208416665} + - {fileID: 1775193989} + - {fileID: 2011193248} + - {fileID: 1515102456} + - {fileID: 204377776} + - {fileID: 1857525121} --- !u!1 &2050100489 GameObject: m_ObjectHideFlags: 0 @@ -6347,18 +6130,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2064880678} m_PrefabAsset: {fileID: 0} ---- !u!114 &2064880680 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 2064880678} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &2066991624 GameObject: m_ObjectHideFlags: 0 @@ -11667,18 +11438,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} ---- !u!114 &7689040400970721154 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, - type: 3} - m_PrefabInstance: {fileID: 7689040400970721153} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &7893376663159737481 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index 3042690a..dbadafba 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -164,6 +164,16 @@ public sealed class ProductData { return materialList.Count(material => material.id != Const.NotSetMaterialId); } + + public Animator GetRecipePrefab() + { + return Resources.Load("Popcorns/" + (string.IsNullOrEmpty(prefabName) ? "package_salt" : prefabName)); + } + + public MarketPopcornView GetProductPrefab() + { + return Resources.Load("Popcorns/" + (string.IsNullOrEmpty(productPrefabName) ? "package_salt" : productPrefabName)); + } } [Serializable] From 073e263e138e4621f88042da13399e9a07eb3bd7 Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 5 Oct 2021 19:03:51 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=82=B9=E3=82=AD?= =?UTF-8?q?=E3=83=B3prefab=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Popcorns/package_butter_soysource.prefab | 77 +++++++++++++++++++ .../package_butter_soysource.prefab.meta | 7 ++ .../Resources/Popcorns/package_caramel.prefab | 77 +++++++++++++++++++ .../Popcorns/package_caramel.prefab.meta | 7 ++ .../Resources/Popcorns/package_cheese.prefab | 77 +++++++++++++++++++ .../Popcorns/package_cheese.prefab.meta | 7 ++ .../Popcorns/package_chocolate.prefab | 77 +++++++++++++++++++ .../Popcorns/package_chocolate.prefab.meta | 7 ++ .../Popcorns/package_greentea.prefab | 77 +++++++++++++++++++ .../Popcorns/package_greentea.prefab.meta | 7 ++ .../Resources/Popcorns/package_honey.prefab | 77 +++++++++++++++++++ .../Popcorns/package_honey.prefab.meta | 7 ++ .../Popcorns/package_nori_butter.prefab | 77 +++++++++++++++++++ .../Popcorns/package_nori_butter.prefab.meta | 7 ++ .../Popcorns/package_nori_salt.prefab | 77 +++++++++++++++++++ .../Popcorns/package_nori_salt.prefab.meta | 7 ++ .../Popcorns/package_nori_soysource.prefab | 77 +++++++++++++++++++ .../package_nori_soysource.prefab.meta | 7 ++ .../Resources/Popcorns/package_pepper.prefab | 77 +++++++++++++++++++ .../Popcorns/package_pepper.prefab.meta | 7 ++ .../Popcorns/package_pepper_cheese.prefab | 77 +++++++++++++++++++ .../package_pepper_cheese.prefab.meta | 7 ++ .../Popcorns/package_salt_butter.prefab | 77 +++++++++++++++++++ .../Popcorns/package_salt_butter.prefab.meta | 7 ++ .../Popcorns/package_salt_caramel.prefab | 77 +++++++++++++++++++ .../Popcorns/package_salt_caramel.prefab.meta | 7 ++ .../Popcorns/package_soysource.prefab | 77 +++++++++++++++++++ .../Popcorns/package_soysource.prefab.meta | 7 ++ .../Popcorns/package_strawberry.prefab | 77 +++++++++++++++++++ .../Popcorns/package_strawberry.prefab.meta | 7 ++ .../Popcorns/package_strawberry_milk.prefab | 77 +++++++++++++++++++ .../package_strawberry_milk.prefab.meta | 7 ++ 32 files changed, 1344 insertions(+) create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_butter_soysource.prefab create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_butter_soysource.prefab.meta create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_caramel.prefab create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_caramel.prefab.meta create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_cheese.prefab create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_cheese.prefab.meta create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_chocolate.prefab create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_chocolate.prefab.meta create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_greentea.prefab create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_greentea.prefab.meta create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_honey.prefab create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_honey.prefab.meta create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_nori_butter.prefab create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_nori_butter.prefab.meta create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_nori_salt.prefab create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_nori_salt.prefab.meta create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_nori_soysource.prefab create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_nori_soysource.prefab.meta create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_pepper.prefab create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_pepper.prefab.meta create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_pepper_cheese.prefab create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_pepper_cheese.prefab.meta create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_salt_butter.prefab create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_salt_butter.prefab.meta create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_salt_caramel.prefab create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_salt_caramel.prefab.meta create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_soysource.prefab create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_soysource.prefab.meta create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry.prefab create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry.prefab.meta create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry_milk.prefab create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry_milk.prefab.meta diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_butter_soysource.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/package_butter_soysource.prefab new file mode 100644 index 00000000..8b1c2e0e --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_butter_soysource.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7944901940612951782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Name + value: package_butter_soysource + objectReference: {fileID: 0} + - target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 404cd19cb789c974a99425d35ca19181, + type: 3} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_butter_soysource.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/package_butter_soysource.prefab.meta new file mode 100644 index 00000000..f8639f13 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_butter_soysource.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 604b2f0ba0e5e42e091f8949db8c82ce +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_caramel.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/package_caramel.prefab new file mode 100644 index 00000000..e847d8e3 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_caramel.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7944901940612951782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Name + value: package_salt Variant + objectReference: {fileID: 0} + - target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 469b78432f101024aa1a2060a57231d8, + type: 3} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_caramel.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/package_caramel.prefab.meta new file mode 100644 index 00000000..b821d7c2 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_caramel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 424635e0a97004ce09deab3176b64689 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_cheese.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/package_cheese.prefab new file mode 100644 index 00000000..fb929f43 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_cheese.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7944901940612951782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Name + value: package_cheese + objectReference: {fileID: 0} + - target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 443f87c71161c1d479f7828090007573, + type: 3} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_cheese.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/package_cheese.prefab.meta new file mode 100644 index 00000000..f672da7f --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_cheese.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f19108dbf83864059aa62b860cda28f6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_chocolate.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/package_chocolate.prefab new file mode 100644 index 00000000..0f7be920 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_chocolate.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7944901940612951782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Name + value: package_chocolate + objectReference: {fileID: 0} + - target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 48b081c95d0f39b4581a6507b4d69a7c, + type: 3} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_chocolate.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/package_chocolate.prefab.meta new file mode 100644 index 00000000..f0318aba --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_chocolate.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ff6272320cb6140e6b5833eadff10206 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_greentea.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/package_greentea.prefab new file mode 100644 index 00000000..57eaddf4 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_greentea.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7944901940612951782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Name + value: package_greentea + objectReference: {fileID: 0} + - target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 28a3bde5a9dbd044ba94e5266b36e70d, + type: 3} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_greentea.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/package_greentea.prefab.meta new file mode 100644 index 00000000..6c7fdb82 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_greentea.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f8d11f5a8461c41be86fc1f475cdec5b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_honey.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/package_honey.prefab new file mode 100644 index 00000000..0ad7782b --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_honey.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7944901940612951782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Name + value: package_honey + objectReference: {fileID: 0} + - target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 82dc0fc7c762fe3428dae7501aa8401c, + type: 3} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_honey.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/package_honey.prefab.meta new file mode 100644 index 00000000..e94ac335 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_honey.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5ecdb326bfa0b4fbb9ba660446f5f111 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_nori_butter.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/package_nori_butter.prefab new file mode 100644 index 00000000..f893f386 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_nori_butter.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7944901940612951782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Name + value: package_nori_butter + objectReference: {fileID: 0} + - target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 8fc7f4cee1804564c9edda4d22901dfb, + type: 3} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_nori_butter.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/package_nori_butter.prefab.meta new file mode 100644 index 00000000..13a0cd08 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_nori_butter.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a594c04d863034fd29b52bb8a0a1683a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_nori_salt.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/package_nori_salt.prefab new file mode 100644 index 00000000..c41d2f45 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_nori_salt.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7944901940612951782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Name + value: package_nori_salt + objectReference: {fileID: 0} + - target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 2f8fed00b6ad1074893d9b7538fe5722, + type: 3} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_nori_salt.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/package_nori_salt.prefab.meta new file mode 100644 index 00000000..a51ca17d --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_nori_salt.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f32ab65c2af6d4a0f9e7607ec17bbcf1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_nori_soysource.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/package_nori_soysource.prefab new file mode 100644 index 00000000..53b4245d --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_nori_soysource.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7944901940612951782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Name + value: package_nori_soysource + objectReference: {fileID: 0} + - target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 57df1feec2e9cdb41b96d91b3afb95aa, + type: 3} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_nori_soysource.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/package_nori_soysource.prefab.meta new file mode 100644 index 00000000..bc5f976a --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_nori_soysource.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9f638538f686d48539fbffc025902eec +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_pepper.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/package_pepper.prefab new file mode 100644 index 00000000..f900238a --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_pepper.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7944901940612951782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Name + value: package_pepper + objectReference: {fileID: 0} + - target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 846ea4e3644edc046869e0d193586978, + type: 3} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_pepper.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/package_pepper.prefab.meta new file mode 100644 index 00000000..22de3b29 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_pepper.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3d8b34255c85d45829d6c0830c754dfb +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_pepper_cheese.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/package_pepper_cheese.prefab new file mode 100644 index 00000000..f415f7f0 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_pepper_cheese.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7944901940612951782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Name + value: package_pepper_cheese + objectReference: {fileID: 0} + - target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ed485f56188d62a4a81a650fdb5ec3d7, + type: 3} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_pepper_cheese.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/package_pepper_cheese.prefab.meta new file mode 100644 index 00000000..626f7ab6 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_pepper_cheese.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 11758cb203e6342ea95361cc34977844 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_salt_butter.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/package_salt_butter.prefab new file mode 100644 index 00000000..1608e734 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_salt_butter.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7944901940612951782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Name + value: package_salt_butter + objectReference: {fileID: 0} + - target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 91f7cd62f434a374fa78ba468706146f, + type: 3} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_salt_butter.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/package_salt_butter.prefab.meta new file mode 100644 index 00000000..ac510e94 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_salt_butter.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ceeff5ac4d9dc46bb86090ac3f4ed5a9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_salt_caramel.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/package_salt_caramel.prefab new file mode 100644 index 00000000..b12ca0ea --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_salt_caramel.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7944901940612951782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Name + value: package_salt_caramel + objectReference: {fileID: 0} + - target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 4631873861a83b24fba7c1e01a4a9626, + type: 3} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_salt_caramel.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/package_salt_caramel.prefab.meta new file mode 100644 index 00000000..b3b4a35f --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_salt_caramel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d8aa8a6210fb44ad7bfe4c72550ec990 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_soysource.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/package_soysource.prefab new file mode 100644 index 00000000..ae4c1caa --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_soysource.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7944901940612951782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Name + value: package_soysource + objectReference: {fileID: 0} + - target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 863049e045d1db5428818435f49e290f, + type: 3} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_soysource.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/package_soysource.prefab.meta new file mode 100644 index 00000000..daa1ac48 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_soysource.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 90137bb4145224a128056cae367f4d49 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry.prefab new file mode 100644 index 00000000..7834eb45 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7944901940612951782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Name + value: package_strawberry + objectReference: {fileID: 0} + - target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 4b4f324999aefb14facb94dfce77ac79, + type: 3} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry.prefab.meta new file mode 100644 index 00000000..777945ab --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d03094c626ed842a79b3a4a55fe322fe +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry_milk.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry_milk.prefab new file mode 100644 index 00000000..6f52e2c1 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry_milk.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7944901940612951782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Name + value: package_strawberry_milk + objectReference: {fileID: 0} + - target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 33d0c4c6a507c554ebd9fb937561f89b, + type: 3} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry_milk.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry_milk.prefab.meta new file mode 100644 index 00000000..995f4856 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry_milk.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7e4f0a231bb4d460295ce3a135d2aa81 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From 64859b73817d2df153ab1ca20d4639fe209f2ba8 Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 5 Oct 2021 19:04:10 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=BF=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt | 2 +- popcorn/Assets/MyGame/Resources/Data/MissionData.txt | 2 +- popcorn/Assets/MyGame/Resources/Data/PanData.txt | 2 +- popcorn/Assets/MyGame/Resources/Data/ProductData.txt | 2 +- popcorn/Assets/MyGame/Resources/Data/ShopData.txt | 2 +- popcorn/Assets/MyGame/Resources/Data/ShopLevelData.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt b/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt index b87f7794..235bdf27 100644 --- a/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt +++ b/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt @@ -1 +1 @@ -b022WR6xvqTzMgUJZxplP8cd1vINFi6qUnHnitukZjn+IsGSGzkigyHIAn43B2wv \ No newline at end of file +iC+nFgGNhnVfd2tbxmQ3bcWR1g4BO9c68pFV9Qxf7BW4RcJReW94df2aiP0xUzIa \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/Data/MissionData.txt b/popcorn/Assets/MyGame/Resources/Data/MissionData.txt index 488ea3a8..fd75f863 100644 --- a/popcorn/Assets/MyGame/Resources/Data/MissionData.txt +++ b/popcorn/Assets/MyGame/Resources/Data/MissionData.txt @@ -1 +1 @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/Data/PanData.txt b/popcorn/Assets/MyGame/Resources/Data/PanData.txt index 5accf56b..d58c0b41 100644 --- a/popcorn/Assets/MyGame/Resources/Data/PanData.txt +++ b/popcorn/Assets/MyGame/Resources/Data/PanData.txt @@ -1 +1 @@ -hnfIoHLTIO78KQab+gbOMMtv7vgOyoTHmaWNRDXOxQNzkGdOhXTO57DYilUlMI5HUsbxAe9ctGHP3jwlLulxR9jXP2sdGn+adJV4Zoto5A4ZJE95BrmGURxoPzxhtUZMURjbqxclXW54+4GrDgsjJpcWwLQJmwuj4bIVb3kI/Y1Baey5dXesyqn+x0PrWcGkatmvx5EVrMKmP/BFTheJezvsEl4W7Wpy8hOOJw6hzZqQZgxE/PcSrIz+bBLKd5O4MmXs04pKJ5Z826TWTqPNth22LWIgPU5s29MgBFBCKbQKwz6CMYtkG8HDtwPNO8Z9y0uovbQJh08Sf7EckFiBIg== \ No newline at end of file +1bxoAry+92PyYbg0WCzf99zbozkYTLF79bmAx01ETWN0iSevoph472rZwFjr8+DVeH5J9AIXj7I1+bTKeWW4Yo0M9jnwZhoZIcFnD2URpcTf8Lpjwlrdy99J/lnzr+gcHfy4kQjjSVQ4bQGdYNNc5Ga0KcDoclIgs97c4prwIY0hV0RDkZYjzdSnjFzxRUuI9LhgQw+f7x8fKZQ3Q0k8E4E6Z+wUkOXXpmC0t4teEMVZILz3H3PxzN2hL4Vz5/JIVaK7Me35NQ52xUays1EayRpAZn2d7NfKYrPSF20dF0o3iFHAkws6P0EaggxkFHhol8R4mi5MPw1tNcToMz54iDDF7MmhCS1WZdcITd2fA29UtTzweStyQ1sVGqX0NmqSd6nGoVTrUCQCguLGzz2odAQOcUuK6pTU0BQQ5j3x70Y+slxcNFNfo23/DZrbI/Rnf0LvrmIeU+TUuh0FZz8hnh3AJtDt/nRpKhJeEooR47UahQ+MSkllRBVTjfxZRYIuRTVmvigz6qawxaMa6YA3u0OesEPavsKlVMOBb72KiwM5S4ce6JN2jGJdp07F0E8oBCHeEkIomYpQEZUmnPtsnUlarl805kqmeBBvj846aja0WYPhIEx/R1K3rwLbW6Wyh0lHxbN0WK+8nnOm8BjKftwWWujSk6+9VRNmoAVCy9u0V6xre6ir7ifT9f9ieY/EuDriyYsRoDzjeKaKLi/EeIaE7/qj4hdUoX4aBI5HGI+fNvD2Xe6M97QbdeXBkMRbufob+x/UgVbO1Z5mZPdlmekcDSua0/MU0/ER5oW8MHLYk9aWac4iXrEPj1ZiLsTLDiM/5PJlToFjApT/PDpv6yU8E+M0idBMHmpglAwm5QfKMqvoLtxxAvb3ZEnqQwcZrxc/tLsJqE5gXRWgzAaPTp+KGE5qOYefvIlpWXgp7wn0czJEAKnpSfnS1ciySBnJJRWoWhzSzLuC+zKjTMnimckAw4RqxnUHy/OxSIyA7S+RzaQuhS5lagVgo5TmkE0nlvfSgt7yS+fg7QYI+2qxHCJZZLiu4hzKuFxP4KtZp9iOXyzGBzdmYsb/KCSzAZAz \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/Data/ProductData.txt b/popcorn/Assets/MyGame/Resources/Data/ProductData.txt index 91612d3f..7e6edc24 100644 --- a/popcorn/Assets/MyGame/Resources/Data/ProductData.txt +++ b/popcorn/Assets/MyGame/Resources/Data/ProductData.txt @@ -1 +1 @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/Data/ShopData.txt b/popcorn/Assets/MyGame/Resources/Data/ShopData.txt index f01789a9..8eeb5e02 100644 --- a/popcorn/Assets/MyGame/Resources/Data/ShopData.txt +++ b/popcorn/Assets/MyGame/Resources/Data/ShopData.txt @@ -1 +1 @@ -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 \ No newline at end of file +FjJb2l7ivikuiEZ/p/Lnbgo1zMvwCefjZemoUFQ10b6f+SYehkH7M6MdmEiv5FFo+1VYEJOauVfIw3HCPhl8ipV8G5AF0wUoIZ53uNh47c0u3ftFLKTUibTNueP7fnI4lbsdbIrfFg8GYKtP+F/Rgu5p/JgyyRvgxBuOHXmURG5ozy3gsR3/fzsCO/GkY682eiEGVGDaO0VbtdHV8FW4kGslu6arzW5yeymBFh2/zHUlISAWEUFzCnhjFHSZSpyTeNsKOXpqcom05sA5+mZ+lHfRuCkwc/8Lf/1aOBA+7mMUkLn2lDyk7bHVvXBLZRJTH5PCsf6sN4n2qKolltJR4M8n5gp8Jz4lEx1MvYSYnaRMLQkgKlIQwczQTrWScb+4WOr5KSkyxEeXRz6sq5zM+GouSp4vvH0Y/Uf9rBufxF6WGfGJH4OBDCNL73234cKbdOAd93WNe2XnX+f6hDrbYn80D4GKs5wU6MMxfdWxmDJ/1nwg1NiliwLqLtgaBWwUv+4uQDKSEMKBwXSLMu9o7R3qqPZGLO37ZMsYTUHRSmbS0mTo59xBPQMfwOjrn71+nlyRAy7G4My8olyPV878pbolx07HMaK+aP+LSVjz9rTd79AuK5LMglkcW8q/vOuhIrsStlCPxAEaa/X0Bdn9M3J3c7O1Ux/dqstOuMnMSD4sTzhCsynDzhSCEZpB7XKz5kvp7+rcvgfk4V3CVgHWo9Mu8xAgNW6NXSMSDk8zxeOjcPEgsAGBGkRPDJN4SFBtYqtU6iLa7gMmZ/gIJS+35UzKYwbLCCyadBU7vCDgox3/XXUE72Eb8YRsHtgodg85fTOfUMLBneYEaSWRSNXOQbFhfaRIrsJd/E47+WzSdwdcWI4eUVayLOVrWzl7ifbVy/LRSCmCmo+UDRWagdXIAgj+aqbxOWwyq3d3+MsZEgxVzVgvtU79AkCmUyi/t9U+Gw47ePiMf79r8DRZUslQXFvz1926u6CgBL7Ndt8Dyy9JSJGsXjnHC7kWqAtfDih8S7gdQ3rAFASNdcSqKPFmRregi6irgCFYnKGm9l3iftXuUF6fAWJf8OZYnxwhNZ9ou4O9UJQpTCHcbMMNBBxs72t5/ZhkBAWvuJujaeCYNcclXP2FmOuuyNWgD6xspcFhjLCW4+m/+I4CuJ3HUEG7i1zq/2Alp6mK2iXZ8hp/rkbvHxb//YS6CxB8TRudUzXt8ah0ZLgdrlTLRAdAmNbwevR3WQ8vciwaBXRdsWz4SzIHSF9M2siyFmcizje2/HN5GFNasHCQBOCKyUFHL5jjObMNSfdOwI2LebQSvQGBSAmdTd91gai34MruX5SWpiPkjaHmClt4sVuzdSQEekrsPhvzZE1fCCqL/7pjl38ijO67RPpISK9lErkroDLnAxfxdQk3mXlXT7cQKpnLaOLxI2lM+4lxgCBpMFsf7kECV5IhLSO9D/YWqDGIyhDfmgqtmu7ifnd2/QOXmzBt3a3+HLyLFWkg3gmZ36IWvV9F/Bd7cfgThrc+tjPdWHpdnxLH9yBezfXhrsLpkWBpZkJsy7nZyaW6xo+Ddg2KwtGKztFoEzxUVityebptUD1u3k/yKkS+AciqNVw3CtJe6g1w1U3ySYxNH1sr/zvz9es+qsdNM6tUTAHwIg9aH+FCNrYL/FGJwLIHiveDq4o289BY9KkAexrXsWqMtoHJyz9BUdxU24RPPiJoqJlpqxbKFSxSnfHHLIKLQKg6z/+71SFATZdN5OQffr/x0pzwiNOyPB4IQYlrDmuuh6dNyKmmt7ppaW67dbrjt6+2LtOvbHJOLZjYFUvRAygMqmH7rYAmG0VNdVP3ExItkrdjQkEXKvzY2tv0uvk/+abPCLfmgyfGV8xaqesBtkt+RwVrsohaDCHfQy/I8iTb5ccWXCr1misc9JsCKjnxV+lICnAGldT+dFzeMihnNLklK4D3R9BJHrNaKdM6H524fiGQkJWbIKsJiZRc8Clgkoq2AJy/7ketdcu6aa6h2E4sj5a1R8r3IiHmzCQhzVUF4bvioNYfFGPg/Ewo0xegAZWGX/RAtxB5hnezO1gUEPKS4c69O06GRfGaFFWjRe3436ewfsInvLpMBX3EoYh0iYuO1IOfMEs9jAQPBMoShcTj60ix2NssXmdsgtr/Xh1wN+TeI5VkibslKbP5tBMmhqS7LA3Fab5eQFYwkOxu4ewTKJNvx9dJhJXSHXTfWnLLgJNRTJAmbs6ztFuRdlbqn3yN6Wj8KChCFSlRhXsYAl+9Ok8NAp6eDhmkTsuUH9PBUN7dQAYuMxlziW4h5r6hQ8chfLAS+0AilSwtsDHBND2Zzr8GI6yN3MH8xpN7u3LznLzeu3VBIo0DL6Q3fqm75oeI3fxkTWAQQQ/lhX7mvfAhNktXDmbrDFLSVIObh8Pjb5LUp2Z73VAqBdtBoaMiivyAUrRLbv3N8cuiNrbG7ZGevmN00W2laUKif3QV/gNmsDLhByNQ3Y/O8KFWj9+gFGMlR6b5kMLZE9ni9YThxTif81W/HB10W2SeOgcQcWPvmpMTLwlA7IJI0zhcOn/yuNSMoOHnXpQKn0E0vX7Ff4B8X0MI+g0JWnfmbLT9br/Ru32i+MKzbBqy2dY0AjvWvc8cclqFvAs/wd3mbj0xG88Xu7xO5eIecARZniCvkQRKSaP64L3euYl+8GN6M9VG43SDRUTrI72SCI1wAO27lhp6X6l1L9R4DELcxIkVPE9TlcAdMDptf6zLnm8Pj+5u7vkuaW3F05wMcoADfvQTOwvPbnEN1vOgJf0JJguWSn3jAHWjBPz6bsHFw23ksSN5IbyhmbMmEYsVj9RQYZBWZ4W3+B14FtdZtMr2uHNflpAK8uilX9PwTWBNGHw0FPK3oIvM3B+x0kPeyBFBnhI6oe+NWuiE/8TXTBdV/tEq9lH28mAS2bq/cE6GCWKDbTPmzJNMagfQrlSYbq7j3sC7ufnAa59d6zPDFqK406+LZKHtrJLx488HWcPGFUS5Ebir38CdL71+zhKEZbqP8HbID2XWNXuDN5cCaxP9PbqowaBKw6TqR8cDhCF4jmcsDWyyX5+djBaJm+5u//aoCXX49XS4p4Ee87VBbD+p+JteJ72jf7X68ZRSFLOaSkfEpfW3RmQItI45i4qACWclfxR6mBTV4n1E6wzN9kpitc23tL0BY52G+kBJjft5D3tFZj6AcmUkgRvluM00TYj6piD7T0NRZoFZ5HaiWk8arQPURGvmj1NAju1MrC6aI8khSthxEeIfLXHLpdNdxotCwGX7Z+xs+46TfUfsFohqSy0sJ3ix0YNQs34dZrrV0bz4uxv3q61UfGilqZiPawn2BF157NL52/AFCKnPYp8XkqOl4Nxb4gZJd0RmOPRk9KpAbreWQYRIiax62QzOQOCGlUeSmTApOIdU2APAS1ctjiO1bZfSy+62cgpY5Uv7+I5aBXJvtoXxt81vgTfRzdypNvA5pxhOajUwK63Bsx8RaJR+DyAQnrF+3MkNtg/lfHqS3IjpqRdcuw7p6A7L52hh7lfxInY4S430HFW0YMgQoUxdttY/FGe06BceDwq/4xVZjoW0ma7zfz3VSJPw++z27zIx1duCyamZHtnC7HLV7C73y6o7M2YD6KjJo5tLwE0E/hGvZ5szFHCiG0tfrVHoJYemi8XshlFZGp69gJbvcjDJL0EMJDkGvMPnOxJj+PIb/KRbhnFf+uvt773WNV2B7h7jZ/CWyCWoBhAjtUQY7IjYfFi6C/mDufKaTdGMLrrkSZsPp33kTh/WBYJzmqDdWe1qcq0hGzF/3WPT8Uvha5a9mNutU/9F64r5HGnokfodupXCNAbQe7bVer+iNKZJ+nNuj1zZbQ+U5z6YUnIHjCwl/DabWHojT5ozY+5z/EMADWz6ufYDRLIQIFfQnqyU9k1N/+mOHlN9be2/omdj3LMkvVO6n3DjkTQLr4KU7Dvw1RkdlEh8PzXwxxYvQLDs7CoOf8P8TIWQeA1N6gEjR+3iHtjfurpvSGzaF0QWcv/1IW0ealbhy6WMATC4ELhVm8K9ifH68U/zr+poo6hAC/PIH13Oo06WIh78CFhssr9T85gLVQjVBKt+Hjn0BXmFZJXmhzcJWMOwW7QPVM1VRzE1KNd1Pi6mzlMCOKNcSPc+el+0mRpd6/YShI0pUsaiggfClIUO7IIpdQTtmwsZ0gQxJpiR6pydGpyDlCeqIZtuoo7mA6FAKG+kyEP080EsLnksk6omD/6xYT1iFvMXeV4D12IzB28se2sxllLZ8QqXgSSyENQ4+lBey4+3x6sj9d8sJ1tspeJH/Fm208gkCE3AfDSQl0sYP9ptR4trPeJRTZhjDFHKrs7y3n7x9LueZwP/XR1B5F+30K9K4t+q8CXq99IzfGz9XtdI5e/juXyJYTEIsdlDXw50ZD1HaZ8IR3PNlcOYTseNWapMiFg7gcsBS8/yMs3MK9X+3yB8eynufnriM/gZ0iRuZBLTkChZuKy+2qCDvS8xVvrEj53vDwXouvx6rdJ8u5OaAaAKMFGuNOS9UCnc0BTlkPgnB5cL4bLKVPr4bKdSx9pVKkSPbQUMlw5DWPg+lgOof1L2YJ6jS105Dssm1oZCb9IxGKk8hHzp1K4Ko/IjOKLH//KYehUZrCkLkTpz3/XdtMDeWukkKemWYao+7x6UYz2VlcHpzp+DfR8X50ZMwF3iwKviJefxxkPoO19lHZtA01MQ0alPe9my2GhjTzlHq68KngjqPxevXdSaRV29u4RR/L/KKqURfEW2y6X6+FD/rRsrfkvhjfQbskfRATZRON16EHwE/oDllAhBqjOlEv1OunxfE22YrjlwlViUV+Ju5q9kup4WQuS848os5rmDhGuobz3ChZTzfoxOxs8LjdgWzeUE/nnI/IzpCoo902HDqc7uDZ/cjyc2AFtVQnxT1e0uausALyqLX9svqPS9Ig+wqyGn3jjiQX+sFuGmfA5Wqs9x2rHmq3Xfk+QLmoPmkL9gxqwJ0nVfRpg8mX5ZnJIeUEkPszoR3OMrwGfBJg90kFjTXD9UCb7c9xh4MiadXAhg82JdfZybZM8FsJjNIQVD0qmSY2cdyqU81fqlS13pNS7C3zPpVD5d215PpXNCl1KwCYBbtJgQxvsuqZwSdeqx4UXyt12Dmsp2FOqYEy0Zf3AD+IFLG+m0PrepT8H5XYB9OfKftRrwZ7BkbDiNe3fdB7GqXeNFeIoQh8mfxxjyXikoPdf+EfXJg9u7UoMkqt3HgOGXJTH99JOTp8snqBlXx8b8qlDdzYdpOUC0L1Ay5LbZVV0a0amN+NzczcqiI5E8bAozH3OgiQExPVJoYL0r8D5kMlpHeqVBpXLI6V/v2vxI/qsBtVJzhnfsb0cBZjhSq4zJuT7xiILvbJE5SCvOg+mdVgiPottfu684unVQTJF1hImUX1ZVsDf+8H45xbewc/1oBpiklron6d9Fyd7MpXeTjOyj45qanl5bjWnj/BuHiJvmvbNkubSfdFnuFYw8nkS/E5XQ6MbmkNY4zR4n8QkvUdfnRi/sUtW53+/H2SN5TWhxk/1JVgyPaQWzvUyyzdJ+6wPHdq7vp+dn9JEnsAzmh2podYTWxUOOStoIcel0WC0yQ0pEJG+TveYddIW+3XOWV3js9hSg6jU+4mCOW7N86xriGngTJh9cO7HhvWJn0NH7DyU6s+A0Daa1zwxWBMko6jwKhuOPeuG9sxIOrXyEF0eI2zMMJ44XN6fNq837MaArHe+DKaIuQ4Dce+GqtBHyW1Wbxs2Cll+CYqN4/PbSBYDLT6qPwTmXnGcWT8EeJKjFZsgUWx9IzlWvj8ANAPFgBFm5Lm+2a7ScD8gIH7EcxLa/WhjwM3uuKkzo5e6c1263OoX/kO6/l9ZDmZL8PYpaC+xL4IDjFivvb7s1lU9mmJ5J/Ujo2/B9EZdfAWNTpCe+slqZJE16FIJPFpB2kg2iANfdKGC305y6qKw/mk71pPjniuGddUr9MRwSdYy1o6PlU/f/QP0SIyCweBnivkbzQLrAjMh4e9mrmpObdXbNLN5LvXCPTaF8DDGxcSHxZe2m1RLFzfqJMWLaipTlkniczTNCnjO4dDyiok0FVgOl1Erfn1AscKwYOaHTqgYfrS3bXoP5RfyzaSaHu3rzTpk0r/UDc0ORee+vPAr74oYr/pQtADZURn8VDgmon+lBhn6IWtrXfKXmwOSWZzZgTG7zJHf4zPoFO8skzlLFTch4/sbo14iBO+WTwBR5bThDyFtSG7P4hd7i+vd2lGjgOg+mkoNX3whtN9yfS46j0VvWCk17sfbuBdCQ+V4jLvPQel6OfFkRrgdmPLDmRr9Oy1CrwpgnTfHWD4/zwd+L4S0o/g1wJZT+5tW42/OG12YV \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/Data/ShopLevelData.txt b/popcorn/Assets/MyGame/Resources/Data/ShopLevelData.txt index 5df98145..21b810bb 100644 --- a/popcorn/Assets/MyGame/Resources/Data/ShopLevelData.txt +++ b/popcorn/Assets/MyGame/Resources/Data/ShopLevelData.txt @@ -1 +1 @@ -pRRXPQ/CaHIOepWUfXpC14TxfTgCjMw/fUCadUwdpMKjAwYIvcaJjV3YSEWBz3NuRwZaAwNoxG1KB52jVcgBxvRsSec45As6ktyMcwniaPwlWzNU1rtFYH79uyP6vaz1QyELN++t+lzCSAh+UtQmV701mGe73pHolCNIuWwr1rvgp6K3xQhqQENeI/H44A+5QKhsKaAvoI3zfM/7TuH5xj3chvwHo9Cz9wOghEHeMe/BSO/J+Vqqn09+Vq4P7DVZefH8uj/BCpiXYc8akW6yJXvW6nRahfC+k9k+r/PQLVVJ+1qXp3vRLHIWp7nY1rLikcfIpndmIUQrS774cWMDJbLfcxofJgQzNnFxrL+//m317ORLa3miRCYRYh+l5/srwp5B/4OtI/TsY+gd+GtbLfFUbRvLUhFK5GFhWHxBy4YhpdBI5r0f2rium0DzETrkQ3DupylMyeJ/oSEn5VAh3Kp+rGpXkGrw5devcCyDnqWcrd/qL7lhUSLtHjnDQeYmBqYIlUXcbr44uSvefsw6ZRy6mEunFAfpCcN5tzZZQKefcWXPnZLBtdYBL02yw+Gqg13fm0ftj46lc8Om0YNKL3PLH9ZaOdJfkieCv1pyb58Zcx/OzK+ctdOkZEIpqsqeeYTQAgi1+qqBi9VcWEQ4emzx6M1Un2sr/lj/KjnKsJ7RkoStt5zcATuBRUPenO53FTXxnKpZ/22c4U8q8odIO6le2I5X3KpZb8gKQAeiiuORYn/3rJNYS9n+camF/2w5WggOytbubM3SxlD3yfOaun+Pc60GbEYFTei1oeU56ehe224lKCNVGWcUUQI3sYkoqQozzBXipTtI+Aql8mqAIe5JwjX1JN5wapWVVvpCcrBpR3ekgFaN2RLayLZ90n606f5RIHqmAeYOAbqOPJd2UmYiC2yR6tjB5X2NJp7XCtfvPs1GRNLvwlYePYHQb3Bvjy/SWavUPJJKDH+yyt34CCQzN0ayHPTV9prbuXXlyp5kK9nRy+QNtBwdwI+XhxKAQplH6+WHvzPTyHnBnkc0jRKMfybeknmK6xULnyXLqLy6tWyMjrz1vSXsM73rqBg5f0XhNhGreaLMPGkhkW2XLx4C0wGfDRNaMvn3Taj5867j9WSiCFkQTY3iK8IzpWxDqlTPZkwugBgo3cunaTPvtgwNl1iC3au7N6imsHLpVRiIGAM0rltgYsJcIZtZmAobE239jLd+RmSfMb8gO6zi2Z5UmN026y8dHINW5QOWxVBeNcQefIeC+CENE+rGDknsKk+1eVdiXwzhVTaKTLZaiyg1rWfYEr4IKylyazro32uY7ol8JVlf390EG8W53ukaYBB/iTEJlDy212+eGubCUtSL+oHTzj1yy/rtFMlQq0c= \ No newline at end of file +ObvIW2R4Mzy6VIXUwSGAZW503sDvM9Qa8DdJmOJyfg8CnCb5WcgHb10mB5oxrw2rRiyH0OwJD5UhYqxHIMoGj7wxR1uFUauH6x42AkIqBW6VazcYFjJ8aES4wWwQGaAK/jZOvQYfWZrejJsWDfKuA/9bmNY+xMkjLvDEB2opjXwlpz5Awew2tJLoeZynIKXZeNkACPLez4PxVFWOXSZ+PMCQDgISbBtBzdcxfJcvSoBNU9CBPlHo3JGS9ASJKyOLLbHTX2PwnBb8FK6AQoBWBTyOIjomvqWDE2R8iNe4tV5IcM0yIBX0I9fn+UZQyVmx6gi3aDX4/y0PPI/g8T1kQD3Yz/5N9h/Cm5G7b4Zd8/PmQLFiyZ0il4/5flBMh2a/au15irQFrox4wm5W4+UOMFrMa0rHM0Qi+W2J5F3v9vpkLNsv0Nspr9WOqR3+AZMCR+jEf9DVWzLD12kkVX3ba56tTJO1kWyt6CSGhOGmxExbKXyNvCxd55NGyNj+YXQdDbzbroDWEdG84dNl0tYOTrwEWzCZetnHhn8dB9fu48kDGGQkdx/RqrUYBF+2Tz2UlOJrt8vX5ZvGMc73eg66yYJ87vUx+cnNKyrPUlEf34bFd9w9dpqVoI2/o/h1l1L5BN7TuZoLU6hnRb2eJxq8wYOp9FLOEAxBM3Lo6bgH2JQHlIe8eq9a2aapEpJw7nhwptOKDArEctQHi6VVJLgKR4tJEYhDsjvpmrpSs3f67FahvUQcwWMxnIvI1jycIONoBMWjp6XMb/V4c3xQgRrpkLuCGNsrW9nAToz+Y9EO4XXty7Q/IqvDaZUbo0F4E8AXIKQiF/TehX7QbsHjpnb/XaSQPQhAg8OC4AOmOOwCSUNXVTRHTXkIIhsLyM98uNsGE+u+VkQZjGu5tL5cz8bNgpvgxThTxUC3qy2rBR0SYolF/4hfXvbdtdnqcg6iZLSw6PxdCqnlUUsFnu5srw17qJZgUgaJ1dZhqEqd65uNqfk50UPOxwBslMvJ9/opxjzVrCOHcyhPFc3l4mqPNFXnz0tf/orKNwekaIR3XZBw9arJvWWpDGt+IUTmvmQXlILju9gV2/FWBwj8kT+inO1ZkNcHD1EZiX50PQ1XtUoid7yLI/TxcOrZEpWy8nLcqY9Ji9SH54Ynu2ISXF0pUlPk/tWJoHA8OxnqawMFjVViBWqzSmX3y52TEDJWlFZRzSQQQSWlbk0GF/V5xOFCA2+sosUoMt9xCAn+Xz2yjFJVGCCyxIIoVuCFxynqYX7g2/x5Wp4YlZ9D5ip59YWuBVLijJ98pUPhn1Pn8jj+XSTT1KUk7ZJVVjANeMIxpZwklOKI9pUH0karBNM70z14Yk3YZ5zb8Fy8tRZFLLFMVqegUXnma7uWkbIhDCAAEO+ebCVBXlh5RmkCXec85TRhZja1o8deD8x+Jxgi1yAyl1sL2zn/NZ0h8NaVljY8Dq5IjsoSNMU8lzuyIV2HfbbORijmR5kap8WdZZDhRkhHkIhlaZowXWTneXR2zPt1dvrgUgjkbOyN0xXLReswTbTl3E24d8XNydY14OLog9Dr5E8e/jYmrPTqVrCppCpTuxb5EBbS9w4Zv2hrYcbjqqBgmcVU0U7uhMCpQrNc7nrDnVMjsyID8TkhmR5s980ZzUTf6z6GEH5bATlkNkvoAiSdDSJxpGL+zKc0rJ7BwPxUBAmAORZvhYHsq9c/QtDRxRQlQd3RYzvD/5m6DEyw3mbh6Eabw0OYPUDlZOhiwOEYjQQ5s97FE6dlYycceGH1A8DoMMkZqip9O0DVAdSvHrvu4RyB5rS4Vf0vKEc63pRi/aMHUwgrKDpVW7WEJvw2EDMAaOaYSeqjZ+o7O4C3p78H1bi3AB2BZWw6WwCsQr0gsTjUiXs= \ No newline at end of file