diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity b/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity index 57405ca0..a2f1a502 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity @@ -1072,6 +1072,7 @@ RectTransform: - {fileID: 1998240840} - {fileID: 1074704276} - {fileID: 6551978} + - {fileID: 1612205221} - {fileID: 1484413800} - {fileID: 839487031} m_Father: {fileID: 785180938} @@ -1331,7 +1332,7 @@ PrefabInstance: - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, type: 3} @@ -2331,7 +2332,7 @@ PrefabInstance: - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, type: 3} @@ -2448,6 +2449,153 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1612205220 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 744739666} + m_Modifications: + - target: {fileID: 1907863346325523399, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_Name + value: VipRewardToggle + objectReference: {fileID: 0} + - target: {fileID: 1907863346325523399, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6855072136971505580, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_Text + value: "VIP\u5BA3\u4F1D" + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bc0b42d29ba9f4568aa0b803c18574c5, type: 3} +--- !u!224 &1612205221 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + m_PrefabInstance: {fileID: 1612205220} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1612205222 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8246534116929882156, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + m_PrefabInstance: {fileID: 1612205220} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1651104559 PrefabInstance: m_ObjectHideFlags: 0 @@ -2859,6 +3007,7 @@ MonoBehaviour: fastGrowingToggle: {fileID: 1998240841} skipTutorialToggle: {fileID: 6551979} manyWalkerToggle: {fileID: 1074704277} + vipRewardToggle: {fileID: 1612205222} coinCount: {fileID: 1484413801} heartCount: {fileID: 839487032} --- !u!4 &1870432534 diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs index d2b58fe0..803b3643 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs @@ -29,6 +29,7 @@ public class DebugOptionManager : MonoBehaviour [SerializeField] private Toggle fastGrowingToggle; [SerializeField] private Toggle skipTutorialToggle; [SerializeField] private Toggle manyWalkerToggle; + [SerializeField] private Toggle vipRewardToggle; [SerializeField] private InputField coinCount; [SerializeField] private InputField heartCount; #if UNITY_EDITOR || DEVELOPMENT_BUILD @@ -200,6 +201,12 @@ public class DebugOptionManager : MonoBehaviour { UsayaStorageManager.Save(UsayaStorageFilename.Settings_Data, "DebugTutorialEnable", x); }).AddTo(this); + vipRewardToggle.isOn = gameData.vipCustomerFirstOpen; + vipRewardToggle.OnValueChangedAsObservable().Subscribe(x => + { + gameData.vipCustomerFirstOpen = x; + gameData.vipCustomerLimitTime = (x ? DateTime.UtcNow.AddSeconds(60f) : DateTime.UtcNow).ToBinary(); + }).AddTo(this); } #endif }