bingo b面修改
This commit is contained in:
@@ -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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user