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-19 18:13:35 +08:00
parent defb4f0280
commit b764571e86
13 changed files with 101 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/BingoBrain/FGUI/Package/bkg_jilu/com_record_item.cs
+3 -3
View File
@@ -9,8 +9,8 @@ namespace FGUI.bkg_jilu
{
public GTextField name;
public GTextField lab_claim;
public GTextField time;
public GRichTextField num;
public GTextField time;
public const string URL = "ui://u5bqcwhxf6p04";
public static com_record_item CreateInstance()
@@ -24,8 +24,8 @@ namespace FGUI.bkg_jilu
name = (GTextField)GetChildAt(2);
lab_claim = (GTextField)GetChildAt(3);
time = (GTextField)GetChildAt(4);
num = (GRichTextField)GetChildAt(5);
num = (GRichTextField)GetChildAt(4);
time = (GTextField)GetChildAt(5);
}
}
}
Assets/BingoBrain/Harmony/GameHelper.cs
+1
View File
@@ -705,6 +705,7 @@ namespace BingoBrain
public static AdReward GetChanceByIdAndNum(int id, int num = 0)
{
if(id==102) id=101;
var adRewardModel = GetConfig<AdRewardModel>();
return adRewardModel.GetDataList().FirstOrDefault(vo =>
vo.reward == id && (vo.rewardAmount == 0 || vo.rewardAmount == num));
Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs
+1
View File
@@ -202,6 +202,7 @@ namespace BingoBrain
{
ui.btn_wb.visible = true;
}
Debug.Log(JsonConvert.SerializeObject(GameHelper.GetConfig<AdRewardModel>().dataList));
}
private void UpdateNextCardBoardTime()
Assets/BingoBrain/ModuleUI/Exchange/ExchangeUI.cs
+3 -3
View File
@@ -82,7 +82,7 @@ namespace BingoBrain
{
Debug.Log(GameHelper.GetCommonModel().ExchangeCard);
Debug.Log(GameHelper.GetCommonModel().ExchangeAmazon);
ui.text_amazon_ch.text =(GameHelper.isRDExchangeMode() ? "": "$") + GameHelper.GetCommonModel().ExchangeAmazon[0].ToString();
ui.text_amazon_ch.text = (GameHelper.isRDExchangeMode() ? "" : "$") + GameHelper.GetCommonModel().ExchangeAmazon[0].ToString();
SetGold();
ui.btn_addcard.SetClick(() =>
{
@@ -194,12 +194,12 @@ namespace BingoBrain
if (makeupTaskData.status > MakeupTaskStatus.None)
{
btn_list[i].text_progress.text = $"{makeupTaskData.amount:N}" + "/" + $"{makeupTaskData.amount:N}";
btn_list[i].progress_makeup.value=100;
btn_list[i].progress_makeup.value = 100;
}
else
{
btn_list[i].text_progress.text = $"{PreferencesMgr.Instance.Currency102:N}" + "/" + $"{makeupTaskData.amount:N}";
btn_list[i].progress_makeup.value=(double)(PreferencesMgr.Instance.Currency102/makeupTaskData.amount);
btn_list[i].progress_makeup.value = (double)(PreferencesMgr.Instance.Currency102 / makeupTaskData.amount) * 100;
}
Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs
+15 -5
View File
@@ -90,7 +90,7 @@ namespace BingoBrain
makeupTaskData = args as MakeupTaskData;
ch_index = makeupTaskData.tableId - 1;
// PreferencesMgr.Instance.Currency102 = 999999999; //zhushi
// PreferencesMgr.Instance.Currency102 = 999999999; //zhushi
// makeupTaskData.LvVideoCount = 999;//zhushi
// makeupTaskData.videoCount = 999;//zhushi
@@ -179,7 +179,7 @@ namespace BingoBrain
}
if (PreferencesMgr.Instance.MakeupTaskHistory.Count > 1)
{
// ui.group_.visible = true;
// ui.group_.visible = true;
}
else
{
@@ -681,7 +681,10 @@ namespace BingoBrain
ui.cont_state.selectedIndex = 2;
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();
@@ -948,14 +951,21 @@ namespace BingoBrain
// 可以加速多少排名
int rank_num = active_times * rdVOModel.Active_time_Down;
var last = data.activeSpeedNum;
data.activeSpeedNum += rank_num;
Debug.Log($"rank_num=== {rank_num} {last} {data.activeSpeedNum} {rdVOModel.Active_Limit_times}");
if (data.activeSpeedNum > rdVOModel.Active_Limit_times)
{
rank_num = rdVOModel.Active_Limit_times - last;
// rank_num = rdVOModel.Active_Limit_times - last;
data.activeSpeedNum = rdVOModel.Active_Limit_times;
}
data.inlineNum -= rank_num;
else
{
if (data.activeSpeedNum + rank_num > rdVOModel.Active_Limit_times) rank_num = rdVOModel.Active_Limit_times - data.activeSpeedNum;
data.activeSpeedNum += rank_num;
data.inlineNum -= rank_num;
}
Debug.Log($"订单为： {data.tableId} 通过活跃时间减少的排名为：{rank_num}");
Assets/BingoBrain/ModuleUI/SaveData.cs
+34 -34
View File
@@ -127,60 +127,60 @@ namespace BingoBrain
public int _goldtime0;
public int _goldtime1;
public int _goldtime2;
public int _goldtime3;
public int _goldtime4;
public bool have_slot;
public int battle_pass_time;
// public int _goldtime0;
// public int _goldtime1;
// public int _goldtime2;
// public int _goldtime3;
// public int _goldtime4;
// public bool have_slot;
// public int battle_pass_time;
public List<int> pass_task_record = new List<int>();
public List<int> time_task_record = new List<int>();
public int login_day;
public int login_hour;
public int cash_people;
public float cash_people_1;
public float cash_people_2;
// public int cash_people;
// public float cash_people_1;
// public float cash_people_2;
public bool is_get_packreward;
// public bool is_get_packreward;
public bool is_get_removead;
public bool is_autopack_show;
public int is_autopack_show_day;
// public bool is_autopack_show;
// public int is_autopack_show_day;
public long start_time;
public int clear_number;
// public long start_time;
// public int clear_number;
/// <summary>
/// 每一局使用道具数量（[0]:out [1]:back [2]:refresh）
/// </summary>
public int[] usePropsNum = new int[3];
/// <summary>
/// 卡牌层数
/// </summary>
public int card_layer;
/// <summary>
/// 卡牌总数量
/// </summary>
public int all_card_numbers;
// /// <summary>
// /// 每一局使用道具数量（[0]:out [1]:back [2]:refresh）
// /// </summary>
// public int[] usePropsNum = new int[3];
// /// <summary>
// /// 卡牌层数
// /// </summary>
// public int card_layer;
// /// <summary>
// /// 卡牌总数量
// /// </summary>
// public int all_card_numbers;
public int this_time_cardtype;
// public int this_time_cardtype;
public int look_ad_numbers;
public int look_ad_time;
// public int look_ad_time;
public int[] dark_Dayref;
public int[] _goldtime;
// public int[] _goldtime;
// public MaxPayClass max_pay_object;
public List<SaveingPotClass> saveingpot_history = new List<SaveingPotClass>();
public long failed_pack_time;
public int three_gift_got_index = 1;
public long last_got_three_gift_time = 0;
public bool is_get_ThreeDaysGift;
// public long failed_pack_time;
// public int three_gift_got_index = 1;
// public long last_got_three_gift_time = 0;
// public bool is_get_ThreeDaysGift;
//tixian
public int ExchangeProcessMode = -1;
public int CHProcessMode = -1;
Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUI.cs
+10 -3
View File
@@ -467,14 +467,21 @@ namespace BingoBrain
// 可以加速多少排名
int rank_num = active_times * rdVOModel.Active_time_Down;
var last = data.activeSpeedNum;
data.activeSpeedNum += rank_num;
//Debug.Log($"rank_num=== {rank_num} {last} {data.activeSpeedNum} {rdVOModel.Active_Limit_times}");
if (data.activeSpeedNum > rdVOModel.Active_Limit_times)
{
rank_num = rdVOModel.Active_Limit_times - last;
// rank_num = rdVOModel.Active_Limit_times - last;
data.activeSpeedNum = rdVOModel.Active_Limit_times;
}
data.inlineNum -= rank_num;
else
{
if (data.activeSpeedNum + rank_num > rdVOModel.Active_Limit_times) rank_num = rdVOModel.Active_Limit_times - data.activeSpeedNum;
data.activeSpeedNum += rank_num;
data.inlineNum -= rank_num;
}
//Debug.Log($"订单为： {data.tableId} 通过活跃时间减少的排名为：{rank_num}");
Assets/BingoBrain/ModuleUI/Somsion/SomsionUI.cs
+2 -2
View File
@@ -85,8 +85,8 @@ namespace BingoBrain
}
if (task.RewardId == 102)
{
val = $"{GameHelper.Get102Str((decimal)task.RewardSum)}";
{
val = $"{(decimal)task.RewardSum:N}";
}
_Singletask.text_num.text = val;
Assets/BingoBrain/System/Game/BingoDataSystem.cs
+31 -23
View File
@@ -103,7 +103,7 @@ namespace BingoBrain
}
public static void CheckMakeupTaskData()
{
Debug.Log("????????????????????????1");
Debug.Log("????????????????????????1");
if (!GameHelper.IsGiftSwitch())
{
return;
@@ -138,7 +138,7 @@ namespace BingoBrain
PlayerPrefs.SetInt($"days_{userId}_{makeuptaskData.tableId}", DateTime.Today.Day);
var loginNum = UnityEngine.Random.Range(common.inlineLoginDown[0],
common.inlineLoginDown[1]);
makeuptaskData.loginSpeedNum += loginNum;
//如果登录减少人数大于配置的阈值，则不能减少排名了
Debug.Log($"登录累计增加的排名为：{makeuptaskData.loginSpeedNum} 阈值为：{redeemVOModel.Login_Limit_times}");
if (makeuptaskData.loginSpeedNum > redeemVOModel.Login_Limit_times)
@@ -146,7 +146,8 @@ namespace BingoBrain
makeuptaskData.loginSpeedNum = redeemVOModel.Login_Limit_times;
continue;
}
if (makeuptaskData.loginSpeedNum + loginNum > redeemVOModel.Login_Limit_times) loginNum = redeemVOModel.Login_Limit_times - makeuptaskData.loginSpeedNum;
makeuptaskData.loginSpeedNum += loginNum;
Debug.Log($"订单为： {makeuptaskData.tableId} 通过登录减少的排名为：{loginNum}");
makeuptaskData.inlineNum -= loginNum;
if (makeuptaskData.inlineNum < common.inlineMin)
@@ -186,7 +187,7 @@ namespace BingoBrain
PlayerPrefs.SetInt($"days__{makeuptaskData.tableId}_pot", DateTime.Today.Day);
var loginNum = UnityEngine.Random.Range(common.inlineLoginDown[0],
common.inlineLoginDown[1]);
makeuptaskData.loginSpeedNum += loginNum;
//如果登录减少人数大于配置的阈值，则不能减少排名了
// Debug.Log($"登录累计增加的排名为：{makeuptaskData.loginSpeedNum} 阈值为：{redeemVOModel.Login_Limit_times}");
if (makeuptaskData.loginSpeedNum > redeemVOModel.Login_Limit_times)
@@ -194,7 +195,8 @@ namespace BingoBrain
makeuptaskData.loginSpeedNum = redeemVOModel.Login_Limit_times;
continue;
}
if (makeuptaskData.loginSpeedNum + loginNum > redeemVOModel.Login_Limit_times) loginNum = redeemVOModel.Login_Limit_times - makeuptaskData.loginSpeedNum;
makeuptaskData.loginSpeedNum += loginNum;
//Debug.Log($"订单为： {makeuptaskData.tableId} 通过登录减少的排名为：{loginNum}");
makeuptaskData.inlineNum -= loginNum;
if (makeuptaskData.inlineNum < common.inlineMin)
@@ -280,7 +282,7 @@ namespace BingoBrain
PreferencesMgr.Instance.IsShowRewardFly105 = false;
PreferencesMgr.Instance.IsShowRewardFly106 = false;
CheckCoinMakeupTaskData();
// CheckCoinMakeupTaskData();
CheckMakeupTaskData();
PreferencesMgr.Instance.IsShowOpenReward = true;
}
@@ -345,27 +347,30 @@ namespace BingoBrain
CheckSpeedUpTaskData();
var taskData = PreferencesMgr.Instance.MakeupTaskHistory.Last();
if (taskData.status == MakeupTaskStatus.Task)
foreach (var taskData in PreferencesMgr.Instance.MakeupTaskHistory)
{
var makeupVo = ConfigSystem.GetConfig<MakeupModel>().dataList.FirstOrDefault(card => card.id == taskData.tableId);
if (makeupVo != null && taskData.videoCount < makeupVo.ad_need)
if (taskData.status == MakeupTaskStatus.Task)
{
taskData.videoCount++;
NetworkKit.BuriedPoint(BuriedPointEvent.ad_task, BuriedPointEvent.watch_ad_number, 1);
PreferencesMgr.Instance.SaveMakeupTaskHistory();
PlayerPrefs.SetInt("finish_ad_number", 0);
}
else
{
if (PlayerPrefs.GetInt("finish_ad_number", 0) == 0)
var makeupVo = ConfigSystem.GetConfig<MakeupModel>().dataList.FirstOrDefault(card => card.id == taskData.tableId);
if (makeupVo != null && taskData.videoCount < makeupVo.ad_need)
{
NetworkKit.BuriedPoint(BuriedPointEvent.ad_task, BuriedPointEvent.finish_ad_number, 1);
PlayerPrefs.SetInt("finish_ad_number", 1);
taskData.videoCount++;
NetworkKit.BuriedPoint(BuriedPointEvent.ad_task, BuriedPointEvent.watch_ad_number, 1);
PreferencesMgr.Instance.SaveMakeupTaskHistory();
PlayerPrefs.SetInt("finish_ad_number", 0);
}
else
{
if (PlayerPrefs.GetInt("finish_ad_number", 0) == 0)
{
NetworkKit.BuriedPoint(BuriedPointEvent.ad_task, BuriedPointEvent.finish_ad_number, 1);
PlayerPrefs.SetInt("finish_ad_number", 1);
}
}
}
}
// var taskData = PreferencesMgr.Instance.MakeupTaskHistory.Last();
}
// if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count > 0)
@@ -529,15 +534,17 @@ namespace BingoBrain
var dowmNum = redeemVOModel.AD_Down;
Debug.Log($"CheckSpeedUpTaskData dowmNum=== {dowmNum} makeuptaskData.WatchVideoSpeedNum ==== {makeuptaskData.WatchVideoSpeedNum}");
makeuptaskData.WatchVideoSpeedNum += dowmNum;
//如果看广告的减少人数大于配置的阈值，则不能减少排名了
if (makeuptaskData.WatchVideoSpeedNum > redeemVOModel.AD_Limit_times)
{
makeuptaskData.WatchVideoSpeedNum = redeemVOModel.AD_Limit_times;
continue;
}
if (makeuptaskData.WatchVideoSpeedNum + dowmNum > redeemVOModel.AD_Limit_times) dowmNum = redeemVOModel.AD_Limit_times - makeuptaskData.WatchVideoSpeedNum;
Debug.Log($"订单为： {makeuptaskData.tableId} 通过看广告减少的排名为：{dowmNum}");
makeuptaskData.WatchVideoSpeedNum += dowmNum;
makeuptaskData.inlineNum -= dowmNum;
Debug.Log($"订单为： {makeuptaskData.tableId} 减少后的排名：{makeuptaskData.inlineNum}");
if (makeuptaskData.inlineNum < common.inlineMin)
@@ -560,14 +567,15 @@ namespace BingoBrain
var dowmNum = redeemVOModel.AD_Down;
// Debug.Log($"CheckSpeedUpTaskData dowmNum=== {dowmNum} makeuptaskData.WatchVideoSpeedNum ==== {makeuptaskData.WatchVideoSpeedNum}");
makeuptaskData.WatchVideoSpeedNum += dowmNum;
//如果看广告的减少人数大于配置的阈值，则不能减少排名了
if (makeuptaskData.WatchVideoSpeedNum > redeemVOModel.AD_Limit_times)
{
makeuptaskData.WatchVideoSpeedNum = redeemVOModel.AD_Limit_times;
continue;
}
if (makeuptaskData.WatchVideoSpeedNum + dowmNum > redeemVOModel.AD_Limit_times) dowmNum = redeemVOModel.AD_Limit_times - makeuptaskData.WatchVideoSpeedNum;
makeuptaskData.WatchVideoSpeedNum += dowmNum;
//Debug.Log($"订单为： {makeuptaskData.tableId} 通过看广告减少的排名为：{dowmNum}");
makeuptaskData.inlineNum -= dowmNum;
//Debug.Log($"订单为： {makeuptaskData.tableId} 减少后的排名：{makeuptaskData.inlineNum}");
Assets/OPS/Obfuscator/Log/iOS.txt
+1 -1
View File
@@ -16388,7 +16388,7 @@
[Info][OPS.OBF][OnAnalyse_Assemblies] Skip Field [[Assembly-CSharp] System.Int32 BingoBrain.AdReward::reward] Because of your defined Field obfuscation settings.
[Info][OPS.OBF][OnAnalyse_Assemblies] Skip Field [[Assembly-CSharp] System.Int32 BingoBrain.AdReward::rewardAmount] Because of your defined Field obfuscation settings.
[Info][OPS.OBF][OnAnalyse_Assemblies] Skip Field [[Assembly-CSharp] System.Int32[] BingoBrain.AdReward::ratio] Because of your defined Field obfuscation settings.
[Info][OPS.OBF][OnAnalyse_Assemblies] Skip Field [[Assembly-CSharp] System.Int32[] BingoBrain.AdReward::probability] Because of your defined Field obfuscation settings.
[Info][OPS.OBF][OnAnalyse_Assemblies] Skip Field [[Assembly-CSharp] System.Int32[] BingoBrain.::probability] Because of your defined Field obfuscation settings.
[Info][OPS.OBF][OnAnalyse_Assemblies] Skip Field [[Assembly-CSharp] System.Int32 BingoBrain.BingoProb::probability] Because of your defined Field obfuscation settings.
[Info][OPS.OBF][OnAnalyse_Assemblies] Skip Field [[Assembly-CSharp] System.Int32[] BingoBrain.BingoProb::daubNum] Because of your defined Field obfuscation settings.
[Info][OPS.OBF][OnAnalyse_Assemblies] Skip Field [[Assembly-CSharp] System.Int32[] BingoBrain.BingoProb::bingoprob] Because of your defined Field obfuscation settings.
Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes
BIN
View File
Binary file not shown.
Assets/Resources/AssetHotFix/FGUI/bkg_jilu_fui.bytes
BIN
View File
Binary file not shown.
Assets/Resources/AssetHotFix/FGUI/tixian_fui.bytes
BIN
View File
Binary file not shown.