From 26cc153ff6c7152c664c178b1b28be84bfa7a96a Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 15 Sep 2021 16:47:38 +0900 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=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 --- .../Scenes/marketing/PopcornDescription.unity | 85 +------ .../marketing/Prefabs/Description.prefab | 152 ++++++++++++- .../marketing/Prefabs/RareDetails.prefab | 15 ++ .../Scenes/marketing/Prefabs/TankList.prefab | 215 ++++++++++-------- .../Scenes/marketing/Prefabs/detail.prefab | 51 +++++ .../Scenes/marketing/ProductManagement.unity | 29 +++ .../marketing/Scripts/ProductManagement.cs | 193 ++++++++++++++++ .../Assets/MyGame/Scripts/GameDataManager.cs | 6 + 8 files changed, 564 insertions(+), 182 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity b/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity index 5ce200c3..451e18c7 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity @@ -121,89 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &853973358 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 853973361} - - component: {fileID: 853973360} - - component: {fileID: 853973359} - m_Layer: 5 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &853973359 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 853973358} - m_Enabled: 1 ---- !u!20 &853973360 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 853973358} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 4 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: -10 - far clip plane: 10 - field of view: 26.991467 - orthographic: 1 - orthographic size: 11.04 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 32 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 0 - m_AllowMSAA: 0 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &853973361 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 853973358} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3856012874773314169 PrefabInstance: m_ObjectHideFlags: 0 @@ -325,6 +242,6 @@ PrefabInstance: type: 3} propertyPath: m_Camera value: - objectReference: {fileID: 853973360} + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6592613d31e034734bea16833d6345c1, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab index 260b2de4..2cbdf33e 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab @@ -60,7 +60,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: @@ -104,6 +104,7 @@ GameObject: m_Component: - component: {fileID: 3856012874490264331} - component: {fileID: 3856012874490264330} + - component: {fileID: 5342480092941596622} m_Layer: 5 m_Name: RareDetails_summary m_TagString: Untagged @@ -160,6 +161,25 @@ MonoBehaviour: m_Spacing: {x: 8, y: 20} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!114 &5342480092941596622 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3856012874490264328} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 756a75c73f084205b9473c046ff47a94, type: 3} + m_Name: + m_EditorClassIdentifier: + rarityStockViews: + - {fileID: 5228864552364374033} + - {fileID: 5799495138696269141} + - {fileID: 5799495140421476643} + - {fileID: 5799495138690915002} + - {fileID: 5799495139603894947} + - {fileID: 5799495140018518241} --- !u!1 &3856012874794846575 GameObject: m_ObjectHideFlags: 0 @@ -169,6 +189,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3856012874794846574} + - component: {fileID: 5360726889513396134} m_Layer: 5 m_Name: Window m_TagString: Untagged @@ -197,6 +218,28 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 706, y: 856} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5360726889513396134 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3856012874794846575} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 503f73b9937449a58919451f7b823757, type: 3} + m_Name: + m_EditorClassIdentifier: + backgroundAnimator: {fileID: 3856012874473253804} + tankNumber: {fileID: 3856012874977579074} + totalStock: {fileID: 3856012875805691666} + tankStock: {fileID: 3856012875338846987} + price: {fileID: 3856012876438822065} + name: {fileID: 3856012875645848067} + text: {fileID: 3856012875694233262} + popcornImage: {fileID: 3856012875488019546} + raritySummaryView: {fileID: 5342480092941596622} + closeButton: {fileID: 3856012876379087773} --- !u!1 &3856012874861365793 GameObject: m_ObjectHideFlags: 0 @@ -1990,6 +2033,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 25.800293 objectReference: {fileID: 0} + - target: {fileID: 2059738712371773594, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2613923737832606406, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_Layer @@ -2000,6 +2048,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: rarity + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7802156769292725947, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_Layer @@ -2013,6 +2066,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3271889073656297700} m_PrefabAsset: {fileID: 0} +--- !u!114 &5228864552364374033 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + m_PrefabInstance: {fileID: 3271889073656297700} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0dc9cb18f7548c6a51cf39c843c54ef, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &3856012874690155094 PrefabInstance: m_ObjectHideFlags: 0 @@ -2155,6 +2220,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: rarity + value: 5 + objectReference: {fileID: 0} - target: {fileID: 7802156769292725947, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_Layer @@ -2168,6 +2238,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3856012874690155094} m_PrefabAsset: {fileID: 0} +--- !u!114 &5799495139603894947 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + m_PrefabInstance: {fileID: 3856012874690155094} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0dc9cb18f7548c6a51cf39c843c54ef, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &3856012875392093600 PrefabInstance: m_ObjectHideFlags: 0 @@ -2310,6 +2392,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: rarity + value: 2 + objectReference: {fileID: 0} - target: {fileID: 7802156769292725947, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_Layer @@ -2323,6 +2410,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3856012875392093600} m_PrefabAsset: {fileID: 0} +--- !u!114 &5799495138696269141 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + m_PrefabInstance: {fileID: 3856012875392093600} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0dc9cb18f7548c6a51cf39c843c54ef, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &3856012875404040783 PrefabInstance: m_ObjectHideFlags: 0 @@ -2465,6 +2564,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: rarity + value: 4 + objectReference: {fileID: 0} - target: {fileID: 7802156769292725947, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_Layer @@ -2478,6 +2582,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3856012875404040783} m_PrefabAsset: {fileID: 0} +--- !u!114 &5799495138690915002 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + m_PrefabInstance: {fileID: 3856012875404040783} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0dc9cb18f7548c6a51cf39c843c54ef, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &3856012876026323414 PrefabInstance: m_ObjectHideFlags: 0 @@ -2635,6 +2751,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: rarity + value: 3 + objectReference: {fileID: 0} - target: {fileID: 7802156769292725947, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_Layer @@ -2648,6 +2769,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3856012876026323414} m_PrefabAsset: {fileID: 0} +--- !u!114 &5799495140421476643 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + m_PrefabInstance: {fileID: 3856012876026323414} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0dc9cb18f7548c6a51cf39c843c54ef, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &3856012876160759828 PrefabInstance: m_ObjectHideFlags: 0 @@ -2785,6 +2918,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: rarity + value: 6 + objectReference: {fileID: 0} - target: {fileID: 7802156769292725947, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_Layer @@ -2803,3 +2941,15 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3856012876160759828} m_PrefabAsset: {fileID: 0} +--- !u!114 &5799495140018518241 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + m_PrefabInstance: {fileID: 3856012876160759828} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0dc9cb18f7548c6a51cf39c843c54ef, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab index 89951f93..13d46804 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 551217487534969408} + - component: {fileID: 7347831002230456565} - component: {fileID: 8625965282603476129} - component: {fileID: 6338487512025374499} m_Layer: 5 @@ -40,6 +41,20 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 198, y: 72} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7347831002230456565 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 68604352306250142} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0dc9cb18f7548c6a51cf39c843c54ef, type: 3} + m_Name: + m_EditorClassIdentifier: + normalText: {fileID: 3446673658581084022} + rarity: 0 --- !u!222 &8625965282603476129 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab index 35cd7022..e5d2d687 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab @@ -244,7 +244,6 @@ GameObject: - component: {fileID: 6124127957328696056} - component: {fileID: 6124127957328696059} - component: {fileID: 6124127957328696058} - - component: {fileID: 6124127957328696057} m_Layer: 5 m_Name: Button_frame_on m_TagString: Untagged @@ -309,49 +308,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &6124127957328696057 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6124127957328695943} - 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: 1 - 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: 6124127957328696058} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &6124127957362852677 GameObject: m_ObjectHideFlags: 0 @@ -439,8 +395,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6124127957792349541} + - component: {fileID: 4115935509581831060} m_Layer: 5 - m_Name: tank + m_Name: TankList m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -470,6 +427,30 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -900, y: -946} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4115935509581831060 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6124127957792349540} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6fb8a3338e924cbe9255939ad1ab6017, type: 3} + m_Name: + m_EditorClassIdentifier: + tankList: + - {fileID: 1703305198614521804} + - {fileID: 7410006873414403973} + - {fileID: 7410006873326190942} + - {fileID: 7410006874113819964} + - {fileID: 7410006873622376052} + - {fileID: 7410006873821952634} + - {fileID: 7410006872429959918} + oneByOneOn: {fileID: 6124127957328695943} + tankByTankOn: {fileID: 6124127957800881880} + oneByOneOff: {fileID: 2475725912389513548} + tankByTankOff: {fileID: 2571460208686409723} --- !u!1 &6124127957800881880 GameObject: m_ObjectHideFlags: 0 @@ -481,7 +462,6 @@ GameObject: - component: {fileID: 6124127957800881881} - component: {fileID: 6124127957800881884} - component: {fileID: 6124127957800881883} - - component: {fileID: 6124127957800881882} m_Layer: 5 m_Name: Button_frame_on m_TagString: Untagged @@ -546,49 +526,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &6124127957800881882 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6124127957800881880} - 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: 1 - 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: 6124127957800881883} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &6124127957921726007 GameObject: m_ObjectHideFlags: 0 @@ -973,7 +910,7 @@ GameObject: - component: {fileID: 6124127958242834723} - component: {fileID: 6124127958242834726} - component: {fileID: 6124127958242834725} - - component: {fileID: 6124127958242834724} + - component: {fileID: 2571460208686409723} m_Layer: 5 m_Name: Button_frame_off m_TagString: Untagged @@ -1038,7 +975,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &6124127958242834724 +--- !u!114 &2571460208686409723 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1056,7 +993,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} @@ -1077,7 +1014,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 6124127958242834725} + m_TargetGraphic: {fileID: 6124127957800881883} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -1314,7 +1251,7 @@ GameObject: - component: {fileID: 6124127958658035367} - component: {fileID: 6124127958658035354} - component: {fileID: 6124127958658035353} - - component: {fileID: 6124127958658035352} + - component: {fileID: 2475725912389513548} m_Layer: 5 m_Name: Button_frame_off m_TagString: Untagged @@ -1379,7 +1316,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &6124127958658035352 +--- !u!114 &2475725912389513548 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1397,7 +1334,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} @@ -1418,7 +1355,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 6124127958658035353} + m_TargetGraphic: {fileID: 6124127957328696058} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -1831,6 +1768,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2705466137574694683} m_PrefabAsset: {fileID: 0} +--- !u!114 &1703305198614521804 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3614389473544141015, guid: 61beefd3a05503e419363598678ad43a, + type: 3} + m_PrefabInstance: {fileID: 2705466137574694683} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb86ab823f03425b97e7c977c5e65267, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &6124127957283136057 PrefabInstance: m_ObjectHideFlags: 0 @@ -1965,6 +1914,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} +--- !u!114 &7410006872429959918 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3614389473544141015, guid: 61beefd3a05503e419363598678ad43a, + type: 3} + m_PrefabInstance: {fileID: 6124127957283136057} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb86ab823f03425b97e7c977c5e65267, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &2705466136803566539 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8175998082654142962, guid: 61beefd3a05503e419363598678ad43a, @@ -2230,6 +2191,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} +--- !u!114 &7410006873326190942 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3614389473544141015, guid: 61beefd3a05503e419363598678ad43a, + type: 3} + m_PrefabInstance: {fileID: 6124127957893904777} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb86ab823f03425b97e7c977c5e65267, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &2705466138240612475 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8175998082654142962, guid: 61beefd3a05503e419363598678ad43a, @@ -2495,6 +2468,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} +--- !u!114 &7410006873622376052 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3614389473544141015, guid: 61beefd3a05503e419363598678ad43a, + type: 3} + m_PrefabInstance: {fileID: 6124127958273922723} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb86ab823f03425b97e7c977c5e65267, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &2705466138062788433 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8175998082654142962, guid: 61beefd3a05503e419363598678ad43a, @@ -2786,6 +2771,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 6124127958334701394} m_PrefabAsset: {fileID: 0} +--- !u!114 &7410006873414403973 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3614389473544141015, guid: 61beefd3a05503e419363598678ad43a, + type: 3} + m_PrefabInstance: {fileID: 6124127958334701394} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb86ab823f03425b97e7c977c5e65267, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &6124127958473786029 PrefabInstance: m_ObjectHideFlags: 0 @@ -2920,6 +2917,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} +--- !u!114 &7410006873821952634 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3614389473544141015, guid: 61beefd3a05503e419363598678ad43a, + type: 3} + m_PrefabInstance: {fileID: 6124127958473786029} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb86ab823f03425b97e7c977c5e65267, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &2705466138803716959 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8175998082654142962, guid: 61beefd3a05503e419363598678ad43a, @@ -3185,6 +3194,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} +--- !u!114 &7410006874113819964 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3614389473544141015, guid: 61beefd3a05503e419363598678ad43a, + type: 3} + m_PrefabInstance: {fileID: 6124127958681763307} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb86ab823f03425b97e7c977c5e65267, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &2705466138491599897 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8175998082654142962, guid: 61beefd3a05503e419363598678ad43a, diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab index 6ab55d3d..30f9bcc7 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab @@ -761,6 +761,7 @@ GameObject: - component: {fileID: 7909304278807150436} - component: {fileID: 7647176822634498729} - component: {fileID: 5295426972407679314} + - component: {fileID: 3091180832490970851} m_Layer: 5 m_Name: RareFrame m_TagString: Untagged @@ -825,6 +826,30 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3091180832490970851 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4753476481036792322} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bb57f12f265d434da0a003594c0d20d1, type: 3} + m_Name: + m_EditorClassIdentifier: + normalOn: {fileID: 8614610498628167074} + normalOff: {fileID: 2308454864973730191} + yellowOn: {fileID: 625079125139171277} + yellowOff: {fileID: 2693384584858985978} + copperOn: {fileID: 8614079837859538292} + copperOff: {fileID: 2803530085894031143} + silverOn: {fileID: 3246189463358310613} + silverOff: {fileID: 83536216591997874} + goldOn: {fileID: 1192503041519524233} + goldOff: {fileID: 6073365891126353338} + rainbowOn: {fileID: 8291717697316772424} + rainbowOff: {fileID: 7439539612409910212} --- !u!1 &6073365891126353338 GameObject: m_ObjectHideFlags: 0 @@ -1358,6 +1383,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8175998082654142962} + - component: {fileID: 3614389473544141015} m_Layer: 5 m_Name: detail m_TagString: Untagged @@ -1387,6 +1413,31 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 224, y: 328} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3614389473544141015 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8175998082654142963} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb86ab823f03425b97e7c977c5e65267, type: 3} + m_Name: + m_EditorClassIdentifier: + selectedIndicateObject: {fileID: 8175998082772346535} + tankObject: {fileID: 8175998082947913935} + popcornImage: {fileID: 8175998082903555689} + packageImage: {fileID: 8175998084009524135} + tankNumber: {fileID: 8175998082262830091} + tankStock: {fileID: 8175998083605669215} + rarityView: {fileID: 3091180832490970851} + detailButton: {fileID: 8175998082998279047} + arrow: {fileID: 8004273412923137814} + lockedTankObject: {fileID: 8175998082953259674} + lockedTankNumber: {fileID: 8175998083386752690} + price: {fileID: 8175998083146003101} + purchaseButton: {fileID: 8175998083657673474} --- !u!1 &8175998082772346535 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity index 4adeb04b..77d41efa 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity @@ -1017,6 +1017,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a62cbd02371f4283b67c8730d020b558, type: 3} m_Name: m_EditorClassIdentifier: + tastingButton: {fileID: 1280872481} + view: {fileID: 639967259} --- !u!1 &613202084 GameObject: m_ObjectHideFlags: 0 @@ -1259,6 +1261,21 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 2705466137498387710, guid: b24d8537ddbd94882ad379e4b679f044, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2705466137578734835, guid: b24d8537ddbd94882ad379e4b679f044, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2705466138819445049, guid: b24d8537ddbd94882ad379e4b679f044, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3539959088520368584, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} propertyPath: m_AnchorMax.y @@ -1787,6 +1804,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 639967257} m_PrefabAsset: {fileID: 0} +--- !u!114 &639967259 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4115935509581831060, guid: b24d8537ddbd94882ad379e4b679f044, + type: 3} + m_PrefabInstance: {fileID: 639967257} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6fb8a3338e924cbe9255939ad1ab6017, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &748884348 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs index 311d19ea..657eb1f6 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs @@ -1,11 +1,204 @@ using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; using UniRx; using UnityEngine; using UnityEngine.UI; +public enum ManagementState +{ + None, + Replacing, + Tasting, +} public class ProductManagement : MonoBehaviour { + [SerializeField] private Button tastingButton; + [SerializeField] private ProductManagementView view; + private readonly ReactiveProperty state = new ReactiveProperty(); private void Start() { + state.AddTo(this); + state.Value = ManagementState.None; + var gameData = GameDataManager.GameData; + // CoinManager.Instance.ChangeCoin(gameData.coin); + + // タンクデータ読み込み + gameData.StorageTanks = new List + { + new StorageTank(){Id = 1, Capacity = 50, FlavorId = 1, Stocks = new List{new ProductStockData{Rarity = ProductRarity.Normal, Stock = 0}}}, + new StorageTank(){Id = 2, Capacity = 50, FlavorId = 1, Stocks = new List + { + new ProductStockData{Rarity = ProductRarity.Normal, Stock = 1}, + new ProductStockData{Rarity = ProductRarity.Yellow, Stock = 20}, + new ProductStockData{Rarity = ProductRarity.Copper, Stock = 1}, + new ProductStockData{Rarity = ProductRarity.Rainbow, Stock = 10}, + }}, + // new StorageTank(){Id = 3, Capacity = 50, FlavorId = 1, Stocks = new List{new ProductStockData{Rarity = ProductRarity.Yellow, Stock = 2}}}, + new StorageTank(){Id = 5, Capacity = 50, FlavorId = 1, Stocks = new List{new ProductStockData{Rarity = ProductRarity.Gold, Stock = 4}}}, + }; + + // 補充方法設定 + view.SetRefillType(gameData.RefillMode); + // TankOrderを更新 + Debug.Log(gameData.TankOrder.Aggregate(new StringBuilder(), (builder, i) => builder.Append(i)).ToString()); + if (gameData.TankOrder.Length != gameData.StorageTanks.Count) + { + var excepts = gameData.StorageTanks.Select(x => x.Id).Except(gameData.TankOrder); + Debug.Log(excepts.Aggregate("", (s, i) => $"{s},{i}")); + var tmpTankOrder = gameData.TankOrder.ToList(); + tmpTankOrder.AddRange(excepts); + gameData.TankOrder = tmpTankOrder.ToArray(); + Debug.Log(gameData.TankOrder.Aggregate("", (s, i) => $"{s},{i}")); + } + // tank price list + var priceList = new List + { + 0, + 300, + 500, + 1000, + 1500, + 2000, + 2500, + }; + // タンク設定 + var tankList = view.SetTanks(priceList); + var rarityDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.RarityDataSheet); + foreach (var tankView in tankList) + { + tankView.SetArrow(tankView.TankNumber != 4 && tankView.TankNumber != 7 && tankView.TankNumber != gameData.StorageTanks.Count); + if (tankView.TankNumber > gameData.StorageTanks.Count) + { + tankView.SetState(TankState.Lock); + // タンク購入 + tankView.PurchaseButtonObservable + .TakeWhile(_ => tankView.State.Value == TankState.Lock || tankView.State.Value == TankState.Unavailable) + .Subscribe(_ => + { + var price = priceList[tankView.TankNumber - 1]; + // 購入処理 + // タンク追加＆Order追加 + tankView.SetData(gameData.StorageTanks.First(x => x.Id == gameData.TankOrder[tankView.TankNumber - 1])); + }).AddTo(tankView); + } + else + { + var tankData = gameData.StorageTanks.First(x => x.Id == gameData.TankOrder[tankView.TankNumber - 1]); + tankView.SetData(tankData); + tankView.SetState(TankState.Unlock); + var totalStock = gameData.ShopStock.Sum(x => x) + gameData.StorageTanks.Where(x => x.FlavorId == tankData.FlavorId).Sum(x => x.Stock); + var recipe = RecipeData.GetAllRecipe().First(x => x.RecipeId == tankData.FlavorId); + var price = recipe?.Price ?? 0; + List<(ProductRarity rarity, int price, int stock)> raritySummaryData = rarityDataList.Select(x => + (x.Rarity, price * x.rate / 100, tankData.Stocks.FirstOrDefault(sd => sd.Rarity == x.Rarity)?.Stock ?? 0) + ).ToList(); + tankView.DetailButtonObservable.Subscribe(_ => + { + state.Value = ManagementState.None; + LocalCacheManager.Save(TankDetailView.TankDetailDataTag, (tankView.TankNumber, totalStock, tankData, recipe, raritySummaryData)); + TransitionManager.Instance.LoadSceneAdditive(GameScenes.PopcornDescription); + }).AddTo(tankView); + } + state.Subscribe(x => + { + tankView.SetDetailButtonActive(x != ManagementState.Tasting); + }).AddTo(tankView); + } + + state.Subscribe(x => + { + switch (x) + { + case ManagementState.None: + ClearSelectedTank(tankList); + break; + case ManagementState.Replacing: + break; + case ManagementState.Tasting: + ClearSelectedTank(tankList); + // 1番目選択 + tankList[0].SetState(TankState.Selected); + // TastingシーンAdditive + // tasting閉じたあとの処理コールバックAction渡す + break; + default: + throw new ArgumentOutOfRangeException(nameof(x), x, null); + } + }).AddTo(this); + + // タンククリック検知 + Observable.Merge(tankList.Select(tankView => tankView.TankClickObservable.Select(_ => tankView))) + .Where(tankView => tankView.State.Value != TankState.Lock) + .Where(tankView => tankView.State.Value != TankState.Unavailable) + .Subscribe(tankView => + { + switch (state.Value) + { + case ManagementState.None: + ClearSelectedTank(tankList); + tankView.SetState(TankState.Selected); + state.Value = ManagementState.Replacing; + break; + case ManagementState.Replacing: + break; + case ManagementState.Tasting: + ClearSelectedTank(tankList); + tankView.SetState(TankState.Selected); + break; + default: + throw new ArgumentOutOfRangeException(); + } + }).AddTo(this); + + // 2連続でクリックされたViewがまとめて取得できるストリーム + var replacingObservable = Observable.Merge(tankList.Select(x => x.TankClickObservable.Select(_ => x))) + .Where(x => x.State.Value != TankState.Lock) + .Where(x => x.State.Value != TankState.Unavailable) + .TakeWhile(_ => state.Value != ManagementState.Tasting) + .Pairwise(); + // タンク入れ替え + state.Where(x => x == ManagementState.None) + .Select(_ => replacingObservable) + .Switch() + .Subscribe(tanks => + { + if (tanks.Previous.TankNumber != tanks.Current.TankNumber) + { + var tmpId = gameData.TankOrder[tanks.Previous.TankNumber - 1]; + gameData.TankOrder[tanks.Previous.TankNumber - 1] = gameData.TankOrder[tanks.Current.TankNumber - 1]; + gameData.TankOrder[tanks.Current.TankNumber - 1] = tmpId; + // 再設定 + tanks.Previous.SetData(gameData.StorageTanks.First(x => x.Id == gameData.TankOrder[tanks.Previous.TankNumber - 1])); + tanks.Current.SetData(gameData.StorageTanks.First(x => x.Id == gameData.TankOrder[tanks.Current.TankNumber - 1])); + GameDataManager.SaveGameData(); + } + state.Value = ManagementState.None; + }).AddTo(this); + + tastingButton.OnClickAsObservable().Subscribe(_ => + { + state.Value = ManagementState.Tasting; + }).AddTo(this); + + view.RefillType.Subscribe(mode => + { + state.Value = ManagementState.None; + // 補充方法変更 + gameData.RefillMode = mode; + GameDataManager.SaveGameData(); + }).AddTo(this); + } + + private void ClearSelectedTank(List tankList) + { + foreach (var tankView in tankList) + { + if (tankView.State.Value == TankState.Selected) + { + tankView.SetState(TankState.Unlock); + } + } } } diff --git a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs index 0a3f2f78..abf417f6 100644 --- a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs +++ b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs @@ -79,6 +79,11 @@ public sealed class GameData { public int Heart = 0; [DataMember(Name = "Data22")] public int[] Pans; + // [DataMember(Name = "Data23")] + public int[] TankOrder; + [DataMember(Name = "Data24")] + public ProductRefillMode RefillMode; + // [DataMember(Name = "Data25")] // public void ChangeAvatar(AvatarData avatarData){ // newAvatarIdList.Remove(avatarData.id); @@ -119,6 +124,7 @@ public sealed class GameData { // lastAdRewardTimeList = lastAdRewardTimeArray == null ? new List() : lastAdRewardTimeArray.ToList(); ShopStock = shopStock?.ToList() ?? new List(); Pans = Pans ?? new int[0]; + TankOrder = TankOrder ?? new int[0]; } private Dictionary ArrayToDictionary(KeyValueOfintint[] array){ var dictionary = new Dictionary();