From 894759e99efa256f51970526d2999d14413a7c0e Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 7 Oct 2021 17:25:45 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E3=83=AC=E3=82=B7=E3=83=94=E7=B4=A0?= =?UTF-8?q?=E6=9D=90=E8=A1=A8=E7=A4=BA=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/recipe/Prefabs/Frame.prefab | 206 +++++-- .../recipe/Prefabs/MaterialFrame.prefab | 193 +++--- .../recipe/Prefabs/NecessaryMaterial.prefab | 116 ++-- .../{FryingPanl.prefab => PanTarget.prefab} | 32 +- .../MyGame/Scenes/recipe/RecipeChoice.unity | 574 +++++++----------- .../Scenes/recipe/Scripts/PanSelector.cs | 15 +- .../Scenes/recipe/Scripts/RecipeDetailView.cs | 24 +- .../Scenes/recipe/Scripts/RecipeView.cs | 16 + 8 files changed, 618 insertions(+), 558 deletions(-) rename popcorn/Assets/MyGame/Scenes/recipe/Prefabs/{FryingPanl.prefab => PanTarget.prefab} (60%) diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab index fd93c3dc..f79de36b 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab @@ -297,8 +297,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2929932626576346080} - - component: {fileID: 2929932626576346094} - - component: {fileID: 2929932626576346095} m_Layer: 0 m_Name: popcorn m_TagString: Untagged @@ -316,7 +314,8 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: -0.067144625, w: 0.9977433} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} - m_Children: [] + m_Children: + - {fileID: 3383784790555608151} m_Father: {fileID: 2646634445844468798} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -7.7} @@ -325,43 +324,6 @@ RectTransform: m_AnchoredPosition: {x: -135.2, y: 20.8} m_SizeDelta: {x: 92, y: 136} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2929932626576346094 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2929932626576346081} - m_CullTransparentMesh: 0 ---- !u!114 &2929932626576346095 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2929932626576346081} - 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: 99d426990eeb08d4d85ae03f04609196, 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 &2929932626624286251 GameObject: m_ObjectHideFlags: 0 @@ -685,9 +647,12 @@ MonoBehaviour: detailButton: {fileID: 8320108874302735811} flavorName: {fileID: 2929932626752093611} flavorPrice: {fileID: 2929932627123125673} + flavorImageTarget: {fileID: 2929932626576346080} cornAmountText: {fileID: 6296255899301773980} flavor1AmountText: {fileID: 2929932625557648441} flavor2AmountText: {fileID: 367551539734858426} + flavor1IconTarget: {fileID: 7519072249774920432} + flavor2IconTarget: {fileID: 5037808626432961651} flavor2View: {fileID: 367551539495355422} --- !u!1 &2997770120253274331 GameObject: @@ -1219,12 +1184,143 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &7519072249774920432 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7485231107204569293, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + m_PrefabInstance: {fileID: 1133216431126940221} + m_PrefabAsset: {fileID: 0} --- !u!224 &2929932625336302236 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} m_PrefabInstance: {fileID: 1133216431126940221} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1330168031711161346 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2929932626576346080} + m_Modifications: + - target: {fileID: 3426746518987915701, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_Name + value: popcorn + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_SizeDelta.x + value: 92 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_SizeDelta.y + value: 136 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -7.7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 84aaa57282766408683fbb28f556d547, type: 3} +--- !u!224 &3383784790555608151 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + m_PrefabInstance: {fileID: 1330168031711161346} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2452498385069847742 PrefabInstance: m_ObjectHideFlags: 0 @@ -1390,6 +1486,24 @@ PrefabInstance: m_RemovedComponents: - {fileID: 2814970099097301159, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} +--- !u!1 &367551539495355422 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2814970099097301152, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + m_PrefabInstance: {fileID: 2452498385069847742} + m_PrefabAsset: {fileID: 0} +--- !u!224 &367551539495355423 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + m_PrefabInstance: {fileID: 2452498385069847742} + m_PrefabAsset: {fileID: 0} +--- !u!224 &5037808626432961651 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7485231107204569293, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + m_PrefabInstance: {fileID: 2452498385069847742} + m_PrefabAsset: {fileID: 0} --- !u!114 &367551539734858426 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340, @@ -1402,18 +1516,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &367551539495355423 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, - type: 3} - m_PrefabInstance: {fileID: 2452498385069847742} - m_PrefabAsset: {fileID: 0} ---- !u!1 &367551539495355422 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2814970099097301152, guid: e2818e79d8fc1f34388aff1b8969d340, - type: 3} - m_PrefabInstance: {fileID: 2452498385069847742} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8101979052737494168 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame.prefab index 078460e9..bdc05b58 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame.prefab @@ -199,77 +199,128 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &9022058312688212008 -GameObject: +--- !u!1001 &942238507702582337 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7483059290751347205} - - component: {fileID: 8202708994273755924} - - component: {fileID: 8770553785412743810} - m_Layer: 5 - m_Name: material - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7483059290751347205 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7485231107204569293} + m_Modifications: + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_SizeDelta.x + value: 56 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_SizeDelta.y + value: 56 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8081510323215557737, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_Name + value: material + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 21933a027d6844d1b8213bf5192430ac, type: 3} +--- !u!224 &7483059290751347205 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + m_PrefabInstance: {fileID: 942238507702582337} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9022058312688212008} - 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: 7485231107204569293} - 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: 56, y: 56} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8202708994273755924 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9022058312688212008} - m_CullTransparentMesh: 0 ---- !u!114 &8770553785412743810 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9022058312688212008} - 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: ffa1614fb4f7b9d48b0530ce2f77f954, 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/recipe/Prefabs/NecessaryMaterial.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab index 52a9fc2d..ba9d5962 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab @@ -74,6 +74,80 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2358514311597240715 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 150415631863662799} + - component: {fileID: 1740348503652499160} + - component: {fileID: 8656009127678696843} + m_Layer: 0 + m_Name: material (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &150415631863662799 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2358514311597240715} + 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: 6739113353957456840} + 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: 56, y: 56} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1740348503652499160 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2358514311597240715} + m_CullTransparentMesh: 0 +--- !u!114 &8656009127678696843 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2358514311597240715} + 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: ffa1614fb4f7b9d48b0530ce2f77f954, 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 &4570586286644907414 GameObject: m_ObjectHideFlags: 0 @@ -199,8 +273,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6739113353957456840} - - component: {fileID: 8715719486321133168} - - component: {fileID: 318270868077356309} m_Layer: 0 m_Name: material m_TagString: Untagged @@ -218,7 +290,8 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 114} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 150415631863662799} m_Father: {fileID: 5352886967997046957} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -227,40 +300,3 @@ RectTransform: m_AnchoredPosition: {x: -66.89995, y: 0.29986572} m_SizeDelta: {x: 56, y: 56} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8715719486321133168 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8915749249284169289} - m_CullTransparentMesh: 0 ---- !u!114 &318270868077356309 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8915749249284169289} - 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: ffa1614fb4f7b9d48b0530ce2f77f954, 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/recipe/Prefabs/FryingPanl.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/PanTarget.prefab similarity index 60% rename from popcorn/Assets/MyGame/Scenes/recipe/Prefabs/FryingPanl.prefab rename to popcorn/Assets/MyGame/Scenes/recipe/Prefabs/PanTarget.prefab index fb6c51ac..c46ffac2 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/FryingPanl.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/PanTarget.prefab @@ -10,9 +10,8 @@ GameObject: m_Component: - component: {fileID: 2260898471005442079} - component: {fileID: 2260898471005442077} - - component: {fileID: 2260898471005442078} m_Layer: 5 - m_Name: FryingPanl + m_Name: PanTarget m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -45,32 +44,3 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2260898471005442072} m_CullTransparentMesh: 0 ---- !u!114 &2260898471005442078 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2260898471005442072} - 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: 92c7166ea217de94594bc0f2667a7523, 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/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index faae8ee7..7da3b273 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -299,7 +299,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1487129869} - - {fileID: 670639509} m_Father: {fileID: 1160535647} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -460,84 +459,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 269597408} m_CullTransparentMesh: 0 ---- !u!1 &326258101 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 326258102} - - component: {fileID: 326258104} - - component: {fileID: 326258103} - m_Layer: 5 - m_Name: Text_FryingPanl - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &326258102 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 326258101} - 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: 389422779} - 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: 5, y: -30} - m_SizeDelta: {x: 200, y: 34} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &326258103 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 326258101} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 26 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 26 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u4F7F\u3046\u30D5\u30E9\u30A4\u30D1\u30F3" ---- !u!222 &326258104 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 326258101} - m_CullTransparentMesh: 0 --- !u!1 &374985848 GameObject: m_ObjectHideFlags: 0 @@ -612,82 +533,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 374985848} m_CullTransparentMesh: 0 ---- !u!1 &389422778 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 389422779} - - component: {fileID: 389422781} - - component: {fileID: 389422780} - m_Layer: 5 - m_Name: FryingPanl_frame - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &389422779 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 389422778} - 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: 326258102} - - {fileID: 2086901980} - m_Father: {fileID: 2135558976} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 537, y: 0} - m_SizeDelta: {x: 250, y: 252} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &389422780 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 389422778} - 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: ad305bc75e53add488410a7400246330, type: 3} - m_Type: 2 - 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!222 &389422781 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 389422778} - m_CullTransparentMesh: 0 --- !u!1 &430811414 GameObject: m_ObjectHideFlags: 0 @@ -993,12 +838,12 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 230185243} + m_TransformParent: {fileID: 1487129869} m_Modifications: - target: {fileID: 2260898471005442072, guid: 434f6174871f2dc4992321e9d579f138, type: 3} propertyPath: m_Name - value: FryingPanl + value: PanTarget objectReference: {fileID: 0} - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, type: 3} @@ -1013,7 +858,7 @@ PrefabInstance: - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, type: 3} @@ -1098,12 +943,12 @@ PrefabInstance: - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, type: 3} propertyPath: m_AnchoredPosition.x - value: -186 + value: 2.0000153 objectReference: {fileID: 0} - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, type: 3} propertyPath: m_AnchoredPosition.y - value: -181 + value: -0.99998474 objectReference: {fileID: 0} - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, type: 3} @@ -1120,7 +965,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: [{fileID: 2260898471005442077, guid: 434f6174871f2dc4992321e9d579f138, + type: 3}] m_SourcePrefab: {fileID: 100100000, guid: 434f6174871f2dc4992321e9d579f138, type: 3} --- !u!224 &670639509 stripped RectTransform: @@ -1128,18 +974,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 670639508} m_PrefabAsset: {fileID: 0} ---- !u!114 &670639510 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2260898471005442078, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - m_PrefabInstance: {fileID: 670639508} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &679566761 GameObject: m_ObjectHideFlags: 0 @@ -1965,9 +1799,12 @@ MonoBehaviour: flavorPrice: {fileID: 498799267} flavorStock: {fileID: 1109202679} flavorText: {fileID: 1116792172} + flavorImageTarget: {fileID: 1826815494} cornAmountText: {fileID: 4654596182167880407} flavor1AmountText: {fileID: 5352886969301700758} flavor2AmountText: {fileID: 1408233927} + flavor1IconTarget: {fileID: 5352886969301700759} + flavor2IconTarget: {fileID: 1408233929} flavor2View: {fileID: 1408233928} --- !u!1 &1036314250 GameObject: @@ -2482,12 +2319,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2992efc758994825b664d9d47a650b8a, type: 3} m_Name: m_EditorClassIdentifier: - selectedPanIcon: {fileID: 2260898471079004356} prevPanButton: {fileID: 998259991263772436} nextPanButton: {fileID: 2073894620} panName: {fileID: 956402762} panText: {fileID: 2045825934} - panIcon: {fileID: 670639510} + panIconTarget: {fileID: 670639509} --- !u!1 &1170636683 GameObject: m_ObjectHideFlags: 0 @@ -2638,6 +2474,125 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1197864696} m_CullTransparentMesh: 0 +--- !u!1001 &1379860012 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 670639509} + m_Modifications: + - target: {fileID: 1135206952446428548, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_Name + value: pan_normal + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_SizeDelta.x + value: 174 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_SizeDelta.y + value: 154 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7926a2834eb0a469e8ab0491dde7c3ba, type: 3} --- !u!224 &1380167736 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, @@ -2844,6 +2799,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1408233925} m_PrefabAsset: {fileID: 0} +--- !u!224 &1408233929 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6739113353957456840, guid: c84cc6844fe59ef4d8e52438b7bffa42, + type: 3} + m_PrefabInstance: {fileID: 1408233925} + m_PrefabAsset: {fileID: 0} --- !u!1 &1464412873 GameObject: m_ObjectHideFlags: 0 @@ -2984,7 +2945,7 @@ RectTransform: 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_Children: [{fileID: 670639509}] m_Father: {fileID: 230185243} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3380,10 +3341,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1826815494} - - component: {fileID: 1826815496} - - component: {fileID: 1826815495} m_Layer: 5 - m_Name: Image_Popcorn + m_Name: PopcornTarget m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3399,7 +3358,7 @@ RectTransform: 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_Children: [{fileID: 1971927379}] m_Father: {fileID: 1626721124} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3408,43 +3367,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 23.00003} m_SizeDelta: {x: 92, y: 136} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1826815495 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1826815493} - 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: 99d426990eeb08d4d85ae03f04609196, 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!222 &1826815496 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1826815493} - m_CullTransparentMesh: 0 --- !u!1 &1853630202 GameObject: m_ObjectHideFlags: 0 @@ -3565,6 +3487,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1853630202} m_CullTransparentMesh: 0 +--- !u!1 &1971927378 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1971927379} + - component: {fileID: 1971927381} + - component: {fileID: 1971927380} + m_Layer: 5 + m_Name: Image_Popcorn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1971927379 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1971927378} + 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: 1826815494} + 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: 92, y: 136} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1971927380 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1971927378} + 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: 99d426990eeb08d4d85ae03f04609196, 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!222 &1971927381 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1971927378} + m_CullTransparentMesh: 0 --- !u!114 &1853630207 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3897,12 +3893,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 700, y: 180} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &2086901980 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - m_PrefabInstance: {fileID: 2260898471079004355} - m_PrefabAsset: {fileID: 0} --- !u!1 &2124266406 GameObject: m_ObjectHideFlags: 0 @@ -4005,7 +3995,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1197864697} - - {fileID: 389422779} m_Father: {fileID: 1001521034} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4203,137 +4192,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4570586285425884512} m_CullTransparentMesh: 0 ---- !u!1001 &2260898471079004355 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 389422779} - m_Modifications: - - target: {fileID: 2260898471005442072, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_Name - value: FryingPanl - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_SizeDelta.x - value: 174 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_SizeDelta.y - value: 154 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -28 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 434f6174871f2dc4992321e9d579f138, type: 3} ---- !u!114 &2260898471079004356 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2260898471005442078, guid: 434f6174871f2dc4992321e9d579f138, - type: 3} - m_PrefabInstance: {fileID: 2260898471079004355} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &4570586285425884512 GameObject: m_ObjectHideFlags: 0 @@ -4648,6 +4506,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &5352886969301700759 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6739113353957456840, guid: c84cc6844fe59ef4d8e52438b7bffa42, + type: 3} + m_PrefabInstance: {fileID: 5352886969301700757} + m_PrefabAsset: {fileID: 0} --- !u!224 &6739113352738409278 RectTransform: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs index 6b2c9342..fba14a54 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs @@ -1,17 +1,17 @@ using System; +using System.Linq; using UniRx; using UnityEngine; using UnityEngine.UI; public class PanSelector : MonoBehaviour { - [SerializeField] private Image selectedPanIcon; [SerializeField] private Button prevPanButton; [SerializeField] private Button nextPanButton; [SerializeField] private Text panName; [SerializeField] private Text panText; - [SerializeField] private Image panIcon; + [SerializeField] private Transform panIconTarget; public IReadOnlyReactiveProperty SelectedPanData => selectedPanData; private readonly ReactiveProperty selectedPanData = new ReactiveProperty(); private readonly ReactiveProperty selectedIndex = new ReactiveProperty(); @@ -21,15 +21,18 @@ public class PanSelector : MonoBehaviour selectedPanData.AddTo(this); selectedIndex.AddTo(this); var panList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.PanDataSheet); - var panCount = panList.Count; - selectedPanData.Value = panList[0]; + var myPanList = panList.Where(data => GameDataManager.GameData.Pans.Contains(data.id)).ToList(); + var panCount = myPanList.Count; + Debug.Log(string.Join(",", panList.Select(data => data.id))); + Debug.Log(string.Join(",", GameDataManager.GameData.Pans)); + selectedPanData.Value = myPanList[0]; selectedPanData.Subscribe(data => { SetData(data); }).AddTo(this); selectedIndex.Subscribe(x => { - selectedPanData.Value = panList[x]; + selectedPanData.Value = myPanList[x]; }).AddTo(this); prevPanButton.OnClickAsObservable().Subscribe(_ => { @@ -45,5 +48,7 @@ public class PanSelector : MonoBehaviour { panName.text = data.name; panText.text = data.text; + panIconTarget.DestroyAllChildrens(); + Instantiate(data.GetIconPrefab(), panIconTarget); } } diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs index d39adc57..9939efc9 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs @@ -22,9 +22,12 @@ public class RecipeDetailView : MonoBehaviour [SerializeField] private Text flavorPrice; [SerializeField] private Text flavorStock; [SerializeField] private Text flavorText; + [SerializeField] private Transform flavorImageTarget; [SerializeField] private Text cornAmountText; [SerializeField] private Text flavor1AmountText; [SerializeField] private Text flavor2AmountText; + [SerializeField] private Transform flavor1IconTarget; + [SerializeField] private Transform flavor2IconTarget; [SerializeField] private GameObject flavor2View; private void Start() @@ -79,30 +82,43 @@ public class RecipeDetailView : MonoBehaviour flavorName.text = data.name; flavorPrice.text = data.price.ToString(); flavorText.text = data.text; + flavorImageTarget.DestroyAllChildrens(); + Instantiate(data.GetIconPrefab(), flavorImageTarget); cornAmountText.text = string.Format(cornAmountFormat, gameData.CornSeed, data.MaterialList[0].amount); + var shopData = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopDataSheet); var flavor1Amount = gameData.Material.FirstOrDefault(x => x.Id == data.MaterialList[1].id)?.Amount ?? 0; flavor1AmountText.text = string.Format(flavorAmountFormat, flavor1Amount, data.MaterialList[1].amount); + if (shopData.FirstOrDefault(sData => sData.itemId == data.MaterialList[1].id)?.GetIconPrefab() is Transform prefab1) + { + flavor1IconTarget.DestroyAllChildrens(); + Instantiate(prefab1, flavor1IconTarget); + } var flavor2Amount = gameData.Material.FirstOrDefault(x => x.Id == data.MaterialList[2].id)?.Amount ?? 0; flavor2AmountText.text = string.Format(flavorAmountFormat, flavor2Amount, data.MaterialList[2].amount); + if (shopData.FirstOrDefault(sData => sData.itemId == data.MaterialList[2].id)?.GetIconPrefab() is Transform prefab2) + { + flavor2IconTarget.DestroyAllChildrens(); + Instantiate(prefab2, flavor2IconTarget); + } flavor2View.SetActive(data.GetMaterialCount() == 3); } - private bool CheckAmount(ProductData data) + private bool CheckAmount(ProductData productData) { var flag = true; var gameData = GameDataManager.GameData; - if (gameData.CornSeed < data.MaterialList[0].amount) + if (gameData.CornSeed < productData.MaterialList[0].amount) { flag = false; cornAmountText.color = Color.red; } - if (gameData.Material.Exists(x => x.Id == data.MaterialList[1].id && x.Amount < data.MaterialList[1].amount)) + if ((gameData.Material.FirstOrDefault(data => data.Id == productData.MaterialList[1].id)?.Amount ?? 0) < productData.MaterialList[1].amount) { flag = false; flavor1AmountText.color = Color.red; } - if (data.GetMaterialCount() == 3 && gameData.Material.Exists(x => x.Id == data.MaterialList[2].id && x.Amount < data.MaterialList[2].amount)) + if (productData.GetMaterialCount() == 3 && (gameData.Material.FirstOrDefault(data => data.Id == productData.MaterialList[2].id)?.Amount ?? 0) < productData.MaterialList[2].amount) { flag = false; flavor2AmountText.color = Color.red; diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs index 68bf2f69..f444f2fe 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs @@ -11,9 +11,12 @@ public class RecipeView : MonoBehaviour [SerializeField] private Button detailButton; [SerializeField] private Text flavorName; [SerializeField] private Text flavorPrice; + [SerializeField] private Transform flavorImageTarget; [SerializeField] private Text cornAmountText; [SerializeField] private Text flavor1AmountText; [SerializeField] private Text flavor2AmountText; + [SerializeField] private Transform flavor1IconTarget; + [SerializeField] private Transform flavor2IconTarget; [SerializeField] private GameObject flavor2View; private static readonly string amountFormat = "x{0}"; private static readonly string lockPanelTextFormat = "店舗レベル{0}で開放"; @@ -28,12 +31,25 @@ public class RecipeView : MonoBehaviour { flavorName.text = data.name; flavorPrice.text = data.price.ToString(); + flavorImageTarget.DestroyAllChildrens(); + Instantiate(data.GetIconPrefab(), flavorImageTarget); cornAmountText.text = string.Format(amountFormat, data.MaterialList[0].amount); flavor1AmountText.text = string.Format(amountFormat, data.MaterialList[1].amount); + var shopData = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopDataSheet); + if (shopData.FirstOrDefault(sData => sData.itemId == data.MaterialList[1].id)?.GetIconPrefab() is Transform prefab1) + { + flavor1IconTarget.DestroyAllChildrens(); + Instantiate(prefab1, flavor1IconTarget); + } if (data.GetMaterialCount() == 3) { flavor2View.SetActive(true); flavor2AmountText.text = string.Format(amountFormat, data.MaterialList[2].amount); + if (shopData.FirstOrDefault(sData => sData.itemId == data.MaterialList[2].id)?.GetIconPrefab() is Transform prefab2) + { + flavor2IconTarget.DestroyAllChildrens(); + Instantiate(prefab2, flavor2IconTarget); + } } else { From d0e77050f2fc5b2bd4f8eb44cbf5ee03e1cb700c Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 7 Oct 2021 17:26:18 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=95=E5=85=A5=E3=82=8C=E3=83=9C?= =?UTF-8?q?=E3=82=BF=E3=83=B3=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/shopping/Prefabs/Frame.prefab | 46 +--------- .../Scenes/shopping/Prefabs/Window.prefab | 92 +------------------ 2 files changed, 3 insertions(+), 135 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab index 7f64d645..6dd434a2 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab @@ -257,7 +257,6 @@ GameObject: m_Component: - component: {fileID: 8536603422802196745} - component: {fileID: 1458252247847964818} - - component: {fileID: 1342298367473717200} m_Layer: 5 m_Name: Button_purchase m_TagString: Untagged @@ -299,55 +298,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f1b7d4e426d24898817abfdca0387221, type: 3} m_Name: m_EditorClassIdentifier: - purchaseButton: {fileID: 1342298367473717200} + purchaseButton: {fileID: 3348363390361919889} onObject: {fileID: 8536603422629144349} offObject: {fileID: 8536603424418812070} soldOutObject: {fileID: 8536603424566114136} learnedObject: {fileID: 8536603424476639146} purchasedObject: {fileID: 1735230268650569057} ---- !u!114 &1342298367473717200 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8536603422802196746} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 0} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &8536603422883751236 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab index 9e49d627..02841cd6 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab @@ -696,7 +696,6 @@ GameObject: m_Component: - component: {fileID: 2912042418702301919} - component: {fileID: 2912042418702301917} - - component: {fileID: 2912042418702301916} m_Layer: 5 m_Name: Button_material m_TagString: Untagged @@ -737,52 +736,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c8f923fbd6b4418ab2b578c5688d314e, type: 3} m_Name: m_EditorClassIdentifier: - button: {fileID: 2912042418702301916} + button: {fileID: 4039810787608905224} onObject: {fileID: 2912042419203209778} offObject: {fileID: 2912042419946951650} ---- !u!114 &2912042418702301916 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2912042418702301918} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 0} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &2912042418828803477 GameObject: m_ObjectHideFlags: 0 @@ -793,7 +749,6 @@ GameObject: m_Component: - component: {fileID: 2912042418828803474} - component: {fileID: 2912042418828803472} - - component: {fileID: 2912042418828803475} m_Layer: 5 m_Name: Button_recipe m_TagString: Untagged @@ -834,52 +789,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c8f923fbd6b4418ab2b578c5688d314e, type: 3} m_Name: m_EditorClassIdentifier: - button: {fileID: 2912042418828803475} + button: {fileID: 2307080139950086264} onObject: {fileID: 2912042418098885678} offObject: {fileID: 2912042418451981111} ---- !u!114 &2912042418828803475 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2912042418828803477} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 0} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &2912042419129627536 GameObject: m_ObjectHideFlags: 0 From 4f25312cef4f1c1f176962025229b6cc1463450e Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 8 Oct 2021 14:43:02 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=A7=E9=87=8F=E6=B3=A8=E6=96=87?= =?UTF-8?q?=E5=87=A6=E7=90=86=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Main/Main.unity | 17 +- .../Main/Prefabs/BulkOrder/Canvas.prefab | 60 +++ .../Prefabs/BulkOrder/CanvasCancel.prefab | 32 +- .../Prefabs/BulkOrder/CanvasTelePhone.prefab | 73 +++- .../Prefabs/BulkOrder/Frame_BulkOrder.prefab | 372 ++++++++++++------ .../Main/Prefabs/{ => BulkOrder}/Orde.prefab | 68 +++- .../Prefabs/{ => BulkOrder}/Orde.prefab.meta | 0 .../Main/Prefabs/BulkOrder/smartphone.prefab | 3 +- .../MyGame/Scenes/Main/Scripts/BulkOrder.cs | 107 +++++ .../Scenes/Main/Scripts/BulkOrder.cs.meta | 3 + .../Main/Scripts/BulkOrderAchievedView.cs | 6 + .../Scripts/BulkOrderAchievedView.cs.meta | 3 + .../Main/Scripts/BulkOrderCancelView.cs | 51 +++ .../Main/Scripts/BulkOrderCancelView.cs.meta | 3 + .../Main/Scripts/BulkOrderIndicatorView.cs | 10 +- .../Scenes/Main/Scripts/BulkOrderItemView.cs | 98 +++++ .../Main/Scripts/BulkOrderItemView.cs.meta | 3 + .../Main/Scripts/BulkOrderNotifyItemView.cs | 25 ++ .../Scripts/BulkOrderNotifyItemView.cs.meta | 3 + .../Main/Scripts/BulkOrderNotifyView.cs | 72 ++++ .../Main/Scripts/BulkOrderNotifyView.cs.meta | 3 + .../Scenes/Main/Scripts/KitchenManager.cs | 124 ++++-- .../Assets/MyGame/Scripts/GameDataManager.cs | 20 + .../MyGame/Scripts/TransitionManager.cs | 2 +- 24 files changed, 970 insertions(+), 188 deletions(-) rename popcorn/Assets/MyGame/Scenes/Main/Prefabs/{ => BulkOrder}/Orde.prefab (90%) rename popcorn/Assets/MyGame/Scenes/Main/Prefabs/{ => BulkOrder}/Orde.prefab.meta (100%) create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs.meta create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs.meta create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs.meta create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs.meta create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyItemView.cs create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyItemView.cs.meta create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs.meta diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index 99b050f1..56596e2a 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -4630,7 +4630,7 @@ PrefabInstance: - target: {fileID: 3832433339922076370, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -4642,6 +4642,21 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7252061863213906723, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Transition + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7252061863213906723, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Interactable + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7387931604440686042, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} --- !u!224 &3664916832445709978 stripped diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab index 36846780..b27310de 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab @@ -1012,6 +1012,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4082915278546610718} + - component: {fileID: 2145851308931691871} m_Layer: 5 m_Name: Window m_TagString: Untagged @@ -1041,6 +1042,29 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 52} m_SizeDelta: {x: 922, y: 1700} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2145851308931691871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4082915278546610719} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5dcfec9a112d409796b81c96710930a6, type: 3} + m_Name: + m_EditorClassIdentifier: + backgroundAnimator: {fileID: 4082915279313483617} + closeButton: {fileID: 4082915278992014893} + cancelButton: {fileID: 4082915278942985871} + deliveredButton: {fileID: 4082915279019759811} + achievedObject: {fileID: 4082915278879672978} + messageText: {fileID: 4082915277970689977} + coinText: {fileID: 4082915277569352110} + heartText: {fileID: 4082915279101330553} + itemView1: {fileID: 7927160839000454040} + itemView2: {fileID: 6685489803199069635} + itemView3: {fileID: 6685489803297445835} --- !u!1 &4082915278807493231 GameObject: m_ObjectHideFlags: 0 @@ -2582,6 +2606,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} +--- !u!114 &7927160839000454040 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7236946357327453438, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + m_PrefabInstance: {fileID: 751013265656328038} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab9ddab5084248d68b0cb2c53c8dc7cc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &6299910495887276473 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, @@ -2707,6 +2743,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} +--- !u!114 &6685489803199069635 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7236946357327453438, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + m_PrefabInstance: {fileID: 4082915279223546173} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab9ddab5084248d68b0cb2c53c8dc7cc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &7325254816105691106 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, @@ -2832,6 +2880,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} +--- !u!114 &6685489803297445835 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7236946357327453438, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + m_PrefabInstance: {fileID: 4082915279389395765} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab9ddab5084248d68b0cb2c53c8dc7cc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &7325254816271539690 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab index 536b7788..e3ff2cd3 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab @@ -254,6 +254,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 4187074209901625002} - {fileID: 4187074209752017942} m_Father: {fileID: 0} m_RootOrder: 0 @@ -1135,6 +1136,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4187074209752017942} + - component: {fileID: 594854296290337299} m_Layer: 5 m_Name: Window m_TagString: Untagged @@ -1153,17 +1155,33 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4187074209901625002} - {fileID: 4187074210113349099} - {fileID: 4187074209910267576} m_Father: {fileID: 4187074209012466685} - m_RootOrder: 0 + 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: 705, y: 705} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &594854296290337299 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4187074209752017943} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3bace6e100bf4e3a8059828acdc02e1b, type: 3} + m_Name: + m_EditorClassIdentifier: + backgroundAnimator: {fileID: 4187074209901625005} + closeButton: {fileID: 4187074209291994452} + cancelButton: {fileID: 4187074209150459463} + coinText: {fileID: 4187074209543196534} + heartText: {fileID: 4187074210139745722} --- !u!1 &4187074209901625003 GameObject: m_ObjectHideFlags: 0 @@ -1190,11 +1208,11 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4187074209901625003} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 4187074209752017942} + m_Father: {fileID: 4187074209012466685} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1224,7 +1242,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 0.9372549, a: 0.19607843} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1292,7 +1310,7 @@ RectTransform: - {fileID: 4187074209998286564} - {fileID: 4187074209382484540} m_Father: {fileID: 4187074209752017942} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1454,7 +1472,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4187074209752017942} - m_RootOrder: 1 + 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} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab index 403fb592..7511bdab 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab @@ -33,7 +33,7 @@ RectTransform: - {fileID: 4315754687736309292} - {fileID: 4315754687099534943} m_Father: {fileID: 4315754686943043844} - m_RootOrder: 3 + 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} @@ -361,6 +361,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4315754686943043844} + - component: {fileID: 9217531184726761281} m_Layer: 5 m_Name: Window m_TagString: Untagged @@ -379,18 +380,37 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4315754688243439425} - {fileID: 4315754687931289281} - {fileID: 4315754687733902321} - {fileID: 4315754686536851282} m_Father: {fileID: 4315754687615340680} - m_RootOrder: 0 + 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: 705, y: 794} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &9217531184726761281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4315754686943043847} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aedda4da1f224450ad6f9b196e8e7e7d, type: 3} + m_Name: + m_EditorClassIdentifier: + backgroundAnimator: {fileID: 4315754688243439430} + closeButton: {fileID: 4315754687626831810} + messageText: {fileID: 4315754687599301553} + itemView1: {fileID: 706922748529613437} + itemView2: {fileID: 1755114094130154674} + itemView3: {fileID: 1755114094215964333} + coinText: {fileID: 4315754686580462760} + heartText: {fileID: 4315754688005591447} --- !u!1 &4315754687099534942 GameObject: m_ObjectHideFlags: 0 @@ -764,6 +784,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 4315754688243439425} - {fileID: 4315754686943043844} m_Father: {fileID: 0} m_RootOrder: 0 @@ -1002,7 +1023,7 @@ RectTransform: - {fileID: 4315754687599301552} - {fileID: 4315754686575543076} m_Father: {fileID: 4315754686943043844} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1153,7 +1174,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4315754686943043844} - m_RootOrder: 1 + 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} @@ -1451,11 +1472,11 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4315754688243439424} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 4315754686943043844} + m_Father: {fileID: 4315754687615340680} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1485,7 +1506,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 0.9372549, a: 0.19607843} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1792,6 +1813,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3058138225154535967} m_PrefabAsset: {fileID: 0} +--- !u!114 &706922748529613437 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2576005101485369442, guid: 7c3046c0280714d4bb45d41bcbb71ce1, + type: 3} + m_PrefabInstance: {fileID: 3058138225154535967} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f14cd02713649c5b189cbc9fb0b5bfd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4315754688263163599 PrefabInstance: m_ObjectHideFlags: 0 @@ -1927,6 +1960,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 4315754688263163599} m_PrefabAsset: {fileID: 0} +--- !u!114 &1755114094215964333 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2576005101485369442, guid: 7c3046c0280714d4bb45d41bcbb71ce1, + type: 3} + m_PrefabInstance: {fileID: 4315754688263163599} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f14cd02713649c5b189cbc9fb0b5bfd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4315754688290612432 PrefabInstance: m_ObjectHideFlags: 0 @@ -2052,3 +2097,15 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 4315754688290612432} m_PrefabAsset: {fileID: 0} +--- !u!114 &1755114094130154674 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2576005101485369442, guid: 7c3046c0280714d4bb45d41bcbb71ce1, + type: 3} + m_PrefabInstance: {fileID: 4315754688290612432} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f14cd02713649c5b189cbc9fb0b5bfd, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab index a3c3f477..45c95e6e 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab @@ -74,6 +74,80 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1218025997047797446 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7601727368869576156} + - component: {fileID: 5790060652346577943} + - component: {fileID: 6795331204195132790} + m_Layer: 0 + m_Name: package + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7601727368869576156 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1218025997047797446} + 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: 6701890202353341293} + 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: 92, y: 136} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5790060652346577943 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1218025997047797446} + m_CullTransparentMesh: 0 +--- !u!114 &6795331204195132790 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1218025997047797446} + 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: 99d426990eeb08d4d85ae03f04609196, 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 &1516465686560891674 GameObject: m_ObjectHideFlags: 0 @@ -264,80 +338,6 @@ RectTransform: m_AnchoredPosition: {x: 32, y: -34.2} m_SizeDelta: {x: 56, y: 56} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &2570188224453656030 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8361475802832570378} - - component: {fileID: 7721757012747742433} - - component: {fileID: 5866187155139017820} - m_Layer: 5 - m_Name: rare - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8361475802832570378 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2570188224453656030} - 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: 3658417434568161581} - 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: -37.5} - m_SizeDelta: {x: 34, y: 34} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7721757012747742433 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2570188224453656030} - m_CullTransparentMesh: 0 ---- !u!114 &5866187155139017820 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2570188224453656030} - 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: e97f9c209502fae42ba9fe6c73d0875a, 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 &2679656543278342664 GameObject: m_ObjectHideFlags: 0 @@ -765,7 +765,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3658417434518209427} - - {fileID: 8361475802832570378} + - {fileID: 5676996117682643678} m_Father: {fileID: 3658417435631091038} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1157,8 +1157,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6701890202353341293} - - component: {fileID: 6701890202353341283} - - component: {fileID: 6701890202353341282} m_Layer: 0 m_Name: popcorn m_TagString: Untagged @@ -1176,7 +1174,8 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0.06725802, w: 0.9977356} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.90000015, y: 0.90000015, z: 0.9} - m_Children: [] + m_Children: + - {fileID: 7601727368869576156} m_Father: {fileID: 5841854344991296691} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -7.7130003} @@ -1185,43 +1184,6 @@ RectTransform: m_AnchoredPosition: {x: -231, y: -10} m_SizeDelta: {x: 92, y: 136} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6701890202353341283 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6701890202353341292} - m_CullTransparentMesh: 0 ---- !u!114 &6701890202353341282 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6701890202353341292} - 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: 99d426990eeb08d4d85ae03f04609196, 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 &6701890202664346912 GameObject: m_ObjectHideFlags: 0 @@ -1498,7 +1460,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6701890203127158495} - - component: {fileID: 4150581692906928959} + - component: {fileID: 7236946357327453438} m_Layer: 0 m_Name: Frame_BulkOrder m_TagString: Untagged @@ -1526,7 +1488,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &4150581692906928959 +--- !u!114 &7236946357327453438 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1535,18 +1497,22 @@ MonoBehaviour: m_GameObject: {fileID: 6701890203127158494} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 47bc31a2c7d14478bd4ebe3c32e41185, type: 3} + m_Script: {fileID: 11500000, guid: ab9ddab5084248d68b0cb2c53c8dc7cc, type: 3} m_Name: m_EditorClassIdentifier: - lockPanel: {fileID: 0} - lockPanelText: {fileID: 0} - detailButton: {fileID: 0} - flavorName: {fileID: 6701890202664346918} - flavorPrice: {fileID: 6701890202901161252} - cornAmountText: {fileID: 2506280626346203665} - flavor1AmountText: {fileID: 6701890203883728052} - flavor2AmountText: {fileID: 8120304310888387127} - flavor2View: {fileID: 8120304310515719315} + cookingButton: {fileID: 3658417434522814400} + disabledObject: {fileID: 3658417434859902285} + cookedObject: {fileID: 2679656543278342664} + perfectCookedObject: {fileID: 3658417434568161586} + rarityView: {fileID: 5676996117682643677} + nameText: {fileID: 6701890202664346918} + stockText: {fileID: 6701890202901161252} + cornText: {fileID: 2506280626346203665} + material1Text: {fileID: 6701890203883728052} + material2Text: {fileID: 8120304310888387127} + material1IconTarget: {fileID: 2157734177276742269} + material2IconTarget: {fileID: 3477121770257347838} + packageIconTarget: {fileID: 6701890202353341293} --- !u!1 &6701890203527111184 GameObject: m_ObjectHideFlags: 0 @@ -2079,3 +2045,155 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &5112378705130438364 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3658417434568161581} + 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: 1 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + 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_LocalScale.x + value: 0.57123893 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_LocalScale.y + value: 0.57123893 + objectReference: {fileID: 0} + - target: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + propertyPath: m_LocalScale.z + value: 0.57123893 + 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: -37.5 + 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_Canvas + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2c82036225f2d453cac3ff9fb07fae4d, type: 3} +--- !u!114 &5676996117682643677 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 592905858299255809, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + m_PrefabInstance: {fileID: 5112378705130438364} + 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: +--- !u!224 &5676996117682643678 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + m_PrefabInstance: {fileID: 5112378705130438364} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Orde.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab similarity index 90% rename from popcorn/Assets/MyGame/Scenes/Main/Prefabs/Orde.prefab rename to popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab index 111e0068..9536d116 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Orde.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1266659963694843888} + - component: {fileID: 2576005101485369442} m_Layer: 5 m_Name: Orde m_TagString: Untagged @@ -37,6 +38,23 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 550, y: 74} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2576005101485369442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1266659963694843889} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f14cd02713649c5b189cbc9fb0b5bfd, type: 3} + m_Name: + m_EditorClassIdentifier: + materialNameText: {fileID: 1266659963782799786} + materialAmountText: {fileID: 5530322429652472391} + materialIconTarget: {fileID: 4067663658127716431} + itemObject: {fileID: 2012605225197334536} + disabledObject: {fileID: 6078742360956254766} --- !u!1 &1266659963782799784 GameObject: m_ObjectHideFlags: 0 @@ -127,7 +145,7 @@ GameObject: - component: {fileID: 1266659964433289955} - component: {fileID: 1266659964433289952} m_Layer: 5 - m_Name: Popcorn + m_Name: package m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -140,16 +158,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1266659964433289958} - m_LocalRotation: {x: -0, y: -0, z: -0.11129463, w: 0.9937875} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.6000001, y: 0.6000001, z: 0.5999999} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 9017528630810034763} - m_RootOrder: 1 + m_Father: {fileID: 4067663658127716431} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -12.780001} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -222.99997, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 92, y: 136} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1266659964433289955 @@ -217,7 +235,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1805757311142186072} - - {fileID: 1266659964433289953} + - {fileID: 4067663658127716431} - {fileID: 1266659963782799787} - {fileID: 8467582708424851607} m_Father: {fileID: 1266659963694843888} @@ -491,6 +509,42 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 150 +--- !u!1 &8226191546660308840 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4067663658127716431} + m_Layer: 5 + m_Name: Popcorn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4067663658127716431 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8226191546660308840} + m_LocalRotation: {x: -0, y: -0, z: -0.11129463, w: 0.9937875} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6000001, y: 0.6000001, z: 0.5999999} + m_Children: + - {fileID: 1266659964433289953} + m_Father: {fileID: 9017528630810034763} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -12.780001} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -222.99997, y: 0} + m_SizeDelta: {x: 92, y: 136} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8690967114179661769 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Orde.prefab.meta b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab.meta similarity index 100% rename from popcorn/Assets/MyGame/Scenes/Main/Prefabs/Orde.prefab.meta rename to popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab.meta diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/smartphone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/smartphone.prefab index 9e6d45d6..e8e95a0f 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/smartphone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/smartphone.prefab @@ -272,7 +272,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -367,6 +367,7 @@ MonoBehaviour: phoneAnimator: {fileID: 9152305840986396987} indicatorAnimator: {fileID: 8309988580877545720} titleObject: {fileID: 6630966004704031400} + balloonObject: {fileID: 1129648163941645728} --- !u!1 &6630966004704031400 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs new file mode 100644 index 00000000..20c305f7 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs @@ -0,0 +1,107 @@ +using System; +using System.Linq; +using UniRx; +using UnityEngine; +using UnityEngine.UI; + +public class BulkOrderProgressData +{ + public int orderId; + public ProductRarity rarity; +} +public class BulkOrder : MonoBehaviour +{ + public static readonly string DataTag = "BulkOrderData"; + public static readonly string CancelCallbackTag = "BulkOrderCancelCallback"; + private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger"); + private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger"); + [SerializeField] private Animator backgroundAnimator; + [SerializeField] private Button closeButton; + + [SerializeField] private Button cancelButton; + [SerializeField] private Button deliveredButton; + [SerializeField] private GameObject achievedObject; + [SerializeField] private Text messageText; + [SerializeField] private Text coinText; + [SerializeField] private Text heartText; + [SerializeField] private BulkOrderItemView itemView1; + [SerializeField] private BulkOrderItemView itemView2; + [SerializeField] private BulkOrderItemView itemView3; + + private void Start() + { + closeButton.OnClickAsObservable().Subscribe(_ => + { + transform.parent.SetLocalScale(0); + backgroundAnimator.SetTrigger(CloseTrigger); + this.CallWaitForSeconds(.25f, () => + { + TransitionManager.Instance.UnloadScene(GameScenes.BulkOrder); + }); + }).AddTo(this); + + var gameData = GameDataManager.GameData; + // キャンセルすると試食と同じ扱い + // 試食時のお客さんの増加ってどれくらいなんだろ + var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderDataSheet); + var messageList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderTextDataSheet); + var bulkOrderData = bulkOrderList[gameData.OrderIdInProgress]; + messageText.text = messageList.First(data => data.id == gameData.OrderTextId).requestText; + coinText.text = bulkOrderData.rewardCoin.ToString(); + heartText.text = bulkOrderData.rewardHeart.ToString(); + // cache + LocalCacheManager.Save(DataTag, bulkOrderData); + cancelButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => + { + LocalCacheManager.Save(CancelCallbackTag, new Action(() => + { + // 試食フラグ + gameData.CancelOrderId = gameData.OrderIdInProgress; + // カウントリセット + gameData.OrderConditionCount = 0; + + TransitionManager.Instance.UnloadScene(GameScenes.BulkOrder); + })); + TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrderCancel); + }).AddTo(this); + + deliveredButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => + { + // カウントリセット + gameData.OrderConditionCount = 0; + TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrderAchievement); + }).AddTo(this); + + var productList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet); + if (productList.FirstOrDefault(data => data.id == bulkOrderData.productId1) is ProductData data1) + { + itemView1.SetData(data1, bulkOrderData.count1); + itemView1.SetButtonActive(itemView1.CheckAmount(data1)); + itemView1.gameObject.SetActive(true); + } + else + { + itemView1.gameObject.SetActive(false); + } + if (productList.FirstOrDefault(data => data.id == bulkOrderData.productId2) is ProductData data2) + { + itemView2.SetData(data2, bulkOrderData.count2); + itemView2.SetButtonActive(itemView2.CheckAmount(data2)); + itemView2.gameObject.SetActive(true); + } + else + { + itemView2.gameObject.SetActive(false); + } + if (productList.FirstOrDefault(data => data.id == bulkOrderData.productId3) is ProductData data3) + { + itemView3.SetData(data3, bulkOrderData.count3); + itemView3.SetButtonActive(itemView3.CheckAmount(data3)); + itemView3.gameObject.SetActive(true); + } + else + { + itemView3.gameObject.SetActive(false); + } + } +} \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs.meta b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs.meta new file mode 100644 index 00000000..2b904c02 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5dcfec9a112d409796b81c96710930a6 +timeCreated: 1633498142 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs new file mode 100644 index 00000000..dd78fd0e --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs @@ -0,0 +1,6 @@ +using UnityEngine; + +public class BulkOrderAchievedView : MonoBehaviour +{ + +} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs.meta b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs.meta new file mode 100644 index 00000000..89f697cf --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 97711eafafff465ebe1223e7ed0ab2e7 +timeCreated: 1633600571 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs new file mode 100644 index 00000000..92b300a2 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs @@ -0,0 +1,51 @@ +using System; +using UniRx; +using UnityEngine; +using UnityEngine.UI; + +public class BulkOrderCancelView : MonoBehaviour +{ + private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger"); + private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger"); + [SerializeField] private Animator backgroundAnimator; + [SerializeField] private Button closeButton; + + [SerializeField] private Button cancelButton; + [SerializeField] private Text coinText; + [SerializeField] private Text heartText; + + private void Start() + { + if (LocalCacheManager.Load(BulkOrder.DataTag, null) is BulkOrderData orderData) + { + coinText.text = orderData.rewardCoin.ToString(); + heartText.text = orderData.rewardHeart.ToString(); + } + closeButton.OnClickAsObservable().Subscribe(_ => + { + transform.parent.SetLocalScale(0); + backgroundAnimator.SetTrigger(CloseTrigger); + this.CallWaitForSeconds(.25f, () => + { + TransitionManager.Instance.UnloadScene(GameScenes.BulkOrderCancel); + }); + }).AddTo(this); + cancelButton.OnClickAsObservable().Subscribe(_ => + { + if (LocalCacheManager.Load(BulkOrder.CancelCallbackTag, null) is Action callback) + { + callback.Invoke(); + } + if (LocalCacheManager.Load(KitchenManager.CancelCallbackTag, null) is Action callback2) + { + callback2.Invoke(); + } + transform.parent.SetLocalScale(0); + backgroundAnimator.SetTrigger(CloseTrigger); + this.CallWaitForSeconds(.25f, () => + { + TransitionManager.Instance.UnloadScene(GameScenes.BulkOrderCancel); + }); + }).AddTo(this); + } +} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs.meta b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs.meta new file mode 100644 index 00000000..2e5a9929 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3bace6e100bf4e3a8059828acdc02e1b +timeCreated: 1633531953 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderIndicatorView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderIndicatorView.cs index ae36f12a..f9e24a2a 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderIndicatorView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderIndicatorView.cs @@ -9,20 +9,22 @@ public class BulkOrderIndicatorView : MonoBehaviour [SerializeField] private Animator phoneAnimator; [SerializeField] private Animator indicatorAnimator; [SerializeField] private GameObject titleObject; + [SerializeField] private GameObject balloonObject; private static readonly int Ring = Animator.StringToHash("Ring"); private static readonly int Speech = Animator.StringToHash("Speech"); - // [SerializeField] private Button button; public IObservable TappedPhone => button.OnClickAsObservable().TakeUntilDestroy(this); - public void SetIndicate(bool received, bool achieved) + public void SetIndicate(bool receive, bool achieved) { - if (!received) + if (receive) { phoneAnimator.SetTrigger(Ring); indicatorAnimator.SetTrigger(Speech); } - titleObject.SetActive(received && !achieved); + button.interactable = receive || !achieved; + titleObject.SetActive(!receive && !achieved); + balloonObject.SetActive(receive); } } diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs new file mode 100644 index 00000000..6a9655cd --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs @@ -0,0 +1,98 @@ +using System; +using System.Linq; +using UniRx; +using UnityEngine; +using UnityEngine.UI; + +public class BulkOrderItemView : MonoBehaviour +{ + private static readonly string amountFormat = "x{0}"; + [SerializeField] private Button cookingButton; + [SerializeField] private GameObject disabledObject; + [SerializeField] private GameObject cookedObject; + [SerializeField] private GameObject perfectCookedObject; + [SerializeField] private RarityView rarityView; + [SerializeField] private Text nameText; + [SerializeField] private Text stockText; + [SerializeField] private Text cornText; + [SerializeField] private Text material1Text; + [SerializeField] private Text material2Text; + [SerializeField] private Transform material1IconTarget; + [SerializeField] private Transform material2IconTarget; + [SerializeField] private Transform packageIconTarget; + + public IObservable CookingButton => cookingButton.OnClickAsObservable().TakeUntilDestroy(this); + + public void SetData(ProductData data, int wantStock) + { + var materialCount = wantStock / data.volume; + stockText.text = wantStock.ToString(); + nameText.text = data.name; + cornText.text = string.Format(amountFormat, data.MaterialList[0].amount * materialCount); + packageIconTarget.DestroyAllChildrens(); + Instantiate(data.GetIconPrefab(), packageIconTarget); + + material1Text.text = string.Format(amountFormat, data.MaterialList[1].amount * materialCount); + material2Text.text = string.Format(amountFormat, data.MaterialList[2].amount * materialCount); + var shopData = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopDataSheet); + if (shopData.FirstOrDefault(sData => sData.itemId == data.MaterialList[1].id)?.GetIconPrefab() is Transform prefab1) + { + material1IconTarget.DestroyAllChildrens(); + Instantiate(prefab1, material1IconTarget); + } + if (shopData.FirstOrDefault(sData => sData.itemId == data.MaterialList[2].id)?.GetIconPrefab() is Transform prefab2) + { + material2IconTarget.DestroyAllChildrens(); + Instantiate(prefab2, material2IconTarget); + } + else + { + material2Text.transform.parent.gameObject.SetActive(false); + } + } + + public bool CheckAmount(ProductData productData) + { + var flag = true; + var gameData = GameDataManager.GameData; + if (gameData.CornSeed < productData.MaterialList[0].amount) + { + flag = false; + cornText.color = Color.red; + } + if ((gameData.Material.FirstOrDefault(data => data.Id == productData.MaterialList[1].id)?.Amount ?? 0) < productData.MaterialList[1].amount) + { + flag = false; + material1Text.color = Color.red; + } + if (productData.GetMaterialCount() == 3 && (gameData.Material.FirstOrDefault(data => data.Id == productData.MaterialList[2].id)?.Amount ?? 0) < productData.MaterialList[2].amount) + { + flag = false; + material2Text.color = Color.red; + } + return flag; + } + + public void SetButtonActive(bool active) + { + cookedObject.SetActive(false); + perfectCookedObject.SetActive(false); + cookingButton.gameObject.SetActive(active); + disabledObject.SetActive(!active); + } + + public void SetCooked(ProductRarity rarity) + { + cookingButton.gameObject.SetActive(false); + disabledObject.SetActive(false); + if (rarity == ProductRarity.Normal) + { + cookedObject.SetActive(true); + } + else + { + perfectCookedObject.SetActive(true); + rarityView.SetRarity(rarity); + } + } +} \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs.meta b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs.meta new file mode 100644 index 00000000..2a6b272b --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ab9ddab5084248d68b0cb2c53c8dc7cc +timeCreated: 1633529450 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyItemView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyItemView.cs new file mode 100644 index 00000000..ceeada0c --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyItemView.cs @@ -0,0 +1,25 @@ +using UnityEngine; +using UnityEngine.UI; + +public class BulkOrderNotifyItemView : MonoBehaviour +{ + [SerializeField] private Text materialNameText; + [SerializeField] private Text materialAmountText; + [SerializeField] private Transform materialIconTarget; + [SerializeField] private GameObject itemObject; + [SerializeField] private GameObject disabledObject; + + public void SetData(string name, int amount, Transform prefab) + { + materialAmountText.text = amount.ToString(); + materialNameText.text = name; + materialIconTarget.DestroyAllChildrens(); + Instantiate(prefab, materialIconTarget); + } + + public void SetActive(bool active) + { + itemObject.SetActive(active); + disabledObject.SetActive(!active); + } +} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyItemView.cs.meta b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyItemView.cs.meta new file mode 100644 index 00000000..88b7a35b --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyItemView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6f14cd02713649c5b189cbc9fb0b5bfd +timeCreated: 1633533755 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs new file mode 100644 index 00000000..049985f6 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using UniRx; +using UnityEngine; +using UnityEngine.UI; + +public class BulkOrderNotifyView : MonoBehaviour +{ + private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger"); + private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger"); + [SerializeField] private Animator backgroundAnimator; + [SerializeField] private Button closeButton; + + [SerializeField] private Text messageText; + [SerializeField] private BulkOrderNotifyItemView itemView1; + [SerializeField] private BulkOrderNotifyItemView itemView2; + [SerializeField] private BulkOrderNotifyItemView itemView3; + [SerializeField] private Text coinText; + [SerializeField] private Text heartText; + + private void Start() + { + if (LocalCacheManager.Load(BulkOrder.DataTag, null) is BulkOrderData orderData) + { + // Textは固定なのでID保持してここに反映かな？ + var messageList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderTextDataSheet); + var orderTextIndex = 0; + messageText.text = messageList.Where(data => data.shopLevel == orderData.shopLevel).ToList()[orderTextIndex].requestText; + coinText.text = orderData.rewardCoin.ToString(); + heartText.text = orderData.rewardHeart.ToString(); + + var productList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet); + if (productList.FirstOrDefault(data => data.id == orderData.productId1) is ProductData data1) + { + itemView1.SetData(data1.name, orderData.count1, data1.GetIconPrefab()); + itemView1.SetActive(true); + } + else + { + itemView1.SetActive(false); + } + if (productList.FirstOrDefault(data => data.id == orderData.productId2) is ProductData data2) + { + itemView2.SetData(data2.name, orderData.count2, data2.GetIconPrefab()); + itemView2.SetActive(true); + } + else + { + itemView2.SetActive(false); + } + if (productList.FirstOrDefault(data => data.id == orderData.productId3) is ProductData data3) + { + itemView3.SetData(data3.name, orderData.count3, data3.GetIconPrefab()); + itemView3.SetActive(true); + } + else + { + itemView3.SetActive(false); + } + } + closeButton.OnClickAsObservable().Subscribe(_ => + { + transform.parent.SetLocalScale(0); + backgroundAnimator.SetTrigger(CloseTrigger); + this.CallWaitForSeconds(.25f, () => + { + TransitionManager.Instance.UnloadScene(GameScenes.BulkOrderTelephone); + }); + }).AddTo(this); + } +} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs.meta b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs.meta new file mode 100644 index 00000000..b2a73842 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: aedda4da1f224450ad6f9b196e8e7e7d +timeCreated: 1633532782 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 726605a6..9922be2a 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -3,15 +3,18 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using UniRx; +using Unity.Mathematics; using UnityEngine; using UnityEngine.UI; public class KitchenManager : MonoBehaviour { + public static readonly string CancelCallbackTag = "BulkOrderCancelCallback"; [SerializeField] private Button cookingButton; [SerializeField] private Button adButton; [SerializeField] private KitchenView kitchenView; [SerializeField] private BulkOrderIndicatorView orderIndicatorView; + // Start is called before the first frame update void Start() { @@ -43,51 +46,108 @@ public class KitchenManager : MonoBehaviour #endif // 大量注文 - // 受け取っていない場合アニメーション - orderIndicatorView.SetIndicate(false, false); - orderIndicatorView.TappedPhone.ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => + var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderDataSheet); + var result = CheckBulkOrder(); + var achieved = HeartMeter.Instance.ShopLevel.Value == gameData.AchievedOrderLevel; + GameDataManager.SaveGameData(); + LocalCacheManager.Save(CancelCallbackTag, new Action(() => { - TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrder); - }).AddTo(this); - - SetData(); + orderIndicatorView.SetIndicate(false, true); + })); + orderIndicatorView.SetIndicate(result.result, achieved || gameData.OrderIdInProgress == gameData.CancelOrderId); + if (result.result) + { + var messageList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderTextDataSheet); + var nextMessageList = messageList.Where(data => data.shopLevel == result.nextOrderLevel).ToList(); + orderIndicatorView.TappedPhone.ThrottleFirst(TimeSpan.FromSeconds(1f)).Take(1).Subscribe(_ => + { + // タップで更新 + gameData.OrderIdInProgress = result.nextOrderId; + if (nextMessageList.Exists(data => data.id == gameData.OrderTextId)) + { + var messageCount = nextMessageList.Count; + var nextMessageIndex = nextMessageList.FindIndex(data => data.id == result.nextOrderId) + 1; + gameData.OrderTextId = messageList[nextMessageIndex >= messageCount ? 0 : nextMessageIndex].id; + } + else + { + gameData.OrderTextId = messageList.First().id; + } + GameDataManager.SaveGameData(); + + var orderData = bulkOrderList.First(data => data.id == result.nextOrderId); + LocalCacheManager.Save(BulkOrder.DataTag, orderData); + TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrderTelephone); + + // 通知をタップ後タップ動作を切り替える + orderIndicatorView.SetIndicate(false, false); + orderIndicatorView.TappedPhone.ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(__ => + { + TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrder); + }).AddTo(this); + }).AddTo(this); + } + else + { + if (gameData.OrderIdInProgress != gameData.CancelOrderId) + { + orderIndicatorView.TappedPhone + .ThrottleFirst(TimeSpan.FromSeconds(1f)) + .Subscribe(_ => + { + TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrder); + }).AddTo(this); + } + } #if UNITY_EDITOR Market.StockFlavorLog(); #endif } - private void SetData() + private (bool result, int nextOrderId, int nextOrderLevel) CheckBulkOrder() { var gameData = GameDataManager.GameData; - // 所持レシピ - if (gameData.MyRecipes == null || gameData.MyRecipes.Length == 0) + var nextOrderLevel = 0; + var nextOrderId = gameData.OrderIdInProgress; + var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderDataSheet); + if (!(bulkOrderList.FirstOrDefault(data => data.shopLevel >= gameData.AchievedOrderLevel + 1) is BulkOrderData bulkOrderData)) { - gameData.MyRecipes = new[] - { - 1, - }; - } - - // 所持素材 - if (gameData.Material == null || gameData.Material.Count == 0) - { - gameData.Material = Enumerable.Range(1, 12).Select(x => new MaterialData(x, 0)).ToList(); + return (false, nextOrderId, nextOrderLevel); } - // 保存タンク - if (gameData.StorageTanks == null || gameData.StorageTanks.Count == 0) + nextOrderLevel = bulkOrderData.shopLevel; + + if (HeartMeter.Instance.ShopLevel.Value < nextOrderLevel) { - gameData.StorageTanks = new List - { - new StorageTank - { - Id = 1, - Capacity = 50, - FlavorId = -1, - } - }; + return (false, nextOrderId, nextOrderLevel); } - GameDataManager.SaveGameData(); + + var nextOrderList = bulkOrderList.Where(data => data.shopLevel == nextOrderLevel).ToList(); + if (!nextOrderList.Exists(data => data.id == gameData.OrderIdInProgress)) + { + // まだ次のオーダーが設定されてない場合shopLevelの一番若いIDを設定 + nextOrderId = nextOrderList.First().id; + } + else if (gameData.OrderIdInProgress == gameData.CancelOrderId && gameData.CancelOrderId > 0) + { + // キャンセルされた場合次のIDを設定 + var orderCount = nextOrderList.Count; + var nextIndex = nextOrderList.FindIndex(data => data.id == gameData.OrderIdInProgress) + 1; + nextOrderId = nextOrderList[nextIndex >= orderCount ? 0 : nextIndex].id; + } + + if (gameData.OrderIdInProgress == nextOrderId) + { + return (false, nextOrderId, nextOrderLevel); + } + + Debug.Log($"{gameData.OrderIdInProgress} {gameData.CancelOrderId} {nextOrderId} {gameData.OrderConditionCount}"); + var orderData = nextOrderList.First(data => data.id == nextOrderId); + var isFirst = !nextOrderList.Exists(data => data.id == gameData.CancelOrderId); + var condition = isFirst ? orderData.firstOrderCondition : orderData.retryCondition; + + // 条件チェック + return (condition <= gameData.OrderConditionCount, nextOrderId, nextOrderLevel); } } diff --git a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs index db273d7a..bc424a2a 100644 --- a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs +++ b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs @@ -98,6 +98,24 @@ public sealed class GameData { [DataMember(Name = "Data25")] private int[] achievedMission; public List AchievedMission; + // [DataMember(Name = "Data26")] + + // [DataMember(Name = "Data27")] + + [DataMember(Name = "Data28")] + public int OrderIdInProgress; + + [DataMember(Name = "Data29")] + public int OrderTextId; + [DataMember(Name = "Data30")] + public int OrderConditionCount; + [DataMember(Name = "Data31")] + public int CancelOrderId; + [DataMember(Name = "Data32")] + public int AchievedOrderLevel; + // 進捗 + [DataMember(Name = "Data33")] + public List OrderProgressList; // mission [DataMember(Name = "Data1001")] @@ -143,6 +161,7 @@ public sealed class GameData { public void AddSalesCount(int id, int stock, ProductRarity rarity) { + OrderConditionCount += stock; if (TotalSalesList.FirstOrDefault(x => x.Rarity == rarity) is ProductStockData stockData) { stockData.Stock += stock; @@ -205,6 +224,7 @@ public sealed class GameData { Pans = Pans ?? new int[0]; TotalSalesList = TotalSalesList ?? new List(); AchievedMission = achievedMission?.ToList() ?? new List(); + OrderProgressList = OrderProgressList ?? new List(); } private Dictionary ArrayToDictionary(KeyValueOfintint[] array){ var dictionary = new Dictionary(); diff --git a/popcorn/Assets/MyGame/Scripts/TransitionManager.cs b/popcorn/Assets/MyGame/Scripts/TransitionManager.cs index d28fdea2..66fe055e 100644 --- a/popcorn/Assets/MyGame/Scripts/TransitionManager.cs +++ b/popcorn/Assets/MyGame/Scripts/TransitionManager.cs @@ -26,7 +26,7 @@ public enum GameScenes BulkOrder, BulkOrderAchievement, BulkOrderCancel, - BulkOrderPhone, + BulkOrderTelephone, SettingsDialog, DebugOption, UnableWatchVideoDialog,