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]