From b2aa90ce0091cc27a8df53a7a3ae7755aa85ea6b Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 5 Oct 2021 13:42:39 +0900 Subject: [PATCH] =?UTF-8?q?Market=E5=86=8D=E7=B5=B1=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/Avatars/customer_normal.prefab | 581 +++++++++++++----- .../Scenes/marketing/Prefabs/Customer.meta | 8 - .../Prefabs/Customer/Customer.prefab | 273 -------- .../Prefabs/CustomerController.prefab | 59 ++ ...ab.meta => CustomerController.prefab.meta} | 0 .../Scenes/marketing/Prefabs/popcorn.prefab | 1 + .../marketing/Scripts/BrotherPinkView.cs | 11 +- .../marketing/Scripts/CustomerController.cs | 139 ++--- .../marketing/Scripts/HeartAnimation.cs | 8 +- .../MyGame/Scenes/marketing/Scripts/Market.cs | 511 +++++++-------- .../marketing/Scripts/MarketCartView.cs | 32 +- .../marketing/Scripts/MarketPopcornView.cs | 11 + .../MyGame/Scenes/marketing/marketing.unity | 374 ++++++++--- 13 files changed, 1096 insertions(+), 912 deletions(-) delete mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customer.meta delete mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customer/Customer.prefab create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/CustomerController.prefab rename popcorn/Assets/MyGame/Scenes/marketing/Prefabs/{Customer/Customer.prefab.meta => CustomerController.prefab.meta} (100%) diff --git a/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab b/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab index 7fa9dfe7..00ecf450 100644 --- a/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab +++ b/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab @@ -4853,6 +4853,37 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &471339744374256983 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8759972247495498057} + m_Layer: 0 + m_Name: popcorn_right_eat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &8759972247495498057 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 471339744374256983} + m_LocalRotation: {x: -0, y: -0, z: -0.920882, w: 0.38984132} + m_LocalPosition: {x: -0.327, y: -0.891, z: 0.3995858} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 864454891212723563} + m_Father: {fileID: 4886416729068509252} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -134.11101} --- !u!1 &2471704596236347950 GameObject: m_ObjectHideFlags: 0 @@ -5302,6 +5333,9 @@ GameObject: - component: {fileID: 4886416728471897984} - component: {fileID: 4886416728471897985} - component: {fileID: 5450916343452979085} + - component: {fileID: 8951347046735010126} + - component: {fileID: 7213583640106143312} + - component: {fileID: 9050575574056621052} m_Layer: 0 m_Name: customer_normal m_TagString: Untagged @@ -5362,6 +5396,73 @@ MonoBehaviour: bodySides: - {fileID: 4886416730379292501} - {fileID: 4886416728696845434} +--- !u!114 &8951347046735010126 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4886416728471897999} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72fc7821a0f8481495274ac394c7b620, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 4886416728471897985} + customerDirection: {fileID: 5450916343452979085} + orderAnimator: {fileID: 8741854802242665909} + tapReaction: {fileID: 6511433195714067906} + orderPopup: {fileID: 4886416729748261544} + leftPopcornTarget: {fileID: 864454890252178187} + 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 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4886416728471897999} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 786931d1da2c4b1c8ce9519c9b3c32fd, type: 3} + m_Name: + m_EditorClassIdentifier: + bigHeart: {fileID: 7358655632798716600} + smallHeart: {fileID: 360816779210449747} +--- !u!61 &9050575574056621052 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4886416728471897999} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 2, y: 2} + m_EdgeRadius: 0 --- !u!1 &4886416728477582529 GameObject: m_ObjectHideFlags: 0 @@ -5841,6 +5942,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4886416728696845434} + - component: {fileID: 3968866702977508545} m_Layer: 0 m_Name: NormalBody_side m_TagString: Untagged @@ -5863,6 +5965,17 @@ Transform: m_Father: {fileID: 4886416728471897984} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!210 &3968866702977508545 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4886416728696845433} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 23 --- !u!1 &4886416728948486882 GameObject: m_ObjectHideFlags: 0 @@ -5973,7 +6086,7 @@ Transform: m_Children: - {fileID: 4886416730151565591} - {fileID: 4886416730140146070} - - {fileID: 864454891212723563} + - {fileID: 8759972247495498057} - {fileID: 4886416729645955359} - {fileID: 4886416730294442469} - {fileID: 4886416728497438190} @@ -6444,13 +6557,14 @@ GameObject: m_Component: - component: {fileID: 4886416729748261545} - component: {fileID: 8741854802242665909} + - component: {fileID: 8954821676095258545} m_Layer: 0 m_Name: Customer_order m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4886416729748261545 Transform: m_ObjectHideFlags: 0 @@ -6487,6 +6601,17 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!210 &8954821676095258545 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4886416729748261544} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 23 --- !u!1 &4886416729796178189 GameObject: m_ObjectHideFlags: 0 @@ -6515,7 +6640,7 @@ Transform: m_LocalPosition: {x: -1.09, y: 0.16, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 864454890883285588} + - {fileID: 2262857044639259982} m_Father: {fileID: 4886416728696168849} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7292,7 +7417,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4886416730275037410} - - component: {fileID: 4886416730275037411} m_Layer: 0 m_Name: order m_TagString: Untagged @@ -7310,60 +7434,11 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: -0.13052624, w: 0.9914449} m_LocalPosition: {x: 0.338, y: 0.621, z: 0} m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} - m_Children: [] + m_Children: + - {fileID: 2617542989482238824} m_Father: {fileID: 4886416729748261545} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15} ---- !u!212 &4886416730275037411 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4886416730275037409} - 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: 21 - 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!1 &4886416730294442468 GameObject: m_ObjectHideFlags: 0 @@ -7469,6 +7544,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4886416730379292501} + - component: {fileID: 7430279294695426778} m_Layer: 0 m_Name: NormalBody_FrontBack m_TagString: Untagged @@ -7492,6 +7568,17 @@ Transform: m_Father: {fileID: 4886416728471897984} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!210 &7430279294695426778 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4886416730379292500} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 23 --- !u!1 &6511433195714067906 GameObject: m_ObjectHideFlags: 0 @@ -7509,7 +7596,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &9057806665180912866 Transform: m_ObjectHideFlags: 0 @@ -7593,6 +7680,37 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &6952551938940088656 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2262857044639259982} + m_Layer: 0 + m_Name: popcorn_front_eat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2262857044639259982 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6952551938940088656} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.432, y: 0.29000005, z: 0.2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 864454890883285588} + m_Father: {fileID: 4886416729796178190} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7358655632798716600 GameObject: m_ObjectHideFlags: 0 @@ -7610,7 +7728,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &3403812381271641660 Transform: m_ObjectHideFlags: 0 @@ -7776,102 +7894,48 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1001 &4886416729439276163 -PrefabInstance: +--- !u!1 &8422870931014696725 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4886416729645955359} - m_Modifications: - - target: {fileID: 3977811363330864022, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - propertyPath: m_Name - value: popcorn_left_eat - objectReference: {fileID: 0} - - target: {fileID: 3977811363330864022, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - propertyPath: m_LocalPosition.x - value: 1.01 - objectReference: {fileID: 0} - - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.41999984 - objectReference: {fileID: 0} - - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5765847566386641861, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - propertyPath: m_SortingOrder - value: 6 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0a807afb08578f048850b990e00884b1, type: 3} ---- !u!4 &864454890252178187 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, - type: 3} - m_PrefabInstance: {fileID: 4886416729439276163} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 864454890252178187} + m_Layer: 0 + m_Name: popcorn_left_eat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &864454890252178187 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8422870931014696725} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.01, y: 0.41999984, z: 0.2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1249575302503997369} + m_Father: {fileID: 4886416729645955359} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &4886416729869589980 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 4886416729796178190} + m_TransformParent: {fileID: 2262857044639259982} m_Modifications: - target: {fileID: 3977811363330864022, guid: 0a807afb08578f048850b990e00884b1, type: 3} propertyPath: m_Name - value: popcorn_front_eat + value: package objectReference: {fileID: 0} - target: {fileID: 3977811363330864022, guid: 0a807afb08578f048850b990e00884b1, type: 3} @@ -7886,17 +7950,17 @@ PrefabInstance: - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, type: 3} propertyPath: m_LocalPosition.x - value: -0.432 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, type: 3} propertyPath: m_LocalPosition.y - value: 0.29000005 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, type: 3} propertyPath: m_LocalPosition.z - value: 0.2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, type: 3} @@ -7940,6 +8004,12 @@ 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, @@ -7951,42 +8021,42 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 4886416729068509252} + m_TransformParent: {fileID: 8759972247495498057} m_Modifications: - target: {fileID: 3977811363330864022, guid: 0a807afb08578f048850b990e00884b1, type: 3} propertyPath: m_Name - value: popcorn_right_eat + value: package objectReference: {fileID: 0} - target: {fileID: 3977811363330864022, guid: 0a807afb08578f048850b990e00884b1, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, type: 3} propertyPath: m_RootOrder - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, type: 3} propertyPath: m_LocalPosition.x - value: -0.327 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, type: 3} propertyPath: m_LocalPosition.y - value: -0.891 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, type: 3} propertyPath: m_LocalPosition.z - value: 0.3995858 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, type: 3} propertyPath: m_LocalRotation.w - value: 0.38984132 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, type: 3} @@ -8001,7 +8071,7 @@ PrefabInstance: - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, type: 3} propertyPath: m_LocalRotation.z - value: -0.920882 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, type: 3} @@ -8025,9 +8095,212 @@ 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, type: 3} m_PrefabInstance: {fileID: 4886416730332646115} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6446974443264639025 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 864454890252178187} + m_Modifications: + - target: {fileID: 3977811363330864022, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_Name + value: package + objectReference: {fileID: 0} + - target: {fileID: 3977811363330864022, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5765847566386641861, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_SortingOrder + value: 6 + 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, + type: 3} + m_PrefabInstance: {fileID: 6446974443264639025} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7817196169917021408 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4886416730275037410} + m_Modifications: + - target: {fileID: 3977811363330864022, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_Name + value: package + objectReference: {fileID: 0} + - target: {fileID: 3977811363330864022, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5201414598063136648, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5765847566386641861, guid: 0a807afb08578f048850b990e00884b1, + type: 3} + propertyPath: m_SortingOrder + value: 21 + 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, + type: 3} + m_PrefabInstance: {fileID: 7817196169917021408} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customer.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customer.meta deleted file mode 100644 index 9659a7f0..00000000 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customer.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5f2fdf18e15934b1da5f8f4903d1f394 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customer/Customer.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customer/Customer.prefab deleted file mode 100644 index 8a0c7273..00000000 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customer/Customer.prefab +++ /dev/null @@ -1,273 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &5409985849651702440 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5409985849651702441} - - component: {fileID: 5715829407227760309} - - component: {fileID: 1385243083193661112} - m_Layer: 0 - m_Name: Customer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5409985849651702441 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5409985849651702440} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -1.55, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 5409985851491668856} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5715829407227760309 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5409985849651702440} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3aa8dec9a88540bf93de4c93663335ec, type: 3} - m_Name: - m_EditorClassIdentifier: - animator: {fileID: 5409985851491668857} - customerDirection: {fileID: 4855338754077236085} - orderAnimator: {fileID: 8184560012277033293} - OrderCount: 0 - PrefabName: - tapReaction: {fileID: 5951905660557715770} - orderPopup: {fileID: 5409985850085678672} - leftPopcorn: {fileID: 1950136324582499262} - rightPopcorn: {fileID: 1950136324150437342} - frontPopcorn: {fileID: 1950136324089803489} - wantFlavorSprite: {fileID: 5409985849570169883} - defaultSprite: {fileID: 21300000, guid: 99d426990eeb08d4d85ae03f04609196, type: 3} - caramelSprite: {fileID: 21300000, guid: 469b78432f101024aa1a2060a57231d8, type: 3} - walkSideTopPosition: -0.6 - walkSideMidPos: -4 - walkSideBottomPos: -6.7 - walkSideLeavePos: -1 - stopPosision: 0 - stopPositionRange: 3 - waitPositions: [] - orderPosision: 0.5 - orderPositionRange: 2 - waitOrderPosision: -1.5 - walkSideSpeed: 1.3 - walkFrontBackSpeed: 1 ---- !u!114 &1385243083193661112 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5409985849651702440} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 786931d1da2c4b1c8ce9519c9b3c32fd, type: 3} - m_Name: - m_EditorClassIdentifier: - bigHeart: {fileID: 7988005957398545984} - smallHeart: {fileID: 992423202615605163} ---- !u!1001 &631677504613307640 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5409985849651702441} - m_Modifications: - - target: {fileID: 3340056901353795718, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4886416728471897984, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4886416728471897984, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4886416728471897984, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4886416728471897984, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4886416728471897984, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4886416728471897984, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4886416728471897984, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4886416728471897984, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4886416728471897984, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4886416728471897984, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4886416728471897984, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4886416728471897999, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_Name - value: NormalBody - objectReference: {fileID: 0} - - target: {fileID: 4886416729068509251, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4886416729748261544, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4886416730379292500, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6511433195714067906, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7358655632798716600, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8422870931014696725, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8422870931732035957, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: db654393793a67d45a7d0b70a68b73a6, type: 3} ---- !u!4 &5409985851491668856 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4886416728471897984, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - m_PrefabInstance: {fileID: 631677504613307640} - m_PrefabAsset: {fileID: 0} ---- !u!95 &5409985851491668857 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 4886416728471897985, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - m_PrefabInstance: {fileID: 631677504613307640} - m_PrefabAsset: {fileID: 0} ---- !u!114 &4855338754077236085 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5450916343452979085, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - m_PrefabInstance: {fileID: 631677504613307640} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0eb44b30c9454383898faae0c3666b94, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!212 &1950136324089803489 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 1428887861354145305, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - m_PrefabInstance: {fileID: 631677504613307640} - m_PrefabAsset: {fileID: 0} ---- !u!212 &1950136324150437342 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 1428887861146841382, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - m_PrefabInstance: {fileID: 631677504613307640} - m_PrefabAsset: {fileID: 0} ---- !u!212 &1950136324582499262 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 1428887860706522950, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - m_PrefabInstance: {fileID: 631677504613307640} - m_PrefabAsset: {fileID: 0} ---- !u!1 &7988005957398545984 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7358655632798716600, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - m_PrefabInstance: {fileID: 631677504613307640} - m_PrefabAsset: {fileID: 0} ---- !u!1 &992423202615605163 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 360816779210449747, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - m_PrefabInstance: {fileID: 631677504613307640} - m_PrefabAsset: {fileID: 0} ---- !u!1 &5409985850085678672 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4886416729748261544, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - m_PrefabInstance: {fileID: 631677504613307640} - m_PrefabAsset: {fileID: 0} ---- !u!95 &8184560012277033293 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 8741854802242665909, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - m_PrefabInstance: {fileID: 631677504613307640} - m_PrefabAsset: {fileID: 0} ---- !u!212 &5409985849570169883 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 4886416730275037411, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - m_PrefabInstance: {fileID: 631677504613307640} - m_PrefabAsset: {fileID: 0} ---- !u!1 &5951905660557715770 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6511433195714067906, guid: db654393793a67d45a7d0b70a68b73a6, - type: 3} - m_PrefabInstance: {fileID: 631677504613307640} - m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/CustomerController.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/CustomerController.prefab new file mode 100644 index 00000000..3e8992c2 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/CustomerController.prefab @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5409985849651702440 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5409985849651702441} + - component: {fileID: 5715829407227760309} + m_Layer: 0 + m_Name: CustomerController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5409985849651702441 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5409985849651702440} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -1.55, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5715829407227760309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5409985849651702440} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3aa8dec9a88540bf93de4c93663335ec, type: 3} + m_Name: + m_EditorClassIdentifier: + OrderCount: 0 + PrefabName: + walkSideTopPosition: -0.6 + walkSideMidPos: -4 + walkSideBottomPos: -6.7 + walkSideLeavePos: -1 + stopPosision: 0 + stopPositionRange: 3 + waitPositions: [] + orderPosision: 0.5 + orderPositionRange: 2 + waitOrderPosision: -1.5 + walkSideSpeed: 1.3 + walkFrontBackSpeed: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customer/Customer.prefab.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/CustomerController.prefab.meta similarity index 100% rename from popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customer/Customer.prefab.meta rename to popcorn/Assets/MyGame/Scenes/marketing/Prefabs/CustomerController.prefab.meta diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/popcorn.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/popcorn.prefab index 21a2239c..4b5d7abf 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/popcorn.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/popcorn.prefab @@ -518,6 +518,7 @@ MonoBehaviour: 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 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherPinkView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherPinkView.cs index ad516aa4..2699d87c 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherPinkView.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherPinkView.cs @@ -36,8 +36,6 @@ public class BrotherPinkView : MonoBehaviour private float completedDuration; private void Start() { - nextId = Normal; - isManyCustomer = true; this.UpdateAsObservable().Subscribe(_ => { if (isManyCustomer || isLocked) @@ -74,6 +72,12 @@ public class BrotherPinkView : MonoBehaviour }).AddTo(this); } + public void Initialize() + { + nextId = Normal; + isManyCustomer = true; + } + private void SetPinkMove() { var move = pinkMoves[moveIndex]; @@ -102,7 +106,8 @@ public class BrotherPinkView : MonoBehaviour nextId = id; if (isManyCustomer) { - animator.SetTrigger(Normal); + Debug.Log($"triggered"); + animator.SetTrigger(id); } } diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerController.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerController.cs index f1faf63b..1888930d 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerController.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerController.cs @@ -31,27 +31,9 @@ public enum CustomerState public class CustomerController : MonoBehaviour { - private static readonly int WalkFront = Animator.StringToHash("WalkFront"); - private static readonly int WalkSide = Animator.StringToHash("WalkSide"); - private static readonly int WalkBack = Animator.StringToHash("WalkBack"); - private static readonly int StayBack = Animator.StringToHash("StayBack"); - private static readonly int WalkFrontEat = Animator.StringToHash("WalkFrontEat"); - private static readonly int WalkSideEat = Animator.StringToHash("WalkSideEat"); - - private static readonly int Complain = Animator.StringToHash("ComplainTrigger"); - - [SerializeField] private Animator animator; - [SerializeField] private CustomerDirection customerDirection; - [SerializeField] private Animator orderAnimator; - - [SerializeField] private GameObject tapReaction; - [SerializeField] private GameObject orderPopup; - [SerializeField] private SpriteRenderer leftPopcorn; - [SerializeField] private SpriteRenderer rightPopcorn; - [SerializeField] private SpriteRenderer frontPopcorn; - [SerializeField] private SpriteRenderer wantFlavorSprite; - [SerializeField] private Sprite defaultSprite; - [SerializeField] private Sprite caramelSprite; + public int OrderCount; + public CustomerAnimator CustomerPrefab; + public bool IsCustomer; // 歩道の幅(min,max) [SerializeField] private float walkSideTopPosition; @@ -75,7 +57,6 @@ public class CustomerController : MonoBehaviour private static readonly float leftEndPosision = -10f; private Vector3 beginPos; private Vector3 wayPoint; - private CustomerMovingType currentMovingType; private bool isMoveOverride; private List<(CustomerMovingType type, float duration)> moves = new List<(CustomerMovingType, float)>(); private float speed = 0f; @@ -83,15 +64,42 @@ public class CustomerController : MonoBehaviour private float durationDelta; // 左右どちらから出るか private float walkSideDirection; + public IReadOnlyReactiveProperty CurrentMovingType => currentMovingType; + private readonly ReactiveProperty currentMovingType = new ReactiveProperty(); public IReadOnlyReactiveProperty MoveEndObservable => moveEndSubject; private readonly ReactiveProperty moveEndSubject = new ReactiveProperty(); public IReadOnlyReactiveProperty State => state; private readonly ReactiveProperty state = new ReactiveProperty(); + // 向き + public IReadOnlyReactiveProperty IsDefaultSide => isDefaultSide; + private readonly ReactiveProperty isDefaultSide = new ReactiveProperty(); + public IReadOnlyReactiveProperty WantFlavor => wantFlavor; + private readonly ReactiveProperty wantFlavor = new ReactiveProperty(); + public IReadOnlyReactiveProperty IsComplain => isComplain; + private readonly ReactiveProperty isComplain = new ReactiveProperty(); + + public IObservable Purchased => purchased; + private readonly Subject purchased = new Subject(); + public IObservable TappedObservable => tappedSubject; + private Subject tappedSubject = new Subject(); + private void Start() { + currentMovingType.AddTo(this); + moveEndSubject.AddTo(this); state.AddTo(this); + isDefaultSide.AddTo(this); + purchased.AddTo(this); + durationDelta = 0f; + Observable.Interval(TimeSpan.FromSeconds(.1f)).Subscribe(_ => + { + // if (Vector3.Distance(transform.localPosition, wayPoint) < .09f) + // { + // Debug.Log($"{transform.localPosition}, {wayPoint}, {currentMovingType.Value}, {moveEndSubject.Value} {GetHashCode()}"); + // } + }).AddTo(this); this.UpdateAsObservable().Subscribe(_ => { var localPosition = transform.localPosition; @@ -105,7 +113,7 @@ public class CustomerController : MonoBehaviour durationDelta += Time.deltaTime; return; } - moveEndSubject.Value = currentMovingType; + moveEndSubject.Value = currentMovingType.Value; if (isMoveOverride) { isMoveOverride = false; @@ -129,7 +137,7 @@ public class CustomerController : MonoBehaviour beginPos.x = leftEndPosision * walkSideDirection; beginPos.y = Random.Range(walkSideMidPos, walkSideBottomPos); transform.localPosition = beginPos; - currentMovingType = CustomerMovingType.StayBack; + currentMovingType.Value = CustomerMovingType.StayBack; moveEndSubject.Value = CustomerMovingType.StayBack; isMoveOverride = false; SetWayPoint(beginPos); @@ -138,7 +146,7 @@ public class CustomerController : MonoBehaviour public void ChangeCustomerState(CustomerState state) { this.state.Value = state; - Debug.Log(state); + // Debug.Log(state); switch (state) { case CustomerState.Walk: @@ -193,7 +201,7 @@ public class CustomerController : MonoBehaviour // キャラの奥行き描画順のため、y方向に対応したz軸を設定 private void SetMove(CustomerMovingType type, float duration = 0f) { - if (currentMovingType == type) + if (currentMovingType.Value == type) { return; } @@ -204,17 +212,10 @@ public class CustomerController : MonoBehaviour case CustomerMovingType.WalkSide: SetWayPoint(new Vector3(-leftEndPosision * walkSideDirection, transform.localPosition.y)); speed = walkSideSpeed; - // アニメーション違和感回避 - if (currentMovingType == CustomerMovingType.WalkCenter) - { - break; - } - animator.SetTrigger(WalkSide); break; case CustomerMovingType.WalkSideEat: SetWayPoint(new Vector3(-leftEndPosision * walkSideDirection, transform.localPosition.y)); speed = walkSideSpeed; - animator.SetTrigger(WalkSideEat); break; case CustomerMovingType.WalkCenter: if (Mathf.Abs(transform.localPosition.x - stopPosision) <= stopPositionRange) @@ -226,27 +227,18 @@ public class CustomerController : MonoBehaviour SetWayPoint(new Vector3(stopPosision - Random.value * stopPositionRange * walkSideDirection, beginPos.y)); } speed = walkSideSpeed; - // アニメーション違和感回避 - if (currentMovingType == CustomerMovingType.WalkSide) - { - break; - } - animator.SetTrigger(WalkSide); break; case CustomerMovingType.StayBackOrder: // オーダー speed = 0f; - animator.SetTrigger(StayBack); break; case CustomerMovingType.StayBack: speed = 0f; - animator.SetTrigger(StayBack); break; case CustomerMovingType.WalkBack: // 購入場所に行く SetWayPoint(orderPositions[orderPositionIndex].localPosition); speed = walkFrontBackSpeed; - animator.SetTrigger(WalkBack); break; case CustomerMovingType.WalkBackHalf: // 待機列に入る @@ -259,78 +251,49 @@ public class CustomerController : MonoBehaviour SetWayPoint(new Vector3(stopPosision - Random.value * stopPositionRange * walkSideDirection, waitOrderPosision)); } speed = walkFrontBackSpeed; - animator.SetTrigger(WalkBack); break; case CustomerMovingType.WalkFront: SetWayPoint(new Vector3(wayPoint.x, Random.Range(walkSideLeavePos, walkSideTopPosition))); speed = walkFrontBackSpeed; - animator.SetTrigger(WalkFront); break; case CustomerMovingType.WalkFrontEat: SetWayPoint(new Vector3(wayPoint.x, Random.Range(walkSideLeavePos, walkSideTopPosition))); speed = walkFrontBackSpeed; - animator.SetTrigger(WalkFrontEat); break; default: throw new ArgumentOutOfRangeException(nameof(type), type, null); } - currentMovingType = type; + currentMovingType.Value = type; } private void SetWayPoint(Vector3 point) { + // Debug.Log($"SetWayPoint {transform.localPosition}, {wayPoint}, {point}"); wayPoint = point; - if ((wayPoint - transform.localPosition).x >= 0) - { - customerDirection.SetDefaultSide(); - } - else - { - customerDirection.SetFlipSide(); - } + isDefaultSide.Value = (wayPoint - transform.localPosition).x >= 0; } public void SetOrderPosition(int index) { orderPositionIndex = index; } - - public void ShowWantFlavor(int flavor) + + public void Tapped() { - if (flavor == 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; - } - orderPopup.SetActive(true); + tappedSubject.OnNext(Unit.Default); + } + + public void SetPurchased() + { + purchased.OnNext(Unit.Default); + } + public void SetWantFlavor(ProductStockData stockData) + { + wantFlavor.Value = stockData; } - public void ShowComplain() + public void SetComplain() { - orderPopup.SetActive(true); - orderAnimator.SetTrigger(Complain); - this.CallWaitForSeconds(1.5f, () => - { - HideOrderPopup(); - }); - } - - public void HideOrderPopup() - { - orderPopup.SetActive(false); - } - - public void ShowTapReaction() - { - tapReaction.SetActive(true); + isComplain.SetValueAndForceNotify(true); } } \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/HeartAnimation.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/HeartAnimation.cs index a74ac88d..c5902929 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/HeartAnimation.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/HeartAnimation.cs @@ -5,17 +5,11 @@ public class HeartAnimation : MonoBehaviour { [SerializeField] private GameObject bigHeart; [SerializeField] private GameObject smallHeart; - private Transform target; private float animationDelay = .3f; private float animationDuration = .5f; private float heartToMeterDuration = .4f; - public void SetTarget(Transform transform) - { - target = transform; - } - - public void GetHeart(Action callback = null) + public void GetHeart(Transform target, Action callback = null) { smallHeart.SetActive(false); this.CallWaitForSeconds(animationDelay, () => diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs index 4f957782..606e872e 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs @@ -15,44 +15,47 @@ public enum ShopState Close, } -public class Market : MonoBehaviour -{ +public class Market : SingletonMonoBehaviour +{ public static readonly int ShopStockCount = 20; - [SerializeField] private ShopStockView stockView; - [SerializeField] private MarketCartView cartView; - [SerializeField] private BrotherBlueView blueView; - [SerializeField] private BrotherPinkView pinkView; - [SerializeField] private GameObject closeSign; - [SerializeField] private GameObject customerPrefab; + [SerializeField] private CustomerFlow customerFlow; [SerializeField] private GameObject orderPosisionObject; - [SerializeField] private Transform coinPrefab; - [SerializeField] private Transform rootTransform; - - private List displayFlavors; - private List shuffledOrder; - private ReactiveProperty shopState = new ReactiveProperty(); - private ReactiveCollection waitCustomerList = new ReactiveCollection(); - private Subject requestSubject = new Subject(); - private Subject orderSubject = new Subject(); + [SerializeField] private CustomerData customerData; + [SerializeField] private CustomerController customerControllerPrefab; + public List DisplayFlavors => displayFlavors; + private List displayFlavors = new List(); + public List ShuffledOrder => shuffledOrder; + private List shuffledOrder = new List(); + + public IReadOnlyReactiveProperty CurrentShopState => shopState; + private readonly ReactiveProperty shopState = new ReactiveProperty(); + public IReadOnlyReactiveCollection CustomerControllerList => customerControllerList; + private readonly ReactiveCollection customerControllerList = new ReactiveCollection(); + public IReadOnlyReactiveCollection CustomerList => customerList; + private readonly ReactiveCollection customerList = new ReactiveCollection(); + private readonly Subject requestSubject = new Subject(); + private readonly ReactiveCollection waitCustomerList = new ReactiveCollection(); + private readonly Subject orderSubject = new Subject(); + + public Subject SellObservable => sellObservable; + private readonly Subject sellObservable = new Subject(); + public Subject<(bool isReorder, List orders)> SellOrderSubject => sellOrderSubject; + private readonly Subject<(bool isReorder, List orders)> sellOrderSubject = new Subject<(bool, List)>(); + private int orderIndex; // Start is called before the first frame update void Start() { shopState.AddTo(this); + customerList.AddTo(this); waitCustomerList.AddTo(this); requestSubject.AddTo(this); orderSubject.AddTo(this); var gameData = GameDataManager.GameData; - CoinManager.Instance.ChangeCoin(gameData.Coin); - HeartMeter.Instance.Initialize(); - HeartMeter.Instance.SetHeart(gameData.Heart); - - var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopLevelDataSheet); - var shopLevelToCustomerList = shopLevelList.Select(shopLevel => (level:shopLevel.shopLevel, tenMinCustomer:shopLevel.customer)); #if UNITY_EDITOR || DEVELOPMENT_BUILD CheckAndFixStock(); @@ -61,23 +64,29 @@ public class Market : MonoBehaviour // 陳列 displayFlavors = gameData.ShopStock.Select(x => x).ToList(); - cartView.SetStock(displayFlavors); // 売り順決定 shuffledOrder = ShuffleOrder(displayFlavors.Count); + + Observable.Interval(TimeSpan.FromSeconds(1f)) + .Where(_ => shuffledOrder.Count == 0) + .Where(_ => gameData.ShopStock.Count > 0) + .Subscribe(_ => + { + Debug.Log("displayFlavors updated"); + displayFlavors = gameData.ShopStock.Select(x => x).ToList(); + shuffledOrder = ShuffleOrder(displayFlavors.Count); + shopState.Value = ShopState.Open; + }); // お店の状態設定 shopState.Value = gameData.ShopStock.Count == 0 ? ShopState.Close : ShopState.Open; - - // お客さん一覧 - var customerList = new ReactiveCollection(); - customerList.AddTo(this); // 購入リクエスト var maxOrder = orderPosisionObject.transform.childCount; - orderSubject - .Merge(waitCustomerList.ObserveAdd().AsUnitObservable()) - .Merge(shopState.Where(x => x == ShopState.Open).AsUnitObservable()) + orderSubject.Do(_ => { Debug.Log($"aa orderSubject");}) + .Merge(waitCustomerList.ObserveAdd().AsUnitObservable().Do(_ => { Debug.Log($"aa waitCustomerListAdd");})) + .Merge(shopState.Where(x => x == ShopState.Open).AsUnitObservable().Do(_ => { Debug.Log($"aa shopStateOpen");})) .BatchFrame() .Where(_ => waitCustomerList.Count > 0) .SelectMany(_ => waitCustomerList.ToList().GetRange(0, Mathf.Min(maxOrder, waitCustomerList.Count))) @@ -100,47 +109,9 @@ public class Market : MonoBehaviour customer.SetOrderPosition(orderIndex); customer.ChangeCustomerState(CustomerState.Order); }).AddTo(this); - - // 購入客 - customerList.ObserveAdd() - .Select(x => x.Value) - .Subscribe(customerController => - { - if (shopState.Value == ShopState.Close) - { - customerController.ChangeCustomerState(CustomerState.Leave); - return; - } - customerController.State - .Where(x => x == CustomerState.EatingLeave) - .Subscribe(c => - { - orderSubject.OnNext(default); - }).AddTo(customerController); - - // 店に向かう - customerController.ChangeCustomerState(CustomerState.Wait); - - shopState - .Where(x => x == ShopState.Close) - .Subscribe(x => - { - // 売り切れの場合帰る - if (customerController.State.Value == CustomerState.Order) - { - return; - } - customerController.ChangeCustomerState(CustomerState.Leave); - }).AddTo(customerController); - }).AddTo(this); - + requestSubject.BatchFrame().Subscribe(customers => { - if (gameData.ShopStock.Count == 0) - { - shopState.Value = ShopState.Close; - } - var orders = new List(); var dontBuyCustomerList = new List(); foreach (var controller in customers) @@ -148,210 +119,169 @@ public class Market : MonoBehaviour // 売り切れ if (shuffledOrder.Count == 0) { - controller.ShowWantFlavor(displayFlavors.RandomChoose()); + controller.SetWantFlavor(new ProductStockData + { + FlavorId = displayFlavors.RandomChoose(), + Rarity = ProductRarity.Normal, + Stock = 0 + }); controller.CallWaitForSeconds(1.5f, () => { - controller.ShowComplain(); + controller.SetComplain(); controller.ChangeCustomerState(CustomerState.SadLeave); }); dontBuyCustomerList.Add(controller); continue; } + // 何も買わない + if (controller.OrderCount == 0) + { + controller.CallWaitForSeconds(1.5f, () => + { + controller.ChangeCustomerState(CustomerState.Leave); + }); + dontBuyCustomerList.Add(controller); + continue; + } - // オーダー数 - var orderCount = Random.Range(1,5); // 在庫取得 - var tmpOrderCount = Mathf.Min(orderCount, shuffledOrder.Count); + var tmpOrderCount = Mathf.Min(controller.OrderCount, shuffledOrder.Count); // shuffledOrder順に販売 orders.AddRange(shuffledOrder.GetRange(0, tmpOrderCount)); shuffledOrder.RemoveRange(0, tmpOrderCount); // コーンの味吹き出しを設定(レア度優先など - controller.ShowWantFlavor(displayFlavors[orders.RandomChoose()]); + controller.SetWantFlavor(new ProductStockData + { + FlavorId = orders.RandomChoose(), + Rarity = ProductRarity.Normal, + Stock = 0 + }); } foreach (var customerController in dontBuyCustomerList) { customers.Remove(customerController); } + if (gameData.ShopStock.Count == 0) + { + shopState.Value = ShopState.Close; + } if (orders.Count == 0) { return; } - // 購入 var flavors = orders.Select(x => (displayFlavors[x], ProductRarity.Normal)).ToList(); #if UNITY_EDITOR Debug.Log($"bb order: {orders.Count} {orders.Aggregate("", (s, i) => $"{s},{i}")}"); Debug.Log($"bb shuffledOrder:{shuffledOrder.Count} {shuffledOrder.Aggregate("", (s, i) => $"{s},{i}")}"); #endif + // 購入 var coin = SellPopcorn(flavors); + + // 獲得処理 + gameData.Coin += coin; + gameData.Heart += customers.Count; + GameDataManager.SaveGameData(); + var remainStockCount = gameData.ShopStock.Count; - + // 自動補充 refill - RefillProduct(); + RefillShopStockData(); StockFlavorLog(); // 補充された場合フレーバー再設定 - var setStockFlag = false; - if (gameData.ShopStock.Count == ShopStockCount) - { - shuffledOrder.AddRange(orders); - var stock = gameData.ShopStock.GetRange(remainStockCount, orders.Count).ToArray(); - for (int i = 0; i < orders.Count; i++) - { - displayFlavors[orders[i]] = stock[i]; - } - } - else if (gameData.ShopStock.Count <= 13 && shuffledOrder.Exists(x => x > 13)) - { - displayFlavors = gameData.ShopStock.Select(x => x).ToList(); - shuffledOrder = ShuffleOrder(displayFlavors.Count); - setStockFlag = true; - } - else if (gameData.ShopStock.Count <= 7 && shuffledOrder.Exists(x => x > 7)) - { - displayFlavors = gameData.ShopStock.Select(x => x).ToList(); - shuffledOrder = ShuffleOrder(displayFlavors.Count); - setStockFlag = true; - } - + var isReorder = RefillShopFlavors(orders, remainStockCount); + this.CallWaitForSeconds(1.5f, () => { - foreach (var order in orders) - { - cartView.SellStock(order); - } - blueView.SellAction(); - // コイン獲得 - CoinEffect(coin); - CoinManager.Instance.AddCoinWithEffect(coin, () => { }); - gameData.Coin = CoinManager.Instance.OwnCoin; - gameData.Heart += customers.Count; - GameDataManager.SaveGameData(); + sellObservable.OnNext(coin); + sellOrderSubject.OnNext((isReorder, orders)); shopState.Value = gameData.ShopStock.Count == 0 ? ShopState.Close : ShopState.Open; - // 表示更新(陳列13=650ms,7=350ms) this.CallWaitForSeconds(1f, () => { - foreach (var customerController in customers) + foreach (var controller in customers) { - customerController.HideOrderPopup(); - var heartAnimation = customerController.GetComponent(); - heartAnimation.SetTarget(HeartMeter.Instance.transform); - heartAnimation.GetHeart(() => - { - HeartMeter.Instance.AddHeart(1); - }); - customerController.ChangeCustomerState(CustomerState.EatingLeave); - } - stockView.SetStock(gameData.StorageTanks); - if (gameData.ShopStock.Count == ShopStockCount) - { - // 補充したフレーバーのスキンを設定 - foreach (var order in orders) - { - cartView.Refill(order, displayFlavors[order]); - } - } - else if (setStockFlag) - { -#if UNITY_EDITOR - Debug.Log($"bb setStockFlag {displayFlavors.Count} {shuffledOrder.Count}"); -#endif - // 陳列 - cartView.ResetDisplay(); - for (int i = 0; i < displayFlavors.Count; i++) - { - var index = i; - this.CallWaitForSeconds(.05f * i, () => - { - if (!shuffledOrder.Contains(index)) - { -#if UNITY_EDITOR - Debug.Log($"bb no refill"); -#endif - return; - } - cartView.Refill(index, displayFlavors[index]); - }); - } + controller.SetPurchased(); + controller.ChangeCustomerState(CustomerState.EatingLeave); } }); }); }).AddTo(this); - - // お客さん出現タイマー（店舗レベル連動 - var changeCustomerFlowObservable = HeartMeter.Instance.ShopLevel - .Select(x => (float)60 * 10 / shopLevelToCustomerList.First(y => y.level == x).tenMinCustomer); // 10分間期待値から来客の間隔を算出 - var customerObservable = changeCustomerFlowObservable - .Select(x => Observable.Interval(TimeSpan.FromSeconds(x)) - .Select(_ => + + // 購入客 + customerList.ObserveAdd() + .Select(x => x.Value) + .Subscribe(controller => + { + if (shopState.Value == ShopState.Close) { - Debug.Log($"customer:{GetHashCode()}"); - // 一般客orセレブ - // 複数パターンある場合ChooseRandom - return (isCustomer: true, isSpecial: false); - })) - .Switch(); - - // 歩行者出現頻度、立ち止まり確率も設定(歩行者タイマー1分間に6人 - var walkerObservable = Observable.Timer(TimeSpan.FromSeconds(2f), TimeSpan.FromSeconds(10f)) - .Select(x => - { - Debug.Log($"walker:{GetHashCode()}"); - // 一般客orセレブ - // 複数パターンある場合ChooseRandom - return (isCustomer: false, isSpecial: false); - }); - - // 宣伝時、タップすると60秒だけ稼働するストリーム - // タップ, リアクティブコマンドで60秒押せない,その後復活 - var adClickObservable = new Subject(); - adClickObservable.AddTo(this); - var adWalkerObservable = Observable.Interval(TimeSpan.FromSeconds(3f)) - .Take(20) - .Select(x => - { - Debug.Log($"adWalker"); - return (isCustomer: false, isSpecial: false); - }); - var adClickWalkerObservable = adClickObservable - .Do(_ => { Debug.Log($"clicked");}) - .Delay(TimeSpan.FromSeconds(2f)) - .Select(x => adWalkerObservable).Switch(); -#if DEVELOPMENT_BUILD || UNITY_EDITOR - if (UsayaStorageManager.LoadOrDefault(UsayaStorageFilename.Settings_Data, "DebugManyWalker", false)) - { - Observable.Timer(TimeSpan.FromSeconds(1f), TimeSpan.FromSeconds(70f)).Subscribe(_ => { adClickObservable.OnNext(default); }).AddTo(this); - } -#endif + controller.ChangeCustomerState(CustomerState.Leave); + return; + } + + // 売り切れの場合帰る + shopState + .Where(x => x == ShopState.Close && controller.State.Value != CustomerState.Order) + .Subscribe(x => + { + controller.ChangeCustomerState(CustomerState.Leave); + }).AddTo(controller); + + controller.State + .Where(x => x == CustomerState.EatingLeave) + .Subscribe(c => + { + orderSubject.OnNext(default); + }).AddTo(controller); + + // 店に向かう + controller.ChangeCustomerState(CustomerState.Wait); + }).AddTo(this); - // キャラ生成 - Observable.Merge(walkerObservable, customerObservable) - .Merge(adClickWalkerObservable) - .Subscribe(x => + customerFlow.Flow.Subscribe(isCustomer => { - var customer = Instantiate(customerPrefab); - var customerController = customer.GetComponent(); + // 一般客orセレブ + var (isSpecial, orderCount) = GetCustomerData(isCustomer); + + // 複数パターンある場合ChooseRandom + CustomerAnimator prefab; + if (isSpecial) + { + prefab = customerData.ChooseSpecialPrefab(); + } + else + { + prefab = customerData.ChooseNormalPrefab(); + } + + var customerController = Instantiate(customerControllerPrefab, transform); customerController.Setup(orderPosisionObject.transform.GetComponentsInChildren().ToList().Skip(1).ToList()); + customerController.OrderCount = orderCount; + customerController.CustomerPrefab = prefab; + customerController.IsCustomer = isCustomer; + customerControllerList.Add(customerController); + customerController.MoveEndObservable .SkipLatestValueOnSubscribe() .DistinctUntilChanged() - .Subscribe(type => + .Subscribe(prevMovingType => { - // Debug.Log($"move end {type}"); - switch (type) + // Debug.Log($"move end {type} {customerController.GetHashCode()}"); + switch (prevMovingType) { case CustomerMovingType.WalkSide: case CustomerMovingType.WalkSideEat: customerList.Remove(customerController); - Destroy(customer); + customerControllerList.Remove(customerController); + Destroy(customerController.gameObject); break; case CustomerMovingType.WalkCenter: - if (shopState.Value == ShopState.Close) - { - customerController.ChangeCustomerState(CustomerState.Leave); - } + // if (shopState.Value == ShopState.Close) + // { + // customerController.ChangeCustomerState(CustomerState.Leave); + // } if (customerController.State.Value == CustomerState.WalkShop) { customerList.Add(customerController); @@ -368,94 +298,81 @@ public class Market : MonoBehaviour } }).AddTo(customerController); - var customerObject = customer.transform.GetChild(0).gameObject; - var eventTrigger = customerObject.AddComponent(); - if (x.isCustomer) + if (customerController.IsCustomer) { // 近くまで歩く(タップされたらcustomerList.Add() customerController.ChangeCustomerState(CustomerState.WalkShop); - eventTrigger.OnPointerClickAsObservable() + customerController.TappedObservable .TakeUntil(customerController.MoveEndObservable.Where(type => type == CustomerMovingType.WalkCenter)) - .TakeWhile(_ => shopState.Value != ShopState.Close) .Take(1) .Subscribe(_ => { - customerController.ShowTapReaction(); customerList.Add(customerController); - if (customerObject.TryGetComponent(typeof(Collider2D), out var target)) - { - Destroy(target); - } }).AddTo(customerController); } else { // 歩行者はタップ後customerList.Add() customerController.ChangeCustomerState(CustomerState.Walk); - eventTrigger.OnPointerClickAsObservable() - .TakeWhile(_ => shopState.Value != ShopState.Close) + customerController.TappedObservable .Take(1) .Subscribe(_ => { - customerController.ShowTapReaction(); customerList.Add(customerController); - if (customerObject.TryGetComponent(typeof(Collider2D), out var target)) - { - Destroy(target); - } }).AddTo(customerController); } }).AddTo(this); - - CompositeDisposable shopStateCompositeDisposable = new CompositeDisposable(); - shopStateCompositeDisposable.AddTo(this); - shopState.Subscribe(state => + } + + // お客さん出現パターン確率計算と行動パターン計算 + private int GetOrderCount(bool isSpecial) + { + if (isSpecial) { - shopStateCompositeDisposable.Clear(); - switch (state) - { - case ShopState.Open: - pinkView.SetNormal(); - closeSign.SetActive(false); - break; - case ShopState.Busy: - break; - case ShopState.Close: - if (customerList.Count(x => x.State.Value == CustomerState.Order) == 0) - { - pinkView.SetSleepy(); - closeSign.SetActive(true); - } - else - { - // お客さんがいなくなったあと、閉店の看板を出す - Observable.CombineLatest(customerList.Select(x => x.State).Where(x => x.Value == CustomerState.Order)) - .First(states => states.Count(x => x == CustomerState.Order) == 0) - .Delay(TimeSpan.FromSeconds(2f)) - .Subscribe(_ => - { - pinkView.SetSleepy(); - closeSign.SetActive(true); - }).AddTo(shopStateCompositeDisposable); - } + return 5; + } - break; - default: - throw new ArgumentOutOfRangeException(nameof(state), state, null); + var customerWeightTable = new (int want, float weight)[]{ + (1, 70f), + (2, 20f), + (3, 3f), + (4, 1.5f), + (5, .5f), + (0, 5f), + }; + + var randomPoint = Random.value * customerWeightTable.Sum(x => x.weight); + foreach (var value in customerWeightTable) + { + if (randomPoint < value.weight) + { + return value.want; } - }).AddTo(this); + randomPoint -= value.weight; + } + return customerWeightTable.Last().want; + } + + private (bool isSpecial, int orderCount) GetCustomerData (bool isCustomer) + { + var isSpecial = false; + + if (isCustomer) + { + isSpecial = Random.value < .01f; + } + else + { + isSpecial = Random.value < .03f; + } - // お客さんが少なくなったら弟が走る - customerList.ObserveCountChanged(true).AsUnitObservable() - .Merge(Observable.Interval(TimeSpan.FromSeconds(1f)).AsUnitObservable()) - .Subscribe(_ => - { - var count = customerList.Count(c => c.State.Value == CustomerState.Wait || c.State.Value == CustomerState.Order); - if (count < pinkView.FewerBorder) - { - pinkView.SetWalk(); - } - }).AddTo(this); + // セレブは5個購入固定 + if (isSpecial) + { + return (true, GetOrderCount(true)); + } + + return (false, GetOrderCount(false)); } private int SellPopcorn(List<(int flavor, ProductRarity rarity)> flavors) @@ -489,7 +406,7 @@ public class Market : MonoBehaviour .OrderBy(_ => Random.value).ToList(); } - private void RefillProduct() + private void RefillShopStockData() { // 手前のタンクから出し多分stockをへらす // へらした分を店頭リストに追加する @@ -505,6 +422,8 @@ public class Market : MonoBehaviour } var tank = gameData.StorageTanks[index]; var stockCount = Mathf.Min(shopSpace, tank.Stock); + // 追加処理 + // レアの設定入れる gameData.ShopStock.AddRange(Enumerable.Repeat(tank.FlavorId, stockCount)); shopSpace -= stockCount; tank.Stock -= stockCount; @@ -514,13 +433,39 @@ public class Market : MonoBehaviour GameDataManager.SaveGameData(); } - private void CoinEffect(int count) + private bool RefillShopFlavors(List orders, int remainStockCount) { - var effect = Instantiate(coinPrefab, Vector3.zero, Quaternion.identity, rootTransform); - effect.GetComponentInChildren().text = count.ToString(); - Destroy(effect.gameObject, 1f); + var gameData = GameDataManager.GameData; + if (gameData.ShopStock.Count == ShopStockCount) + { + shuffledOrder.AddRange(orders); + var stock = gameData.ShopStock.GetRange(remainStockCount, orders.Count).ToArray(); + for (int i = 0; i < orders.Count; i++) + { + displayFlavors[orders[i]] = stock[i]; + } + } + else if (gameData.ShopStock.Count <= 13 && shuffledOrder.Exists(x => x > 13)) + { + displayFlavors = gameData.ShopStock.Select(x => x).ToList(); + shuffledOrder = ShuffleOrder(displayFlavors.Count); + return true; + } + else if (gameData.ShopStock.Count <= 7 && shuffledOrder.Exists(x => x > 7)) + { + displayFlavors = gameData.ShopStock.Select(x => x).ToList(); + shuffledOrder = ShuffleOrder(displayFlavors.Count); + return true; + } + + return false; } - + + public void AdClickAction() + { + customerFlow.StartAdWalker(); + } + private void CheckAndFixStock() { if (GameDataManager.GameData.ShopStock.Count > ShopStockCount) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketCartView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketCartView.cs index 77a23552..4c59bd31 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketCartView.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketCartView.cs @@ -10,33 +10,43 @@ public class MarketCartView : MonoBehaviour { foreach (var popcorn in popcornPositions) { - popcorn.gameObject.SetActive(false); + popcorn.SetActive(false); } } - public void SetStock(List shopStock) + public void SetStock(List<(int index, ProductStockData stockData)> shopStocks, bool animate = true ) { ResetDisplay(); // 陳列 - for (int i = 0; i < shopStock.Count; i++) + if (animate) { - var popcorn = popcornPositions[i]; - popcorn.ChangeSkin(shopStock[i]); - this.CallWaitForSeconds(.05f * i, () => + var i = 0; + foreach (var stock in shopStocks) { - popcorn.gameObject.SetActive(true); - }); + this.CallWaitForSeconds(.05f * i, () => + { + Refill(stock.index, stock.stockData.FlavorId, animate); + }); + i++; + } + } + else + { + foreach (var stock in shopStocks) + { + Refill(stock.index, stock.stockData.FlavorId, animate); + } } } - public void Refill(int index, int flavor) + public void Refill(int index, int flavor, bool animate = true) { popcornPositions[index].ChangeSkin(flavor); - popcornPositions[index].gameObject.SetActive(true); + popcornPositions[index].SetActive(true, animate); } public void SellStock(int index) { - popcornPositions[index].gameObject.SetActive(false); + popcornPositions[index].SetActive(false); } } diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketPopcornView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketPopcornView.cs index eccfa817..2d48cd6a 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketPopcornView.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketPopcornView.cs @@ -3,6 +3,8 @@ using UnityEngine; 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; @@ -12,6 +14,15 @@ public class MarketPopcornView : MonoBehaviour defaultSkin = popcornRenderer.sprite; } + public void SetActive(bool active, bool animate = true) + { + gameObject.SetActive(active); + if (active && animate) + { + animator.SetTrigger(Place); + } + } + public void ChangeSkin(int flavor) { if (flavor == 2) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index f125e185..7f8781cd 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -1299,12 +1299,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &384574881 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1069859090919850344, guid: 49f4b2509378048e7b7a5c6c0674be9f, - type: 3} - m_PrefabInstance: {fileID: 5368382573410461785} - m_PrefabAsset: {fileID: 0} --- !u!1 &438315598 GameObject: m_ObjectHideFlags: 0 @@ -1505,6 +1499,123 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 m_MaxRayIntersections: 0 +--- !u!1 &658817260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 658817264} + - component: {fileID: 658817263} + - component: {fileID: 658817262} + - component: {fileID: 658817261} + m_Layer: 0 + m_Name: MarketManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &658817261 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658817260} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 772e0346311a433fb714573f207813d2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &658817262 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658817260} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eee40f4ea08e42fab5bf3ea8810f972a, type: 3} + m_Name: + m_EditorClassIdentifier: + normalCustomerList: + - {fileID: 2081206165642927681, guid: 8c6dcd9482c51504e89ba42234369eda, type: 3} + - {fileID: 3417146906192995648, guid: af261bf183461af4b92b31a8649f1255, type: 3} + - {fileID: 7335308589943261866, guid: 8119ab8ce92a2484e83fa24bd7e91a7f, type: 3} + - {fileID: 413810629974474182, guid: b2e16ea88a942194fba4f20587f878d6, type: 3} + - {fileID: 7387534375894606070, guid: d7cea2d0458d10045a554a2fd1d5fde6, type: 3} + - {fileID: 2956205987963330084, guid: 2500a61ff79089d4da546f201f081e47, type: 3} + - {fileID: 4003975052009544272, guid: 324a7da4fcc328b4f86c4b8187774494, type: 3} + - {fileID: 6611440640265939248, guid: 7b6b18cba9150a1489f4b43c7dc96d01, type: 3} + - {fileID: 4805680105836285077, guid: 52eaa7893b55de0429402c694cde7077, type: 3} + - {fileID: 1961958092796897608, guid: 2d382a736a77d094ab8bd5337378ef12, type: 3} + - {fileID: 5217128672583935175, guid: 2b6084fdf652c6243b87c13c91f3b853, type: 3} + - {fileID: 1495806834793429147, guid: aee5c283a9302b749b3d37a96fcfdda2, type: 3} + - {fileID: 6205875053208953292, guid: 82c0cba8f34403145be5233f1a5c3068, type: 3} + - {fileID: 1289510962161473022, guid: 362f5d085a6f03448ab7123ee6592fc5, type: 3} + - {fileID: 3410656625090842591, guid: d3e920d4dcd68904db3aee438806ccc9, type: 3} + - {fileID: 8951347046735010126, guid: db654393793a67d45a7d0b70a68b73a6, type: 3} + - {fileID: 5939373664598446035, guid: d822fed75e272b5478a8ba9c9c591435, type: 3} + - {fileID: 5110027364233171103, guid: c07d09141aed9ea4d8f5fb012b316b43, type: 3} + - {fileID: 2961800609380067762, guid: fce9702bad3abf54691591f9720488fa, type: 3} + - {fileID: 1134751513859088931, guid: 09a4786fa1ab00e4b9c5bf9cebf256bc, type: 3} + specialCustomerList: + - {fileID: 2081206165642927681, guid: 8c6dcd9482c51504e89ba42234369eda, type: 3} + - {fileID: 3417146906192995648, guid: af261bf183461af4b92b31a8649f1255, type: 3} + - {fileID: 7335308589943261866, guid: 8119ab8ce92a2484e83fa24bd7e91a7f, type: 3} + - {fileID: 413810629974474182, guid: b2e16ea88a942194fba4f20587f878d6, type: 3} + - {fileID: 7387534375894606070, guid: d7cea2d0458d10045a554a2fd1d5fde6, type: 3} + - {fileID: 2956205987963330084, guid: 2500a61ff79089d4da546f201f081e47, type: 3} + - {fileID: 4003975052009544272, guid: 324a7da4fcc328b4f86c4b8187774494, type: 3} + - {fileID: 6611440640265939248, guid: 7b6b18cba9150a1489f4b43c7dc96d01, type: 3} + - {fileID: 4805680105836285077, guid: 52eaa7893b55de0429402c694cde7077, type: 3} + - {fileID: 1961958092796897608, guid: 2d382a736a77d094ab8bd5337378ef12, type: 3} + - {fileID: 5217128672583935175, guid: 2b6084fdf652c6243b87c13c91f3b853, type: 3} + - {fileID: 1495806834793429147, guid: aee5c283a9302b749b3d37a96fcfdda2, type: 3} + - {fileID: 6205875053208953292, guid: 82c0cba8f34403145be5233f1a5c3068, type: 3} + - {fileID: 1289510962161473022, guid: 362f5d085a6f03448ab7123ee6592fc5, type: 3} + - {fileID: 3410656625090842591, guid: d3e920d4dcd68904db3aee438806ccc9, type: 3} + - {fileID: 8951347046735010126, guid: db654393793a67d45a7d0b70a68b73a6, type: 3} + - {fileID: 5939373664598446035, guid: d822fed75e272b5478a8ba9c9c591435, type: 3} + - {fileID: 5110027364233171103, guid: c07d09141aed9ea4d8f5fb012b316b43, type: 3} + - {fileID: 2961800609380067762, guid: fce9702bad3abf54691591f9720488fa, type: 3} + - {fileID: 1134751513859088931, guid: 09a4786fa1ab00e4b9c5bf9cebf256bc, type: 3} +--- !u!114 &658817263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658817260} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf4a253e4bfcb47f18e7d6f28af64b01, type: 3} + m_Name: + m_EditorClassIdentifier: + customerFlow: {fileID: 658817261} + orderPosisionObject: {fileID: 1717315655} + customerData: {fileID: 658817262} + customerControllerPrefab: {fileID: 5715829407227760309, guid: 6fbb038c9aae840f2bea57bce30740f7, + type: 3} +--- !u!4 &658817264 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658817260} + 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: 1717315656} + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &668553842 GameObject: m_ObjectHideFlags: 0 @@ -2037,7 +2148,7 @@ PrefabInstance: - target: {fileID: 3664916832564167477, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 3664916832564167477, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -2201,6 +2312,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} +--- !u!224 &714437465 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3664916832844628215, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 714437464} + m_PrefabAsset: {fileID: 0} --- !u!1 &757275525 GameObject: m_ObjectHideFlags: 0 @@ -2412,7 +2529,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &887630637 GameObject: @@ -2872,7 +2989,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1025201115} - - component: {fileID: 1025201116} + - component: {fileID: 1025201118} m_Layer: 0 m_Name: Manager m_TagString: Untagged @@ -2892,9 +3009,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1025201116 +--- !u!114 &1025201118 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2903,17 +3020,18 @@ MonoBehaviour: m_GameObject: {fileID: 1025201113} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cf4a253e4bfcb47f18e7d6f28af64b01, type: 3} + m_Script: {fileID: 11500000, guid: 2acf7c5ed16d4e3890013ca7519535d5, type: 3} m_Name: m_EditorClassIdentifier: + market: {fileID: 0} + closeSign: {fileID: 1199276394} stockView: {fileID: 438315601} cartView: {fileID: 2048621276} blueView: {fileID: 1506158581} pinkView: {fileID: 1749782976} - closeSign: {fileID: 1199276394} - customerPrefab: {fileID: 5409985849651702440, guid: 6fbb038c9aae840f2bea57bce30740f7, + coinPrefab: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, type: 3} - orderPosisionObject: {fileID: 384574881} + rootTransform: {fileID: 714437465} --- !u!1 &1035509476 GameObject: m_ObjectHideFlags: 0 @@ -4319,7 +4437,7 @@ Transform: - {fileID: 1178501604} - {fileID: 1749782974} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1506158581 MonoBehaviour: @@ -4876,6 +4994,87 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1717315654 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 658817264} + m_Modifications: + - target: {fileID: 1069859090919850344, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_Name + value: OrderPositions + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 49f4b2509378048e7b7a5c6c0674be9f, type: 3} +--- !u!1 &1717315655 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1069859090919850344, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + m_PrefabInstance: {fileID: 1717315654} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1717315656 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + m_PrefabInstance: {fileID: 1717315654} + m_PrefabAsset: {fileID: 0} --- !u!1 &1749782973 GameObject: m_ObjectHideFlags: 0 @@ -11163,6 +11362,80 @@ Transform: m_Father: {fileID: 1749782974} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: -116.713, y: -81.332, z: 80.314995} +--- !u!1001 &2724256641515514847 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3459593390050872226, guid: b875e6e94a97840ca8490ce0718fca6e, + type: 3} + propertyPath: m_Name + value: DontDestroyObject + objectReference: {fileID: 0} + - target: {fileID: 3459593390050872226, guid: b875e6e94a97840ca8490ce0718fca6e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3667080857874733261, guid: b875e6e94a97840ca8490ce0718fca6e, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 3667080857874733261, guid: b875e6e94a97840ca8490ce0718fca6e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3667080857874733261, guid: b875e6e94a97840ca8490ce0718fca6e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3667080857874733261, guid: b875e6e94a97840ca8490ce0718fca6e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3667080857874733261, guid: b875e6e94a97840ca8490ce0718fca6e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3667080857874733261, guid: b875e6e94a97840ca8490ce0718fca6e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3667080857874733261, guid: b875e6e94a97840ca8490ce0718fca6e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3667080857874733261, guid: b875e6e94a97840ca8490ce0718fca6e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3667080857874733261, guid: b875e6e94a97840ca8490ce0718fca6e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3667080857874733261, guid: b875e6e94a97840ca8490ce0718fca6e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3667080857874733261, guid: b875e6e94a97840ca8490ce0718fca6e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b875e6e94a97840ca8490ce0718fca6e, type: 3} --- !u!1 &4490465400677463140 GameObject: m_ObjectHideFlags: 0 @@ -11261,75 +11534,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5221623863607992028} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5368382573410461785 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1069859090919850344, guid: 49f4b2509378048e7b7a5c6c0674be9f, - type: 3} - propertyPath: m_Name - value: OrderPositions - objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 49f4b2509378048e7b7a5c6c0674be9f, type: 3} --- !u!199 &6605833987182439101 ParticleSystemRenderer: serializedVersion: 6