diff --git a/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_end.cs b/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_end.cs index f4ba240..157c15b 100644 --- a/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_end.cs +++ b/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_end.cs @@ -7,6 +7,7 @@ namespace FGUI.JBingoPlay { public partial class com_end : GComponent { + public Controller gift; public com_endpop com_endPop; public btn_playagain btn_playagain; public GButton btn_home; @@ -22,6 +23,7 @@ namespace FGUI.JBingoPlay { base.ConstructFromXML(xml); + gift = GetControllerAt(0); com_endPop = (com_endpop)GetChildAt(2); btn_playagain = (btn_playagain)GetChildAt(3); btn_home = (GButton)GetChildAt(4); diff --git a/Assets/BingoBrain/FGUI/Package/JRewardPop/com_StarReward.cs b/Assets/BingoBrain/FGUI/Package/JRewardPop/com_StarReward.cs index 1d049a0..2306fa2 100644 --- a/Assets/BingoBrain/FGUI/Package/JRewardPop/com_StarReward.cs +++ b/Assets/BingoBrain/FGUI/Package/JRewardPop/com_StarReward.cs @@ -7,6 +7,7 @@ namespace FGUI.JRewardPop { public partial class com_StarReward : GComponent { + public Controller gift; public GGraph spine_parent; public GTextField cash_text; public GButton btn_adget; @@ -24,12 +25,13 @@ namespace FGUI.JRewardPop { base.ConstructFromXML(xml); - spine_parent = (GGraph)GetChildAt(2); - cash_text = (GTextField)GetChildAt(4); - btn_adget = (GButton)GetChildAt(5); - rate_text = (GTextField)GetChildAt(7); - btn_get = (GButton)GetChildAt(8); - reward_end = (GButton)GetChildAt(9); + gift = GetControllerAt(0); + spine_parent = (GGraph)GetChildAt(1); + cash_text = (GTextField)GetChildAt(3); + btn_adget = (GButton)GetChildAt(4); + rate_text = (GTextField)GetChildAt(6); + btn_get = (GButton)GetChildAt(7); + reward_end = (GButton)GetChildAt(8); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/tixian/btn_top.cs b/Assets/BingoBrain/FGUI/Package/tixian/btn_top.cs index e9fd06c..580ec23 100644 --- a/Assets/BingoBrain/FGUI/Package/tixian/btn_top.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/btn_top.cs @@ -10,7 +10,7 @@ namespace FGUI.tixian public Controller index; public Controller btn_state; public GTextField text_type; - public GTextField text_ch; + public GRichTextField text_ch; public GImage img_outline; public const string URL = "ui://jwedp6jyupx71r"; @@ -26,7 +26,7 @@ namespace FGUI.tixian index = GetControllerAt(0); btn_state = GetControllerAt(1); text_type = (GTextField)GetChildAt(5); - text_ch = (GTextField)GetChildAt(6); + text_ch = (GRichTextField)GetChildAt(6); img_outline = (GImage)GetChildAt(7); } } diff --git a/Assets/BingoBrain/FGUI/Package/tixian/com_broadcast.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_broadcast.cs index eaada4a..c1c2fd5 100644 --- a/Assets/BingoBrain/FGUI/Package/tixian/com_broadcast.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_broadcast.cs @@ -23,9 +23,9 @@ namespace FGUI.tixian { base.ConstructFromXML(xml); - rich_text0 = (GRichTextField)GetChildAt(1); - rich_text1 = (GRichTextField)GetChildAt(3); - rich_text2 = (GRichTextField)GetChildAt(5); + rich_text0 = (GRichTextField)GetChildAt(4); + rich_text1 = (GRichTextField)GetChildAt(5); + rich_text2 = (GRichTextField)GetChildAt(6); rich_text3 = (GRichTextField)GetChildAt(7); t1 = GetTransitionAt(0); } diff --git a/Assets/BingoBrain/FGUI/Package/tixian/com_confirm.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_confirm.cs index eab2b6f..236adf4 100644 --- a/Assets/BingoBrain/FGUI/Package/tixian/com_confirm.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_confirm.cs @@ -33,7 +33,6 @@ namespace FGUI.tixian public GTextField text_chdate3; public GTextField text_number0; public GTextField text_number1; - public GTextField text_number2; public btn_pay btn_watch; public btn_get btn_tab; public btn_get btn_earn; @@ -59,8 +58,9 @@ namespace FGUI.tixian public GRichTextField text_condi1; public GRichTextField text_ch_number; public GButton btn_close; - public GComponent btn_watchad; public GButton btn_task_watch; + public GRichTextField text_number2; + public GButton btn_watchad; public Transition t0; public const string URL = "ui://jwedp6jyut66d"; @@ -99,34 +99,34 @@ namespace FGUI.tixian text_chdate3 = (GTextField)GetChildAt(36); text_number0 = (GTextField)GetChildAt(37); text_number1 = (GTextField)GetChildAt(38); - text_number2 = (GTextField)GetChildAt(39); - btn_watch = (btn_pay)GetChildAt(40); - btn_tab = (btn_get)GetChildAt(41); - btn_earn = (btn_get)GetChildAt(42); - btn_chout = (btn_get)GetChildAt(43); - btn_confirm = (btn_get)GetChildAt(44); - btn_check_level = (btn_get)GetChildAt(45); - text_nowch = (GTextField)GetChildAt(47); - text_cashneedlv = (GTextField)GetChildAt(48); - text_leveltime = (GTextField)GetChildAt(49); - lab_lv_need_des = (GTextField)GetChildAt(51); - com_chlevel = (cash_levelcom)GetChildAt(54); - group_ = (GGroup)GetChildAt(55); - lab_mn = (GTextField)GetChildAt(59); - list_kicket = (GList)GetChildAt(64); - lab_mn2 = (GTextField)GetChildAt(69); - lab_ticket = (GTextField)GetChildAt(77); - lab_code = (GTextField)GetChildAt(79); - btn_copy = (btn_code)GetChildAt(80); - btn_contact_us = (btn_code)GetChildAt(81); - btn_back = (GButton)GetChildAt(85); - lab_ads = (GTextField)GetChildAt(88); - btn_inline_ok = (btn_get)GetChildAt(89); - text_condi1 = (GRichTextField)GetChildAt(90); - text_ch_number = (GRichTextField)GetChildAt(91); - btn_close = (GButton)GetChildAt(92); - btn_watchad = (GComponent)GetChildAt(93); - btn_task_watch = (GButton)GetChildAt(96); + btn_watch = (btn_pay)GetChildAt(39); + btn_tab = (btn_get)GetChildAt(40); + btn_earn = (btn_get)GetChildAt(41); + btn_chout = (btn_get)GetChildAt(42); + btn_confirm = (btn_get)GetChildAt(43); + btn_check_level = (btn_get)GetChildAt(44); + text_nowch = (GTextField)GetChildAt(46); + text_cashneedlv = (GTextField)GetChildAt(47); + text_leveltime = (GTextField)GetChildAt(48); + lab_lv_need_des = (GTextField)GetChildAt(50); + com_chlevel = (cash_levelcom)GetChildAt(53); + group_ = (GGroup)GetChildAt(54); + lab_mn = (GTextField)GetChildAt(58); + list_kicket = (GList)GetChildAt(63); + lab_mn2 = (GTextField)GetChildAt(68); + lab_ticket = (GTextField)GetChildAt(76); + lab_code = (GTextField)GetChildAt(78); + btn_copy = (btn_code)GetChildAt(79); + btn_contact_us = (btn_code)GetChildAt(80); + btn_back = (GButton)GetChildAt(84); + lab_ads = (GTextField)GetChildAt(87); + btn_inline_ok = (btn_get)GetChildAt(88); + text_condi1 = (GRichTextField)GetChildAt(89); + text_ch_number = (GRichTextField)GetChildAt(90); + btn_close = (GButton)GetChildAt(91); + btn_task_watch = (GButton)GetChildAt(94); + text_number2 = (GRichTextField)GetChildAt(95); + btn_watchad = (GButton)GetChildAt(96); t0 = GetTransitionAt(0); } } diff --git a/Assets/BingoBrain/FGUI/Package/tixian/com_saveingpot.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_saveingpot.cs index d2bf697..df80cb6 100644 --- a/Assets/BingoBrain/FGUI/Package/tixian/com_saveingpot.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_saveingpot.cs @@ -9,11 +9,11 @@ namespace FGUI.tixian { public Controller type; public Controller cont_confirm; + public Controller isRDExchangeMode; public GGraph ani_potparent; public GTextField text_remaintime; public GProgressBar progress_ch; public GTextField text_chprogress; - public GTextField text_nowch; public GTextField text_ad; public GTextField text_pay; public GButton btn_ch; @@ -51,6 +51,8 @@ namespace FGUI.tixian public com_broadcast broad; public GButton btn_close; public GButton btn_task_watch; + public GRichTextField text_nowch; + public GImage text_ch_2; public const string URL = "ui://jwedp6jyupx71p"; public static com_saveingpot CreateInstance() @@ -64,48 +66,50 @@ namespace FGUI.tixian type = GetControllerAt(0); cont_confirm = GetControllerAt(1); + isRDExchangeMode = GetControllerAt(2); ani_potparent = (GGraph)GetChildAt(0); text_remaintime = (GTextField)GetChildAt(3); progress_ch = (GProgressBar)GetChildAt(4); text_chprogress = (GTextField)GetChildAt(5); - text_nowch = (GTextField)GetChildAt(6); - text_ad = (GTextField)GetChildAt(8); - text_pay = (GTextField)GetChildAt(9); - btn_ch = (GButton)GetChildAt(10); - text_lose = (GTextField)GetChildAt(11); - btn_confirm = (btn_confirm)GetChildAt(14); - text_title = (GTextField)GetChildAt(15); - text_query = (GTextField)GetChildAt(19); - text_payhint = (GTextField)GetChildAt(20); - btn_level0 = (btn_top)GetChildAt(21); - btn_level1 = (btn_top)GetChildAt(22); - btn_level2 = (btn_top)GetChildAt(23); - group_ = (GGroup)GetChildAt(24); - text_title_2 = (GTextField)GetChildAt(25); - text_smaill_title = (GTextField)GetChildAt(26); - com_info = (com_enter)GetChildAt(27); - com_fname = (com_firstname)GetChildAt(28); - com_lname = (com_lastname)GetChildAt(29); - com_pay = (com_info)GetChildAt(30); - text_smaill_title_2 = (GTextField)GetChildAt(31); - text_ch = (GTextField)GetChildAt(34); - text_account = (GTextField)GetChildAt(35); - com_task = (com_task)GetChildAt(38); - com_newRecord = (com_newRecord)GetChildAt(39); - btn_watch = (btn_pay)GetChildAt(40); - card_ = (GImage)GetChildAt(42); - lab_mn = (GTextField)GetChildAt(45); - list_kicket = (GList)GetChildAt(51); - lab_mn2 = (GTextField)GetChildAt(55); - lab_ticket = (GTextField)GetChildAt(62); - lab_code = (GTextField)GetChildAt(64); - btn_copy = (btn_code)GetChildAt(65); - btn_contact_us = (btn_code)GetChildAt(66); - btn_back = (GButton)GetChildAt(70); - btn_inline_ok = (btn_get)GetChildAt(75); - broad = (com_broadcast)GetChildAt(76); - btn_close = (GButton)GetChildAt(77); - btn_task_watch = (GButton)GetChildAt(78); + text_ad = (GTextField)GetChildAt(7); + text_pay = (GTextField)GetChildAt(8); + btn_ch = (GButton)GetChildAt(9); + text_lose = (GTextField)GetChildAt(10); + btn_confirm = (btn_confirm)GetChildAt(13); + text_title = (GTextField)GetChildAt(14); + text_query = (GTextField)GetChildAt(18); + text_payhint = (GTextField)GetChildAt(19); + btn_level0 = (btn_top)GetChildAt(20); + btn_level1 = (btn_top)GetChildAt(21); + btn_level2 = (btn_top)GetChildAt(22); + group_ = (GGroup)GetChildAt(23); + text_title_2 = (GTextField)GetChildAt(24); + text_smaill_title = (GTextField)GetChildAt(25); + com_info = (com_enter)GetChildAt(26); + com_fname = (com_firstname)GetChildAt(27); + com_lname = (com_lastname)GetChildAt(28); + com_pay = (com_info)GetChildAt(29); + text_smaill_title_2 = (GTextField)GetChildAt(30); + text_ch = (GTextField)GetChildAt(33); + text_account = (GTextField)GetChildAt(34); + com_task = (com_task)GetChildAt(37); + com_newRecord = (com_newRecord)GetChildAt(38); + btn_watch = (btn_pay)GetChildAt(39); + card_ = (GImage)GetChildAt(41); + lab_mn = (GTextField)GetChildAt(44); + list_kicket = (GList)GetChildAt(50); + lab_mn2 = (GTextField)GetChildAt(54); + lab_ticket = (GTextField)GetChildAt(61); + lab_code = (GTextField)GetChildAt(63); + btn_copy = (btn_code)GetChildAt(64); + btn_contact_us = (btn_code)GetChildAt(65); + btn_back = (GButton)GetChildAt(69); + btn_inline_ok = (btn_get)GetChildAt(74); + broad = (com_broadcast)GetChildAt(75); + btn_close = (GButton)GetChildAt(76); + btn_task_watch = (GButton)GetChildAt(77); + text_nowch = (GRichTextField)GetChildAt(78); + text_ch_2 = (GImage)GetChildAt(79); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/tixian/com_task.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_task.cs index b73c3b9..773bb0d 100644 --- a/Assets/BingoBrain/FGUI/Package/tixian/com_task.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_task.cs @@ -12,7 +12,7 @@ namespace FGUI.tixian public GTextField text_task_title; public GTextField text_ads; public GTextField text_task; - public GTextField text_payer; + public GRichTextField text_payer; public const string URL = "ui://jwedp6jyes171x"; public static com_task CreateInstance() @@ -29,7 +29,7 @@ namespace FGUI.tixian text_task_title = (GTextField)GetChildAt(5); text_ads = (GTextField)GetChildAt(6); text_task = (GTextField)GetChildAt(7); - text_payer = (GTextField)GetChildAt(16); + text_payer = (GRichTextField)GetChildAt(16); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/Harmony/GameHelper.cs b/Assets/BingoBrain/Harmony/GameHelper.cs index 4c8d4a0..85256c7 100644 --- a/Assets/BingoBrain/Harmony/GameHelper.cs +++ b/Assets/BingoBrain/Harmony/GameHelper.cs @@ -586,7 +586,30 @@ namespace BingoBrain return $"{currency102:N}"; } } + public static string Get102Str_new(decimal currency102 = -1) + { + if (currency102 == -1) + { + currency102 = PreferencesMgr.Instance.Currency102; + } + if (IsGiftSwitch()) + { + if (isRDExchangeMode()) + { + return $"{currency102:N}"; + } + else + { + return $"${currency102:N}"; + } + } + else + { + currency102 = (int)currency102; + return $"{currency102:N0}"; + } + } public static T GetConfig() { return ConfigSystem.GetConfig(); @@ -1635,7 +1658,7 @@ namespace BingoBrain } public static bool isRDExchangeMode() { - + return false;//zhushi return SaveData.GetSaveobject().ExchangeModeToggle == 1; } public static string getDesByKey(string key) @@ -1647,8 +1670,8 @@ namespace BingoBrain string str = ConfigSystem.GetConfig().dataList.FirstOrDefault(data => data.des_key == key)?.Mode_1 ?? ""; if (str != "") { - str = str.Replace("", "") - .Replace("", ""); + str = str.Replace("", "") + .Replace("", ""); } return str; } @@ -1661,7 +1684,7 @@ namespace BingoBrain { if (GameHelper.isRDExchangeMode()) { - string str = ""; + string str = ""; return str + $" {ch:N0}"; } else diff --git a/Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUI.cs b/Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUI.cs index 5324256..be3f66c 100644 --- a/Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUI.cs +++ b/Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUI.cs @@ -203,11 +203,9 @@ namespace BingoBrain { name = name[..4] + "..."; } - string broad_text = String.Format(text_ui.hide_text.text, name, - "$" + config_money_list[money_index], DateTimeBoardk.Instance.GetCurrDateTime()); + // text_ui.hide_text.text = GameHelper.getDesByKey("makeup_4"); + string broad_text = String.Format(GameHelper.getDesByKey("makeup_4"), name, GameHelper.Get102Str_new(decimal.Parse( config_money_list[money_index])), DateTimeBoardk.Instance.GetCurrDateTime()); text_ui.cast_text.text = broad_text; - // Tweener tweener = DOTween.To(() => ui.broad.x, - // x => ui.broad.x = x, 200, 0.5f); ui.t0.Play(); DOVirtual.DelayedCall(3.5f, () => diff --git a/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs b/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs index 0a3b621..0a0b37a 100644 --- a/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs +++ b/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs @@ -508,7 +508,7 @@ namespace BingoBrain ui.text_number0.text = SaveData.GetSaveobject().ch_people.ToString(); ui.text_number1.text = SaveData.GetSaveobject().ch_people_1.ToString(); - ui.text_number2.text = GameHelper.Get102Str((decimal)SaveData.GetSaveobject().ch_people_2); + ui.text_number2.text = (GameHelper.isRDExchangeMode() ? "" : "") + GameHelper.Get102Str_new((decimal)SaveData.GetSaveobject().ch_people_2); ui.text_chdate.text = string.Format(ui.text_chdate.text, DateTime.Now.Year + "." + DateTime.Now.Month + "." + DateTime.Now.Day); } @@ -626,6 +626,7 @@ namespace BingoBrain } ui.text_condi1.text = GameHelper.getChString(vo.item_need); + Debug.Log(GameHelper.getChString(vo.item_need)); ui.pb_condi1.max = vo.item_need; ui.text_ch_number.text = GameHelper.getChString(PreferencesMgr.Instance.Currency102); var curValue = Math.Min(PreferencesMgr.Instance.Currency102, vo.item_need); @@ -682,16 +683,19 @@ namespace BingoBrain ui.com_task.text_orderid.text = makeupTaskData.orderID; ui.com_task.text_task_title.SetVar("ad", vo.ad_need.ToString()).FlushVars(); ui.com_task.text_ads.text = $"{makeupTaskData.videoCount}/{vo.ad_need}"; + ui.com_task.text_payer.SetVar("amt", "$" + makeupTaskData.GetAmountStr()).FlushVars(); + if (GameHelper.isRDExchangeMode()) { ui.com_task.text_task.text = GameHelper.getDesByKey("makeup_12"); } else { - string str = string.Format(GameHelper.getDesByKey("makeup_12"), makeupTaskData.GetAmountStr()); + string str = string.Format(GameHelper.getDesByKey("makeup_12"), $"${makeupTaskData.amount:N}"); ui.com_task.text_task.text = str; } + Debug.Log(GameHelper.getDesByKey("makeup_12")); if (makeupTaskData.videoCount >= vo.ad_need) { ui.com_task.cont_process.selectedIndex = 1; @@ -763,9 +767,56 @@ namespace BingoBrain } else { - makeupTaskData.SetStatus(MakeupTaskStatus.Level); - makeupTaskData.ch_time = GameHelper.GetNowTime() + ConfigSystem.GetConfig().BalanceExpired * 3600; - PreferencesMgr.Instance.SaveMakeupTaskHistory(); + // makeupTaskData.SetStatus(MakeupTaskStatus.Level);//不要关卡条件了 + // makeupTaskData.ch_time = GameHelper.GetNowTime() + ConfigSystem.GetConfig().BalanceExpired * 3600; + // PreferencesMgr.Instance.SaveMakeupTaskHistory(); + // InitView(); + SaveData.GetSaveobject().chout_lv = vo.id; + SaveData.saveDataFunc(); + GameHelper.ShowLoading(1, 2, () => + { + TuSystem.Consume(vo.item, vo.item_need, isSuccess => + { + makeupTaskData.SetStatus(MakeupTaskStatus.Inline); + makeupTaskData.inlineInitNum = + UnityEngine.Random.Range(ConfigSystem.GetConfig().inlineInitNum[0], + ConfigSystem.GetConfig().inlineInitNum[1]); + makeupTaskData.inlineNum = UnityEngine.Random.Range( + ConfigSystem.GetConfig().inlineInitNum[0], + makeupTaskData.inlineInitNum); + makeupTaskData.order_time = GameHelper.GetNowTime(); + PreferencesMgr.Instance.SaveMakeupTaskHistory(); + GameDispatcher.Instance.Dispatch(BingoInfo.Update102); + //OnInline(); + // Debug.Log(JsonConvert.SerializeObject(vo)); + // if (vo.id == 1) + // { + // TrackKit.SendEvent(Property.withdraw_Event, Property.WithdrawCash, 1); + + // } + // else if (vo.id == 2) + // { + // TrackKit.SendEvent(Property.withdraw_Event, Property.WithdrawCash, 2); + // } + // else if (vo.id == 3) + // { + // TrackKit.SendEvent(Property.withdraw_Event, Property.WithdrawCash, 3); + // } + if (vo.id != 3) + { + ch_index++; + } + InitView(); + if (vo.id == 3) + { + // PlayerPrefs.SetInt("ch_lv", 2); + SaveData.GetSaveobject().chout_lv = 2; + SaveData.saveDataFunc(); + makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last(); + } + + }); + }); InitView(); } } diff --git a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUI.cs b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUI.cs index 37b402f..fa68fa7 100644 --- a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUI.cs +++ b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUI.cs @@ -203,6 +203,7 @@ namespace BingoBrain string val = $"{SaveData.GetSaveobject().saveingpot_ch:N}"; ui.text_lose.SetVar("num", val).FlushVars(); + if (GameHelper.isRDExchangeMode()) ui.isRDExchangeMode.selectedIndex = 1; // ui.text_lose.text = string.Format(ui.text_lose.text, SaveingPotHelper.getChString(SaveData.GetSaveobject().saveingpot_ch)); if (makeupTaskData.needShowAni) { @@ -247,14 +248,14 @@ namespace BingoBrain if (SaveData.GetSaveobject().saveingpot_ch > SaveData.GetSaveobject().last_saveingpot_ch) { DOVirtual.Float(SaveData.GetSaveobject().last_saveingpot_ch, SaveData.GetSaveobject().saveingpot_ch, 1, - value => { ui.text_nowch.text = GameHelper.Get102Str((decimal)value); }); + value => { ui.text_nowch.text = GameHelper.Get102Str_new((decimal)value); }); ske_pot.state.SetAnimation(0, "getcash", false); ske_pot.state.Complete += (a) => { ske_pot.state.SetAnimation(0, "edie", true); }; } - else ui.text_nowch.text = GameHelper.Get102Str((decimal)SaveData.GetSaveobject().saveingpot_ch); + else ui.text_nowch.text = GameHelper.Get102Str_new((decimal)SaveData.GetSaveobject().saveingpot_ch); SaveData.GetSaveobject().last_saveingpot_ch = SaveData.GetSaveobject().saveingpot_ch; SaveData.saveDataFunc(); } @@ -733,7 +734,16 @@ namespace BingoBrain ui.com_task.text_orderid.text = makeupTaskData.orderID; ui.com_task.text_task_title.SetVar("ad", vo.ad_need.ToString()).FlushVars(); ui.com_task.text_ads.text = $"{makeupTaskData.videoCount}/{vo.ad_need}"; - ui.com_task.text_payer.SetVar("amt", makeupTaskData.GetAmountStr()).FlushVars(); + + + if (GameHelper.isRDExchangeMode()) + { + ui.com_task.text_payer.SetVar("amt", "" + makeupTaskData.amount).FlushVars(); + } + else + { + ui.com_task.text_payer.SetVar("amt", makeupTaskData.GetAmountStr()).FlushVars(); + } if (makeupTaskData.videoCount >= vo.ad_need) { @@ -912,7 +922,7 @@ namespace BingoBrain for (int i = 0; i < btn_list.Count; i++) { - btn_list[i].text_ch.text = "$" + (int)makeup_list[i].item_need; + btn_list[i].text_ch.text = (GameHelper.isRDExchangeMode() ? "" : "") + GameHelper.Get102Str_new(makeup_list[i].item_need); Debug.Log(makeup_list[i].item_need); btn_list[i].index.selectedIndex = i; if (i >= saveingpot_history.Count) @@ -987,11 +997,11 @@ namespace BingoBrain { if (GameHelper.isRDExchangeMode()) { - text_list[i].text = "congratulations,[color=#ad4800][size=36] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]" + broad_list[i][1] + "[/color]"; + text_list[i].text = "congratulations,[color=#ad4800][size=29] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]" + broad_list[i][1] + "[/color]"; } else { - text_list[i].text = "congratulations,[color=#ad4800][size=36] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]$" + broad_list[i][1] + "[/color]"; + text_list[i].text = "congratulations,[color=#ad4800][size=29] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]$" + broad_list[i][1] + "[/color]"; } } }); @@ -1015,11 +1025,11 @@ namespace BingoBrain broad_list.Add(new string[2] { config_name_list[name_index], config_money_list[money_index] }); if (GameHelper.isRDExchangeMode()) { - text_list[i].text = "congratulations,[color=#ad4800][size=36] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]" + broad_list[i][1] + "[/color]"; + text_list[i].text = "congratulations,[color=#ad4800][size=29] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]" + broad_list[i][1] + "[/color]"; } else { - text_list[i].text = "congratulations,[color=#ad4800][size=36] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]$" + broad_list[i][1] + "[/color]"; + text_list[i].text = "congratulations,[color=#ad4800][size=29] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]$" + broad_list[i][1] + "[/color]"; } } } diff --git a/Assets/BingoBrain/ModuleUI/StarReward/StarRewardUI.cs b/Assets/BingoBrain/ModuleUI/StarReward/StarRewardUI.cs index ad0f3d2..fddc19d 100644 --- a/Assets/BingoBrain/ModuleUI/StarReward/StarRewardUI.cs +++ b/Assets/BingoBrain/ModuleUI/StarReward/StarRewardUI.cs @@ -97,10 +97,11 @@ namespace BingoBrain { UICtrlDispatcher.Instance.Dispatch(SkinInfo.StarRewardUI_Close); // GameHelper.ShowInterstitial("interstitial_skipAd"); - GameHelper.addInterAdnumber(); + GameHelper.addInterAdnumber(); }); }); + ui.gift.selectedIndex = GameHelper.IsGiftSwitch() ? 1 : 0; ui.btn_adget.SetClick(() => { diff --git a/Assets/BingoSun/Scripts/WebviewManager.cs b/Assets/BingoSun/Scripts/WebviewManager.cs index 19cede6..b3611ce 100644 --- a/Assets/BingoSun/Scripts/WebviewManager.cs +++ b/Assets/BingoSun/Scripts/WebviewManager.cs @@ -97,16 +97,17 @@ namespace DontConfuse } public void SetDarkThough(bool though) { - if (though) - { - if (UI.Instance.IsExistUI(UIConst.LevelSuccessUI) || UI.Instance.IsExistUI(UIConst.MakeupConfirmUI) || - UI.Instance.IsExistUI(UIConst.NewTaskUI) || UI.Instance.IsExistUI(UIConst.PackrewardUI) || UI.Instance.IsExistUI(UIConst.SaveingPotUI) - ) - { - return; - } + if(!GameHelper.IsGiftSwitch()) return; + // if (though) + // { + // if (UI.Instance.IsExistUI(UIConst.LevelSuccessUI) || UI.Instance.IsExistUI(UIConst.MakeupConfirmUI) || + // UI.Instance.IsExistUI(UIConst.NewTaskUI) || UI.Instance.IsExistUI(UIConst.PackrewardUI) || UI.Instance.IsExistUI(UIConst.SaveingPotUI) + // ) + // { + // return; + // } - } + // } // Debug.Log("[WebviewManager] SetPadding"); #if UNITY_IOS && !UNITY_EDITOR BrigdeIOS.SetDarkThough(though); diff --git a/Assets/Resources/AssetHotFix/FGUI/ACommon_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/ACommon_fui.bytes index 992ddfe..b6fae3d 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/ACommon_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/ACommon_fui.bytes differ diff --git a/Assets/Resources/AssetHotFix/FGUI/JBingoPlay_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/JBingoPlay_fui.bytes index ae079ff..de2390b 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/JBingoPlay_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/JBingoPlay_fui.bytes differ diff --git a/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes index a89b7ab..167bb65 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes differ diff --git a/Assets/Resources/AssetHotFix/FGUI/JRewardPop_atlas0.png b/Assets/Resources/AssetHotFix/FGUI/JRewardPop_atlas0.png index 8af5139..ba1f12b 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/JRewardPop_atlas0.png and b/Assets/Resources/AssetHotFix/FGUI/JRewardPop_atlas0.png differ diff --git a/Assets/Resources/AssetHotFix/FGUI/JRewardPop_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/JRewardPop_fui.bytes index 0bd1dfe..d02236c 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/JRewardPop_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/JRewardPop_fui.bytes differ diff --git a/Assets/Resources/AssetHotFix/FGUI/JTask_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/JTask_fui.bytes index 799c2d3..620f364 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/JTask_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/JTask_fui.bytes differ diff --git a/Assets/Resources/AssetHotFix/FGUI/tixian_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/tixian_fui.bytes index adf76e4..5c47753 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/tixian_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/tixian_fui.bytes differ