fix:1、更换项目,使用winter来创建

This commit is contained in:
2026-04-22 11:13:16 +08:00
parent 173cfb2dc9
commit 83ff9f71ad
7375 changed files with 209752 additions and 157557 deletions
+96 -116
View File
@@ -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;
}
}
}
}
}
}