From 6eb74e9a6e818311b9d4bd72e26cb02ffe12740d Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 17 May 2022 10:27:46 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0?= =?UTF-8?q?=E6=A9=9F=E8=83=BD=20=E3=83=87=E3=82=A4=E3=83=AA=E3=83=BC?= =?UTF-8?q?=E3=83=9F=E3=83=83=E3=82=B7=E3=83=A7=E3=83=B3=E5=AE=8C=E4=BA=86?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/DebugOption/DebugOption.unity | 148 +++++++++++++++++- .../DebugOption/Scripts/DebugOptionManager.cs | 7 + 2 files changed, 152 insertions(+), 3 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity b/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity index 5aebd4a9..7b0f9bc7 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: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -2424,7 +2424,7 @@ PrefabInstance: - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -6146,6 +6146,7 @@ MonoBehaviour: bulkOrderResetButton: {fileID: 1344540256} shopLevelUpResetButton: {fileID: 1349073832} dailyMissionResetButton: {fileID: 297099900} + dailyMissionCompleteButton: {fileID: 2146514805} normalMissionResetButton: {fileID: 1001425729} autoCookCompleteButton: {fileID: 916882297} resetShopCustomizeButton: {fileID: 2107025835} @@ -7106,7 +7107,7 @@ PrefabInstance: - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -7263,3 +7264,144 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -0.000045776367} m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 1} +--- !u!1001 &2146514804 +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: 8 + 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: "\u30C7\u30A4\u30EA\u30FC\n\u30DF\u30C3\u30B7\u30E7\u30F3\n\u5B8C\u4E86" + objectReference: {fileID: 0} + - target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Name + value: DailyMissionComplete + 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 &2146514805 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 502413859327355263, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + m_PrefabInstance: {fileID: 2146514804} + 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: diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs index 54215c57..fd97b138 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs @@ -22,6 +22,7 @@ public class DebugOptionManager : MonoBehaviour [SerializeField] private Button bulkOrderResetButton; [SerializeField] private Button shopLevelUpResetButton; [SerializeField] private Button dailyMissionResetButton; + [SerializeField] private Button dailyMissionCompleteButton; [SerializeField] private Button normalMissionResetButton; [SerializeField] private Button autoCookCompleteButton; [SerializeField] private Button resetShopCustomizeButton; @@ -151,6 +152,12 @@ public class DebugOptionManager : MonoBehaviour gameData.lastDailyMissionSetTime = DateTime.MinValue.ToBinary(); }).AddTo(this); + dailyMissionCompleteButton.OnClickAsObservable().Subscribe(_ => + { + gameData.dailyMissionAchievedIdArray = gameData.dailyMissionIdArray; + gameData.dailyMissionCompleted = false; + }).AddTo(this); + normalMissionResetButton.OnClickAsObservable().Subscribe(_ => { gameData.AchievedMission.Clear(); From af4ccda5d03f3695326987c91fa452e6ebbf8136 Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 17 May 2022 10:28:08 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=82=AB=E3=82=B9=E3=82=BF=E3=83=9E?= =?UTF-8?q?=E3=82=A4=E3=82=BA=E6=A9=9F=E8=83=BD=E3=81=AE=E3=83=AA=E3=82=BB?= =?UTF-8?q?=E3=83=83=E3=83=88=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs index fd97b138..72ab531e 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs @@ -171,7 +171,7 @@ public class DebugOptionManager : MonoBehaviour resetShopCustomizeButton.OnClickAsObservable().Subscribe(_ => { - gameData.ShopCustomizeLevel = 0; + gameData.ShopCustomizeLevel = 1; gameData.ShopCustomizePoint = 0; gameData.ShopCustomizeCoin = 0; gameData.ShopCustomizeSettings = new ShopCustomizeSettings(); From 16c08b8c0256f13a528445ebc0a32bc75af94e03 Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 17 May 2022 10:29:56 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E3=82=AB=E3=82=B9=E3=82=BF=E3=83=9E?= =?UTF-8?q?=E3=82=A4=E3=82=BA=E6=A9=9F=E8=83=BD=E3=81=AE=E9=96=8B=E7=99=BA?= =?UTF-8?q?=E7=94=A8=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index 42694c0b..f3b2486b 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -455,8 +455,8 @@ public sealed class ShopCustomizeData { public int price; public int point; public string prefabName; - public string Name => "hoge"; - public string Text => "huga"; + public string Name => LocalizationManager.GetTranslation($"Item/ShopCustomizeName{id:0000}"); + public string Text => LocalizationManager.GetTranslation($"Item/ShopCustomizeText{id:0000}"); public ShopCustomizeCategory Category => (ShopCustomizeCategory)category; public Transform GetPrefab() @@ -466,8 +466,7 @@ public sealed class ShopCustomizeData { public Transform GetIconPrefab() { - // return Resources.Load($"ShopCustomizeIcons/{GetCategoryString(Category)}_{prefabName}"); - return Resources.Load($"ShopCustomizeIcons/{GetCategoryString(Category)}_a"); + return Resources.Load($"ShopCustomizeIcons/{GetCategoryString(Category)}_{prefabName}"); } private string GetCategoryString(ShopCustomizeCategory category)