From 9b2b69dac2c8d83bf86b7a44539a1fa330e98b09 Mon Sep 17 00:00:00 2001 From: changyunjia <905640960@qq.com> Date: Mon, 1 Jun 2026 10:36:42 +0800 Subject: [PATCH] =?UTF-8?q?a=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FGUI/package/Pack_16/pack_panel.cs | 2 ++ .../FGUI/package/store_17/com_buygold.cs | 2 ++ .../ChillConnectAssets/FGUI/Pack_16_fui.bytes | Bin 5546 -> 5633 bytes .../FGUI/store_17_fui.bytes | Bin 7146 -> 7210 bytes Assets/Scripts/MainScene.cs | 4 ++-- Assets/Scripts/ModuleUI/Loading/LoadingUI.cs | 5 +++-- .../ModuleUI/Packreward/PackrewardUI.cs | 11 ++++++++--- Assets/Scripts/ModuleUI/ShopView/BuygoldUI.cs | 11 +++++++++-- Assets/Scripts/System/Network/LoginSystem.cs | 1 + 9 files changed, 27 insertions(+), 9 deletions(-) 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 dd1131cd6c82fef76510c48421441a37e2ddabf8..c5a6220e21487135edf8fa1f0a7268e967e5b501 100644 GIT binary patch delta 1032 zcmZ`&OH31C5dOCRZnxX*D<}=rnhNp|s3I>5Vg*{jS5d2iAT1z55%GbF_^2jmJQ)wh z(TfK>Xrl3eF_F_@vC=ghILImbA5+K(D+I7YqR+|x3$WqBN4CvojzB3}zwD4A2kS8SApu>xm zfCWV;MhQxdtUt)Ad8CMu5_%~DQW<>_O=>v@RUk;!a-}b!O7I|z7Id?>2MIu#%V0Iu zP+Bg_weUOmNL(M9jh_g&4gy23-D+g-i1+jN%YIc4Qmnvm@vq%a(c=N2tb` zEj8r~N=MC29K$%xIFm)k5nG(64eh+Qn1&PF+DS|>4`H5Tif71YA~d?~vQw{XiQB+W zVUqC>^K|boyg;1B8G7dGm(EhN@J4v0#>oRhI0xDM)o_<>rAnG9y-Wd5fe3Nrn8%1DQ$O((OBZH8c!nfJ9vMwd J%(mvF#BT=B&OHDC delta 845 zcmZ`%Nl#Nz6#g#vwXd(QrDaG{Ns|f|5h$WXCZ!B5;6Rx~oL_MO$BHz%$ zVQ18ZiN@%H5O*dl+`8~b7`Kw3Tk3hYiBS`7a?U;HeBXIzcy}@SuKrovNJ1U|hn4v8?vJ7zKCCe+8ReB)r3a zq3<$m?BbMqmN=C-BNWrh^jh}nP){kXv0_vg@FR{M403b`qktp7i6|OqS*xW5)1(G1 zsPAU55qoGuOXz#qj-iP<9G!9>nrYtAvoJn~A9W=~$ z9G$f6v_uzW^q}lU4;AZ{NGLCfUV6e_pYr-~aLHwfLzH#}Ig<@*04fHvG~t4V_0zJH@S;39HSqGJxwV!yQ87;t%%2Qg67=?;%9eMoTPPk zxqgZVK8-VEnki+Ug+*y|M5Zx8E2b4XhlHxz%;WN)NFZV0JSSbiMXK|}b=#iA6is`2 z%uBe;8{$toe({zn!VCe~|N5RQ^nC?aX~R=!r`;O~UE7Ly9U01c3&b^VMBGq&nZ`}Z zd#%U}Qh)mELqAeT8Mwt|Z{rRi;(&a_y=>$C7_?sOruW5VJ{!M_dyKaN`kTM-N;!); zD)&u@`_wH1^wj5WYe5#8dbN1XiEklz?e+<1$f diff --git a/Assets/Resources/ChillConnectAssets/FGUI/store_17_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/store_17_fui.bytes index 4fcbb560975963d1bb3cbe41eeea0f126fee7dd4..a4ac831979059045523ff9263e679b12b9b83cda 100644 GIT binary patch delta 806 zcmZ8eNla5=5dQxDt*@^OT>*1GxXoCi^ND-`TTA=Kfy;u+z78e8*X>|@J zMq@Y`y%9{jc+{JTiQbHN6XV?*b>3_8Oq@S6c{A^unQvx(9erDoJ*B>cF2%}v%`1y2 z-}q^9nIg|6s&E=-a+?A$R{+X9qbze)4ZDlAjJ1y=N!CHu8SO`23^=EnC~VzEZm;cN z4Lb<%E8)lDL|74Uqa4R@g8fQ_fpfV{L{LlLojd87b-O%|I(l!7$|&kdQKR+?XkchN zQ|cp^S}hxKkzT72CC1T9Xre#rp^_fG>`CU|%FzUR0F}!&qlLn@{Z!!#(6B8eThT@t zTW9bxR{u*_*^=Ajge!=X&7M!FvL6YyBW4h;Mieo`RCF+~6A8-L>s?*ku3Kw|9jrFW zsUdPWf=VxYedwn$N1YtNRho4)h$MY+tja+QQNr0&I?O8>VHC_r7(L?bw=;i?^2Zp) zc`2PDMaK)K#00Gu_?2rMPh*lk7xc?1T&Hr^sFD zQcMJPuC;&%bk;kjEOKxO%k;t9z?_}F>EJ^w8Y$Xg+OUw{vqpW*Hxhh=Nn`dD112yD z35;NwKQ)%h2w^crdG<>IuWmtX41uJ~#Hjhb+A)+$*y5QMbQ!>o3wG imAdWK?TT*S>Gnrasd&0!D(*5_%mc~(^hS4J$@CXmU9&&{ delta 721 zcmZ`$J5WVYED1HcY zI}0rA?3^@K4m8eKSYTm8Y2l28rDfvHbIgo|J9Ez7-93Bn*}ZR@e>A1r)XUI@`}4cN zYrQy<`L4I>dZH2?IDyVwRscoKfU?XgeYYX6tzjHy^zshR`UXa4{@~9j$oZCeB1Ls5D&HN% zIT|+lsokv5meD7NaGpLG$HXvgJ3aCOE>erhPn8Z;l+lu@u_A)7B4EQ&w4fV7&KFiO z!ih#PMxRXmN|cL?;}Y#RcPaTln7|c^nfv5bOwxOENM6G}>aa9XgQbyDmP#4Jb$VqP ztet`v)2v4kqJ;_(UXLIO%y2M^I6t$R>Z~<1R9qqEC|SICAc4t$>+j> zaHPaj+IDy}D|?Qa+I1`x{3lpDkA=VfpYgJl;R9{jJ+$f!%jaxr&l&T+_@AklH0p{d z8@VjEBuzUmr`Vvct~%zd#s}T`xL@N%jkh%ZsPRvY-KDi+GjptTT$g!Mwx;_Hz`>+S 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 {