取消金币
This commit is contained in:
@@ -12,9 +12,6 @@ namespace FGUI.G003_play
|
|||||||
public GTextField txt_Title;
|
public GTextField txt_Title;
|
||||||
public GButton btn_close;
|
public GButton btn_close;
|
||||||
public GTextField txt_content;
|
public GTextField txt_content;
|
||||||
public GButton btn_clean;
|
|
||||||
public GButton btn_add;
|
|
||||||
public GButton btn_merge;
|
|
||||||
public GButton btn_PayBox;
|
public GButton btn_PayBox;
|
||||||
public GTextField text_NeedAds;
|
public GTextField text_NeedAds;
|
||||||
public GTextField text_hasADsCount;
|
public GTextField text_hasADsCount;
|
||||||
@@ -35,13 +32,10 @@ namespace FGUI.G003_play
|
|||||||
txt_Title = (GTextField)GetChildAt(1);
|
txt_Title = (GTextField)GetChildAt(1);
|
||||||
btn_close = (GButton)GetChildAt(2);
|
btn_close = (GButton)GetChildAt(2);
|
||||||
txt_content = (GTextField)GetChildAt(7);
|
txt_content = (GTextField)GetChildAt(7);
|
||||||
btn_clean = (GButton)GetChildAt(8);
|
btn_PayBox = (GButton)GetChildAt(12);
|
||||||
btn_add = (GButton)GetChildAt(9);
|
text_NeedAds = (GTextField)GetChildAt(15);
|
||||||
btn_merge = (GButton)GetChildAt(10);
|
text_hasADsCount = (GTextField)GetChildAt(16);
|
||||||
btn_PayBox = (GButton)GetChildAt(15);
|
btn_max_pay = (GButton)GetChildAt(17);
|
||||||
text_NeedAds = (GTextField)GetChildAt(18);
|
|
||||||
text_hasADsCount = (GTextField)GetChildAt(19);
|
|
||||||
btn_max_pay = (GButton)GetChildAt(20);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -7,17 +7,17 @@ namespace FGUI.G003_play
|
|||||||
{
|
{
|
||||||
public partial class sheep_play : GComponent
|
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_failpack;
|
||||||
|
public GButton btn_noads;
|
||||||
|
public GTextField level_text;
|
||||||
public GComponent broadcast;
|
public GComponent broadcast;
|
||||||
public new_topmoney money;
|
public new_topmoney money;
|
||||||
public new_topgold gold;
|
|
||||||
public GButton btn_setting;
|
public GButton btn_setting;
|
||||||
public GButton btn_noads;
|
|
||||||
public btn_battle btn_task;
|
|
||||||
public GButton btn_menu;
|
public GButton btn_menu;
|
||||||
public GButton btn_saveingpot;
|
public GButton btn_saveingpot;
|
||||||
public GButton Btn_SignIn;
|
|
||||||
public GGroup TopBox;
|
public GGroup TopBox;
|
||||||
public btn_look_ad btn_look_ad;
|
public btn_look_ad btn_look_ad;
|
||||||
public btn_battle btn_clear;
|
public btn_battle btn_clear;
|
||||||
@@ -33,17 +33,17 @@ namespace FGUI.G003_play
|
|||||||
{
|
{
|
||||||
base.ConstructFromXML(xml);
|
base.ConstructFromXML(xml);
|
||||||
|
|
||||||
level_text = (GTextField)GetChildAt(0);
|
gold = (new_topgold)GetChildAt(0);
|
||||||
btn_failpack = (GButton)GetChildAt(1);
|
Btn_SignIn = (GButton)GetChildAt(1);
|
||||||
broadcast = (GComponent)GetChildAt(2);
|
btn_task = (btn_battle)GetChildAt(2);
|
||||||
money = (new_topmoney)GetChildAt(3);
|
btn_failpack = (GButton)GetChildAt(3);
|
||||||
gold = (new_topgold)GetChildAt(4);
|
btn_noads = (GButton)GetChildAt(4);
|
||||||
btn_setting = (GButton)GetChildAt(5);
|
level_text = (GTextField)GetChildAt(5);
|
||||||
btn_noads = (GButton)GetChildAt(6);
|
broadcast = (GComponent)GetChildAt(6);
|
||||||
btn_task = (btn_battle)GetChildAt(7);
|
money = (new_topmoney)GetChildAt(7);
|
||||||
btn_menu = (GButton)GetChildAt(8);
|
btn_setting = (GButton)GetChildAt(8);
|
||||||
btn_saveingpot = (GButton)GetChildAt(9);
|
btn_menu = (GButton)GetChildAt(9);
|
||||||
Btn_SignIn = (GButton)GetChildAt(10);
|
btn_saveingpot = (GButton)GetChildAt(10);
|
||||||
TopBox = (GGroup)GetChildAt(11);
|
TopBox = (GGroup)GetChildAt(11);
|
||||||
btn_look_ad = (btn_look_ad)GetChildAt(12);
|
btn_look_ad = (btn_look_ad)GetChildAt(12);
|
||||||
btn_clear = (btn_battle)GetChildAt(13);
|
btn_clear = (btn_battle)GetChildAt(13);
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ namespace FGUI.G008_reward
|
|||||||
{
|
{
|
||||||
public Controller cont_iswacth;
|
public Controller cont_iswacth;
|
||||||
public GButton btn_close;
|
public GButton btn_close;
|
||||||
public GButton btn_revive;
|
|
||||||
public GButton btn_AdRevive;
|
public GButton btn_AdRevive;
|
||||||
public GButton btn_back;
|
public GButton btn_back;
|
||||||
public const string URL = "ui://1x1w9cxngxpr2z";
|
public const string URL = "ui://1x1w9cxngxpr2z";
|
||||||
@@ -25,9 +24,8 @@ namespace FGUI.G008_reward
|
|||||||
|
|
||||||
cont_iswacth = GetControllerAt(0);
|
cont_iswacth = GetControllerAt(0);
|
||||||
btn_close = (GButton)GetChildAt(2);
|
btn_close = (GButton)GetChildAt(2);
|
||||||
btn_revive = (GButton)GetChildAt(7);
|
btn_AdRevive = (GButton)GetChildAt(7);
|
||||||
btn_AdRevive = (GButton)GetChildAt(8);
|
btn_back = (GButton)GetChildAt(8);
|
||||||
btn_back = (GButton)GetChildAt(9);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -10,22 +10,22 @@ namespace FGUI.G018_GameHome
|
|||||||
public Controller Mode;
|
public Controller Mode;
|
||||||
public Controller switchgift;
|
public Controller switchgift;
|
||||||
public GButton btn_saveingpot;
|
public GButton btn_saveingpot;
|
||||||
public GButton btn_menu;
|
|
||||||
public GButton btn_setting;
|
|
||||||
public new_topgold gold;
|
public new_topgold gold;
|
||||||
public GComponent money;
|
|
||||||
public btn_battle BattleBtn;
|
public btn_battle BattleBtn;
|
||||||
public GButton btn_three_day;
|
public GButton btn_three_day;
|
||||||
public SignInBtn SignInBtn;
|
public SignInBtn SignInBtn;
|
||||||
public GButton NoAdsBtn;
|
public GButton NoAdsBtn;
|
||||||
public GButton btn_failpack;
|
public GButton btn_failpack;
|
||||||
public btn_repur btn_restore;
|
public btn_repur btn_restore;
|
||||||
public GGroup TopBox;
|
|
||||||
public GButton RightBtn;
|
public GButton RightBtn;
|
||||||
public GButton LeftBtn;
|
public GButton LeftBtn;
|
||||||
public GButton PlayBtn;
|
public GButton PlayBtn;
|
||||||
public GButton LuckySpinBtn;
|
public GButton LuckySpinBtn;
|
||||||
public GButton RankBtn;
|
public GButton RankBtn;
|
||||||
|
public GButton btn_menu;
|
||||||
|
public GButton btn_setting;
|
||||||
|
public GComponent money;
|
||||||
|
public GGroup TopBox;
|
||||||
public const string URL = "ui://dypufdsgtrht2i";
|
public const string URL = "ui://dypufdsgtrht2i";
|
||||||
|
|
||||||
public static GameHome CreateInstance()
|
public static GameHome CreateInstance()
|
||||||
@@ -40,22 +40,22 @@ namespace FGUI.G018_GameHome
|
|||||||
Mode = GetControllerAt(0);
|
Mode = GetControllerAt(0);
|
||||||
switchgift = GetControllerAt(1);
|
switchgift = GetControllerAt(1);
|
||||||
btn_saveingpot = (GButton)GetChildAt(1);
|
btn_saveingpot = (GButton)GetChildAt(1);
|
||||||
btn_menu = (GButton)GetChildAt(2);
|
gold = (new_topgold)GetChildAt(2);
|
||||||
btn_setting = (GButton)GetChildAt(3);
|
BattleBtn = (btn_battle)GetChildAt(3);
|
||||||
gold = (new_topgold)GetChildAt(4);
|
btn_three_day = (GButton)GetChildAt(4);
|
||||||
money = (GComponent)GetChildAt(5);
|
SignInBtn = (SignInBtn)GetChildAt(5);
|
||||||
BattleBtn = (btn_battle)GetChildAt(6);
|
NoAdsBtn = (GButton)GetChildAt(6);
|
||||||
btn_three_day = (GButton)GetChildAt(7);
|
btn_failpack = (GButton)GetChildAt(7);
|
||||||
SignInBtn = (SignInBtn)GetChildAt(8);
|
btn_restore = (btn_repur)GetChildAt(8);
|
||||||
NoAdsBtn = (GButton)GetChildAt(9);
|
RightBtn = (GButton)GetChildAt(10);
|
||||||
btn_failpack = (GButton)GetChildAt(10);
|
LeftBtn = (GButton)GetChildAt(11);
|
||||||
btn_restore = (btn_repur)GetChildAt(11);
|
PlayBtn = (GButton)GetChildAt(14);
|
||||||
TopBox = (GGroup)GetChildAt(12);
|
LuckySpinBtn = (GButton)GetChildAt(17);
|
||||||
RightBtn = (GButton)GetChildAt(14);
|
RankBtn = (GButton)GetChildAt(18);
|
||||||
LeftBtn = (GButton)GetChildAt(15);
|
btn_menu = (GButton)GetChildAt(20);
|
||||||
PlayBtn = (GButton)GetChildAt(18);
|
btn_setting = (GButton)GetChildAt(21);
|
||||||
LuckySpinBtn = (GButton)GetChildAt(21);
|
money = (GComponent)GetChildAt(22);
|
||||||
RankBtn = (GButton)GetChildAt(22);
|
TopBox = (GGroup)GetChildAt(23);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1321,7 +1321,7 @@ namespace ScrewsMaster
|
|||||||
{
|
{
|
||||||
isAd = false;
|
isAd = false;
|
||||||
}
|
}
|
||||||
// return true;//zhushi
|
return true;//zhushi
|
||||||
// return false;//zhushi
|
// return false;//zhushi
|
||||||
return isAd;
|
return isAd;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -132,61 +132,103 @@ namespace ScrewsMaster
|
|||||||
var mergePrice = ConfigSystem.GetConfig<CommonModel>().Purchaseprops;
|
var mergePrice = ConfigSystem.GetConfig<CommonModel>().Purchaseprops;
|
||||||
var cleanPrice = ConfigSystem.GetConfig<CommonModel>().Purchaseprops;
|
var cleanPrice = ConfigSystem.GetConfig<CommonModel>().Purchaseprops;
|
||||||
_payBoxPrice = (int)ConfigSystem.GetConfig<CommonModel>().addspace;
|
_payBoxPrice = (int)ConfigSystem.GetConfig<CommonModel>().addspace;
|
||||||
|
if (type != 3)
|
||||||
|
{
|
||||||
|
_payBoxPrice = 1;
|
||||||
|
|
||||||
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.AddHole, 1);
|
// if (ui.btn_add is btn_revive btnAdd) btnAdd.txt_coin.text = addPrice.ToString();
|
||||||
SetButtonsTouchable(false);
|
// ui.btn_add.onClick.Add(() =>
|
||||||
CtrlCloseUI();
|
// {
|
||||||
ShowScrews.Instance.ShowToast("Successful purchase");
|
// if (!GameHelper.CheckGoldNumber(addPrice))
|
||||||
});
|
// {
|
||||||
|
// GameHelper.ShowTips("Not Enough Coins");
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
// GameHelper.AddGoldNumber(-addPrice);
|
||||||
|
// GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
|
||||||
|
|
||||||
if (ui.btn_merge is btn_revive btnMerge) btnMerge.txt_coin.text = mergePrice.ToString();
|
// GameHelper.AddItemNumber(ItemEnum.AddHole, 1);
|
||||||
ui.btn_merge.onClick.Add(() =>
|
// SetButtonsTouchable(false);
|
||||||
{
|
// CtrlCloseUI();
|
||||||
if (!GameHelper.CheckGoldNumber(mergePrice))
|
// ShowScrews.Instance.ShowToast("Successful purchase");
|
||||||
{
|
// });
|
||||||
GameHelper.ShowTips("Not Enough Coins");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
GameHelper.AddGoldNumber(-mergePrice);
|
|
||||||
GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
|
|
||||||
|
|
||||||
GameHelper.AddItemNumber(ItemEnum.MergeBox, 1);
|
// 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);
|
||||||
|
|
||||||
SetButtonsTouchable(false);
|
// GameHelper.AddItemNumber(ItemEnum.MergeBox, 1);
|
||||||
CtrlCloseUI();
|
|
||||||
ShowScrews.Instance.ShowToast("Successful purchase");
|
|
||||||
});
|
|
||||||
|
|
||||||
if (ui.btn_clean is btn_revive btnClean) btnClean.txt_coin.text = cleanPrice.ToString();
|
// SetButtonsTouchable(false);
|
||||||
ui.btn_clean.onClick.Add(() =>
|
// CtrlCloseUI();
|
||||||
{
|
// ShowScrews.Instance.ShowToast("Successful purchase");
|
||||||
if (!GameHelper.CheckGoldNumber(cleanPrice))
|
// });
|
||||||
{
|
|
||||||
GameHelper.ShowTips("Not Enough Coins");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
GameHelper.AddGoldNumber(-cleanPrice);
|
|
||||||
GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
|
|
||||||
|
|
||||||
GameHelper.AddItemNumber(ItemEnum.ClearHole, 1);
|
// if (ui.btn_clean is btn_revive btnClean) btnClean.txt_coin.text = cleanPrice.ToString();
|
||||||
SetButtonsTouchable(false);
|
// ui.btn_clean.onClick.Add(() =>
|
||||||
CtrlCloseUI();
|
// {
|
||||||
ShowScrews.Instance.ShowToast("Successful purchase");
|
// 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();
|
// if (ui.btn_PayBox is btn_revive btnPayBox) btnPayBox.txt_coin.text = payBoxPrice.ToString();
|
||||||
ui.btn_PayBox.onClick.Add(() =>
|
ui.btn_PayBox.onClick.Add(() =>
|
||||||
|
{
|
||||||
|
if (type != 3)
|
||||||
|
{
|
||||||
|
if (_needWatchAds)
|
||||||
|
{
|
||||||
|
NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.BuyProp + "_" + type, 1);
|
||||||
|
GameHelper.ShowVideoAd($"Prop", 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");
|
||||||
|
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 if (type == 3)
|
||||||
{
|
{
|
||||||
if (_needWatchAds)
|
if (_needWatchAds)
|
||||||
{
|
{
|
||||||
@@ -213,6 +255,7 @@ namespace ScrewsMaster
|
|||||||
{
|
{
|
||||||
GameHelper.ShowTips("Insufficient AdWatchCount");
|
GameHelper.ShowTips("Insufficient AdWatchCount");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
@@ -226,7 +269,7 @@ namespace ScrewsMaster
|
|||||||
{
|
{
|
||||||
ui.pay_type.selectedIndex = 1;
|
ui.pay_type.selectedIndex = 1;
|
||||||
decimal price = (decimal)GameHelper.GetCommonModel().addspace2;
|
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;
|
if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1) (ui.btn_max_pay.GetChild("img_saveingpot") as GImage).visible = true;
|
||||||
|
|
||||||
@@ -248,7 +291,7 @@ namespace ScrewsMaster
|
|||||||
private void UpdateWatchAdsText()
|
private void UpdateWatchAdsText()
|
||||||
{
|
{
|
||||||
ui.text_hasADsCount.text = $"Owner ADs:{GameHelper.GetAdWatchCount()}";
|
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()
|
private void UpdateButtonState()
|
||||||
@@ -279,9 +322,9 @@ namespace ScrewsMaster
|
|||||||
|
|
||||||
private void SetButtonsTouchable(bool b)
|
private void SetButtonsTouchable(bool b)
|
||||||
{
|
{
|
||||||
ui.btn_add.touchable = b;
|
// ui.btn_add.touchable = b;
|
||||||
ui.btn_merge.touchable = b;
|
// ui.btn_merge.touchable = b;
|
||||||
ui.btn_clean.touchable = b;
|
// ui.btn_clean.touchable = b;
|
||||||
ui.btn_PayBox.touchable = b;
|
ui.btn_PayBox.touchable = b;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -108,9 +108,9 @@ namespace ScrewsMaster
|
|||||||
{
|
{
|
||||||
ui.btn_back.SetClick(() => { });
|
ui.btn_back.SetClick(() => { });
|
||||||
ui.btn_close.SetClick(() => { });
|
ui.btn_close.SetClick(() => { });
|
||||||
ui.btn_revive.SetClick(() => { });
|
// ui.btn_revive.SetClick(() => { });
|
||||||
GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
|
GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
|
||||||
GameHelper.SetIsWatchAd(1);
|
GameHelper.SetReviveCount();
|
||||||
GameHelper.SetReviveCount();
|
GameHelper.SetReviveCount();
|
||||||
isRevive = true;
|
isRevive = true;
|
||||||
ctrl.CloseUI();
|
ctrl.CloseUI();
|
||||||
@@ -118,24 +118,24 @@ namespace ScrewsMaster
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
var revivalCoins = ConfigSystem.GetConfig<CommonModel>().RevivalCoins;
|
// var revivalCoins = ConfigSystem.GetConfig<CommonModel>().RevivalCoins;
|
||||||
if (ui.btn_revive is btn_revive btnRevive) btnRevive.txt_coin.text = revivalCoins.ToString();
|
// if (ui.btn_revive is btn_revive btnRevive) btnRevive.txt_coin.text = revivalCoins.ToString();
|
||||||
ui.btn_revive.onClick.Add(() =>
|
// ui.btn_revive.onClick.Add(() =>
|
||||||
{
|
// {
|
||||||
if (!GameHelper.CheckGoldNumber(revivalCoins))
|
// if (!GameHelper.CheckGoldNumber(revivalCoins))
|
||||||
{
|
// {
|
||||||
GameHelper.ShowTips("Not Enough Coins");
|
// GameHelper.ShowTips("Not Enough Coins");
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
//消耗金币复活
|
// //消耗金币复活
|
||||||
GameHelper.AddGoldNumber(-revivalCoins);
|
// GameHelper.AddGoldNumber(-revivalCoins);
|
||||||
GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
|
// GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
|
||||||
//CtrlCloseUI();
|
// //CtrlCloseUI();
|
||||||
GameHelper.SetIsWatchAd(2);
|
// GameHelper.SetIsWatchAd(2);
|
||||||
GameHelper.SetReviveCount();
|
// GameHelper.SetReviveCount();
|
||||||
isRevive = true;
|
// isRevive = true;
|
||||||
ctrl.CloseUI();
|
// ctrl.CloseUI();
|
||||||
});
|
// });
|
||||||
|
|
||||||
ui.btn_close.onClick.Add(() =>
|
ui.btn_close.onClick.Add(() =>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ namespace ScrewsMaster
|
|||||||
{
|
{
|
||||||
Debug.Log(PreferencesMgr.Instance.ExchangeAccount);
|
Debug.Log(PreferencesMgr.Instance.ExchangeAccount);
|
||||||
Makeup_2 makeupVo = ConfigSystem.GetConfig<MakeupModel_2>().GetData(makeupTaskData.tableId);
|
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.";
|
ui.text_pay.text = "2. Pay USD for " + makeupVo.PayIncrease + " times cashback.";
|
||||||
initTop();
|
initTop();
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -7,6 +7,7 @@ using System.Collections.Generic;
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using ScrewsMaster;
|
using ScrewsMaster;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
|
||||||
public class PurchasingManager
|
public class PurchasingManager
|
||||||
@@ -176,7 +177,7 @@ public class PurchasingManager
|
|||||||
{
|
{
|
||||||
ApplePayClass data_ = statusDictionary[transactionID];
|
ApplePayClass data_ = statusDictionary[transactionID];
|
||||||
var test = new checkData();
|
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;
|
test.innerOrderId = data_.innerOrderId;
|
||||||
NetworkKit.PostWithHeader<orderData>("shop/applePayCheck", test, (isSuccess, obj) =>
|
NetworkKit.PostWithHeader<orderData>("shop/applePayCheck", test, (isSuccess, obj) =>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1508,16 +1508,16 @@ public class ShowScrews : MonoBehaviour, ICanvasRaycastFilter
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if ((LevelProgress >= ((float)ConfigSystem.GetConfig<CommonModel>().FailedGiftProgress / 100)) && !is_resurgence)
|
// if ((LevelProgress >= ((float)ConfigSystem.GetConfig<CommonModel>().FailedGiftProgress / 100)) && !is_resurgence)
|
||||||
//if (true && !is_resurgence)//zhushi
|
// //if (true && !is_resurgence)//zhushi
|
||||||
{
|
// {
|
||||||
|
|
||||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, LevelProgress);
|
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, LevelProgress);
|
||||||
is_resurgence = true;
|
// is_resurgence = true;
|
||||||
yield return null;
|
// yield return null;
|
||||||
}
|
// }
|
||||||
else
|
// else
|
||||||
{
|
// {
|
||||||
if (GameHelper.GetReviveCount() < 2)
|
if (GameHelper.GetReviveCount() < 2)
|
||||||
{
|
{
|
||||||
yield return new WaitForSeconds(0.3f);
|
yield return new WaitForSeconds(0.3f);
|
||||||
@@ -1531,7 +1531,7 @@ public class ShowScrews : MonoBehaviour, ICanvasRaycastFilter
|
|||||||
|
|
||||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp);
|
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp);
|
||||||
}
|
}
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public bool is_resurgence = false;
|
public bool is_resurgence = false;
|
||||||
|
|||||||
Reference in New Issue
Block a user