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

取消金币

Browse Source
This commit is contained in:
changyunjia
2026-07-14 18:19:43 +08:00
parent 1f4c215d59
commit 2d1c510ae0
15 changed files with 197 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/CrazyZoo/FGUI/Package/G003_play/com_prop.cs
+4 -10
View File
@@ -12,9 +12,6 @@ namespace FGUI.G003_play
public GTextField txt_Title;
public GButton btn_close;
public GTextField txt_content;
public GButton btn_clean;
public GButton btn_add;
public GButton btn_merge;
public GButton btn_PayBox;
public GTextField text_NeedAds;
public GTextField text_hasADsCount;
@@ -35,13 +32,10 @@ namespace FGUI.G003_play
txt_Title = (GTextField)GetChildAt(1);
btn_close = (GButton)GetChildAt(2);
txt_content = (GTextField)GetChildAt(7);
btn_clean = (GButton)GetChildAt(8);
btn_add = (GButton)GetChildAt(9);
btn_merge = (GButton)GetChildAt(10);
btn_PayBox = (GButton)GetChildAt(15);
text_NeedAds = (GTextField)GetChildAt(18);
text_hasADsCount = (GTextField)GetChildAt(19);
btn_max_pay = (GButton)GetChildAt(20);
btn_PayBox = (GButton)GetChildAt(12);
text_NeedAds = (GTextField)GetChildAt(15);
text_hasADsCount = (GTextField)GetChildAt(16);
btn_max_pay = (GButton)GetChildAt(17);
}
}
}
Assets/CrazyZoo/FGUI/Package/G003_play/sheep_play.cs
+16 -16
View File
@@ -7,17 +7,17 @@ namespace FGUI.G003_play
{
public partial class sheep_play : GComponent
{
public GTextField level_text;
public new_topgold gold;
public GButton Btn_SignIn;
public btn_battle btn_task;
public GButton btn_failpack;
public GButton btn_noads;
public GTextField level_text;
public GComponent broadcast;
public new_topmoney money;
public new_topgold gold;
public GButton btn_setting;
public GButton btn_noads;
public btn_battle btn_task;
public GButton btn_menu;
public GButton btn_saveingpot;
public GButton Btn_SignIn;
public GGroup TopBox;
public btn_look_ad btn_look_ad;
public btn_battle btn_clear;
@@ -33,17 +33,17 @@ namespace FGUI.G003_play
{
base.ConstructFromXML(xml);
level_text = (GTextField)GetChildAt(0);
btn_failpack = (GButton)GetChildAt(1);
broadcast = (GComponent)GetChildAt(2);
money = (new_topmoney)GetChildAt(3);
gold = (new_topgold)GetChildAt(4);
btn_setting = (GButton)GetChildAt(5);
btn_noads = (GButton)GetChildAt(6);
btn_task = (btn_battle)GetChildAt(7);
btn_menu = (GButton)GetChildAt(8);
btn_saveingpot = (GButton)GetChildAt(9);
Btn_SignIn = (GButton)GetChildAt(10);
gold = (new_topgold)GetChildAt(0);
Btn_SignIn = (GButton)GetChildAt(1);
btn_task = (btn_battle)GetChildAt(2);
btn_failpack = (GButton)GetChildAt(3);
btn_noads = (GButton)GetChildAt(4);
level_text = (GTextField)GetChildAt(5);
broadcast = (GComponent)GetChildAt(6);
money = (new_topmoney)GetChildAt(7);
btn_setting = (GButton)GetChildAt(8);
btn_menu = (GButton)GetChildAt(9);
btn_saveingpot = (GButton)GetChildAt(10);
TopBox = (GGroup)GetChildAt(11);
btn_look_ad = (btn_look_ad)GetChildAt(12);
btn_clear = (btn_battle)GetChildAt(13);
Assets/CrazyZoo/FGUI/Package/G008_reward/com_revive.cs
+2 -4
View File
@@ -9,7 +9,6 @@ namespace FGUI.G008_reward
{
public Controller cont_iswacth;
public GButton btn_close;
public GButton btn_revive;
public GButton btn_AdRevive;
public GButton btn_back;
public const string URL = "ui://1x1w9cxngxpr2z";
@@ -25,9 +24,8 @@ namespace FGUI.G008_reward
cont_iswacth = GetControllerAt(0);
btn_close = (GButton)GetChildAt(2);
btn_revive = (GButton)GetChildAt(7);
btn_AdRevive = (GButton)GetChildAt(8);
btn_back = (GButton)GetChildAt(9);
btn_AdRevive = (GButton)GetChildAt(7);
btn_back = (GButton)GetChildAt(8);
}
}
}
Assets/CrazyZoo/FGUI/Package/G018_GameHome/GameHome.cs
+20 -20
View File
@@ -10,22 +10,22 @@ namespace FGUI.G018_GameHome
public Controller Mode;
public Controller switchgift;
public GButton btn_saveingpot;
public GButton btn_menu;
public GButton btn_setting;
public new_topgold gold;
public GComponent money;
public btn_battle BattleBtn;
public GButton btn_three_day;
public SignInBtn SignInBtn;
public GButton NoAdsBtn;
public GButton btn_failpack;
public btn_repur btn_restore;
public GGroup TopBox;
public GButton RightBtn;
public GButton LeftBtn;
public GButton PlayBtn;
public GButton LuckySpinBtn;
public GButton RankBtn;
public GButton btn_menu;
public GButton btn_setting;
public GComponent money;
public GGroup TopBox;
public const string URL = "ui://dypufdsgtrht2i";
public static GameHome CreateInstance()
@@ -40,22 +40,22 @@ namespace FGUI.G018_GameHome
Mode = GetControllerAt(0);
switchgift = GetControllerAt(1);
btn_saveingpot = (GButton)GetChildAt(1);
btn_menu = (GButton)GetChildAt(2);
btn_setting = (GButton)GetChildAt(3);
gold = (new_topgold)GetChildAt(4);
money = (GComponent)GetChildAt(5);
BattleBtn = (btn_battle)GetChildAt(6);
btn_three_day = (GButton)GetChildAt(7);
SignInBtn = (SignInBtn)GetChildAt(8);
NoAdsBtn = (GButton)GetChildAt(9);
btn_failpack = (GButton)GetChildAt(10);
btn_restore = (btn_repur)GetChildAt(11);
TopBox = (GGroup)GetChildAt(12);
RightBtn = (GButton)GetChildAt(14);
LeftBtn = (GButton)GetChildAt(15);
PlayBtn = (GButton)GetChildAt(18);
LuckySpinBtn = (GButton)GetChildAt(21);
RankBtn = (GButton)GetChildAt(22);
gold = (new_topgold)GetChildAt(2);
BattleBtn = (btn_battle)GetChildAt(3);
btn_three_day = (GButton)GetChildAt(4);
SignInBtn = (SignInBtn)GetChildAt(5);
NoAdsBtn = (GButton)GetChildAt(6);
btn_failpack = (GButton)GetChildAt(7);
btn_restore = (btn_repur)GetChildAt(8);
RightBtn = (GButton)GetChildAt(10);
LeftBtn = (GButton)GetChildAt(11);
PlayBtn = (GButton)GetChildAt(14);
LuckySpinBtn = (GButton)GetChildAt(17);
RankBtn = (GButton)GetChildAt(18);
btn_menu = (GButton)GetChildAt(20);
btn_setting = (GButton)GetChildAt(21);
money = (GComponent)GetChildAt(22);
TopBox = (GGroup)GetChildAt(23);
}
}
}
Assets/CrazyZoo/Runtime/Logic/Helper/GameHelper.cs
+1 -1
View File
@@ -1321,7 +1321,7 @@ namespace ScrewsMaster
{
isAd = false;
}
// return true;//zhushi
return true;//zhushi
// return false;//zhushi
return isAd;
}
Assets/CrazyZoo/Runtime/Logic/ModuleUI/Prop/PropUI.cs
+112 -69
View File
@@ -132,86 +132,129 @@ namespace ScrewsMaster
var mergePrice = ConfigSystem.GetConfig<CommonModel>().Purchaseprops;
var cleanPrice = ConfigSystem.GetConfig<CommonModel>().Purchaseprops;
_payBoxPrice = (int)ConfigSystem.GetConfig<CommonModel>().addspace;
if (ui.btn_add is btn_revive btnAdd) btnAdd.txt_coin.text = addPrice.ToString();
ui.btn_add.onClick.Add(() =>
if (type != 3)
{
if (!GameHelper.CheckGoldNumber(addPrice))
{
GameHelper.ShowTips("Not Enough Coins");
return;
}
GameHelper.AddGoldNumber(-addPrice);
GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
_payBoxPrice = 1;
GameHelper.AddItemNumber(ItemEnum.AddHole, 1);
SetButtonsTouchable(false);
CtrlCloseUI();
ShowScrews.Instance.ShowToast("Successful purchase");
});
}
if (ui.btn_merge is btn_revive btnMerge) btnMerge.txt_coin.text = mergePrice.ToString();
ui.btn_merge.onClick.Add(() =>
{
if (!GameHelper.CheckGoldNumber(mergePrice))
{
GameHelper.ShowTips("Not Enough Coins");
return;
}
GameHelper.AddGoldNumber(-mergePrice);
GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
// if (ui.btn_add is btn_revive btnAdd) btnAdd.txt_coin.text = addPrice.ToString();
// ui.btn_add.onClick.Add(() =>
// {
// if (!GameHelper.CheckGoldNumber(addPrice))
// {
// GameHelper.ShowTips("Not Enough Coins");
// return;
// }
// GameHelper.AddGoldNumber(-addPrice);
// GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
GameHelper.AddItemNumber(ItemEnum.MergeBox, 1);
// GameHelper.AddItemNumber(ItemEnum.AddHole, 1);
// SetButtonsTouchable(false);
// CtrlCloseUI();
// ShowScrews.Instance.ShowToast("Successful purchase");
// });
SetButtonsTouchable(false);
CtrlCloseUI();
ShowScrews.Instance.ShowToast("Successful purchase");
});
// if (ui.btn_merge is btn_revive btnMerge) btnMerge.txt_coin.text = mergePrice.ToString();
// ui.btn_merge.onClick.Add(() =>
// {
// if (!GameHelper.CheckGoldNumber(mergePrice))
// {
// GameHelper.ShowTips("Not Enough Coins");
// return;
// }
// GameHelper.AddGoldNumber(-mergePrice);
// GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
if (ui.btn_clean is btn_revive btnClean) btnClean.txt_coin.text = cleanPrice.ToString();
ui.btn_clean.onClick.Add(() =>
{
if (!GameHelper.CheckGoldNumber(cleanPrice))
{
GameHelper.ShowTips("Not Enough Coins");
return;
}
GameHelper.AddGoldNumber(-cleanPrice);
GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
// GameHelper.AddItemNumber(ItemEnum.MergeBox, 1);
GameHelper.AddItemNumber(ItemEnum.ClearHole, 1);
SetButtonsTouchable(false);
CtrlCloseUI();
ShowScrews.Instance.ShowToast("Successful purchase");
});
// SetButtonsTouchable(false);
// CtrlCloseUI();
// ShowScrews.Instance.ShowToast("Successful purchase");
// });
// if (ui.btn_clean is btn_revive btnClean) btnClean.txt_coin.text = cleanPrice.ToString();
// ui.btn_clean.onClick.Add(() =>
// {
// if (!GameHelper.CheckGoldNumber(cleanPrice))
// {
// GameHelper.ShowTips("Not Enough Coins");
// return;
// }
// GameHelper.AddGoldNumber(-cleanPrice);
// GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
// GameHelper.AddItemNumber(ItemEnum.ClearHole, 1);
// SetButtonsTouchable(false);
// CtrlCloseUI();
// ShowScrews.Instance.ShowToast("Successful purchase");
// });
// if (ui.btn_PayBox is btn_revive btnPayBox) btnPayBox.txt_coin.text = payBoxPrice.ToString();
ui.btn_PayBox.onClick.Add(() =>
{
if (_needWatchAds)
if (type != 3)
{
NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.AddBoxClick + "_" + num, 1);
GameHelper.ShowVideoAd($"PayBox", success =>
if (_needWatchAds)
{
if (success)
NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.BuyProp + "_" + type, 1);
GameHelper.ShowVideoAd($"Prop", success =>
{
GameHelper.UpdateAdRewardExchangeTime();
}
});
return;
}
if (success)
{
GameHelper.UpdateAdRewardExchangeTime();
}
});
return;
}
if (GameHelper.CheckAdWatchCount(_payBoxPrice))
{
GameHelper.AddAdWatchCount(-_payBoxPrice);
ShowScrews.Instance.OnSuccessPayBox1(num);
SetButtonsTouchable(false);
CtrlCloseUI();
ShowScrews.Instance.ShowToast("Successful purchase");
if (GameHelper.CheckAdWatchCount(_payBoxPrice))
{
GameHelper.AddAdWatchCount(-_payBoxPrice);
// ShowScrews.Instance.OnSuccessPayBox1(num);
// SetButtonsTouchable(false);
// CtrlCloseUI();
// ShowScrews.Instance.ShowToast("Successful purchase");
if (type == 0) GameHelper.AddItemNumber(ItemEnum.AddHole, 1);
else if (type == 1) GameHelper.AddItemNumber(ItemEnum.MergeBox, 1);
else if (type == 2) GameHelper.AddItemNumber(ItemEnum.ClearHole, 1);
SetButtonsTouchable(false);
CtrlCloseUI();
ShowScrews.Instance.ShowToast("Successful purchase");
}
else
{
GameHelper.ShowTips("Insufficient AdWatchCount");
}
}
else
else if (type == 3)
{
GameHelper.ShowTips("Insufficient AdWatchCount");
if (_needWatchAds)
{
NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.AddBoxClick + "_" + num, 1);
GameHelper.ShowVideoAd($"PayBox", success =>
{
if (success)
{
GameHelper.UpdateAdRewardExchangeTime();
}
});
return;
}
if (GameHelper.CheckAdWatchCount(_payBoxPrice))
{
GameHelper.AddAdWatchCount(-_payBoxPrice);
ShowScrews.Instance.OnSuccessPayBox1(num);
SetButtonsTouchable(false);
CtrlCloseUI();
ShowScrews.Instance.ShowToast("Successful purchase");
}
else
{
GameHelper.ShowTips("Insufficient AdWatchCount");
}
}
});
@@ -226,14 +269,14 @@ namespace ScrewsMaster
{
ui.pay_type.selectedIndex = 1;
decimal price = (decimal)GameHelper.GetCommonModel().addspace2;
ui.btn_max_pay.title = "$ "+price;
ui.btn_max_pay.title = "$ " + price;
if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1) (ui.btn_max_pay.GetChild("img_saveingpot") as GImage).visible = true;
ui.btn_max_pay.SetClick(() =>
{
Debug.Log(BuriedPointEvent.AddBoxClick + "_" + num);
NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.AddBoxClick + "_" + num, 1);
NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.AddBoxClick + "_" + num, 1);
ApplePayClass maxPayData = new ApplePayClass
{
amount = (int)Math.Round(price * 100),
@@ -248,7 +291,7 @@ namespace ScrewsMaster
private void UpdateWatchAdsText()
{
ui.text_hasADsCount.text = $"Owner ADs:{GameHelper.GetAdWatchCount()}";
ui.text_NeedAds.text = $"Need {(int)ConfigSystem.GetConfig<CommonModel>().addspace} ADs";
ui.text_NeedAds.text = $"Need {(int)_payBoxPrice} ADs";
}
private void UpdateButtonState()
@@ -279,9 +322,9 @@ namespace ScrewsMaster
private void SetButtonsTouchable(bool b)
{
ui.btn_add.touchable = b;
ui.btn_merge.touchable = b;
ui.btn_clean.touchable = b;
// ui.btn_add.touchable = b;
// ui.btn_merge.touchable = b;
// ui.btn_clean.touchable = b;
ui.btn_PayBox.touchable = b;
}
}
Assets/CrazyZoo/Runtime/Logic/ModuleUI/Revive/ReviveUI.cs
+20 -20
View File
@@ -108,9 +108,9 @@ namespace ScrewsMaster
{
ui.btn_back.SetClick(() => { });
ui.btn_close.SetClick(() => { });
ui.btn_revive.SetClick(() => { });
// ui.btn_revive.SetClick(() => { });
GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
GameHelper.SetIsWatchAd(1);
GameHelper.SetReviveCount();
GameHelper.SetReviveCount();
isRevive = true;
ctrl.CloseUI();
@@ -118,24 +118,24 @@ namespace ScrewsMaster
});
});
var revivalCoins = ConfigSystem.GetConfig<CommonModel>().RevivalCoins;
if (ui.btn_revive is btn_revive btnRevive) btnRevive.txt_coin.text = revivalCoins.ToString();
ui.btn_revive.onClick.Add(() =>
{
if (!GameHelper.CheckGoldNumber(revivalCoins))
{
GameHelper.ShowTips("Not Enough Coins");
return;
}
//消耗金币复活
GameHelper.AddGoldNumber(-revivalCoins);
GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
//CtrlCloseUI();
GameHelper.SetIsWatchAd(2);
GameHelper.SetReviveCount();
isRevive = true;
ctrl.CloseUI();
});
// var revivalCoins = ConfigSystem.GetConfig<CommonModel>().RevivalCoins;
// if (ui.btn_revive is btn_revive btnRevive) btnRevive.txt_coin.text = revivalCoins.ToString();
// ui.btn_revive.onClick.Add(() =>
// {
// if (!GameHelper.CheckGoldNumber(revivalCoins))
// {
// GameHelper.ShowTips("Not Enough Coins");
// return;
// }
// //消耗金币复活
// GameHelper.AddGoldNumber(-revivalCoins);
// GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
// //CtrlCloseUI();
// GameHelper.SetIsWatchAd(2);
// GameHelper.SetReviveCount();
// isRevive = true;
// ctrl.CloseUI();
// });
ui.btn_close.onClick.Add(() =>
{
Assets/CrazyZoo/Runtime/Logic/ModuleUI/SaveingPot/SaveingPotUI.cs
+1 -1
View File
@@ -117,7 +117,7 @@ namespace ScrewsMaster
{
Debug.Log(PreferencesMgr.Instance.ExchangeAccount);
Makeup_2 makeupVo = ConfigSystem.GetConfig<MakeupModel_2>().GetData(makeupTaskData.tableId);
ui.text_ad.text = "1. Earn " + makeupVo.ADIncrease + " USD for each ad you watch ";
ui.text_ad.text = "Earn " + makeupVo.ADIncrease + " USD for each ad you watch ";
ui.text_pay.text = "2. Pay USD for " + makeupVo.PayIncrease + " times cashback.";
initTop();
Assets/Resources/CrazyZooAssets/FGUI/A000_common_fui.bytes
BIN
View File
Binary file not shown.
Assets/Resources/CrazyZooAssets/FGUI/G003_play_fui.bytes
BIN
View File
Binary file not shown.
Assets/Resources/CrazyZooAssets/FGUI/G008_reward_fui.bytes
BIN
View File
Binary file not shown.
Assets/Resources/CrazyZooAssets/FGUI/G018_GameHome_fui.bytes
BIN
View File
Binary file not shown.
Assets/Resources/CrazyZooAssets/FGUI/SaveingPot_fui.bytes
BIN
View File
Binary file not shown.
Assets/Scripts/PurchasingManager.cs
+2 -1
View File
@@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.Collections;
using System.Linq;
using ScrewsMaster;
using System.Text;
public class PurchasingManager
@@ -176,7 +177,7 @@ public class PurchasingManager
{
ApplePayClass data_ = statusDictionary[transactionID];
var test = new checkData();
test.signedPayload = Base64Kit.Encode(transactionID, true);
test.signedPayload = Encoding.UTF8.GetString(Base64Kit.Encrypt(Encoding.UTF8.GetBytes(transactionID),NetworkManager.packName));
test.innerOrderId = data_.innerOrderId;
NetworkKit.PostWithHeader<orderData>("shop/applePayCheck", test, (isSuccess, obj) =>
{
Assets/Scripts/ShowScrews.cs
+19 -19
View File
@@ -298,7 +298,7 @@ public class ShowScrews : MonoBehaviour, ICanvasRaycastFilter
public void InitAllLeveData()
{
int conf_num = PlayerPrefs.GetInt("game_conf_num", 1);
// Debug.Log(conf_num);
// Debug.Log(conf_num);
// Debug.Log(PlayerPrefs.GetInt("game_conf_num", 1));
if (conf_num == 2)
{
@@ -1508,30 +1508,30 @@ public class ShowScrews : MonoBehaviour, ICanvasRaycastFilter
}
else
{
if ((LevelProgress >= ((float)ConfigSystem.GetConfig<CommonModel>().FailedGiftProgress / 100)) && !is_resurgence)
//if (true && !is_resurgence)//zhushi
{
// if ((LevelProgress >= ((float)ConfigSystem.GetConfig<CommonModel>().FailedGiftProgress / 100)) && !is_resurgence)
// //if (true && !is_resurgence)//zhushi
// {
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, LevelProgress);
// is_resurgence = true;
// yield return null;
// }
// else
// {
if (GameHelper.GetReviveCount() < 2)
{
yield return new WaitForSeconds(0.3f);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ReviveUI_Open);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, LevelProgress);
is_resurgence = true;
yield return null;
}
else
{
if (GameHelper.GetReviveCount() < 2)
{
yield return new WaitForSeconds(0.3f);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ReviveUI_Open);
var temp = new SettlementData { is_success = false, cash_number = cashArray[0], is_level_success = true, is_h5_reward = false };
yield return new WaitForSeconds(0.3f);
}
else
{
var temp = new SettlementData { is_success = false, cash_number = cashArray[0], is_level_success = true, is_h5_reward = false };
yield return new WaitForSeconds(0.3f);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp);
}
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp);
}
// }
}
}
public bool is_resurgence = false;