tron_wz/CaptainDiceDubloons_IOS_unity
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A面修改

Browse Source
This commit is contained in:
changyunjia
2026-06-01 15:05:48 +08:00
parent a616b21475
commit aa06dbdb04
6 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/ChillConnect/FGUI/package/P14_PassView/com_passunlock.cs
+2
View File
@@ -8,6 +8,7 @@ namespace FGUI.P14_PassView
public partial class com_passunlock : GComponent public partial class com_passunlock : GComponent
{ {
public Controller pay_type; public Controller pay_type;
public Controller gift;
public GButton btn_close; public GButton btn_close;
public GTextField text_allgold; public GTextField text_allgold;
public GButton btn_buypass; public GButton btn_buypass;
@@ -26,6 +27,7 @@ namespace FGUI.P14_PassView
base.ConstructFromXML(xml); base.ConstructFromXML(xml);
pay_type = GetControllerAt(0); pay_type = GetControllerAt(0);
gift = GetControllerAt(1);
btn_close = (GButton)GetChildAt(1); btn_close = (GButton)GetChildAt(1);
text_allgold = (GTextField)GetChildAt(5); text_allgold = (GTextField)GetChildAt(5);
btn_buypass = (GButton)GetChildAt(6); btn_buypass = (GButton)GetChildAt(6);
Assets/Resources/ChillConnectAssets/FGUI/P14_PassView_fui.bytes
BIN
View File
Binary file not shown.
Assets/Scripts/AdRedeemManager.cs
+7 -3
View File
@@ -100,18 +100,22 @@ public class AdRedeemManager
bool is_get1 = item.Key == PurchasingManager.GetPaySku(PayType.remove_ad) && SaveData.GetSaveObject().is_get_removead; bool is_get1 = item.Key == PurchasingManager.GetPaySku(PayType.remove_ad) && SaveData.GetSaveObject().is_get_removead;
if (item.Key == PurchasingManager.GetPaySku(PayType.pack_reward) || item.Key == PurchasingManager.GetPaySku(PayType.remove_ad)) return; if (item.Key == PurchasingManager.GetPaySku(PayType.pack_reward) || item.Key == PurchasingManager.GetPaySku(PayType.remove_ad)) return;
if (GameHelper.GetNowTime() < lastTimes && !checkIsCanReceive(item.Key)) if (is_get || is_get1)
{
item.Value.enabled = false;
}
else if (GameHelper.GetNowTime() < lastTimes && !checkIsCanReceive(item.Key))
{ {
item.Value.enabled = false; item.Value.enabled = false;
item.Value.btn_text.text = CommonHelper.TimeFormat(lastTimes - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour);
item.Value.can_buy.selectedIndex = btn_watchAd.Can_buy_cd; item.Value.can_buy.selectedIndex = btn_watchAd.Can_buy_cd;
item.Value.btn_text.text = CommonHelper.TimeFormat(lastTimes - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour);
} }
else else
{ {
// stopAction(); // stopAction();
item.Value.enabled = true; item.Value.enabled = true;
checkBtnState(item.Value, item.Key);
item.Value.can_buy.selectedIndex = btn_watchAd.Can_buy_can; item.Value.can_buy.selectedIndex = btn_watchAd.Can_buy_can;
checkBtnState(item.Value, item.Key);
} }
} }
Assets/Scripts/ModuleUI/PassView/PassViewUI.cs
+1 -1
View File
@@ -122,7 +122,7 @@ namespace ChillConnect
DOVirtual.DelayedCall(0.5f, () => DOVirtual.DelayedCall(0.5f, () =>
{ {
int gold = 0; int gold = 0;
if(!GameHelper.IsGiftSwitch()) GameHelper.ShowTips("Purchase successful"); if(GameHelper.IsGiftSwitch()) GameHelper.ShowTips("Purchase successful");
List<Passportrewards> Passportrewards_list = ConfigSystem.GetConfig<PassportrewardsModel>().DataList; List<Passportrewards> Passportrewards_list = ConfigSystem.GetConfig<PassportrewardsModel>().DataList;
for (int i = 0; i < Passportrewards_list.Count; i++) for (int i = 0; i < Passportrewards_list.Count; i++)
Assets/Scripts/ModuleUI/Passunlock/PassunlockUI.cs
+5 -2
View File
@@ -57,7 +57,10 @@ namespace ChillConnect
(ui.btn_max_pay.GetChild("img_saveingpot") as GImage).visible = true; (ui.btn_max_pay.GetChild("img_saveingpot") as GImage).visible = true;
ui.btn_buypass.GetChild("img_saveingpot").visible = true; ui.btn_buypass.GetChild("img_saveingpot").visible = true;
} }
if (!GameHelper.IsGiftSwitch())
{
GameHelper.GetCommonModel().Passportgift = 1;
}
if (GameHelper.IsAdModelOfPay()) if (GameHelper.IsAdModelOfPay())
{ {
ui.pay_type.selectedIndex = 0; ui.pay_type.selectedIndex = 0;
@@ -87,7 +90,7 @@ namespace ChillConnect
} }
InitView(); InitView();
TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.PassShow); TrackKit.SendEvent(GameHelper.getTrackEvenName(), Property.PassShow);
} }
Assets/Scripts/ModuleUI/Play/RainPlayUICtrl.cs
+4 -4
View File
@@ -113,7 +113,7 @@ namespace ChillConnect
SaveData.GetSaveObject().have_slot = true; SaveData.GetSaveObject().have_slot = true;
SaveData.saveDataFunc(); SaveData.saveDataFunc();
GameDispatcher.Instance.Dispatch(GameMsg.Slot_refresh); GameDispatcher.Instance.Dispatch(GameMsg.Slot_refresh);
if (!GameHelper.IsGiftSwitch()) GameHelper.ShowTips("Purchase successful"); if (GameHelper.IsGiftSwitch()) GameHelper.ShowTips("Purchase successful");
GameHelper.IsTemporaryEnd = false; GameHelper.IsTemporaryEnd = false;
purch_number = ConfigSystem.GetConfig<CommonModel>().addspace2.ToString(); purch_number = ConfigSystem.GetConfig<CommonModel>().addspace2.ToString();
} }
@@ -128,7 +128,7 @@ namespace ChillConnect
GameDispatcher.Instance.Dispatch(GameMsg.Slot_refresh); GameDispatcher.Instance.Dispatch(GameMsg.Slot_refresh);
} }
GameHelper.IsTemporaryEnd = false; GameHelper.IsTemporaryEnd = false;
if (!GameHelper.IsGiftSwitch()) GameHelper.ShowTips("Purchase successful"); if (GameHelper.IsGiftSwitch()) GameHelper.ShowTips("Purchase successful");
} }
else if (type == PurchasingManager.GetPaySku(PayType.remove_ad)) else if (type == PurchasingManager.GetPaySku(PayType.remove_ad))
{ {
@@ -139,7 +139,7 @@ namespace ChillConnect
// GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); // GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
GameDispatcher.Instance.Dispatch(GameMsg.noads_refresh); GameDispatcher.Instance.Dispatch(GameMsg.noads_refresh);
GameDispatcher.Instance.Dispatch(GameMsg.UpdateNoads); GameDispatcher.Instance.Dispatch(GameMsg.UpdateNoads);
if (!GameHelper.IsGiftSwitch()) GameHelper.ShowTips("Purchase successful"); if (GameHelper.IsGiftSwitch()) GameHelper.ShowTips("Purchase successful");
purch_number = ConfigSystem.GetConfig<PaidgiftModel>().DataList[1].Paid_price2.ToString(); purch_number = ConfigSystem.GetConfig<PaidgiftModel>().DataList[1].Paid_price2.ToString();
} }
else if (type == PurchasingManager.GetPaySku(PayType.pack_reward)) else if (type == PurchasingManager.GetPaySku(PayType.pack_reward))
@@ -160,7 +160,7 @@ namespace ChillConnect
GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
GameDispatcher.Instance.Dispatch(GameMsg.Sheep_item_refresh); GameDispatcher.Instance.Dispatch(GameMsg.Sheep_item_refresh);
GameDispatcher.Instance.Dispatch(GameMsg.UpdateNoads); GameDispatcher.Instance.Dispatch(GameMsg.UpdateNoads);
if (!GameHelper.IsGiftSwitch()) GameHelper.ShowTips("Purchase successful"); if (GameHelper.IsGiftSwitch()) GameHelper.ShowTips("Purchase successful");
purch_number = ConfigSystem.GetConfig<PaidgiftModel>().DataList[0].Paid_price2.ToString(); purch_number = ConfigSystem.GetConfig<PaidgiftModel>().DataList[0].Paid_price2.ToString();
} }
else if (type == PurchasingManager.GetPaySku(PayType.battle_pass)) else if (type == PurchasingManager.GetPaySku(PayType.battle_pass))