From f177694d104e5bdbc5193d1b344e7ca95818209d Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 18 May 2022 11:32:35 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0=E6=A9=9F?= =?UTF-8?q?=E8=83=BD=E8=BF=BD=E5=8A=A0=20=E3=82=BF=E3=83=B3=E3=82=AF?= =?UTF-8?q?=E3=83=AA=E3=82=BB=E3=83=83=E3=83=88/=E7=B4=A0=E6=9D=90?= =?UTF-8?q?=E3=83=AA=E3=82=BB=E3=83=83=E3=83=88=E6=99=82=E3=81=AE=E3=83=AC?= =?UTF-8?q?=E3=82=B7=E3=83=94=E6=89=80=E6=8C=81=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/DebugOption/DebugOption.unity | 308 +++++++++++++++++- .../DebugOption/Scripts/DebugOptionManager.cs | 27 +- 2 files changed, 316 insertions(+), 19 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity b/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity index 7b0f9bc7..94485e07 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity @@ -288,7 +288,7 @@ PrefabInstance: - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} propertyPath: m_RootOrder - value: 11 + value: 13 objectReference: {fileID: 0} - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -388,7 +388,7 @@ PrefabInstance: - target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} propertyPath: m_Name - value: AutoCookComplete (2) + value: ShopCustomizeComplete objectReference: {fileID: 0} - target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -576,7 +576,7 @@ PrefabInstance: - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} propertyPath: m_RootOrder - value: 3 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -717,7 +717,7 @@ PrefabInstance: - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} propertyPath: m_RootOrder - value: 6 + value: 8 objectReference: {fileID: 0} - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -1996,6 +1996,11 @@ PrefabInstance: propertyPath: m_ConstraintCount value: 2 objectReference: {fileID: 0} + - target: {fileID: 2541661409141469743, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 100 + objectReference: {fileID: 0} - target: {fileID: 2541661409648867663, guid: 32f8e8f0ced494daeb0f218e6be9d9db, type: 3} propertyPath: m_IsActive @@ -2424,7 +2429,7 @@ PrefabInstance: - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} propertyPath: m_RootOrder - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -2713,7 +2718,7 @@ PrefabInstance: - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} propertyPath: m_RootOrder - value: 7 + value: 9 objectReference: {fileID: 0} - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -3238,6 +3243,147 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1094868345} m_CullTransparentMesh: 0 +--- !u!1001 &1132497428 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 785180939} + m_Modifications: + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5062447477614030396, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Text + value: "\u30BF\u30F3\u30AF\n\u30EA\u30BB\u30C3\u30C8" + objectReference: {fileID: 0} + - target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Name + value: ResetTank + objectReference: {fileID: 0} + - target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} +--- !u!114 &1132497429 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 502413859327355263, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + m_PrefabInstance: {fileID: 1132497428} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1191515583 PrefabInstance: m_ObjectHideFlags: 0 @@ -3852,7 +3998,7 @@ PrefabInstance: - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} propertyPath: m_RootOrder - value: 4 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -3993,7 +4139,7 @@ PrefabInstance: - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} propertyPath: m_RootOrder - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -4969,6 +5115,145 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1602200499} m_CullTransparentMesh: 0 +--- !u!1001 &1608772709 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 785180939} + m_Modifications: + - target: {fileID: 502413859327355263, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1877055874433787818, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5062447477614030396, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Text + value: + objectReference: {fileID: 0} + - target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Name + value: None + objectReference: {fileID: 0} + - target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} --- !u!1001 &1612205220 PrefabInstance: m_ObjectHideFlags: 0 @@ -5278,7 +5563,7 @@ PrefabInstance: - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} propertyPath: m_RootOrder - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -6141,6 +6426,7 @@ MonoBehaviour: backButton: {fileID: 785180940} resetFieldButton: {fileID: 450754452} resetMaterialButton: {fileID: 1767352104} + resetTankButton: {fileID: 1132497429} refillManyProductButton: {fileID: 1651104560} refillLittleProductButton: {fileID: 153639484} bulkOrderResetButton: {fileID: 1344540256} @@ -7107,7 +7393,7 @@ PrefabInstance: - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 12 objectReference: {fileID: 0} - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -7284,7 +7570,7 @@ PrefabInstance: - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 10 objectReference: {fileID: 0} - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs index fe290636..20bc2eea 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs @@ -17,6 +17,7 @@ public class DebugOptionManager : MonoBehaviour [SerializeField] private Button backButton; [SerializeField] private Button resetFieldButton; [SerializeField] private Button resetMaterialButton; + [SerializeField] private Button resetTankButton; [SerializeField] private Button refillManyProductButton; [SerializeField] private Button refillLittleProductButton; [SerializeField] private Button bulkOrderResetButton; @@ -85,7 +86,7 @@ public class DebugOptionManager : MonoBehaviour { new PlantLineData(PlantLineType.Center, CornFieldRank.Rank1), }; - gameData.SeedlingDataList = new List();; + gameData.SeedlingDataList = new List(); gameData.MachineLevel = 1; gameData.CornSeed = 0; }).AddTo(this); @@ -95,11 +96,16 @@ public class DebugOptionManager : MonoBehaviour // 所持素材 gameData.Material.Clear(); // レシピ - gameData.MyRecipes = new[] {Const.DefaultRecipeId}; + gameData.MyRecipes = GetMyRecipe(gameData.ViewedShopLevel); // フライパン - gameData.Pans = new[] {Const.DefaultPanId}; + gameData.Pans = new[] { Const.DefaultPanId }; }).AddTo(this); - + + resetTankButton.OnClickAsObservable().Subscribe(_ => + { + gameData.InitTank(); + }).AddTo(this); + refillManyProductButton.OnClickAsObservable().Subscribe(_ => { // gameData.StorageTanks.Clear(); @@ -241,7 +247,6 @@ public class DebugOptionManager : MonoBehaviour */ shopLevelDropdown.ClearOptions(); var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopLevelDataSheet); - var myShopRecipe = gameData.MyRecipes.Except(shopLevelList.Select(data => data.id)).ToArray(); shopLevelDropdown.AddOptions(shopLevelList.Where(data => data.shopLevel != Const.SpecialShopLevel).Select(data => data.shopLevel.ToString()).ToList()); shopLevelDropdown.value = gameData.ViewedShopLevel - 1; shopLevelDropdown.OnValueChangedAsObservable() @@ -252,9 +257,7 @@ public class DebugOptionManager : MonoBehaviour var shopLevelData = shopLevelList.First(data => data.shopLevel == x + 1); gameData.ViewedShopLevel = shopLevelData.shopLevel; gameData.Heart = shopLevelData.heart; - gameData.MyRecipes = myShopRecipe - .Union(shopLevelList.Where(data => data.shopLevel <= shopLevelData.shopLevel).Select(data => data.id)) - .ToArray(); + gameData.MyRecipes = GetMyRecipe(shopLevelData.shopLevel); }).AddTo(this); /* @@ -351,5 +354,13 @@ public class DebugOptionManager : MonoBehaviour gameData.vipCustomerLimitTime = (x ? DateTime.UtcNow.AddSeconds(60f) : DateTime.UtcNow).ToBinary(); }).AddTo(this); } + + private static int[] GetMyRecipe(int level) + { + var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopLevelDataSheet); + return GameDataManager.GameData.MyRecipes.Except(shopLevelList.Select(data => data.id)) + .Union(shopLevelList.Where(data => data.shopLevel <= level).Select(data => data.id)) + .ToArray(); + } #endif }