diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity index d1414acb..4b7d1688 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity @@ -1599,6 +1599,7 @@ MonoBehaviour: coinObject: {fileID: 1081810292} fertilizerObject: {fileID: 471677967} publicityObject: {fileID: 262919494} + vipObject: {fileID: 1793920305} --- !u!1 &1450516236 GameObject: m_ObjectHideFlags: 0 @@ -1771,7 +1772,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7c7c75e9f60f2456e9e49a6f81181b90, type: 3} + m_Sprite: {fileID: 21300000, guid: de598de8a3393044686c7ef88b193396, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2163,7 +2164,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2839,7 +2840,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ba037169854dc4c1db3853c4700f027c, type: 3} + m_Sprite: {fileID: 21300000, guid: 490f9ea68882b7b48bcc2974a41f8bcd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs b/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs index 88693f7a..498cc366 100644 --- a/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs +++ b/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs @@ -14,7 +14,8 @@ namespace MyGame.Scripts Coin, CornField, IncreaseCustomer, - PerfectPopcorn + PerfectPopcorn, + VipCustomer } private static readonly string OkCallbackTag = "GetRewardDialogOkCallbackTag"; private static readonly string RewardTypeTag = "GetRewardDialogRewardTypeTag"; @@ -35,6 +36,7 @@ namespace MyGame.Scripts [SerializeField] private GameObject coinObject; [SerializeField] private GameObject fertilizerObject; [SerializeField] private GameObject publicityObject; + [SerializeField] private GameObject vipObject; private void Start() { @@ -42,6 +44,7 @@ namespace MyGame.Scripts coinObject.SetActive(false); fertilizerObject.SetActive(false); publicityObject.SetActive(false); + vipObject.SetActive(false); switch (LocalCacheManager.Load(RewardTypeTag)) { case RewardType.Coin: @@ -67,6 +70,12 @@ namespace MyGame.Scripts messageText.text = ScriptLocalization.System.PerfectPopcornMessage; SetButtonAction(closeButton, okButton); break; + case RewardType.VipCustomer: + normalWindow.SetActive(true); + vipObject.SetActive(true); + messageText.text = ScriptLocalization.System.VipCustomerMessage; + SetButtonAction(closeButton, okButton); + break; default: throw new ArgumentOutOfRangeException(); } @@ -132,5 +141,10 @@ namespace MyGame.Scripts { ShowDialog(okCallback, RewardType.PerfectPopcorn); } + + public static void ShowVipCustomerDialog(Action okCallback) + { + ShowDialog(okCallback, RewardType.VipCustomer); + } } } \ No newline at end of file diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index a0de9bf5..50e0d6a2 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -8419,6 +8419,16 @@ MonoBehaviour: - Flags: 00000000 Languages_Touch: [] + - Term: System/VipCustomerMessage + TermType: 0 + Description: + Languages: + - "VIP\u306A\u304A\u5BA2\u306B\u304A\u9858\u3044\u3059\u308B\u3068\nVIP\u306A\u304A\u53CB\u9054\u3092\u9023\u308C\u3066\u304D\u3066\u304F\u308C\u308B\u3088\uFF01\n\u52D5\u753B\u3092\u898B\u3066\u304A\u9858\u3044\u3057\u307E\u3059\u304B\uFF1F" + - + - + - + Flags: 00000000 + Languages_Touch: [] CaseInsensitiveTerms: 0 OnMissingTranslation: 3 mTerm_AppName: diff --git a/popcorn/Assets/ScriptLocalization.cs b/popcorn/Assets/ScriptLocalization.cs index 5212dc6d..aa8dc148 100644 --- a/popcorn/Assets/ScriptLocalization.cs +++ b/popcorn/Assets/ScriptLocalization.cs @@ -18,6 +18,7 @@ namespace I2.Loc public static string CornFieldMessage { get{ return LocalizationManager.GetTranslation ("System/CornFieldMessage"); } } public static string IncreaseCustomerMessage { get{ return LocalizationManager.GetTranslation ("System/IncreaseCustomerMessage"); } } public static string PerfectPopcornMessage { get{ return LocalizationManager.GetTranslation ("System/PerfectPopcornMessage"); } } + public static string VipCustomerMessage { get{ return LocalizationManager.GetTranslation ("System/VipCustomerMessage"); } } } public static class UI @@ -66,6 +67,7 @@ namespace I2.Loc public const string CornFieldMessage = "System/CornFieldMessage"; public const string IncreaseCustomerMessage = "System/IncreaseCustomerMessage"; public const string PerfectPopcornMessage = "System/PerfectPopcornMessage"; + public const string VipCustomerMessage = "System/VipCustomerMessage"; } public static class UI