From 09bc892c7283df8757a07b646d5af21ddaa263d1 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期四, 06 十一月 2025 18:22:34 +0800
Subject: [PATCH] 164 天子的考验-客户端
---
Main/System/AssetVersion/InGameDownLoad.cs | 212 ++++++++++++++++++++++------------------------------
1 files changed, 91 insertions(+), 121 deletions(-)
diff --git a/Main/System/AssetVersion/InGameDownLoad.cs b/Main/System/AssetVersion/InGameDownLoad.cs
index 648a5a7..3a5965e 100644
--- a/Main/System/AssetVersion/InGameDownLoad.cs
+++ b/Main/System/AssetVersion/InGameDownLoad.cs
@@ -27,7 +27,7 @@
public bool isDone { get { return state == State.Completed; } } //鏄惁鍏ㄩ儴涓嬭浇瀹屾垚
//绐楀彛涓樉绀虹殑宸蹭笅杞藉ぇ灏�
- public long showDownLoadedSize { get { return DownloadMgr.Instance.DownloadedBytes - backGroundDownLoadSizeRecord; } }
+ public long showDownLoadedSize { get { return DownloadHotMgr.Instance.DownloadedBytes - backGroundDownLoadSizeRecord; } }
public long showTotalSize { get { return totalSize - backGroundDownLoadSizeRecord; } }//绐楀彛涓樉绀虹殑鎬诲ぇ灏�
public int showTotalCount { get { return totalCount - downLoadedCountRecord; } }//绐楀彛涓樉绀虹殑鎬绘暟閲�
public int showOkCount { get { return okCount - downLoadedCountRecord; } }//绐楀彛涓樉绀虹殑涓嬭浇瀹屾垚鏁伴噺
@@ -79,8 +79,6 @@
}
}
- // TaskModel taskModel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } }
-
public List<Reward> rewards = new List<Reward>();
public bool hasReward { get; private set; }//鏄惁鏈夊鍔�
public string completeDownLoadAccount
@@ -89,12 +87,11 @@
set { LocalSave.SetString("InGameDownLoadCompleteAccount", value); }
}
- // TODO YYL
- // public Redpoint downLoadRedpoint = new Redpoint(116);
+ public Redpoint downLoadRedpoint = new Redpoint(116);
private void Awake()
{
- DownloadMgr.MaxDownLoadTask = GetMaxTask();
+ DownloadHotMgr.MaxDownLoadTask = GetMaxTask();
}
private void LateUpdate()
@@ -138,45 +135,42 @@
//寮�濮嬪垎閰嶄换鍔�
public void AssignTasks(List<AssetVersion> assets, Action _onDownLoadOk)
{
- // TODO YYL
- // this.inGameDownLoadAllow = false;
- // this.assets = assets;
- // this.assets.Sort(this.AssetDownLoadPriorCompare);//鎵�鏈変换鍔℃牴鎹紭鍏堢骇鎺掑簭
- // onDownLoadOk = _onDownLoadOk;
+
+ this.inGameDownLoadAllow = false;
+ this.assets = assets;
+ this.assets.Sort(this.AssetDownLoadPriorCompare);//鎵�鏈変换鍔℃牴鎹紭鍏堢骇鎺掑簭
+ onDownLoadOk = _onDownLoadOk;
- // totalCount = this.assets.Count;
- // okCount = 0;
- // totalSize = 0;
+ totalCount = this.assets.Count;
+ okCount = 0;
+ totalSize = 0;
- // DownloadMgr.Instance.Prepare();
+ DownloadHotMgr.Instance.Prepare();
- // for (int i = 0; i < this.assets.Count; i++)
- // {
- // var assetVersion = this.assets[i];
- // totalSize += assetVersion.size;//缁熻璧勬簮鎬诲ぇ灏�
- // //缁熻鍦板浘涓撳睘鐨勮祫婧�
- // var mapId = PriorBundleConfig.GetAssetBelongToMap(assetVersion.GetAssetCategory(), AssetVersionUtility.DecodeFileName(assetVersion.fileName));
- // if (mapId != 0)
- // {
- // if (!mapTasks.ContainsKey(mapId))
- // {
- // mapTasks[mapId] = new List<AssetVersion>();
- // }
- // mapTasks[mapId].Add(assetVersion);
- // }
- // //娣诲姞涓嬭浇浠诲姟
- // var remoteURL = StringUtility.Contact(VersionUtility.Instance.versionInfo.GetResourcesURL(VersionConfig.Get().branch), Language.fixPath, "/", assetVersion.relativePath);
- // var localURL = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, assetVersion.relativePath);
- // DownloadMgr.Instance.AddTask(new DownloadTask(remoteURL, localURL, assetVersion));
- // }
+ for (int i = 0; i < this.assets.Count; i++)
+ {
+ var assetVersion = this.assets[i];
+ totalSize += assetVersion.size;//缁熻璧勬簮鎬诲ぇ灏�
+ //缁熻鍦板浘涓撳睘鐨勮祫婧� TODO YYL
+ // var mapId = PriorBundleConfig.GetAssetBelongToMap(assetVersion.GetAssetCategory(), AssetVersionUtility.DecodeFileName(assetVersion.fileName));
+ // if (mapId != 0)
+ // {
+ // if (!mapTasks.ContainsKey(mapId))
+ // {
+ // mapTasks[mapId] = new List<AssetVersion>();
+ // }
+ // mapTasks[mapId].Add(assetVersion);
+ // }
+ //娣诲姞涓嬭浇浠诲姟
+ var remoteURL = StringUtility.Contact(VersionUtility.Instance.versionInfo.GetResourcesURL(VersionConfig.Get().branch), Language.fixPath, "/", assetVersion.relativePath);
+ var localURL = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, assetVersion.relativePath);
+ DownloadHotMgr.Instance.AddTask(new DownloadHotTask(remoteURL, localURL, assetVersion));
+ }
- // state = State.None;
+ state = State.None;
- // TaskModel.Event_MainlineTask -= OnMainTaskChange;
- // TaskModel.Event_MainlineTask += OnMainTaskChange;
-
- // PlayerDatas.Instance.playerDataRefreshEvent -= OnPlayerLevelChange;
- // PlayerDatas.Instance.playerDataRefreshEvent += OnPlayerLevelChange;
+ PlayerDatas.Instance.playerDataRefreshEvent -= OnPlayerLevelChange;
+ PlayerDatas.Instance.playerDataRefreshEvent += OnPlayerLevelChange;
}
//浠诲姟鏍规嵁浼樺厛绾ф帓搴�
@@ -185,8 +179,7 @@
var categoryA = lhs.GetAssetCategory();
var categoryB = rhs.GetAssetCategory();
- // TODO YYL
-
+ // TODO YYL
// var priorA = PriorBundleConfig.GetAssetPrior(categoryA, AssetVersionUtility.DecodeFileName(lhs.fileName));
// var priorB = PriorBundleConfig.GetAssetPrior(categoryB, AssetVersionUtility.DecodeFileName(rhs.fileName));
@@ -252,7 +245,7 @@
case Dominant.Half:
if (dominantState == Dominant.None)
{
- backGroundDownLoadSizeRecord = DownloadMgr.Instance.DownloadedBytes;
+ backGroundDownLoadSizeRecord = DownloadHotMgr.Instance.DownloadedBytes;
downLoadedCountRecord = okCount;
}
StartDownLoad();
@@ -261,7 +254,7 @@
case Dominant.Whole:
if (dominantState == Dominant.None)
{
- backGroundDownLoadSizeRecord = DownloadMgr.Instance.DownloadedBytes;
+ backGroundDownLoadSizeRecord = DownloadHotMgr.Instance.DownloadedBytes;
downLoadedCountRecord = okCount;
Pause();
state = State.Prepared;
@@ -272,9 +265,7 @@
state = State.Prepared;
}
dominantState = Dominant.Whole;
- // TODO YYL
- // UIManager.Instance.ShowWindow<InGameDownLoadWin>();
- // // WindowCenter.Instance.Open<InGameDownLoadWin>();
+ // UIManager.Instance.OpenWindow<InGameDownLoadWin>();
break;
}
}
@@ -285,7 +276,7 @@
if (state == State.None || state == State.Prepared || state == State.Pause)
{
state = State.DownLoad;
- DownloadMgr.Instance.Begin(OnFileDownLoadCompleted);
+ DownloadHotMgr.Instance.Begin(OnFileDownLoadCompleted);
}
}
@@ -294,13 +285,13 @@
{
if (state == State.DownLoad)
{
- DownloadMgr.Instance.Stop();
+ DownloadHotMgr.Instance.Stop();
state = State.Pause;
}
}
//鏂囦欢涓嬭浇瀹屾垚鍥炶皟
- private bool OnFileDownLoadCompleted(bool finished, DownloadTask task)
+ private bool OnFileDownLoadCompleted(bool finished, DownloadHotTask task)
{
if (task.IsDone && task.obj is AssetVersion)
{
@@ -315,71 +306,66 @@
//鎵�鏈変换鍔″畬鎴�
private void OnDownLoadFinished()
{
- // TODO YYL
- // TaskModel.Event_MainlineTask -= OnMainTaskChange;
- // PlayerDatas.Instance.playerDataRefreshEvent -= OnPlayerLevelChange;
+ PlayerDatas.Instance.playerDataRefreshEvent -= OnPlayerLevelChange;
- // WindowCenter.Instance.Close<InGameDownLoadWin>();
+ UIManager.Instance.CloseWindow<InGameDownLoadWin>();
- // if (!hasReward)
- // {
- // if (dominantState == Dominant.None)
- // {
- // RequestDownLoadReward(false);
- // state = State.Completed;
- // }
- // else
- // {
- // completeDownLoadAccount = PlayerDatas.Instance.baseData.AccID;
- // state = State.Award;
- // }
- // }
- // else
- // {
- // state = State.Completed;
- // }
+ if (!hasReward)
+ {
+ if (dominantState == Dominant.None)
+ {
+ RequestDownLoadReward(false);
+ state = State.Completed;
+ }
+ else
+ {
+ completeDownLoadAccount = PlayerDatas.Instance.baseData.AccID;
+ state = State.Award;
+ }
+ }
+ else
+ {
+ state = State.Completed;
+ }
- // downLoadRedpoint.state = state == State.Award ? RedPointState.Simple : RedPointState.None;
+ downLoadRedpoint.state = state == State.Award ? RedPointState.Simple : RedPointState.None;
- // if (onDownLoadOk != null)
- // {
- // onDownLoadOk();
- // onDownLoadOk = null;
- // }
+ if (onDownLoadOk != null)
+ {
+ onDownLoadOk();
+ onDownLoadOk = null;
+ }
}
public void ParseRewardConfig()
{
- // // TODO YYL
- // var rewardString = FuncConfigConfig.Get("DownReward").Numerical1;
- // var matches = Regex.Matches(rewardString, "(\\d+,\\d+,\\d+)");
- // for (int i = 0; i < matches.Count; i++)
- // {
- // rewards.Add(new Reward(matches[i].Value));
- // }
+ var rewardString = FuncConfigConfig.Get("DownReward").Numerical1;
+ var matches = Regex.Matches(rewardString, "(\\d+,\\d+,\\d+)");
+ for (int i = 0; i < matches.Count; i++)
+ {
+ rewards.Add(new Reward(matches[i].Value));
+ }
}
- // TODO YYL
- // public void UpdateRewardInfo(HA319_tagMCPackDownloadRecord _package)
- // {
- // hasReward = _package.Record == 1;
+ public void UpdateRewardInfo(HA319_tagMCPackDownloadRecord _package)
+ {
+ hasReward = _package.Record == 1;
- // if (AssetVersionUtility.unPriorAssetDownLoadDone)
- // {
- // state = !hasReward && completeDownLoadAccount == PlayerDatas.Instance.baseData.AccID ? State.Award : State.Completed;
- // }
+ if (AssetVersionUtility.unPriorAssetDownLoadDone)
+ {
+ state = !hasReward && completeDownLoadAccount == PlayerDatas.Instance.baseData.AccID ? State.Award : State.Completed;
+ }
- // downLoadRedpoint.state = state == State.Award ? RedPointState.Simple : RedPointState.None;
- // }
+ downLoadRedpoint.state = state == State.Award ? RedPointState.Simple : RedPointState.None;
+ }
public void RequestDownLoadReward(bool _manual)
{
- // TODO YYL
- // var send = new CA504_tagCMPlayerGetReward();
- // send.RewardType = 15;
- // send.DataEx = (byte)(_manual ? 0 : 1);
- // GameNetSystem.Instance.SendInfo(send);
+ var send = new CA504_tagCMPlayerGetReward();
+ send.RewardType = 15;
+ send.DataEx = (byte)(_manual ? 0 : 1);
+ GameNetSystem.Instance.SendInfo(send);
}
public float GetMapAssetDownLoadProgress(int mapId)
@@ -540,11 +526,10 @@
}
- // TODO YYL
- // if (!WindowCenter.Instance.IsOpen("MainInterfaceWin"))
- // {
- // return false;
- // }
+ if (!UIManager.Instance.IsOpened<MainWin>())
+ {
+ return false;
+ }
// if (WindowCenter.Instance.ExistAnyFullScreenOrMaskWin())
// {
@@ -586,27 +571,12 @@
}
}
- //涓荤嚎浠诲姟浠诲姟鐘舵�佸彉鏇村拰鍒锋柊
- private void OnMainTaskChange(int _taskId, int _state)
- {
- // TODO YYL
- // var mainTaskId = taskModel.currentMission;
- // if (GeneralDefine.inGameDownLoadTaskCheckPoints.Contains(mainTaskId)
- // && taskModel.currentMissionState == 1)
- // {
- // if (CheckDominantDownLoad())
- // {
- // TryDownLoad(Dominant.Whole);
- // }
- // }
- }
//鑾峰彇鏈�澶т笅杞戒换鍔℃暟
public int GetMaxTask()
{
- // TODO YYL
- // if (!LoginWin.firstOpenEnd)
- // return 20;
+ if (!LoginWin.firstOpenEnd)
+ return 20;
if (downLoadGo)
return 20;
--
Gitblit v1.8.0