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

bingo b面修改

Browse Source
This commit is contained in:
changyunjia
2026-05-08 11:03:44 +08:00
parent ad5920ac6a
commit 5d32fd56f4
1780 changed files with 36187 additions and 73978 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/BingoBrain/System/Game/BingoDataSystem.cs
+80 -78
View File
@@ -54,7 +54,7 @@ namespace BingoBrain
return;
}
Debug.Log("????????????????????????3");
Debug.Log("????????????????????????3");
var lastId = -1;
var isRepeat = PreferencesMgr.Instance.MakeupTaskHistory.Count >= makeupVOModel.dataList.Count;
@@ -90,7 +90,9 @@ Debug.Log("????????????????????????3");
makeupTaskData.orderID = GetRandomNum(8);
PreferencesMgr.Instance.MakeupTaskHistory.Add(makeupTaskData);
makeupTaskData.SetStatus(MakeupTaskStatus.None);
if ((GameHelper.isRDExchangeMode() && SaveData.GetSaveobject().ExchangeProcessMode == 1) || (!GameHelper.isRDExchangeMode() && SaveData.GetSaveobject().CHProcessMode == 1)) makeupTaskData.SetStatus(MakeupTaskStatus.Level);
else makeupTaskData.SetStatus(MakeupTaskStatus.None);
PreferencesMgr.Instance.SaveMakeupTaskHistory();
PreferencesMgr.Instance.MakeupTaskH5Time = 0;
@@ -101,7 +103,7 @@ Debug.Log("????????????????????????3");
}
public static void CheckMakeupTaskData()
{
Debug.Log("????????????????????????1");
Debug.Log("????????????????????????1");
if (!GameHelper.IsGiftSwitch())
{
return;
@@ -367,31 +369,31 @@ Debug.Log("????????????????????????3");
}
}
if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count > 0)
{
var taskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last();
if (taskData.status == MakeupTaskStatus.Task)
{
var cardRedeemNewModel = ConfigSystem.GetConfig<CardRedeemNewModel>();
var makeupVo = cardRedeemNewModel.dataList.FirstOrDefault(card => card.id == taskData.tableId);
if (makeupVo != null && taskData.videoCount < makeupVo.fee_need)
{
taskData.videoCount++;
PreferencesMgr.Instance.SaveCoinMakeupTaskHistory();
}
}
}
if (SaveData.GetSaveobject().saveingpot_history.Count > 0)
// if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count > 0)
// {
// var taskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last();
// if (taskData.status == MakeupTaskStatus.Task)
// {
// var cardRedeemNewModel = ConfigSystem.GetConfig<CardRedeemNewModel>();
// var makeupVo = cardRedeemNewModel.dataList.FirstOrDefault(card => card.id == taskData.tableId);
// if (makeupVo != null && taskData.videoCount < makeupVo.fee_need)
// {
// taskData.videoCount++;
// PreferencesMgr.Instance.SaveCoinMakeupTaskHistory();
// }
// }
// }
if (SaveData.GetSaveobject().saveingpot_history.Count > 0)
{
SaveingPotHelper.TestingClearTime();
CheckSpeedUpTaskData(2);
SaveingPotClass taskData = SaveData.GetSaveobject().saveingpot_history.Last();
makeup_2 makeupVo = ConfigSystem.GetConfig<MakeupModel_2>().GetData(taskData.tableId);
SaveData.GetSaveobject().saveingpot_cash += makeupVo.ADIncrease;
GameDispatcher.Instance.Dispatch(GameMsg.RefreshSaveingPot);
SaveData.GetSaveobject().saveingpot_ch += makeupVo.ADIncrease;
// GameDispatcher.Instance.Dispatch(GameMsg.RefreshSaveingPot);
if (ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1 && GameHelper.IsGiftSwitch())
{
if ((SaveData.GetSaveobject().saveingpot_cash > taskData.amount) && (!taskData.auto_show) && !UI.Instance.IsExistUI(UIConst.H5UI))
if ((SaveData.GetSaveobject().saveingpot_ch > taskData.amount) && (!taskData.auto_show) && !UI.Instance.IsExistUI(UIConst.H5UI))
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SaveingPotUI_Open);
@@ -428,31 +430,31 @@ Debug.Log("????????????????????????3");
return;
}
//if (PreferencesMgr.Instance.CoinMakeupTaskHistory == null) PreferencesMgr.Instance.CoinMakeupTaskHistory = new List<MakeupTaskData>();
MakeupTaskData taskData = null;
if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count != 0) taskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last();
if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count == 0 || taskData.status == MakeupTaskStatus.Inline)
{
AddCoinMakeupTaskData();
}
else
{
foreach (var makeuptaskData in PreferencesMgr.Instance.CoinMakeupTaskHistory)
{
if (makeuptaskData.status == MakeupTaskStatus.Inline
&& makeuptaskData.inlineNum > GameHelper.GetCommonModel().inlineMin)
{
makeuptaskData.inlineNum -= UnityEngine.Random.Range(
GameHelper.GetCommonModel().inlineLoginDown[0],
GameHelper.GetCommonModel().inlineLoginDown[1]);
if (makeuptaskData.inlineNum < GameHelper.GetCommonModel().inlineMin)
{
makeuptaskData.inlineNum = GameHelper.GetCommonModel().inlineMin;
}
}
}
// MakeupTaskData taskData = null;
// if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count != 0) taskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last();
// if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count == 0 || taskData.status == MakeupTaskStatus.Inline)
// {
// AddCoinMakeupTaskData();
// }
// else
// {
// foreach (var makeuptaskData in PreferencesMgr.Instance.CoinMakeupTaskHistory)
// {
// if (makeuptaskData.status == MakeupTaskStatus.Inline
// && makeuptaskData.inlineNum > GameHelper.GetCommonModel().inlineMin)
// {
// makeuptaskData.inlineNum -= UnityEngine.Random.Range(
// GameHelper.GetCommonModel().inlineLoginDown[0],
// GameHelper.GetCommonModel().inlineLoginDown[1]);
// if (makeuptaskData.inlineNum < GameHelper.GetCommonModel().inlineMin)
// {
// makeuptaskData.inlineNum = GameHelper.GetCommonModel().inlineMin;
// }
// }
// }
PreferencesMgr.Instance.SaveCoinMakeupTaskHistory();
}
// PreferencesMgr.Instance.SaveCoinMakeupTaskHistory();
// }
}
public static void AddCoinMakeupTaskData()
{
@@ -465,46 +467,46 @@ Debug.Log("????????????????????????3");
var lastId = -1;
if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count > 0)
{
var makeupTaskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last();
// if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count > 0)
// {
// var makeupTaskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last();
if (makeupTaskData.status == MakeupTaskStatus.None
|| makeupTaskData.status == MakeupTaskStatus.Task)
{
return;
}
// if (makeupTaskData.status == MakeupTaskStatus.None
// || makeupTaskData.status == MakeupTaskStatus.Task)
// {
// return;
// }
lastId = makeupTaskData.tableId;
}
// lastId = makeupTaskData.tableId;
// }
var lastVoId = cardRedeemNewVOModel.dataList.Last().id;
if (lastId == lastVoId)
{
lastId = lastVoId - 1;
}
// var lastVoId = cardRedeemNewVOModel.dataList.Last().id;
// if (lastId == lastVoId)
// {
// lastId = lastVoId - 1;
// }
foreach (var makeupVo in cardRedeemNewVOModel.dataList)
{
if (makeupVo.id > lastId)
{
var makeupTaskData = new MakeupTaskData();
//makeupTaskData.makeupTaskType = MakeupTaskType.Coin;
makeupTaskData.tableId = makeupVo.id;
makeupTaskData.id = PreferencesMgr.Instance.CoinMakeupTaskHistory.Count + 1;
makeupTaskData.is_gold = true;
// makeupTaskData.amountStr = GameHelper.GetMoneyStr(makeupVo);
//makeupTaskData.orderID = GameHelper.GetRandomNum(8);
// foreach (var makeupVo in cardRedeemNewVOModel.dataList)
// {
// if (makeupVo.id > lastId)
// {
// var makeupTaskData = new MakeupTaskData();
// //makeupTaskData.makeupTaskType = MakeupTaskType.Coin;
// makeupTaskData.tableId = makeupVo.id;
// makeupTaskData.id = PreferencesMgr.Instance.CoinMakeupTaskHistory.Count + 1;
// makeupTaskData.is_gold = true;
// // makeupTaskData.amountStr = GameHelper.GetMoneyStr(makeupVo);
// //makeupTaskData.orderID = GameHelper.GetRandomNum(8);
PreferencesMgr.Instance.CoinMakeupTaskHistory.Add(makeupTaskData);
makeupTaskData.SetStatus(MakeupTaskStatus.None);
PreferencesMgr.Instance.SaveCoinMakeupTaskHistory();
// PreferencesMgr.Instance.CoinMakeupTaskHistory.Add(makeupTaskData);
// makeupTaskData.SetStatus(MakeupTaskStatus.None);
// PreferencesMgr.Instance.SaveCoinMakeupTaskHistory();
PreferencesMgr.Instance.CoinMakeupTaskH5Time = 0;
break;
}
}
// PreferencesMgr.Instance.CoinMakeupTaskH5Time = 0;
// break;
// }
// }
}
private void CheckSpeedUpTaskData(int type = 1)
{
Assets/BingoBrain/System/Game/BingoSystem.cs
+2 -1
View File
@@ -156,7 +156,8 @@ namespace BingoBrain
UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoHalldUI_Open);
if (GameHelper.IsGiftSwitch() && Random.Range(0, 100) < ConfigSystem.GetConfig<CommonModel>().backhallrate)
{
BingoHalldUI.Instance.OnClickHall();
// BingoHalldUI.Instance.OnClickHall();
BingoHalldUI.Instance.OnClickMainTab();
}
else
{
Assets/BingoBrain/System/Game/JsonSystem.cs
+13 -2
View File
@@ -98,7 +98,7 @@ namespace BingoBrain
// Debug.Log("kkkkkkkkkkkkkkkkkkkkkk" + needDownloadConfigFile);
// Debug.Log("kkkkkkkkkkkkkkkkkkkkkk" + savedCfgName);
if (needDownloadConfigFile)
if (false)
{
IsfvKit.StartCoroutine(CachKit.GetTextFromUrl($"{NetworkKit.CDNUrl}config/{CDNConfigFileName}",
configFileName, (content) =>
@@ -137,6 +137,7 @@ namespace BingoBrain
private void ParseConfig(string json)
{
Debug.Log(json);
if (json == null)
{
return;
@@ -289,10 +290,14 @@ namespace BingoBrain
GetGameConfig<exBrPoolModel_2, exBrPool_2>(dictionary);
GetGameConfig<MakeupModel_2, makeup_2>(dictionary);
GetGameConfig<MultigiftModel, Multigift>(dictionary);
GetGameConfig<ExchangeDesModel, ExchangeDescriptors>(dictionary);//兑换
Debug.Log(JsonConvert.SerializeObject(ConfigSystem.GetConfig<ExchangeDesModel>().dataList));
exBrPoolModel.config_name_list = ConfigSystem.GetConfig<exBrPoolModel>().dataList[0].user_name.Split(",").ToList();
exBrPoolModel.config_money_list = ConfigSystem.GetConfig<exBrPoolModel>().dataList[0].amount.Split(",").ToList();
exBrPoolModel_2.config_name_list = ConfigSystem.GetConfig<exBrPoolModel_2>().dataList[0].user_name.Split(",").ToList();
exBrPoolModel_2.config_money_list = ConfigSystem.GetConfig<exBrPoolModel_2>().dataList[0].amount.Split(",").ToList();
// exBrPoolModel.getFaqData();
if (PreferencesMgr.Instance.ActiveMissions != null)
{
@@ -329,7 +334,13 @@ namespace BingoBrain
}
}
Debug.Log(SaveData.GetSaveobject());
if (SaveData.GetSaveobject().ExchangeProcessMode < 0)
{
SaveData.GetSaveobject().ExchangeModeToggle = ConfigSystem.GetConfig<CommonModel>().ExchangeModeToggle;
SaveData.GetSaveobject().ExchangeProcessMode = ConfigSystem.GetConfig<CommonModel>().ExchangeProcessMode;
SaveData.GetSaveobject().CHProcessMode = ConfigSystem.GetConfig<CommonModel>().CHProcessMode;
}
// Debug.Log("888888888888888888");
}
Assets/BingoBrain/System/Game/TuSystem.cs
+1 -1
View File
@@ -44,7 +44,7 @@ namespace BingoBrain
}
else
{
GameHelper.Toast("outTicket", true);
// GameHelper.Toast("outTicket", true);
}
break;
Assets/BingoBrain/System/Game/UsaSystem.cs
+7 -7
View File
@@ -41,13 +41,13 @@ public class UsaSystem : BaseSystem
if (!GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(SkinInfo.GodPleUI_Open, rewardData);
else
{
var temp = new SuccessData();
temp.IsWin = true;
temp.cash_number = (float)rewardData.rewardDataList[0].value;
temp.rate = (int)GameHelper.GetRewardValue(2)[1];
temp.IsLevelSuccess = false;
temp.IsH5Reward = true;
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp);
// var temp = new SuccessData();
// temp.IsWin = true;
// temp.cash_number = (float)rewardData.rewardDataList[0].value;
// temp.rate = (int)GameHelper.GetRewardValue(2)[1];
// temp.IsLevelSuccess = false;
// temp.IsH5Reward = true;
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp);
}
}
else