fix：1、更换项目，使用winter来创建
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace FlowerPower
|
||||
namespace LoveLegend
|
||||
{
|
||||
public class ConsumeSystem : BaseSystem
|
||||
{
|
||||
@@ -37,7 +37,7 @@ namespace FlowerPower
|
||||
switch (item)
|
||||
{
|
||||
case 101:
|
||||
if (itemValue <= PreferencesMgr.Instance.Currency101)
|
||||
if (itemValue <= DataMgr.Coin.Value)
|
||||
{
|
||||
consumeSuccessCount++;
|
||||
}
|
||||
@@ -48,7 +48,7 @@ namespace FlowerPower
|
||||
|
||||
break;
|
||||
case 102:
|
||||
if (itemValue <= PreferencesMgr.Instance.Currency102)
|
||||
if (itemValue <= DataMgr.Ticket.Value)
|
||||
{
|
||||
consumeSuccessCount++;
|
||||
}
|
||||
@@ -72,17 +72,17 @@ namespace FlowerPower
|
||||
switch (item)
|
||||
{
|
||||
case 101:
|
||||
if (itemValue <= PreferencesMgr.Instance.Currency101)
|
||||
if (itemValue <= DataMgr.Coin.Value)
|
||||
{
|
||||
PreferencesMgr.Instance.Currency101 -= itemValue;
|
||||
DataMgr.Coin.Value -= (int)itemValue;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 102:
|
||||
if (itemValue <= PreferencesMgr.Instance.Currency102)
|
||||
if (itemValue <= DataMgr.Ticket.Value)
|
||||
{
|
||||
PreferencesMgr.Instance.Currency102 -= itemValue;
|
||||
DataMgr.Ticket.Value -= itemValue;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
using SGModule.NetKit;
|
||||
using UnityEngine;
|
||||
|
||||
namespace FlowerPower
|
||||
namespace LoveLegend
|
||||
{
|
||||
public class GameDataSystem : BaseSystem
|
||||
{
|
||||
@@ -12,6 +13,8 @@ namespace FlowerPower
|
||||
|
||||
private Action onChangeGiftSwitch;
|
||||
|
||||
private long _uid;
|
||||
|
||||
public GameDataSystem(bool isAutoInit = true)
|
||||
{
|
||||
if (isAutoInit)
|
||||
@@ -29,16 +32,16 @@ namespace FlowerPower
|
||||
private void AddListener()
|
||||
{
|
||||
CtrlDispatcher.Instance.AddListener(CtrlMsg.Game_StartBefore, InitPreferences);
|
||||
PreferencesDispatcher<decimal>.Instance.AddListener(PreferencesMsg.currency101, OnChange101);
|
||||
PreferencesDispatcher<float>.Instance.AddListener(PreferencesMsg.playReawrd111, OnChange111);
|
||||
PreferencesDispatcher<decimal>.Instance.AddListener(DataMsg.currency101, OnChange101);
|
||||
PreferencesDispatcher<float>.Instance.AddListener(DataMsg.playReawrd111, OnChange111);
|
||||
CtrlDispatcher.Instance.AddListener(CtrlMsg.GameNewDays, NewDay);
|
||||
CtrlDispatcher.Instance.AddListener(CtrlMsg.Module_GiftSwitchChange, OnChangeGiftSwitch);
|
||||
GameDispatcher.Instance.AddListener(GameMsg.RefreshADTask, RefreshADTaskData);
|
||||
CtrlDispatcher.Instance.AddListener(CtrlMsg.WatchVideoFinish, AddWatchVideo);
|
||||
CtrlDispatcher.Instance.AddListener(CtrlMsg.WatchIntVideoFinish, AddIntWatchVideo);
|
||||
|
||||
PreferencesDispatcher<bool>.Instance.AddListener(PreferencesMsg.isShowRewardFly101, OnChangeRewardFly101);
|
||||
PreferencesDispatcher<bool>.Instance.AddListener(PreferencesMsg.isShowRewardFly111, OnChangeRewardFly111);
|
||||
PreferencesDispatcher<bool>.Instance.AddListener(DataMsg.isShowRewardFly101, OnChangeRewardFly101);
|
||||
PreferencesDispatcher<bool>.Instance.AddListener(DataMsg.isShowRewardFly111, OnChangeRewardFly111);
|
||||
GameDispatcher.Instance.AddListener(GameMsg.ProcessReward, OnGetReward);
|
||||
GameDispatcher.Instance.AddListener(GameMsg.RefreshMakeupData, OnRefreshMakeupData);
|
||||
|
||||
@@ -52,41 +55,43 @@ namespace FlowerPower
|
||||
|
||||
private void InitPreferences(object obj)
|
||||
{
|
||||
if (PreferencesMgr.Instance.Currency101 == -1)
|
||||
if (DataMgr.Coin.Value == -1)
|
||||
{
|
||||
PreferencesMgr.Instance.Currency101 = 0;
|
||||
DataMgr.Coin.Value = 0;
|
||||
}
|
||||
|
||||
if (PreferencesMgr.Instance.Currency102 == -1)
|
||||
if (DataMgr.Ticket.Value == -1)
|
||||
{
|
||||
PreferencesMgr.Instance.Currency102 = 0;
|
||||
DataMgr.Ticket.Value = 0;
|
||||
}
|
||||
|
||||
if (!GameHelper.IsContinuousSignIn())
|
||||
{
|
||||
PreferencesMgr.Instance.SignState.Clear();
|
||||
PreferencesMgr.Instance.SaveSignState();
|
||||
DataMgr.SignState.Value.Clear();
|
||||
}
|
||||
|
||||
if (PreferencesMgr.Instance.PlayerName.IsNullOrWhiteSpace())
|
||||
if (DataMgr.PlayerName.Value.IsNullOrWhiteSpace())
|
||||
{
|
||||
if (ModuleManager.Instance.GetModel(ModelConst.LoginModel) is LoginModel loginModel)
|
||||
if (GameHelper.GetLoginModel() != null)
|
||||
{
|
||||
PreferencesMgr.Instance.PlayerName = loginModel.invite_code;
|
||||
DataMgr.PlayerName.Value = GameHelper.GetLoginModel().InviteCode;
|
||||
}
|
||||
}
|
||||
|
||||
PreferencesMgr.Instance.IsShowRewardFly101 = false;
|
||||
PreferencesMgr.Instance.IsShowRewardFly102 = false;
|
||||
DataMgr.IsShowRewardFly101.Value = false;
|
||||
DataMgr.IsShowRewardFly102.Value = false;
|
||||
|
||||
|
||||
CheckMakeupTaskData();
|
||||
|
||||
|
||||
PreferencesMgr.Instance.IsLastH5Tab = true;
|
||||
DataMgr.IsLastH5Tab.Value = true;
|
||||
|
||||
|
||||
|
||||
CommonHelper.CheckAdTimes();
|
||||
|
||||
|
||||
_uid = LoginKit.Instance.LoginModel.Uid;
|
||||
}
|
||||
|
||||
|
||||
@@ -104,15 +109,15 @@ namespace FlowerPower
|
||||
}
|
||||
|
||||
|
||||
if (PreferencesMgr.Instance.MakeupTaskHistory.Count == 0)
|
||||
if (DataMgr.MakeupTaskHistory.Value.Count == 0)
|
||||
{
|
||||
AddMakeupTaskData();
|
||||
}
|
||||
else
|
||||
{
|
||||
var common = ConfigSystem.GetConfig<CommonModel>();
|
||||
var common = ConfigSystem.GetCommonConf();
|
||||
|
||||
foreach (var makeuptaskData in PreferencesMgr.Instance.MakeupTaskHistory)
|
||||
foreach (var makeuptaskData in DataMgr.MakeupTaskHistory.Value)
|
||||
{
|
||||
if (makeuptaskData.status == MakeupTaskStatus.Inline
|
||||
&& makeuptaskData.inlineNum > common.inlineMin)
|
||||
@@ -120,24 +125,23 @@ namespace FlowerPower
|
||||
|
||||
|
||||
|
||||
var rdVOModel = ConfigSystem.GetConfig<MakeupModel>().dataList
|
||||
.FirstOrDefault(rd => rd.id == makeuptaskData.tableId);
|
||||
var rmVOModel = ConfigSystem.GetConfig<Makeup>()
|
||||
.FirstOrDefault(rm => rm.id == makeuptaskData.tableId);
|
||||
|
||||
var days = PlayerPrefs.GetInt($"days_{NetworkKit.userId}_{makeuptaskData.tableId}", 0);
|
||||
var days = PlayerPrefs.GetInt($"days_{_uid}_{makeuptaskData.tableId}", 0);
|
||||
if (days == DateTime.Today.Day)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
PlayerPrefs.SetInt($"days_{NetworkKit.userId}_{makeuptaskData.tableId}", DateTime.Today.Day);
|
||||
PlayerPrefs.SetInt($"days_{_uid}_{makeuptaskData.tableId}", DateTime.Today.Day);
|
||||
var loginNum = CommonHelper.RandomRange(common.inlineLoginDown[0],
|
||||
common.inlineLoginDown[1]);
|
||||
makeuptaskData.loginSpeedNum += loginNum;
|
||||
//如果登录减少人数大于配置的阈值，则不能减少排名了
|
||||
// Debug.Log($"登录累计增加的排名为：{makeuptaskData.loginSpeedNum} 阈值为：{rdVOModel.Login_Limit_times}");
|
||||
if (makeuptaskData.loginSpeedNum > rdVOModel.Login_Limit_times)
|
||||
if (makeuptaskData.loginSpeedNum > rmVOModel.Login_Limit_times)
|
||||
{
|
||||
makeuptaskData.loginSpeedNum = rdVOModel.Login_Limit_times;
|
||||
makeuptaskData.loginSpeedNum = rmVOModel.Login_Limit_times;
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -150,17 +154,17 @@ namespace FlowerPower
|
||||
}
|
||||
}
|
||||
|
||||
PreferencesMgr.Instance.SaveMakeupTaskHistory();
|
||||
DataMgr.MakeupTaskHistory.Save();;
|
||||
}
|
||||
if (SaveData.GetSaveobject().saveingpot_history.Count == 0)
|
||||
if (SaveData.GetSaveObject().saveingpot_history.Count == 0)
|
||||
{
|
||||
// Debug.Log("tianjialishiiiiiiiiiiiiii");
|
||||
// AddMakeupTaskData();
|
||||
}
|
||||
else
|
||||
{
|
||||
var common = ConfigSystem.GetConfig<CommonModel>();
|
||||
foreach (var makeuptaskData in SaveData.GetSaveobject().saveingpot_history)
|
||||
var common = ConfigSystem.GetCommonConf();
|
||||
foreach (var makeuptaskData in SaveData.GetSaveObject().saveingpot_history)
|
||||
{
|
||||
if (makeuptaskData.status == SaveingPotTaskStatus.Inline
|
||||
&& makeuptaskData.inlineNum > common.inlineMin)
|
||||
@@ -168,24 +172,23 @@ namespace FlowerPower
|
||||
|
||||
|
||||
|
||||
var rdVOModel = ConfigSystem.GetConfig<MakeupModel_2>().dataList
|
||||
.FirstOrDefault(rd => rd.id == makeuptaskData.tableId);
|
||||
var rmVOModel = ConfigSystem.GetConfig<Makeup_2>()
|
||||
.FirstOrDefault(rm => rm.id == makeuptaskData.tableId);
|
||||
|
||||
var days = PlayerPrefs.GetInt($"days_{NetworkKit.userId}_{makeuptaskData.tableId}_pot", 0);
|
||||
var days = PlayerPrefs.GetInt($"days_{_uid}_{makeuptaskData.tableId}_pot", 0);
|
||||
if (days == DateTime.Today.Day)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
PlayerPrefs.SetInt($"days_{NetworkKit.userId}_{makeuptaskData.tableId}_pot", DateTime.Today.Day);
|
||||
PlayerPrefs.SetInt($"days_{_uid}_{makeuptaskData.tableId}_pot", DateTime.Today.Day);
|
||||
var loginNum = CommonHelper.RandomRange(common.inlineLoginDown[0],
|
||||
common.inlineLoginDown[1]);
|
||||
makeuptaskData.loginSpeedNum += loginNum;
|
||||
//如果登录减少人数大于配置的阈值，则不能减少排名了
|
||||
// Debug.Log($"登录累计增加的排名为：{makeuptaskData.loginSpeedNum} 阈值为：{rdVOModel.Login_Limit_times}");
|
||||
if (makeuptaskData.loginSpeedNum > rdVOModel.Login_Limit_times)
|
||||
if (makeuptaskData.loginSpeedNum > rmVOModel.Login_Limit_times)
|
||||
{
|
||||
makeuptaskData.loginSpeedNum = rdVOModel.Login_Limit_times;
|
||||
makeuptaskData.loginSpeedNum = rmVOModel.Login_Limit_times;
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -198,7 +201,7 @@ namespace FlowerPower
|
||||
}
|
||||
}
|
||||
}
|
||||
SaveData.saveDataFunc();
|
||||
SaveData.SaveDataFunc();
|
||||
}
|
||||
|
||||
private void CheckSpeedUpTaskData(int type = 1)
|
||||
@@ -208,26 +211,26 @@ namespace FlowerPower
|
||||
return;
|
||||
}
|
||||
|
||||
var common = ConfigSystem.GetConfig<CommonModel>();
|
||||
var common = ConfigSystem.GetCommonConf();
|
||||
|
||||
if (type == 1 && PreferencesMgr.Instance.MakeupTaskHistory.Count > 0)
|
||||
if (type == 1 && DataMgr.MakeupTaskHistory.Value.Count > 0)
|
||||
{
|
||||
foreach (var makeuptaskData in PreferencesMgr.Instance.MakeupTaskHistory)
|
||||
foreach (var makeuptaskData in DataMgr.MakeupTaskHistory.Value)
|
||||
{
|
||||
if (makeuptaskData.status == MakeupTaskStatus.Inline
|
||||
&& makeuptaskData.inlineNum > common.inlineMin)
|
||||
{
|
||||
var rdVOModel = ConfigSystem.GetConfig<MakeupModel>().dataList
|
||||
.FirstOrDefault(rd => rd.id == makeuptaskData.tableId);
|
||||
var rmVOModel = ConfigSystem.GetConfig<Makeup>()
|
||||
.FirstOrDefault(rm => rm.id == makeuptaskData.tableId);
|
||||
|
||||
var dowmNum = rdVOModel.AD_Down;
|
||||
var dowmNum = rmVOModel.AD_Down;
|
||||
// Debug.Log($"CheckSpeedUpTaskData dowmNum=== {dowmNum} makeuptaskData.WatchVideoSpeedNum ==== {makeuptaskData.WatchVideoSpeedNum}");
|
||||
|
||||
makeuptaskData.WatchVideoSpeedNum += dowmNum;
|
||||
//如果看广告的减少人数大于配置的阈值，则不能减少排名了
|
||||
if (makeuptaskData.WatchVideoSpeedNum > rdVOModel.AD_Limit_times)
|
||||
if (makeuptaskData.WatchVideoSpeedNum > rmVOModel.AD_Limit_times)
|
||||
{
|
||||
makeuptaskData.WatchVideoSpeedNum = rdVOModel.AD_Limit_times;
|
||||
makeuptaskData.WatchVideoSpeedNum = rmVOModel.AD_Limit_times;
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -241,24 +244,24 @@ namespace FlowerPower
|
||||
}
|
||||
}
|
||||
}
|
||||
if (type == 2 && SaveData.GetSaveobject().saveingpot_history.Count > 0)
|
||||
if (type == 2 && SaveData.GetSaveObject().saveingpot_history.Count > 0)
|
||||
{
|
||||
foreach (var makeuptaskData in SaveData.GetSaveobject().saveingpot_history)
|
||||
foreach (var makeuptaskData in SaveData.GetSaveObject().saveingpot_history)
|
||||
{
|
||||
if (makeuptaskData.status == SaveingPotTaskStatus.Inline
|
||||
&& makeuptaskData.inlineNum > common.inlineMin)
|
||||
{
|
||||
var rdVOModel = ConfigSystem.GetConfig<MakeupModel_2>().dataList
|
||||
.FirstOrDefault(rd => rd.id == makeuptaskData.tableId);
|
||||
var rmVOModel = ConfigSystem.GetConfig<Makeup_2>()
|
||||
.FirstOrDefault(rm => rm.id == makeuptaskData.tableId);
|
||||
|
||||
var dowmNum = rdVOModel.AD_Down;
|
||||
var dowmNum = rmVOModel.AD_Down;
|
||||
// Debug.Log($"CheckSpeedUpTaskData dowmNum=== {dowmNum} makeuptaskData.WatchVideoSpeedNum ==== {makeuptaskData.WatchVideoSpeedNum}");
|
||||
|
||||
makeuptaskData.WatchVideoSpeedNum += dowmNum;
|
||||
//如果看广告的减少人数大于配置的阈值，则不能减少排名了
|
||||
if (makeuptaskData.WatchVideoSpeedNum > rdVOModel.AD_Limit_times)
|
||||
if (makeuptaskData.WatchVideoSpeedNum > rmVOModel.AD_Limit_times)
|
||||
{
|
||||
makeuptaskData.WatchVideoSpeedNum = rdVOModel.AD_Limit_times;
|
||||
makeuptaskData.WatchVideoSpeedNum = rmVOModel.AD_Limit_times;
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -275,8 +278,8 @@ namespace FlowerPower
|
||||
}
|
||||
public void AddMakeupTaskData()
|
||||
{
|
||||
var makeupVOModel = ConfigSystem.GetConfig<MakeupModel>();
|
||||
if (makeupVOModel == null || makeupVOModel.dataList == null || makeupVOModel.dataList.Count <= 0)
|
||||
var makeupVOModel = ConfigSystem.GetConfig<Makeup>();
|
||||
if (makeupVOModel == null || makeupVOModel == null || makeupVOModel.Count <= 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -284,10 +287,10 @@ namespace FlowerPower
|
||||
|
||||
var lastId = -1;
|
||||
|
||||
var isRepeat = PreferencesMgr.Instance.MakeupTaskHistory.Count >= makeupVOModel.dataList.Count;
|
||||
if (PreferencesMgr.Instance.MakeupTaskHistory.Count > 0)
|
||||
var isRepeat = DataMgr.MakeupTaskHistory.Value.Count >= makeupVOModel.Count;
|
||||
if (DataMgr.MakeupTaskHistory.Value.Count > 0)
|
||||
{
|
||||
var makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last();
|
||||
var makeupTaskData = DataMgr.MakeupTaskHistory.Value.Last();
|
||||
|
||||
if (makeupTaskData.status != MakeupTaskStatus.Inline)
|
||||
{
|
||||
@@ -298,12 +301,12 @@ namespace FlowerPower
|
||||
}
|
||||
|
||||
|
||||
// if (lastId == makeupVOModel.dataList.Last().id)
|
||||
// {
|
||||
// lastId = -1;
|
||||
// }
|
||||
if (lastId == makeupVOModel.Last().id)
|
||||
{
|
||||
lastId = -1;
|
||||
}
|
||||
|
||||
foreach (var makeupVo in makeupVOModel.dataList)
|
||||
foreach (var makeupVo in makeupVOModel)
|
||||
{
|
||||
if (makeupVo.id > lastId)
|
||||
{
|
||||
@@ -311,17 +314,17 @@ namespace FlowerPower
|
||||
{
|
||||
var makeupTaskData = new MakeupTaskData();
|
||||
makeupTaskData.tableId = makeupVo.id;
|
||||
makeupTaskData.id = PreferencesMgr.Instance.MakeupTaskHistory.Count + 1;
|
||||
makeupTaskData.amountStr = $"{GameHelper.Get101Str(makeupVo.item_need)}";
|
||||
makeupTaskData.id = DataMgr.MakeupTaskHistory.Value.Count + 1;
|
||||
makeupTaskData.amountStr = $"{GameHelper.Get102Str(makeupVo.item_need)}";
|
||||
makeupTaskData.amount = makeupVo.item_need;
|
||||
makeupTaskData.orderID = GameHelper.GetRandomNum(8);
|
||||
|
||||
PreferencesMgr.Instance.MakeupTaskHistory.Add(makeupTaskData);
|
||||
DataMgr.MakeupTaskHistory.Value.Add(makeupTaskData);
|
||||
Debug.Log("uuuuuuuuuuuuuuuuuuuu");
|
||||
makeupTaskData.SetStatus(MakeupTaskStatus.None);
|
||||
PreferencesMgr.Instance.SaveMakeupTaskHistory();
|
||||
DataMgr.MakeupTaskHistory.Save();;
|
||||
|
||||
PreferencesMgr.Instance.MakeupTaskH5Time = 0;
|
||||
DataMgr.MakeupTaskH5Time.Value = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -333,10 +336,10 @@ namespace FlowerPower
|
||||
var val = obj.newValue - obj.oldValue;
|
||||
if (val > 0)
|
||||
{
|
||||
PreferencesMgr.Instance.MaxCurrency101 += val;
|
||||
DataMgr.MaxCurrency101.Value += (int)val;
|
||||
}
|
||||
|
||||
if (!PreferencesMgr.Instance.IsShowRewardFly101)
|
||||
if (!DataMgr.IsShowRewardFly101.Value)
|
||||
{
|
||||
GameDispatcher.Instance.Dispatch(GameMsg.Update101Completed);
|
||||
}
|
||||
@@ -347,7 +350,7 @@ namespace FlowerPower
|
||||
|
||||
private void OnChange111(ChangeValue<float> obj)
|
||||
{
|
||||
if (!PreferencesMgr.Instance.IsShowRewardFly111)
|
||||
if (!DataMgr.IsShowRewardFly111.Value)
|
||||
{
|
||||
GameDispatcher.Instance.Dispatch(GameMsg.Update111Completed);
|
||||
}
|
||||
@@ -355,7 +358,7 @@ namespace FlowerPower
|
||||
|
||||
private void NewDay(object obj)
|
||||
{
|
||||
PreferencesMgr.Instance.IsShowOpenReward = true;
|
||||
DataMgr.IsShowOpenReward.Value = true;
|
||||
}
|
||||
|
||||
private void RefreshADTaskData(object obj = null)
|
||||
@@ -363,33 +366,32 @@ namespace FlowerPower
|
||||
}
|
||||
private void AddIntWatchVideo(object obj = null)
|
||||
{
|
||||
if (PreferencesMgr.Instance.MakeupTaskHistory.Count > 0)
|
||||
if (DataMgr.MakeupTaskHistory.Value.Count > 0)
|
||||
{
|
||||
CheckSpeedUpTaskData();
|
||||
}
|
||||
}
|
||||
private void AddWatchVideo(object obj = null)
|
||||
{
|
||||
PreferencesMgr.Instance.VideoWatchCount++;
|
||||
RankSystemMgr.Instance.addGameExp(addPointType.ads);
|
||||
DataMgr.VideoWatchCount.Value++;
|
||||
GameDispatcher.Instance.Dispatch(GameMsg.RefreshRedDot);
|
||||
|
||||
int adNums = AdRdManager.Instance.GetLookRewardADNum();
|
||||
int adNums = AdExchangeManager.Instance.GetLookRewardADNum();
|
||||
adNums++;
|
||||
AdRdManager.Instance.SetLookRewardADNum(adNums);
|
||||
AdExchangeManager.Instance.SetLookRewardADNum(adNums);
|
||||
|
||||
if (PreferencesMgr.Instance.MakeupTaskHistory.Count > 0)
|
||||
if (DataMgr.MakeupTaskHistory.Value.Count > 0)
|
||||
{
|
||||
CheckSpeedUpTaskData();
|
||||
|
||||
var taskData = PreferencesMgr.Instance.MakeupTaskHistory.Last();
|
||||
var taskData = DataMgr.MakeupTaskHistory.Value.Last();
|
||||
if (taskData.status == MakeupTaskStatus.Task)
|
||||
{
|
||||
var makeupVo = ConfigSystem.GetConfig<MakeupModel>().GetData(taskData.tableId);
|
||||
var makeupVo = MakeupModel.GetData(taskData.tableId);
|
||||
if (makeupVo != null && taskData.videoCount < makeupVo.ad_need)
|
||||
{
|
||||
taskData.videoCount++;
|
||||
PreferencesMgr.Instance.SaveMakeupTaskHistory();
|
||||
DataMgr.MakeupTaskHistory.Save();;
|
||||
PlayerPrefs.SetInt("fin_ad_num", 0);
|
||||
}
|
||||
else
|
||||
@@ -401,37 +403,15 @@ namespace FlowerPower
|
||||
|
||||
}
|
||||
}
|
||||
else if (taskData.status == MakeupTaskStatus.Level)
|
||||
{
|
||||
var ExpiryUnlock = ConfigSystem.GetConfig<CommonModel>().ExpiryUnlock;
|
||||
taskData.LvVideoCount++;
|
||||
if (taskData.LvVideoCount >= ExpiryUnlock)
|
||||
{
|
||||
|
||||
taskData.LvVideoCount = 0;
|
||||
taskData.ch_time = GameHelper.GetNowTime() + ConfigSystem.GetConfig<CommonModel>().BalanceExpired * 3600;
|
||||
}
|
||||
PreferencesMgr.Instance.SaveMakeupTaskHistory();
|
||||
}
|
||||
|
||||
}
|
||||
if (SaveData.GetSaveobject().saveingpot_history.Count > 0)
|
||||
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_ch += makeupVo.ADIncrease;
|
||||
GameDispatcher.Instance.Dispatch(GameMsg.RefreshSaveingPot);
|
||||
if (ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1 && GameHelper.IsGiftSwitch())
|
||||
{
|
||||
if ((SaveData.GetSaveobject().saveingpot_ch > taskData.amount) && (!taskData.auto_show) && !UIManager.Instance.IsExistUI(UIConst.H5UI))
|
||||
{
|
||||
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SaveingPotUI_Open);
|
||||
taskData.auto_show = true;
|
||||
}
|
||||
}
|
||||
SaveingPotClass taskData = SaveData.GetSaveObject().saveingpot_history.Last();
|
||||
Makeup_2 makeupVo =MakeupModel_2.GetData(taskData.tableId);
|
||||
SaveData.GetSaveObject().saveingpot_ch += makeupVo.ADIncrease;
|
||||
|
||||
if (taskData.status == SaveingPotTaskStatus.Task)
|
||||
{
|
||||
@@ -530,29 +510,29 @@ namespace FlowerPower
|
||||
{
|
||||
case 101:
|
||||
{
|
||||
var roomTicket = PreferencesMgr.Instance.Currency101;
|
||||
var roomTicket = DataMgr.Coin.Value;
|
||||
roomTicket += (int)rewardSingleData.GetTotalValue();
|
||||
|
||||
PreferencesMgr.Instance.Currency101 = roomTicket;
|
||||
DataMgr.Coin.Value = roomTicket;
|
||||
}
|
||||
break;
|
||||
case 102:
|
||||
{
|
||||
var dollar = PreferencesMgr.Instance.Currency102;
|
||||
var dollar = DataMgr.Ticket.Value;
|
||||
dollar += rewardSingleData.GetTotalValue();
|
||||
|
||||
PreferencesMgr.Instance.Currency102 = dollar;
|
||||
DataMgr.Ticket.Value = dollar;
|
||||
break;
|
||||
}
|
||||
case 111:
|
||||
{
|
||||
var dollar = PreferencesMgr.Instance.PlayReawrd111;
|
||||
var dollar = DataMgr.PlayReawrd111.Value;
|
||||
dollar += rewardSingleData.GetTotalValue();
|
||||
|
||||
PreferencesMgr.Instance.PlayReawrd111 = dollar;
|
||||
DataMgr.PlayReawrd111.Value = dollar;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a41a924c96049594e8c2d206b71a4487
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,7 +1,7 @@
|
||||
using DG.Tweening;
|
||||
|
||||
using UnityEngine;
|
||||
using FlowerPower;
|
||||
using LoveLegend;
|
||||
|
||||
public class RewardSystem : BaseSystem
|
||||
{
|
||||
@@ -107,15 +107,15 @@ public class RewardSystem : BaseSystem
|
||||
{
|
||||
// if (!UIManager.Instance.IsExistUI(UIConst.H5UI))
|
||||
// {
|
||||
if (_tween is { active: true })
|
||||
{
|
||||
_tween?.Kill();
|
||||
}
|
||||
if (_tween is { active: true })
|
||||
{
|
||||
_tween?.Kill();
|
||||
}
|
||||
|
||||
GameHelper.OnRiseUI(id);
|
||||
GameHelper.OnRiseUI(id);
|
||||
// }
|
||||
}
|
||||
else if (id == 111 || id == 112)
|
||||
else if (id == 111)
|
||||
{
|
||||
if (_tween is { active: true })
|
||||
{
|
||||
@@ -142,7 +142,7 @@ public class RewardSystem : BaseSystem
|
||||
isPlayAudio = true,
|
||||
isNeedFly = isNeedFly,
|
||||
isNeedValueChange = isValueChange,
|
||||
audioName = AudioConst.Coinfly04
|
||||
audioName = AudioConst.CoinFly
|
||||
};
|
||||
|
||||
rewardDisplayModel.SetUpdate(changeValue => { OnChangeValue(id, changeValue); });
|
||||
@@ -178,13 +178,13 @@ public class RewardSystem : BaseSystem
|
||||
switch (id)
|
||||
{
|
||||
case 101:
|
||||
PreferencesMgr.Instance.IsShowRewardFly101 = isShow;
|
||||
DataMgr.IsShowRewardFly101.Value = isShow;
|
||||
break;
|
||||
case 102:
|
||||
PreferencesMgr.Instance.IsShowRewardFly102 = isShow;
|
||||
DataMgr.IsShowRewardFly102.Value = isShow;
|
||||
break;
|
||||
case 111:
|
||||
PreferencesMgr.Instance.IsShowRewardFly111 = isShow;
|
||||
DataMgr.IsShowRewardFly111.Value = isShow;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace FlowerPower
|
||||
namespace LoveLegend
|
||||
{
|
||||
public class WindowSystem : BaseSystem
|
||||
{
|
||||
@@ -63,7 +63,7 @@ namespace FlowerPower
|
||||
|
||||
private void AddRateUs(TaskSequence backMainSequence)
|
||||
{
|
||||
bool isAdd = 5 == PreferencesMgr.Instance.GameOfCount;
|
||||
bool isAdd = 5 == DataMgr.GameOfCount.Value;
|
||||
|
||||
backMainSequence.Add(isAdd, (procedure) =>
|
||||
{
|
||||
|
||||
@@ -1,473 +1,122 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using UnityEngine;
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Unity.VisualScripting;
|
||||
using SGModule.Common.Extensions;
|
||||
using SGModule.Common.Helper;
|
||||
using SGModule.ConfigLoader;
|
||||
using SGModule.NetKit;
|
||||
using UnityEngine;
|
||||
|
||||
namespace FlowerPower
|
||||
{
|
||||
|
||||
public class ConfigSystem : BaseSystem
|
||||
{
|
||||
private static Dictionary<Type, object> configData = new Dictionary<Type, object>();
|
||||
public static List<GameUrls> light_weblist = new List<GameUrls>();
|
||||
public static List<GameUrls> dark_weblist = new List<GameUrls>();
|
||||
namespace LoveLegend {
|
||||
public class ConfigSystem : BaseSystem {
|
||||
public static string web_through_str;
|
||||
public static int requestConfigType = 0;
|
||||
public ConfigSystem(bool isAutoInit = true)
|
||||
{
|
||||
if (isAutoInit)
|
||||
{
|
||||
|
||||
public ConfigSystem(bool isAutoInit = true) {
|
||||
if (isAutoInit) {
|
||||
Init();
|
||||
}
|
||||
}
|
||||
|
||||
public sealed override void Init()
|
||||
{
|
||||
public sealed override void Init() {
|
||||
base.Init();
|
||||
AddListener();
|
||||
}
|
||||
|
||||
private void AddListener()
|
||||
{
|
||||
NetworkDispatcher.Instance.AddListener(NetworkMsg.GetConfig, OnRequestGetConfig);
|
||||
private void AddListener() {
|
||||
NetworkDispatcher.Instance.AddListener(NetworkMsg.GetConfig, OnGetConfig);
|
||||
}
|
||||
|
||||
private void RemoveListener()
|
||||
{
|
||||
NetworkDispatcher.Instance.RemoveListener(NetworkMsg.GetConfig, OnRequestGetConfig);
|
||||
private void RemoveListener() {
|
||||
NetworkDispatcher.Instance.RemoveListener(NetworkMsg.GetConfig, OnGetConfig);
|
||||
}
|
||||
|
||||
private void OnRequestGetConfig(object obj)
|
||||
{
|
||||
private void OnGetConfig(object obj) {
|
||||
TrackKit.TrackLoginFunnel(LoginFunnelEventType.LoadBegin); //加载开始打点
|
||||
|
||||
var reqData = new RespLoginFunnelData
|
||||
{
|
||||
type = "loadBegin",
|
||||
payload = ""
|
||||
};
|
||||
NetworkKit.PostFunnelLogin(reqData);
|
||||
|
||||
if (obj != null) requestConfigType = (int)obj;
|
||||
|
||||
|
||||
var loginData = GameHelper.GetLoginModel();
|
||||
|
||||
var configFileName = "JarvisConfigFile";
|
||||
var configFileSavePath = $"{GemCrushFileKit.GetSavePath()}/Config/";
|
||||
var assetHotFixFilePath = $"{configFileSavePath}{configFileName}.txt";
|
||||
var configFileNameKey = "configFileName";
|
||||
var CDNConfigFileName = loginData.setting;
|
||||
|
||||
string savedCfgName = PlayerPrefs.GetString(configFileNameKey);
|
||||
bool needDownloadConfigFile = false;
|
||||
|
||||
if (!string.IsNullOrEmpty(CDNConfigFileName))
|
||||
{
|
||||
//如果本地Player Prefs里没有保存配置文件名
|
||||
if (string.IsNullOrEmpty(savedCfgName))
|
||||
{
|
||||
// Debug.Log("[UNITY] No config file name saved.");
|
||||
needDownloadConfigFile = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log($"[UNITY] Saved config name: {savedCfgName}, CDN config name: {CDNConfigFileName}");
|
||||
//与CDN上的对比名称
|
||||
if (!savedCfgName.Equals(CDNConfigFileName))
|
||||
{
|
||||
needDownloadConfigFile = true;
|
||||
var loginModel = LoginKit.Instance.LoginModel;
|
||||
ConfigLoader.Instance.Init(new ConfigInitOptions {
|
||||
Setting = loginModel.Setting,
|
||||
CdnUrl = loginModel.CdnURL,
|
||||
OnComplete = state => {
|
||||
Debug.Log($"配置加载状态{state}");
|
||||
if (state == ConfigLoaderState.Successful) {
|
||||
ReloadConfig();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Debug.Log($"[UNITY] needDownloadConfigFile: {needDownloadConfigFile}");
|
||||
//默默地拉去新配置
|
||||
if (needDownloadConfigFile)
|
||||
{
|
||||
CrazyAsyKit.StartCoroutine(DownloadKit.GetTextFromUrl($"{NetworkKit.CDNUrl}config/{CDNConfigFileName}",
|
||||
configFileName, (content) =>
|
||||
{
|
||||
if (content == null)
|
||||
{
|
||||
Debug.Log("down config error");
|
||||
loadLocalConfig(assetHotFixFilePath, configFileName, configFileSavePath);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log("down config success");
|
||||
PlayerPrefs.SetString(configFileNameKey, CDNConfigFileName);
|
||||
ParseConfig(content);
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.NetLoadingUI_Close);
|
||||
var reqData = new RespLoginFunnelData
|
||||
{
|
||||
type = "loadFinish",
|
||||
payload = ""
|
||||
};
|
||||
NetworkKit.PostFunnelLogin(reqData);
|
||||
AppDispatcher.Instance.Dispatch(AppMsg.LoginInit);
|
||||
}
|
||||
SaveingPotHelper.ResetHistory();
|
||||
}, configFileSavePath));
|
||||
}
|
||||
else
|
||||
{
|
||||
loadLocalConfig(assetHotFixFilePath, configFileName, configFileSavePath);
|
||||
}
|
||||
}
|
||||
|
||||
private void loadLocalConfig(string assetHotFixFilePath, string configFileName, string configFileSavePath)
|
||||
{
|
||||
if (File.Exists(assetHotFixFilePath))
|
||||
{
|
||||
ParseConfig(File.ReadAllText(assetHotFixFilePath));
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.NetLoadingUI_Close);
|
||||
var reqData = new RespLoginFunnelData
|
||||
{
|
||||
type = "loadFinish",
|
||||
payload = ""
|
||||
};
|
||||
NetworkKit.PostFunnelLogin(reqData);
|
||||
AppDispatcher.Instance.Dispatch(AppMsg.LoginInit);
|
||||
}
|
||||
else
|
||||
{
|
||||
var path = $"{Application.streamingAssetsPath}/Config/{configFileName}.txt";
|
||||
#if UNITY_IOS
|
||||
path = "file://" + path;
|
||||
#endif
|
||||
// Debug.Log($"[UNITY] Load config from streaming asset: {path}");
|
||||
CrazyAsyKit.StartCoroutine(DownloadKit.GetTextFromUrl(path, configFileName, content =>
|
||||
{
|
||||
ParseConfig(content);
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.NetLoadingUI_Close);
|
||||
var reqData = new RespLoginFunnelData
|
||||
{
|
||||
type = "loadFinish",
|
||||
payload = ""
|
||||
};
|
||||
NetworkKit.PostFunnelLogin(reqData);
|
||||
AppDispatcher.Instance.Dispatch(AppMsg.LoginInit);
|
||||
}, configFileSavePath));
|
||||
}
|
||||
},
|
||||
OnError = (errorName, message) => {
|
||||
Debug.LogError($"配置解析错误 {errorName} 错误信息：{message}");
|
||||
},
|
||||
OnHandleUnmarkedConfig = ParseGameConfig
|
||||
});
|
||||
}
|
||||
|
||||
private void ParseConfig(string json)
|
||||
{
|
||||
if (json == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (!json.StartsWith("{"))
|
||||
{
|
||||
json = Base64Kit.Decode(json, NetworkManager.identifier);
|
||||
}
|
||||
/// <summary>
|
||||
/// 重新加载配置
|
||||
/// </summary>
|
||||
/// <param name="json"></param>
|
||||
private void ReloadConfig() {
|
||||
TrackKit.TrackLoginFunnel(LoginFunnelEventType.LoadFinish); //加载完成打点
|
||||
|
||||
var dictionary = SerializeUtil.ToObject<Dictionary<string, object>>(json);
|
||||
ParseGameConfig(dictionary);
|
||||
TextureHelper.imgUrl = LoginKit.Instance.LoginModel.CdnURL + "/" + ConfigSystem.GetCommonConf().ResVersion + "/";
|
||||
LiveVideoManager.videoBaseUrl = LoginKit.Instance.LoginModel.CdnURL + "/" + ConfigSystem.GetCommonConf().ResVersion + "/";
|
||||
|
||||
// ParseGameConfig();
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.NetLoadingUI_Close);
|
||||
AppDispatcher.Instance.Dispatch(AppMsg.LoginInit);
|
||||
CtrlDispatcher.Instance.Dispatch(CtrlMsg.Game_StartBefore);
|
||||
|
||||
if (requestConfigType == 0)
|
||||
{
|
||||
// Debug.Log("NeedShowOpenAd----0-");
|
||||
if (GameHelper.NeedShowOpenAd())
|
||||
{
|
||||
Debug.Log("NeedShowOpenAd----0-");
|
||||
GameHelper.ShowOpenAd();
|
||||
}
|
||||
else
|
||||
{
|
||||
GameDispatcher.Instance.Dispatch(GameMsg.CloseMask);
|
||||
}
|
||||
}
|
||||
|
||||
var reqData1 = new RespLoginFunnelData
|
||||
{
|
||||
type = "loadFinish",
|
||||
payload = ""
|
||||
};
|
||||
NetworkKit.PostFunnelLogin(reqData1);
|
||||
SaveingPotHelper.ResetHistory();
|
||||
}
|
||||
|
||||
|
||||
#region 游戏配置
|
||||
|
||||
private void ParseGameConfig(IReadOnlyDictionary<string, object> dictionary)
|
||||
{
|
||||
if (dictionary.TryGetValue("Common", out var common))
|
||||
{
|
||||
var commonModel = SerializeUtil.ToObject<CommonModel>(common.ToString());
|
||||
configData[typeof(CommonModel)] = commonModel;
|
||||
}
|
||||
private void ParseGameConfig() {
|
||||
var gameConfigModel = new GameConfigModel();
|
||||
foreach (var key in ConfigLoader.Instance.GetJsonKeys()) {
|
||||
if (!key.StartsWith("GameBoard")) {
|
||||
continue;
|
||||
}
|
||||
|
||||
var GameConfigModel = new GameConfigModel();
|
||||
// 提取 boardIndex
|
||||
var boardIndex = 1;
|
||||
var parts = key.Split('_');
|
||||
if (parts.Length > 1 && int.TryParse(parts[1], out var parsed)) {
|
||||
boardIndex = parsed;
|
||||
}
|
||||
|
||||
foreach (var item in dictionary)
|
||||
{
|
||||
if (item.Key.StartsWith("GameBoard"))
|
||||
{
|
||||
string[] parts = item.Key.Split('_');
|
||||
|
||||
int boardIndex;
|
||||
if (parts.Length > 1 && int.TryParse(parts[1], out boardIndex))
|
||||
{
|
||||
// 成功解析出数字
|
||||
// Debug.Log($"boardIndex==== {boardIndex}");
|
||||
}
|
||||
else
|
||||
{
|
||||
boardIndex = 1;
|
||||
}
|
||||
|
||||
if (dictionary.TryGetValue(item.Key, out var gameboard))
|
||||
{
|
||||
|
||||
if (!GameConfigModel.game_conf.ContainsKey(boardIndex))
|
||||
{
|
||||
GameConfigModel.game_conf.Add(boardIndex, null);
|
||||
// 获取 json 并反序列化
|
||||
if (ConfigLoader.Instance.TryGetJsonValue(key, out var gameboardJson)) {
|
||||
try {
|
||||
var gameBoards = gameboardJson.As<List<GameBoard>>();
|
||||
if (gameBoards != null) {
|
||||
gameConfigModel.game_conf[boardIndex] = gameBoards;
|
||||
}
|
||||
|
||||
GameConfigModel.game_conf[boardIndex] = SerializeUtil.ToObject<List<GameBoard>>(gameboard.ToString());
|
||||
|
||||
else {
|
||||
Log.ConfigLoader.Warning($"GameBoard 配置 {key} 反序列化为空");
|
||||
}
|
||||
}
|
||||
catch (Exception ex) {
|
||||
Log.ConfigLoader.Error($"GameBoard 配置 {key} 反序列化失败: {ex.Message}");
|
||||
}
|
||||
}
|
||||
}
|
||||
configData[typeof(GameConfigModel)] = GameConfigModel;
|
||||
|
||||
if (dictionary.TryGetValue("SignDailyReward", out var signDailyReward))
|
||||
{
|
||||
var signDailyRewardModel = new SignDailyRewardModel();
|
||||
|
||||
signDailyRewardModel.dataList = SerializeUtil.ToObject<List<SignDailyReward>>(signDailyReward.ToString());
|
||||
|
||||
configData[typeof(SignDailyRewardModel)] = signDailyRewardModel;
|
||||
}
|
||||
|
||||
if (dictionary.TryGetValue("turntable", out var turntable))
|
||||
{
|
||||
var turntableModel = new TurntableModel();
|
||||
turntableModel.dataList = SerializeUtil.ToObject<List<Turntable>>(turntable.ToString());
|
||||
configData[typeof(TurntableModel)] = turntableModel;
|
||||
}
|
||||
|
||||
if (dictionary.TryGetValue("rewardNum", out var rewardNum))
|
||||
{
|
||||
var rewardNumModel = new RewardNumModel();
|
||||
rewardNumModel.dataList = SerializeUtil.ToObject<List<RewardNum>>(rewardNum.ToString());
|
||||
configData[typeof(RewardNumModel)] = rewardNumModel;
|
||||
}
|
||||
|
||||
if (dictionary.TryGetValue("Durationtasks", out var durationtasks))
|
||||
{
|
||||
var DurationtasksModel = new DurationtasksModel();
|
||||
DurationtasksModel.dataList = SerializeUtil.ToObject<List<Durationtasks>>(durationtasks.ToString());
|
||||
configData[typeof(DurationtasksModel)] = DurationtasksModel;
|
||||
}
|
||||
|
||||
if (dictionary.TryGetValue("PassingTasks", out var passingtask))
|
||||
{
|
||||
var PassingTaskModel = new PassingTaskModel();
|
||||
PassingTaskModel.dataList = SerializeUtil.ToObject<List<PassingTask>>(passingtask.ToString());
|
||||
configData[typeof(PassingTaskModel)] = PassingTaskModel;
|
||||
}
|
||||
if (dictionary.TryGetValue("ADTasks", out var adtask))
|
||||
{
|
||||
var ADTaskModel = new ADTaskModel();
|
||||
ADTaskModel.dataList = SerializeUtil.ToObject<List<ADTask>>(adtask.ToString());
|
||||
configData[typeof(ADTaskModel)] = ADTaskModel;
|
||||
}
|
||||
|
||||
if (dictionary.TryGetValue("Passportrewards", out var Passportrewards))
|
||||
{
|
||||
var PassportrewardsModel = new PassportrewardsModel();
|
||||
PassportrewardsModel.dataList = SerializeUtil.ToObject<List<Passportrewards>>(Passportrewards.ToString());
|
||||
configData[typeof(PassportrewardsModel)] = PassportrewardsModel;
|
||||
}
|
||||
|
||||
if (dictionary.TryGetValue("SmallrewardNum", out var SmallrewardNum))
|
||||
{
|
||||
var SmallrewardNumModel = new SmallrewardNumModel();
|
||||
SmallrewardNumModel.dataList = SerializeUtil.ToObject<List<SmallrewardNum>>(SmallrewardNum.ToString());
|
||||
configData[typeof(SmallrewardNumModel)] = SmallrewardNumModel;
|
||||
// Debug.Log(SmallrewardNum.ToString());
|
||||
}
|
||||
|
||||
if (dictionary.TryGetValue("LargerewardNum", out var LargerewardNum))
|
||||
{
|
||||
var LargerewardNumModel = new LargerewardNumModel();
|
||||
LargerewardNumModel.dataList = SerializeUtil.ToObject<List<LargerewardNum>>(LargerewardNum.ToString());
|
||||
configData[typeof(LargerewardNumModel)] = LargerewardNumModel;
|
||||
// Debug.Log(LargerewardNum.ToString());
|
||||
}
|
||||
|
||||
if (dictionary.TryGetValue("exBrPool", out var exBrPool))
|
||||
{
|
||||
var exBrPoolModel = new exBrPoolModel();
|
||||
exBrPoolModel.dataList = SerializeUtil.ToObject<List<exBrPool>>(exBrPool.ToString());
|
||||
configData[typeof(exBrPoolModel)] = exBrPoolModel;
|
||||
ConfigSystem.GetConfig<exBrPoolModel>().config_name_list = ConfigSystem.GetConfig<exBrPoolModel>().dataList[0].user_name.Split(",").ToList();
|
||||
ConfigSystem.GetConfig<exBrPoolModel>().config_money_list = ConfigSystem.GetConfig<exBrPoolModel>().dataList[0].amount.Split(",").ToList();
|
||||
}
|
||||
|
||||
if (dictionary.TryGetValue("exBrPool_2", out var exBrPool_2))
|
||||
{
|
||||
var exBrPoolModel_2 = new exBrPoolModel_2
|
||||
{ dataList = SerializeUtil.ToObject<List<exBrPool_2>>(exBrPool_2.ToString()) };
|
||||
configData[typeof(exBrPoolModel_2)] = exBrPoolModel_2;
|
||||
ConfigSystem.GetConfig<exBrPoolModel_2>().config_name_list = ConfigSystem.GetConfig<exBrPoolModel_2>().dataList[0].user_name.Split(",").ToList();
|
||||
ConfigSystem.GetConfig<exBrPoolModel_2>().config_money_list = ConfigSystem.GetConfig<exBrPoolModel_2>().dataList[0].amount.Split(",").ToList();
|
||||
}
|
||||
if (dictionary.TryGetValue("makeup", out var makeup))
|
||||
{
|
||||
var makeupModel = new MakeupModel
|
||||
{ dataList = SerializeUtil.ToObject<List<Makeup>>(makeup.ToString()) };
|
||||
configData[typeof(MakeupModel)] = makeupModel;
|
||||
}
|
||||
|
||||
if (dictionary.TryGetValue("makeup_2", out var makeup_2))
|
||||
{
|
||||
var makeupModel_2 = new MakeupModel_2
|
||||
{ dataList = SerializeUtil.ToObject<List<Makeup_2>>(makeup_2.ToString()) };
|
||||
Debug.Log("---------------" + makeup_2.ToString());
|
||||
configData[typeof(MakeupModel_2)] = makeupModel_2;
|
||||
}
|
||||
if (dictionary.TryGetValue("GameUrls", out var GameUrls))
|
||||
{
|
||||
light_weblist.Clear();
|
||||
dark_weblist.Clear();
|
||||
web_through_str = "";
|
||||
List<GameUrls> alllist = new List<GameUrls>();
|
||||
alllist = SerializeUtil.ToObject<List<GameUrls>>(GameUrls.ToString());
|
||||
List<int> type_list = new List<int>();
|
||||
for (int i = 0; i < alllist.Count; i++)
|
||||
{
|
||||
if (alllist[i].webType == 2)
|
||||
{
|
||||
if (GameHelper.IsGiftSwitch() && (alllist[i].isMagic == 1)) light_weblist.Add(alllist[i]);
|
||||
else if (!GameHelper.IsGiftSwitch() && (alllist[i].isMagic == 0)) light_weblist.Add(alllist[i]);
|
||||
}
|
||||
else
|
||||
{
|
||||
dark_weblist.Add(alllist[i]);
|
||||
if (!type_list.Contains(alllist[i].wvType))
|
||||
{
|
||||
web_through_str += alllist[i].wvthrough;
|
||||
web_through_str += "|";
|
||||
type_list.Add(alllist[i].wvType);
|
||||
}
|
||||
}
|
||||
}
|
||||
web_through_str.Remove(web_through_str.Length - 1);
|
||||
var gameUrlsModel = new GameUrlsModel
|
||||
{
|
||||
dataList = light_weblist
|
||||
};
|
||||
configData[typeof(GameUrlsModel)] = gameUrlsModel;
|
||||
}
|
||||
|
||||
if (dictionary.TryGetValue("Paidcoins", out var Paidcoins))
|
||||
{
|
||||
var PaidcoinsModel = new PaidcoinsModel
|
||||
{ dataList = SerializeUtil.ToObject<List<Paidcoins>>(Paidcoins.ToString()) };
|
||||
configData[typeof(PaidcoinsModel)] = PaidcoinsModel;
|
||||
// Debug.Log(Paidcoins.ToString());
|
||||
}
|
||||
|
||||
if (dictionary.TryGetValue("Paidgift", out var Paidgift))
|
||||
{
|
||||
var PaidgiftModel = new PaidgiftModel
|
||||
{ dataList = SerializeUtil.ToObject<List<Paidgift>>(Paidgift.ToString()) };
|
||||
configData[typeof(PaidgiftModel)] = PaidgiftModel;
|
||||
|
||||
}
|
||||
if (dictionary.TryGetValue("Multigift", out var Multigift))
|
||||
{
|
||||
var MultigiftModel = new MultigiftModel
|
||||
{ dataList = SerializeUtil.ToObject<List<Multigift>>(Multigift.ToString()) };
|
||||
configData[typeof(MultigiftModel)] = MultigiftModel;
|
||||
}
|
||||
if (dictionary.TryGetValue("FAQRule", out var FAQRule))
|
||||
{
|
||||
var FaqModel = new FAQRuleModel
|
||||
{ dataList = SerializeUtil.ToObject<List<FAQRule>>(FAQRule.ToString()) };
|
||||
configData[typeof(FAQRuleModel)] = FaqModel;
|
||||
}
|
||||
if (dictionary.TryGetValue("FAQRule_1", out var FAQRule_1))
|
||||
{
|
||||
var FaqModel = new FAQRuleModel_1
|
||||
{ dataList = SerializeUtil.ToObject<List<FAQRule>>(FAQRule_1.ToString()) };
|
||||
configData[typeof(FAQRuleModel_1)] = FaqModel;
|
||||
}
|
||||
if (dictionary.TryGetValue("MessageBoard", out var MessageBoard))
|
||||
{
|
||||
var messageModel = new MessageBoardModel
|
||||
{ dataList = SerializeUtil.ToObject<List<MessageBoard>>(MessageBoard.ToString()) };
|
||||
configData[typeof(MessageBoardModel)] = messageModel;
|
||||
}
|
||||
if (dictionary.TryGetValue("MessageBoard_1", out var MessageBoard_1))
|
||||
{
|
||||
var messageModel = new MessageBoardModel_1
|
||||
{ dataList = SerializeUtil.ToObject<List<MessageBoard>>(MessageBoard_1.ToString()) };
|
||||
configData[typeof(MessageBoardModel_1)] = messageModel;
|
||||
}
|
||||
if (dictionary.TryGetValue("RankHourRewards", out var RankHourRewards))
|
||||
{
|
||||
var RankHourRewardsModel = new RankHourRewardsModel();
|
||||
RankHourRewardsModel.dataList = SerializeUtil.ToObject<List<RankRewards>>(RankHourRewards.ToString());
|
||||
configData[typeof(RankHourRewardsModel)] = RankHourRewardsModel;
|
||||
}
|
||||
if (dictionary.TryGetValue("RankDayRewards", out var RankDayRewards))
|
||||
{
|
||||
var RankDayRewardsModel = new RankDayRewardsModel();
|
||||
RankDayRewardsModel.dataList = SerializeUtil.ToObject<List<RankRewards>>(RankDayRewards.ToString());
|
||||
configData[typeof(RankDayRewardsModel)] = RankDayRewardsModel;
|
||||
}
|
||||
if (dictionary.TryGetValue("RankWeekRewards", out var RankWeekRewards))
|
||||
{
|
||||
var RankWeekRewardsModel = new RankWeekRewardsModel();
|
||||
RankWeekRewardsModel.dataList = SerializeUtil.ToObject<List<RankRewards>>(RankWeekRewards.ToString());
|
||||
configData[typeof(RankWeekRewardsModel)] = RankWeekRewardsModel;
|
||||
}
|
||||
if (dictionary.TryGetValue("TurnOffRewards", out var TurnOffRewards))
|
||||
{
|
||||
var TurnOffRewardsModel = new TurnOffRewardsModel();
|
||||
TurnOffRewardsModel.dataList = SerializeUtil.ToObject<List<TurnOffRewards>>(TurnOffRewards.ToString());
|
||||
configData[typeof(TurnOffRewardsModel)] = TurnOffRewardsModel;
|
||||
}
|
||||
if (dictionary.TryGetValue("LevelAttempts", out var LevelAttempts))
|
||||
{
|
||||
var LevelAttemptsModel = new LevelAttemptsModel();
|
||||
LevelAttemptsModel.dataList = SerializeUtil.ToObject<List<LevelAttempts>>(LevelAttempts.ToString());
|
||||
configData[typeof(LevelAttemptsModel)] = LevelAttemptsModel;
|
||||
ConfigSystem.GetConfig<LevelAttemptsModel>().config_name_list = ConfigSystem.GetConfig<LevelAttemptsModel>().dataList[0].user_name.Split(",").ToList();
|
||||
ConfigSystem.GetConfig<LevelAttemptsModel>().config_money_list = ConfigSystem.GetConfig<LevelAttemptsModel>().dataList[0].amount.Split(",").ToList();
|
||||
}
|
||||
if (dictionary.TryGetValue("ExchangeDescriptors", out var ExchangeDescriptors))
|
||||
{
|
||||
var ExchangeDesModel = new ExchangeDesModel();
|
||||
ExchangeDesModel.dataList = SerializeUtil.ToObject<List<ExchangeDes>>(ExchangeDescriptors.ToString());
|
||||
configData[typeof(ExchangeDesModel)] = ExchangeDesModel;
|
||||
}
|
||||
if (dictionary.TryGetValue("SplashAD", out var SplashAD))
|
||||
{
|
||||
var AppOpenAdModel = new AppOpenAdModel();
|
||||
AppOpenAdModel.dataList = SerializeUtil.ToObject<List<SplashAD>>(SplashAD.ToString());
|
||||
configData[typeof(AppOpenAdModel)] = AppOpenAdModel;
|
||||
}
|
||||
ConfigLoader.Instance.AddConfig(gameConfigModel);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
public static T GetConfig<T>()
|
||||
{
|
||||
return configData.TryGetValue(typeof(T), out var value) ? (T)value : default;
|
||||
public static CommonModel GetCommonConf() {
|
||||
return ConfigLoader.Instance.GetConfig<CommonModel>();
|
||||
}
|
||||
|
||||
public override void Dispose()
|
||||
{
|
||||
public static List<T> GetConfig<T>() where T : class {
|
||||
return ConfigLoader.Instance.GetConfig<List<T>>() ?? new List<T>();
|
||||
}
|
||||
|
||||
public override void Dispose() {
|
||||
base.Dispose();
|
||||
RemoveListener();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
namespace FlowerPower
|
||||
{
|
||||
using System;
|
||||
using DG.Tweening;
|
||||
using UnityEngine;
|
||||
using System;
|
||||
using IgnoreOPS;
|
||||
using SGModule.Common.Extensions;
|
||||
using SGModule.NetKit;
|
||||
|
||||
namespace LoveLegend
|
||||
{
|
||||
public class LoginSystem : BaseSystem
|
||||
{
|
||||
|
||||
private int loginCount = 0;
|
||||
|
||||
private TimerTask timerTask = null;
|
||||
|
||||
public LoginSystem(bool isAutoInit = true)
|
||||
{
|
||||
if (isAutoInit)
|
||||
@@ -37,126 +40,51 @@ namespace FlowerPower
|
||||
NetworkDispatcher.Instance.RemoveListener(NetworkMsg.Login, RequestLogin);
|
||||
}
|
||||
|
||||
private TimerTask timerTask = null;
|
||||
private void RequestLogin(object obj = null)
|
||||
{
|
||||
var requestLoginData = new RequestLoginData
|
||||
|
||||
// if (!GameHelper.IsConnect())
|
||||
// {
|
||||
// LoginFail();
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
TrackKit.TrackLoginFunnel(LoginFunnelEventType.LoginSend);
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.NetworkErrorTipsUI_Open);
|
||||
LoginKit.Instance.LoginRequest(SuperApplication.Instance.attribution, NetworkManager.haveSimCard, (isSuccess, loginData) =>
|
||||
{
|
||||
device_id = SystemInfo.deviceUniqueIdentifier,
|
||||
pack_name = NetworkManager.identifier,
|
||||
app_version = Application.version,
|
||||
//is debug test--------
|
||||
channel = SuperApplication.Instance.attribution,
|
||||
sim = NetworkManager.haveSimCard
|
||||
TrackKit.TrackLoginFunnel(LoginFunnelEventType.LoginRecv, isSuccess ? "success" : "fail");
|
||||
|
||||
};
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.NetworkErrorTipsUI_Close);
|
||||
|
||||
var reqData = new RespLoginFunnelData
|
||||
{
|
||||
type = "loginSend",
|
||||
payload = ""
|
||||
};
|
||||
NetworkKit.PostFunnelLogin(reqData);
|
||||
Debug.Log("haveSimCard-----login-" + requestLoginData.sim );
|
||||
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LoginloadingUI_Open);
|
||||
|
||||
NetworkKit.Post<LoginModel>("login", requestLoginData, (isSuccess, loginData) =>
|
||||
{
|
||||
if (isSuccess)
|
||||
{
|
||||
var loginModel = GameHelper.GetLoginModel();
|
||||
loginModel.cdn_url = loginData.cdn_url;
|
||||
loginModel.setting = loginData.setting;
|
||||
loginModel.play_data = loginData.play_data;
|
||||
loginModel.token = loginData.token;
|
||||
loginModel.uid = loginData.uid;
|
||||
loginModel.country = loginData.country;
|
||||
loginModel.expires_at = loginData.expires_at;
|
||||
loginModel.invite_code = loginData.invite_code;
|
||||
loginModel.invite_url = loginData.invite_url;
|
||||
loginModel.is_magic = loginData.is_magic;
|
||||
loginModel.last_login_time = loginData.last_login_time;
|
||||
loginModel.login_time = loginData.login_time;
|
||||
loginModel.reg_time = loginData.reg_time;
|
||||
loginModel.new_player = loginData.new_player;
|
||||
loginModel.play_data_ver = loginData.play_data_ver;
|
||||
loginModel.enwp = loginData.enwp;
|
||||
loginModel.debug_log = loginData.debug_log;
|
||||
BIManager.Instance.TrackABConfig(loginData.IsMagic ? 30 : 15);
|
||||
DateTimeManager.Instance.SetServerCurrTimestamp(loginData.LoginTime);
|
||||
|
||||
loginModel.preferences = new Preferences();
|
||||
NetworkKit.CDNUrl = $"{loginData.cdn_url}/";
|
||||
NetworkKit.userId = loginData.uid;
|
||||
NetworkKit.SetCacheToken(loginData.token);
|
||||
DateTimeManager.Instance.SetServerCurrTimestamp(loginData.login_time);
|
||||
RequestHeart();
|
||||
Debug.Log("haveSimCard-----is_magic-" + loginModel.is_magic);
|
||||
|
||||
if (timerTask == null)
|
||||
{
|
||||
// Debug.Log("$ timer task fuzhi---------");
|
||||
timerTask = TimerHelper.UnscaleGeneral.AddLoopTimer(60, (timer) => { RequestHeart(); });
|
||||
}
|
||||
|
||||
GameDispatcher.Instance.Dispatch(GameMsg.netLoading_close);
|
||||
NetworkDispatcher.Instance.Dispatch(NetworkMsg.GetPlayData);
|
||||
var reqData = new RespLoginFunnelData
|
||||
{
|
||||
type = "loginRecv",
|
||||
payload = "success"
|
||||
};
|
||||
NetworkKit.PostFunnelLogin(reqData);
|
||||
|
||||
MaxADKit.SetUserID(loginData.Uid.As<string>());
|
||||
if (loginData.IsMagic) UnityManager.DakaiACT();
|
||||
}
|
||||
else
|
||||
{
|
||||
// if (!GameHelper.IsConnect())
|
||||
// {
|
||||
// loginCount = 0;
|
||||
// Action _OnFail = () =>
|
||||
// {
|
||||
// NetworkDispatcher.Instance.Dispatch(NetworkMsg.Login);
|
||||
// };
|
||||
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.TipsViewUI_Open, _OnFail);
|
||||
// return;
|
||||
// }
|
||||
var reqData = new RespLoginFunnelData
|
||||
{
|
||||
type = "loginRecv",
|
||||
payload = "fail"
|
||||
};
|
||||
NetworkKit.PostFunnelLogin(reqData);
|
||||
|
||||
float times = loginCount == 0 ? 0.1f : 5f;
|
||||
Debug.Log("dddddd");
|
||||
DOVirtual.DelayedCall(times, () =>
|
||||
{
|
||||
Debug.Log("ssssss");
|
||||
if (loginCount < 5)
|
||||
{
|
||||
loginCount++;
|
||||
RequestLogin();
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
loginCount = 0;
|
||||
Action _OnFail = () =>
|
||||
{
|
||||
NetworkDispatcher.Instance.Dispatch(NetworkMsg.Login);
|
||||
};
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.TipsViewUI_Open, _OnFail);
|
||||
GameDispatcher.Instance.Dispatch(GameMsg.netLoading_close);
|
||||
}
|
||||
});
|
||||
LoginFail();
|
||||
}
|
||||
});
|
||||
// }
|
||||
}
|
||||
|
||||
private void RequestHeart()
|
||||
private static void LoginFail()
|
||||
{
|
||||
NetworkKit.PostWithHeader("user/health");
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.NetLoadingUI_Close);
|
||||
|
||||
// Debug.Log($"barry 心跳: ---------");
|
||||
void OnFail()
|
||||
{
|
||||
NetworkDispatcher.Instance.Dispatch(NetworkMsg.Login);
|
||||
}
|
||||
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.TipsViewUI_Open, (Action)OnFail);
|
||||
}
|
||||
|
||||
public override void Dispose()
|
||||
@@ -165,4 +93,4 @@ namespace FlowerPower
|
||||
RemoveListener();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
using System.Collections.Generic;
|
||||
using SGModule.NetKit;
|
||||
using UnityEngine;
|
||||
|
||||
namespace FlowerPower
|
||||
namespace LoveLegend
|
||||
{
|
||||
public class PlayDataSystem : BaseSystem
|
||||
{
|
||||
@@ -16,7 +18,6 @@ namespace FlowerPower
|
||||
{
|
||||
base.Init();
|
||||
|
||||
// do net
|
||||
AddListener();
|
||||
}
|
||||
|
||||
@@ -34,13 +35,15 @@ namespace FlowerPower
|
||||
|
||||
private void OnRequestPlayData(object args)
|
||||
{
|
||||
NetworkKit.PostWithHeader<Preferences>("user/userData", (isSuccess, obj) =>
|
||||
{
|
||||
var loginModel = GameHelper.GetLoginModel();
|
||||
loginModel.preferences = obj;
|
||||
|
||||
PreferencesMgr.Instance.InitPreferences();
|
||||
NetworkDispatcher.Instance.Dispatch(NetworkMsg.GetConfig);
|
||||
NetApi.RequestPlayerData((isSuccess, json) => {
|
||||
// Debug.Log($"barry UserData : {json}");
|
||||
if (isSuccess) {
|
||||
DataMgr.InitPreferences(json);
|
||||
NetworkDispatcher.Instance.Dispatch(NetworkMsg.GetConfig);
|
||||
}
|
||||
else {
|
||||
Debug.LogError($"OnRequestPlayData isError {json}");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -71,7 +74,7 @@ namespace FlowerPower
|
||||
version = version,
|
||||
data = data
|
||||
};
|
||||
NetworkKit.PostWithHeader("user/updateData", requestData);
|
||||
// NetworkKit.PostWithHeader("user/updateData", requestData);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user