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-12 15:56:48 +08:00
parent 6e6aa09d72
commit 1260b9077a
36 changed files with 363 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/BingoBrain/ModuleUI/BingoEnd/BingoEndUI.cs
+2 -1
View File
@@ -91,7 +91,8 @@ namespace BingoBrain
{
CtrlCloseUI();
GameDispatcher.Instance.Dispatch(BingoInfo.EndBingoGame, true);
GameHelper.ShowInterstitial("interstitial_endgameAd");
// GameHelper.addInterAdnumber("interstitial_endgameAd");
GameHelper.addInterAdnumber();
}
#endregion
Assets/BingoBrain/ModuleUI/BingoToy/BingoToyUI.cs
+15 -5
View File
@@ -98,6 +98,8 @@ namespace BingoBrain
ui.com_Spinn.SetClick(ClickSpinBtn);
ui.fairyBatching = false;
Hall.Instance.UpdateSecondEvent += UpdateTime;
}
private void UpdateTime()
@@ -147,6 +149,10 @@ namespace BingoBrain
RefreshUI();
ui.cont_state.selectedIndex =
PreferencesMgr.Instance.IsOnceWheel ? com_wheel.State_normal : com_wheel.State_videl;
if (!PreferencesMgr.Instance.IsOnceWheel && ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1)
{
ui.btn_spin.saveing_open.selectedIndex = 1;
}
}
private void RefreshUI(object o = null)
@@ -170,9 +176,9 @@ namespace BingoBrain
else
{
id = turntable.wheel_itemB;
if(id == 101)
if (id == 101)
{
PreferencesMgr.Instance.VidelWheelLst[i]=MathF.Ceiling(PreferencesMgr.Instance.VidelWheelLst[i]);
PreferencesMgr.Instance.VidelWheelLst[i] = MathF.Ceiling(PreferencesMgr.Instance.VidelWheelLst[i]);
}
val = id == 102
? GameHelper.Get102Str((decimal)PreferencesMgr.Instance.VidelWheelLst[i])
@@ -267,10 +273,10 @@ namespace BingoBrain
NAAVsa.PlayAnim(wheel_ani, "daiji", true);
if (PreferencesMgr.Instance.IsOnceWheel)
{
// ui.closeButton.touchable = false;
// ui.btn_spin.touchable = false;
// ui.closeButton.touchable = false;
// ui.btn_spin.touchable = false;
ui.com_Spinn.touchable = false;
// ui.btn_spin.grayed = true;
// ui.btn_spin.grayed = true;
GameHelper.GetRewardExtra(vo.wheel_itemA, (decimal)PreferencesMgr.Instance.FerrWheelLst[vo.Seq - 1],
vo.cont_index, isCompleted =>
@@ -285,6 +291,10 @@ namespace BingoBrain
ui.cont_state.selectedIndex = PreferencesMgr.Instance.IsOnceWheel
? com_wheel.State_normal
: com_wheel.State_videl;
if (!PreferencesMgr.Instance.IsOnceWheel && ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1)
{
ui.btn_spin.saveing_open.selectedIndex = 1;
}
SetWheelData();
RefreshUI();
ui.fx_enter.Play();
Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUI.cs
+8 -6
View File
@@ -121,18 +121,20 @@ namespace BingoBrain
// var sk = FX.Instance.SetFx<SkeletonAnimation>(ui.broad_cast_text.bg_panel, Fx_Type.fx_broad, closeCallback);
// sk.state.SetAnimation(0, "animation", true);
FX.Instance.SetFx<SkeletonAnimation>(ui.broad_cast_text.bg_panel, Fx_Type.fx_broad, sk =>
FX.Instance.SetFx<SkeletonAnimation>(ui.broad_cast_text.bg_panel, Fx_Type.fx_broad, sk =>
{
// ske_pot = sk;
// ske_pot = sk;
// NAAVsa.AddCompleteEvent(cardSpine, OnChangeCardFinish);
// OnChangeCardFinish(null);
NAAVsa.PlayAnim(sk, "animation", true);
}, closeCallback);
ui.group_.y = 220;
// ui.group_.y = 220;
if (Screen.safeArea.y != 0)
{//刘海屏
ui.group_.y += Screen.safeArea.y;
// ui.group_.y += Screen.safeArea.y;
}
}
@@ -202,7 +204,7 @@ namespace BingoBrain
name = name[..4] + "...";
}
string broad_text = String.Format(text_ui.hide_text.text, name,
"$" + config_money_list[money_index], DateTimeBoardk.Instance.GetCurrDateTime());
"$" + 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);
@@ -215,7 +217,7 @@ namespace BingoBrain
ui.t1.Play();
});
string str = name + "-" + config_money_list[money_index] + "-" + DateTimeBoardk.Instance.GetCurrDateTime();
GameDispatcher.Instance.Dispatch(BingoInfo.updateRecordList, str);
GameDispatcher.Instance.Dispatch(BingoInfo.updateRecordList, str);
}
Assets/BingoBrain/ModuleUI/EnterBingo/EnterBingoUI.cs
-5
View File
@@ -165,11 +165,6 @@ namespace BingoBrain
// WebviewManager.Instance.SetDarkThough(true);
// WebviewManager.Instance.ShowH5View(false);
// WebviewManager.Instance.SetBtn(ConfigSystem.GetConfig<CommonModel>().propCoord[0], ConfigSystem.GetConfig<CommonModel>().propCoord[1], 60, 60);
if (GameHelper.IsGiftSwitch())
{
BingoDataSystem.CheckMakeupTaskData();
}
GameHelper.PostFunnelLogin("enterButtonClick");
ctrlDispatcher.Dispatch(CtrlMsg.Game_Start);
Assets/BingoBrain/ModuleUI/ExtraItem/ExtraItemUI.cs
+4 -1
View File
@@ -129,6 +129,8 @@ namespace BingoBrain
{
GameHelper.DelayedShowGObject(this, ui.closeButton, ui.btn_claim);
}
if ( ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1) ui.btn_more.GetChild("img_saveingpot").visible = true;
}
}
}
@@ -142,7 +144,8 @@ namespace BingoBrain
private void OnBtnClaimClick()
{
GameHelper.ShowInterstitial("interstitial_skipAd");
// GameHelper.ShowInterstitial("interstitial_skipAd");
GameHelper.addInterAdnumber();
OpenCloseClick(false);
if (data.cont_index == ui._Extra_extraball)
{
Assets/BingoBrain/ModuleUI/GodPle/GodPleUI.cs
+15 -12
View File
@@ -3,6 +3,7 @@ using DG.Tweening;
using BingoBrain.Core;
using FGUI.JRewardPop;
using DontConfuse;
using FGUI.ACommon;
namespace BingoBrain
{
@@ -93,9 +94,10 @@ namespace BingoBrain
var isFree = model.rewardInfo.condition == RewardCondition.None;
if (ui.btn_collect is btn_collect btn_collect)
if (ui.btn_collect is btn_green_vid btn_collect)
{
btn_collect.cont_state.selectedIndex = isFree ? btn_collect._State_free : btn_collect._State_video;
btn_collect.cont_button.selectedIndex = isFree ? 0 : 1;
if (!isFree && ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1) btn_collect.img_saveingpot.visible = true;
}
@@ -103,16 +105,16 @@ namespace BingoBrain
// if (!isFree)
// {
DOVirtual.DelayedCall(2, () => { ui.btn_no.visible = true; });
DOVirtual.DelayedCall(2, () => { ui.btn_no.visible = true; });
ui.btn_collect.SetClick(() =>
{
OnClickAdCollect(item.cashmultiple);
});
ui.btn_no.SetClick(() =>
{
OnClickCancel();
});
ui.btn_collect.SetClick(() =>
{
OnClickAdCollect(item.cashmultiple);
});
ui.btn_no.SetClick(() =>
{
OnClickCancel();
});
// }
// else
@@ -144,7 +146,8 @@ namespace BingoBrain
model.rewardInfo.GetRewardDataList()[0].value = model.rewardInfo.GetRewardDataList()[0].value / 10;
UsaSystem.GetReward(model.rewardInfo);
CtrlCloseUI();
GameHelper.ShowInterstitial("interstitial_skipAd");
// GameHelper.ShowInterstitial("interstitial_skipAd");
GameHelper.addInterAdnumber();
}
}
}
Assets/BingoBrain/ModuleUI/GodPleAc/GodPleAcUI.cs
+8 -1
View File
@@ -41,6 +41,7 @@ namespace BingoBrain
private bool isRiseUI;
private Action CloseCb;
public int ui_index = 0;
public GodPleAcUI(GodPleAcUICtrl ctrl) : base(ctrl)
{
@@ -103,6 +104,8 @@ namespace BingoBrain
protected override void OnOpenBefore(object args)
{
ui_index = UnityEngine.Random.Range(0, 99999);
Debug.Log("fasongyiciguanbi" + ui_index);
UICtrlDispatcher.Instance.Dispatch(SkinInfo.MaskUI_Open);
if (args is GodDa displayModel)
{
@@ -184,7 +187,11 @@ namespace BingoBrain
if (completeSum >= ui.com_Coins.numChildren)
{
var tw6 = DOVirtual.DelayedCall(0.2f, CtrlCloseUI);
var tw6 = DOVirtual.DelayedCall(0.2f, () =>
{
uiCtrlDispatcher.Dispatch(SkinInfo.GodPleAcUI_Close, ui_index);
Debug.Log("fasongyiciguanbi" + ui_index);
});
tweenQueue.Enqueue(tw6);
}
});
Assets/BingoBrain/ModuleUI/GodPleAc/GodPleAcUICtrl.cs
+3
View File
@@ -1,5 +1,7 @@
using BingoBrain.Core;
using BingoBrain.HotFix;
using UnityEngine;
namespace BingoBrain
{
@@ -29,6 +31,7 @@ namespace BingoBrain
public override void CloseUI(object args = null)
{
if (args != null && ui.ui_index != (int)args) return;
if (ui != null && !ui.isClose)
{
ui.Close();
Assets/BingoBrain/ModuleUI/Smail/SmailUI.cs
+1
View File
@@ -70,6 +70,7 @@ namespace BingoBrain
SetName();
ui.settings.SetClick(OnClickSetting);
ui.com_avatar.loader_flag.visible = false;
if(GameHelper.IsGiftSwitch()) ui.btn_cash.gift.selectedIndex=1;
if (GameHelper.IsGiftSwitch())
{
// ui.visible = false;
Assets/BingoBrain/ModuleUI/StarReward/StarRewardUI.cs
+2 -1
View File
@@ -96,7 +96,8 @@ namespace BingoBrain
DOVirtual.DelayedCall(1.7f, () =>
{
UICtrlDispatcher.Instance.Dispatch(SkinInfo.StarRewardUI_Close);
GameHelper.ShowInterstitial("interstitial_skipAd");
// GameHelper.ShowInterstitial("interstitial_skipAd");
GameHelper.addInterAdnumber();
});
});