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

修改bug

Browse Source
This commit is contained in:
changyunjia
2026-05-13 14:06:49 +08:00
parent 1260b9077a
commit f2395d0b06
20 changed files with 205 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUI.cs
+2 -4
View File
@@ -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, () =>
Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs
+56 -5
View File
@@ -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() ? "<img src='ui://pmf3wbji112epi7'/>" : "") + 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<CommonModel>().BalanceExpired * 3600;
PreferencesMgr.Instance.SaveMakeupTaskHistory();
// makeupTaskData.SetStatus(MakeupTaskStatus.Level);//不要关卡条件了
// makeupTaskData.ch_time = GameHelper.GetNowTime() + ConfigSystem.GetConfig<CommonModel>().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<CommonModel>().inlineInitNum[0],
ConfigSystem.GetConfig<CommonModel>().inlineInitNum[1]);
makeupTaskData.inlineNum = UnityEngine.Random.Range(
ConfigSystem.GetConfig<CommonModel>().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();
}
}
Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUI.cs
+18 -8
View File
@@ -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", "<img src='ui://pmf3wbji112epi7'/>" + 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() ? "<img src='ui://pmf3wbji112epi7'/>" : "") + 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]<img src='ui://o9974uc5t9w7c3'/>" + broad_list[i][1] + "[/color]";
text_list[i].text = "congratulations,[color=#ad4800][size=29] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]<img src='ui://o9974uc5t9w7c3'/>" + 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]<img src='ui://o9974uc5t9w7c3'/>" + broad_list[i][1] + "[/color]";
text_list[i].text = "congratulations,[color=#ad4800][size=29] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]<img src='ui://o9974uc5t9w7c3'/>" + 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]";
}
}
}
Assets/BingoBrain/ModuleUI/StarReward/StarRewardUI.cs
+2 -1
View File
@@ -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(() =>
{