diff --git a/Assets/ChillConnect/FGUI/package/Pack_16/pack_panel.cs b/Assets/ChillConnect/FGUI/package/Pack_16/pack_panel.cs index 22eb404..fdc549c 100644 --- a/Assets/ChillConnect/FGUI/package/Pack_16/pack_panel.cs +++ b/Assets/ChillConnect/FGUI/package/Pack_16/pack_panel.cs @@ -8,6 +8,7 @@ namespace FGUI.Pack_16 public partial class pack_panel : GComponent { public Controller pay_type; + public Controller gift; public GTextField text_goldnum; public GTextField text_refreshnum; public GTextField text_outnum; @@ -37,6 +38,7 @@ namespace FGUI.Pack_16 base.ConstructFromXML(xml); pay_type = GetControllerAt(0); + gift = GetControllerAt(1); text_goldnum = (GTextField)GetChildAt(9); text_refreshnum = (GTextField)GetChildAt(10); text_outnum = (GTextField)GetChildAt(11); diff --git a/Assets/ChillConnect/FGUI/package/store_17/com_buygold.cs b/Assets/ChillConnect/FGUI/package/store_17/com_buygold.cs index 6176c58..716e98f 100644 --- a/Assets/ChillConnect/FGUI/package/store_17/com_buygold.cs +++ b/Assets/ChillConnect/FGUI/package/store_17/com_buygold.cs @@ -8,6 +8,7 @@ namespace FGUI.store_17 public partial class com_buygold : GComponent { public Controller state; + public Controller gift; public GTextField ads; public btn_watchAd2 btn_watch; public GButton top_gold; @@ -25,6 +26,7 @@ namespace FGUI.store_17 base.ConstructFromXML(xml); state = GetControllerAt(0); + gift = GetControllerAt(1); ads = (GTextField)GetChildAt(8); btn_watch = (btn_watchAd2)GetChildAt(9); top_gold = (GButton)GetChildAt(10); diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Pack_16_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Pack_16_fui.bytes index dd1131c..c5a6220 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Pack_16_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Pack_16_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/store_17_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/store_17_fui.bytes index 4fcbb56..a4ac831 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/store_17_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/store_17_fui.bytes differ diff --git a/Assets/Scripts/MainScene.cs b/Assets/Scripts/MainScene.cs index ea3fd8c..4e5e32c 100644 --- a/Assets/Scripts/MainScene.cs +++ b/Assets/Scripts/MainScene.cs @@ -79,7 +79,7 @@ namespace ChillConnect AppDispatcher.Instance.AddListener(AppMsg.LoginInit, OnLoadingComplete); // DataMgr.InitPreferences(); - NetworkDispatcher.Instance.Dispatch(NetworkMsg.GetConfig); + // NetworkDispatcher.Instance.Dispatch(NetworkMsg.GetConfig); } private bool ispen = false; private void OnLoadingComplete(object param = null) @@ -91,7 +91,7 @@ namespace ChillConnect ispen = true; WebviewManager.DakaiACT(); } - TimerHelper.mEasy.AddTimer(2.0f, () => + TimerHelper.mEasy.AddTimer(0.1f, () => { AudioManager.Instance.InitDefaultButtonClickSound(AudioConst.gameclick); diff --git a/Assets/Scripts/ModuleUI/Loading/LoadingUI.cs b/Assets/Scripts/ModuleUI/Loading/LoadingUI.cs index 14d4e5f..55bf903 100644 --- a/Assets/Scripts/ModuleUI/Loading/LoadingUI.cs +++ b/Assets/Scripts/ModuleUI/Loading/LoadingUI.cs @@ -70,6 +70,7 @@ namespace ChillConnect // Object.Destroy(splashCanvas); // } if (PlayerPrefs.GetInt("OpenAD", 1) == 0) closeMask(); + closeMask(); } @@ -105,7 +106,7 @@ namespace ChillConnect GameDispatcher.Instance.AddListener(GameMsg.UpdateHotFixMax, OnUpdateHotFixMax); // GameDispatcher.Instance.AddListener(GameMsg.UpdateHotFixProgress, OnUpdateHotFixProgress); GameDispatcher.Instance.AddListener(GameMsg.Network_reconnection, Reconnection); - GameDispatcher.Instance.AddListener(GameMsg.CloseMask, closeMask); + // GameDispatcher.Instance.AddListener(GameMsg.CloseMask, closeMask); } protected override void RemoveListener() @@ -113,7 +114,7 @@ namespace ChillConnect GameDispatcher.Instance.RemoveListener(GameMsg.UpdateHotFixMax, OnUpdateHotFixMax); // GameDispatcher.Instance.RemoveListener(GameMsg.UpdateHotFixProgress, OnUpdateHotFixProgress); GameDispatcher.Instance.RemoveListener(GameMsg.Network_reconnection, Reconnection); - GameDispatcher.Instance.RemoveListener(GameMsg.CloseMask, closeMask); + // GameDispatcher.Instance.RemoveListener(GameMsg.CloseMask, closeMask); } #endregion diff --git a/Assets/Scripts/ModuleUI/Packreward/PackrewardUI.cs b/Assets/Scripts/ModuleUI/Packreward/PackrewardUI.cs index eecdc3b..9baccc4 100644 --- a/Assets/Scripts/ModuleUI/Packreward/PackrewardUI.cs +++ b/Assets/Scripts/ModuleUI/Packreward/PackrewardUI.cs @@ -73,6 +73,11 @@ namespace ChillConnect //刘海屏 ui.gold.y += Screen.safeArea.y; } + if (!GameHelper.IsGiftSwitch()) + { + ConfigSystem.GetConfig().DataList[0].Paid_price = 1; + ConfigSystem.GetConfig().DataList[1].Paid_price = 1; + } bool need_scroll = false; @@ -87,11 +92,11 @@ namespace ChillConnect if (need_scroll) ui.panel_parent.scrollPane.ScrollDown(300, false); if (need_scroll) { - TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.RemoveAdShow); + TrackKit.SendEvent(GameHelper.getTrackEvenName(), Property.RemoveAdShow); } else { - TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.FirstPackShow); + TrackKit.SendEvent(GameHelper.getTrackEvenName(), Property.FirstPackShow); } ui.gold.GetChild("text_gold").text = GameHelper.Get101Str(GameHelper.GetGoldNumber()); @@ -200,7 +205,7 @@ namespace ChillConnect SaveData.GetSaveObject().is_get_packreward = true; - Debug.Log(SaveData.GetSaveObject().is_get_packreward+"////////////////////////"); + Debug.Log(SaveData.GetSaveObject().is_get_packreward + "////////////////////////"); InitView(); } } diff --git a/Assets/Scripts/ModuleUI/ShopView/BuygoldUI.cs b/Assets/Scripts/ModuleUI/ShopView/BuygoldUI.cs index 6749c08..92eac1a 100644 --- a/Assets/Scripts/ModuleUI/ShopView/BuygoldUI.cs +++ b/Assets/Scripts/ModuleUI/ShopView/BuygoldUI.cs @@ -271,6 +271,11 @@ namespace ChillConnect void initList() { + if (!GameHelper.IsGiftSwitch()) + { + list = list.GetRange(0, 2); + list[1].Payment_amount = 1; + } ui.gold_list.itemRenderer = setRemaintime; ui.gold_list.numItems = list.Count > 6 ? 6 : list.Count; @@ -337,12 +342,14 @@ namespace ChillConnect if (myAds >= needAds) { item.btn_buy.can_buy.selectedIndex = 0; - item.btn_buy.btn_text.text = needAds + "ADs"; + // item.btn_buy.btn_text.text = needAds + "ADs"; + item.btn_buy.btn_text.text = "Claim"; } else { item.btn_buy.can_buy.selectedIndex = 1; - item.btn_buy.btn_text.text = needAds + "ADs"; + item.btn_buy.btn_text.text = "Watch " + myAds + "/" + needAds + " AD"; + // item.btn_buy.btn_text.text = + "ADs"; } item.text_ads.SetVar("ads", needAds.ToString()).FlushVars(); diff --git a/Assets/Scripts/System/Network/LoginSystem.cs b/Assets/Scripts/System/Network/LoginSystem.cs index d55641e..84ee095 100644 --- a/Assets/Scripts/System/Network/LoginSystem.cs +++ b/Assets/Scripts/System/Network/LoginSystem.cs @@ -56,6 +56,7 @@ namespace ChillConnect DateTimeManager.Instance.SetServerCurrTimestamp(loginData.LoginTime); NetworkDispatcher.Instance.Dispatch(NetworkMsg.GetPlayData); + NetworkDispatcher.Instance.Dispatch(NetworkMsg.GetConfig); } else {