update space shooter

This commit is contained in:
何冠峰
2024-12-31 15:13:13 +08:00
parent 4370ed544f
commit d1d6e023c4
234 changed files with 1727 additions and 5047 deletions
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 62f3c214d7670b44ebbee7153636c648
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,62 +0,0 @@
using System;
using System.IO;
using System.Text;
using YooAsset;
/// <summary>
/// 文件偏移加密方式
/// </summary>
public class FileOffsetEncryption : IEncryptionServices
{
public EncryptResult Encrypt(EncryptFileInfo fileInfo)
{
// 注意:只对音频资源包加密
if (fileInfo.BundleName.Contains("_gameres_audio"))
{
int offset = 32;
byte[] fileData = File.ReadAllBytes(fileInfo.FileLoadPath);
var encryptedData = new byte[fileData.Length + offset];
Buffer.BlockCopy(fileData, 0, encryptedData, offset, fileData.Length);
EncryptResult result = new EncryptResult();
result.Encrypted = true;
result.EncryptedData = encryptedData;
return result;
}
else
{
EncryptResult result = new EncryptResult();
result.Encrypted = false;
return result;
}
}
}
/// <summary>
/// 文件流加密方式
/// </summary>
public class FileStreamEncryption : IEncryptionServices
{
public EncryptResult Encrypt(EncryptFileInfo fileInfo)
{
if (fileInfo.BundleName.Contains("_gameres_audio"))
{
var fileData = File.ReadAllBytes(fileInfo.FileLoadPath);
for (int i = 0; i < fileData.Length; i++)
{
fileData[i] ^= BundleStream.KEY;
}
EncryptResult result = new EncryptResult();
result.Encrypted = true;
result.EncryptedData = fileData;
return result;
}
else
{
EncryptResult result = new EncryptResult();
result.Encrypted = false;
return result;
}
}
}
@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 339682333f36d014e942a790dea6b1f7
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -8,12 +8,12 @@ public class BackgroundScroller : MonoBehaviour
private Vector3 _startPosition;
void Start ()
void Start()
{
_startPosition = transform.position;
}
void Update ()
void Update()
{
float newPosition = Mathf.Repeat(Time.time * ScrollSpeed, TileSizeZ);
this.transform.position = _startPosition + Vector3.forward * newPosition;
@@ -35,7 +35,7 @@ public class Boot : MonoBehaviour
GameObject.Instantiate(go);
// 开始补丁更新流程
PatchOperation operation = new PatchOperation("DefaultPackage", PlayMode);
var operation = new PatchOperation("DefaultPackage", PlayMode);
YooAssets.StartOperation(operation);
yield return operation;
@@ -18,13 +18,13 @@ public class PatchEventDefine
/// <summary>
/// 补丁流程步骤改变
/// </summary>
public class PatchStatesChange : IEventMessage
public class PatchStepsChange : IEventMessage
{
public string Tips;
public static void SendEventMessage(string tips)
{
var msg = new PatchStatesChange();
var msg = new PatchStepsChange();
msg.Tips = tips;
UniEvent.SendMessage(msg);
}
@@ -50,7 +50,7 @@ public class PatchEventDefine
/// <summary>
/// 下载进度更新
/// </summary>
public class DownloadProgressUpdate : IEventMessage
public class DownloadUpdate : IEventMessage
{
public int TotalDownloadCount;
public int CurrentDownloadCount;
@@ -59,7 +59,7 @@ public class PatchEventDefine
public static void SendEventMessage(DownloadUpdateData updateData)
{
var msg = new DownloadProgressUpdate();
var msg = new DownloadUpdate();
msg.TotalDownloadCount = updateData.TotalDownloadCount;
msg.CurrentDownloadCount = updateData.CurrentDownloadCount;
msg.TotalDownloadSizeBytes = updateData.TotalDownloadBytes;
@@ -69,25 +69,25 @@ public class PatchEventDefine
}
/// <summary>
/// 资源版本号更新失败
/// 资源版本请求失败
/// </summary>
public class PackageVersionUpdateFailed : IEventMessage
public class PackageVersionRequestFailed : IEventMessage
{
public static void SendEventMessage()
{
var msg = new PackageVersionUpdateFailed();
var msg = new PackageVersionRequestFailed();
UniEvent.SendMessage(msg);
}
}
/// <summary>
/// 补丁清单更新失败
/// 资源清单更新失败
/// </summary>
public class PatchManifestUpdateFailed : IEventMessage
public class PackageManifestUpdateFailed : IEventMessage
{
public static void SendEventMessage()
{
var msg = new PatchManifestUpdateFailed();
var msg = new PackageManifestUpdateFailed();
UniEvent.SendMessage(msg);
}
}
@@ -27,13 +27,13 @@ public class UserEventDefine
}
/// <summary>
/// 用户尝试再次更新静态版本
/// 用户尝试再次请求资源版本
/// </summary>
public class UserTryUpdatePackageVersion : IEventMessage
public class UserTryRequestPackageVersion : IEventMessage
{
public static void SendEventMessage()
{
var msg = new UserTryUpdatePackageVersion();
var msg = new UserTryRequestPackageVersion();
UniEvent.SendMessage(msg);
}
}
@@ -41,11 +41,11 @@ public class UserEventDefine
/// <summary>
/// 用户尝试再次更新补丁清单
/// </summary>
public class UserTryUpdatePatchManifest : IEventMessage
public class UserTryUpdatePackageManifest : IEventMessage
{
public static void SendEventMessage()
{
var msg = new UserTryUpdatePatchManifest();
var msg = new UserTryUpdatePackageManifest();
UniEvent.SendMessage(msg);
}
}
@@ -1,9 +1,6 @@
using System;
using System.Collections;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UniFramework.Event;
using UniFramework.Machine;
using YooAsset;
internal class SceneBattle : MonoBehaviour
@@ -37,18 +34,21 @@ internal class SceneBattle : MonoBehaviour
}
private void OnDestroy()
{
// 释放资源句柄
if (_windowHandle != null)
{
_windowHandle.Release();
_windowHandle = null;
}
// 释放资源句柄
if (_musicHandle != null)
{
_musicHandle.Release();
_musicHandle = null;
}
// 释放资源句柄
if (_battleRoom != null)
{
_battleRoom.DestroyRoom();
@@ -8,26 +8,17 @@ public class SceneHome : MonoBehaviour
public GameObject CanvasDesktop;
private AssetHandle _windowHandle;
#if UNITY_WEBGL
private IEnumerator Start()
{
// 同步加载登录页面
{
// 加载主页面
_windowHandle = YooAssets.LoadAssetAsync<GameObject>("UIHome");
yield return _windowHandle;
_windowHandle.InstantiateSync(CanvasDesktop.transform);
}
#else
private void Start()
{
// 异步加载登录页面
_windowHandle = YooAssets.LoadAssetSync<GameObject>("UIHome");
_windowHandle.InstantiateSync(CanvasDesktop.transform);
}
#endif
private void OnDestroy()
{
// 释放资源句柄
if (_windowHandle != null)
{
_windowHandle.Release();
@@ -4,10 +4,7 @@ using UnityEngine;
using UniFramework.Machine;
using YooAsset;
/// <summary>
/// 清理未使用的缓存文件
/// </summary>
internal class FsmClearPackageCache : IStateNode
internal class FsmClearCacheBundle : IStateNode
{
private StateMachine _machine;
@@ -17,7 +14,7 @@ internal class FsmClearPackageCache : IStateNode
}
void IStateNode.OnEnter()
{
PatchEventDefine.PatchStatesChange.SendEventMessage("清理未使用的缓存文件!");
PatchEventDefine.PatchStepsChange.SendEventMessage("清理未使用的缓存文件!");
var packageName = (string)_machine.GetBlackboardValue("PackageName");
var package = YooAssets.GetPackage(packageName);
var operation = package.ClearCacheBundleFilesAsync(EFileClearMode.ClearUnusedBundleFiles);
@@ -32,6 +29,6 @@ internal class FsmClearPackageCache : IStateNode
private void Operation_Completed(YooAsset.AsyncOperationBase obj)
{
_machine.ChangeState<FsmUpdaterDone>();
_machine.ChangeState<FsmStartGame>();
}
}
@@ -4,10 +4,7 @@ using UnityEngine;
using UniFramework.Machine;
using YooAsset;
/// <summary>
/// 创建文件下载器
/// </summary>
public class FsmCreatePackageDownloader : IStateNode
public class FsmCreateDownloader : IStateNode
{
private StateMachine _machine;
@@ -17,8 +14,8 @@ public class FsmCreatePackageDownloader : IStateNode
}
void IStateNode.OnEnter()
{
PatchEventDefine.PatchStatesChange.SendEventMessage("创建补丁下载器!");
GameManager.Instance.StartCoroutine(CreateDownloader());
PatchEventDefine.PatchStepsChange.SendEventMessage("创建资源下载器!");
CreateDownloader();
}
void IStateNode.OnUpdate()
{
@@ -27,10 +24,8 @@ public class FsmCreatePackageDownloader : IStateNode
{
}
IEnumerator CreateDownloader()
void CreateDownloader()
{
yield return new WaitForSecondsRealtime(0.5f);
var packageName = (string)_machine.GetBlackboardValue("PackageName");
var package = YooAssets.GetPackage(packageName);
int downloadingMaxNum = 10;
@@ -41,7 +36,7 @@ public class FsmCreatePackageDownloader : IStateNode
if (downloader.TotalDownloadCount == 0)
{
Debug.Log("Not found any download files !");
_machine.ChangeState<FsmUpdaterDone>();
_machine.ChangeState<FsmStartGame>();
}
else
{
@@ -3,9 +3,6 @@ using UnityEngine;
using UniFramework.Machine;
using YooAsset;
/// <summary>
/// 下载更新文件
/// </summary>
public class FsmDownloadPackageFiles : IStateNode
{
private StateMachine _machine;
@@ -16,7 +13,7 @@ public class FsmDownloadPackageFiles : IStateNode
}
void IStateNode.OnEnter()
{
PatchEventDefine.PatchStatesChange.SendEventMessage("开始下载补丁文件!");
PatchEventDefine.PatchStepsChange.SendEventMessage("开始下载资源文件!");
GameManager.Instance.StartCoroutine(BeginDownload());
}
void IStateNode.OnUpdate()
@@ -30,7 +27,7 @@ public class FsmDownloadPackageFiles : IStateNode
{
var downloader = (ResourceDownloaderOperation)_machine.GetBlackboardValue("Downloader");
downloader.DownloadErrorCallback = PatchEventDefine.WebFileDownloadFailed.SendEventMessage;
downloader.DownloadUpdateCallback = PatchEventDefine.DownloadProgressUpdate.SendEventMessage;
downloader.DownloadUpdateCallback = PatchEventDefine.DownloadUpdate.SendEventMessage;
downloader.BeginDownload();
yield return downloader;
@@ -3,9 +3,6 @@ using System.Collections.Generic;
using UnityEngine;
using UniFramework.Machine;
/// <summary>
/// 下载完毕
/// </summary>
internal class FsmDownloadPackageOver : IStateNode
{
private StateMachine _machine;
@@ -16,7 +13,8 @@ internal class FsmDownloadPackageOver : IStateNode
}
void IStateNode.OnEnter()
{
_machine.ChangeState<FsmClearPackageCache>();
PatchEventDefine.PatchStepsChange.SendEventMessage("资源文件下载完毕!");
_machine.ChangeState<FsmClearCacheBundle>();
}
void IStateNode.OnUpdate()
{
@@ -6,9 +6,6 @@ using UnityEngine;
using UniFramework.Machine;
using YooAsset;
/// <summary>
/// 初始化资源包
/// </summary>
internal class FsmInitializePackage : IStateNode
{
private StateMachine _machine;
@@ -19,7 +16,7 @@ internal class FsmInitializePackage : IStateNode
}
void IStateNode.OnEnter()
{
PatchEventDefine.PatchStatesChange.SendEventMessage("初始化资源包!");
PatchEventDefine.PatchStepsChange.SendEventMessage("初始化资源包!");
GameManager.Instance.StartCoroutine(InitPackage());
}
void IStateNode.OnUpdate()
@@ -96,7 +93,7 @@ internal class FsmInitializePackage : IStateNode
}
else
{
_machine.ChangeState<FsmUpdatePackageVersion>();
_machine.ChangeState<FsmRequestPackageVersion>();
}
}
@@ -152,133 +149,4 @@ internal class FsmInitializePackage : IStateNode
return $"{_fallbackHostServer}/{fileName}";
}
}
/// <summary>
/// 资源文件流加载解密类
/// </summary>
private class FileStreamDecryption : IDecryptionServices
{
/// <summary>
/// 同步方式获取解密的资源包对象
/// 注意:加载流对象在资源包对象释放的时候会自动释放
/// </summary>
DecryptResult IDecryptionServices.LoadAssetBundle(DecryptFileInfo fileInfo)
{
BundleStream bundleStream = new BundleStream(fileInfo.FileLoadPath, FileMode.Open, FileAccess.Read, FileShare.Read);
DecryptResult decryptResult = new DecryptResult();
decryptResult.ManagedStream = bundleStream;
decryptResult.Result = AssetBundle.LoadFromStream(bundleStream, fileInfo.FileLoadCRC, GetManagedReadBufferSize());
return decryptResult;
}
/// <summary>
/// 异步方式获取解密的资源包对象
/// 注意:加载流对象在资源包对象释放的时候会自动释放
/// </summary>
DecryptResult IDecryptionServices.LoadAssetBundleAsync(DecryptFileInfo fileInfo)
{
BundleStream bundleStream = new BundleStream(fileInfo.FileLoadPath, FileMode.Open, FileAccess.Read, FileShare.Read);
DecryptResult decryptResult = new DecryptResult();
decryptResult.ManagedStream = bundleStream;
decryptResult.CreateRequest = AssetBundle.LoadFromStreamAsync(bundleStream, fileInfo.FileLoadCRC, GetManagedReadBufferSize());
return decryptResult;
}
/// <summary>
/// 获取解密的字节数据
/// </summary>
byte[] IDecryptionServices.ReadFileData(DecryptFileInfo fileInfo)
{
throw new System.NotImplementedException();
}
/// <summary>
/// 获取解密的文本数据
/// </summary>
string IDecryptionServices.ReadFileText(DecryptFileInfo fileInfo)
{
throw new System.NotImplementedException();
}
private static uint GetManagedReadBufferSize()
{
return 1024;
}
}
/// <summary>
/// 资源文件偏移加载解密类
/// </summary>
private class FileOffsetDecryption : IDecryptionServices
{
/// <summary>
/// 同步方式获取解密的资源包对象
/// 注意:加载流对象在资源包对象释放的时候会自动释放
/// </summary>
DecryptResult IDecryptionServices.LoadAssetBundle(DecryptFileInfo fileInfo)
{
DecryptResult decryptResult = new DecryptResult();
decryptResult.ManagedStream = null;
decryptResult.Result = AssetBundle.LoadFromFile(fileInfo.FileLoadPath, fileInfo.FileLoadCRC, GetFileOffset());
return decryptResult;
}
/// <summary>
/// 异步方式获取解密的资源包对象
/// 注意:加载流对象在资源包对象释放的时候会自动释放
/// </summary>
DecryptResult IDecryptionServices.LoadAssetBundleAsync(DecryptFileInfo fileInfo)
{
DecryptResult decryptResult = new DecryptResult();
decryptResult.ManagedStream = null;
decryptResult.CreateRequest = AssetBundle.LoadFromFileAsync(fileInfo.FileLoadPath, fileInfo.FileLoadCRC, GetFileOffset());
return decryptResult;
}
/// <summary>
/// 获取解密的字节数据
/// </summary>
byte[] IDecryptionServices.ReadFileData(DecryptFileInfo fileInfo)
{
throw new System.NotImplementedException();
}
/// <summary>
/// 获取解密的文本数据
/// </summary>
string IDecryptionServices.ReadFileText(DecryptFileInfo fileInfo)
{
throw new System.NotImplementedException();
}
private static ulong GetFileOffset()
{
return 32;
}
}
}
/// <summary>
/// 资源文件解密流
/// </summary>
public class BundleStream : FileStream
{
public const byte KEY = 64;
public BundleStream(string path, FileMode mode, FileAccess access, FileShare share) : base(path, mode, access, share)
{
}
public BundleStream(string path, FileMode mode) : base(path, mode)
{
}
public override int Read(byte[] array, int offset, int count)
{
var index = base.Read(array, offset, count);
for (int i = 0; i < array.Length; i++)
{
array[i] ^= KEY;
}
return index;
}
}
@@ -4,10 +4,7 @@ using UnityEngine;
using UniFramework.Machine;
using YooAsset;
/// <summary>
/// 更新资源版本号
/// </summary>
internal class FsmUpdatePackageVersion : IStateNode
internal class FsmRequestPackageVersion : IStateNode
{
private StateMachine _machine;
@@ -17,7 +14,7 @@ internal class FsmUpdatePackageVersion : IStateNode
}
void IStateNode.OnEnter()
{
PatchEventDefine.PatchStatesChange.SendEventMessage("获取最新的资源版本 !");
PatchEventDefine.PatchStepsChange.SendEventMessage("请求资源版本 !");
GameManager.Instance.StartCoroutine(UpdatePackageVersion());
}
void IStateNode.OnUpdate()
@@ -29,8 +26,6 @@ internal class FsmUpdatePackageVersion : IStateNode
private IEnumerator UpdatePackageVersion()
{
yield return new WaitForSecondsRealtime(0.5f);
var packageName = (string)_machine.GetBlackboardValue("PackageName");
var package = YooAssets.GetPackage(packageName);
var operation = package.RequestPackageVersionAsync();
@@ -39,7 +34,7 @@ internal class FsmUpdatePackageVersion : IStateNode
if (operation.Status != EOperationStatus.Succeed)
{
Debug.LogWarning(operation.Error);
PatchEventDefine.PackageVersionUpdateFailed.SendEventMessage();
PatchEventDefine.PackageVersionRequestFailed.SendEventMessage();
}
else
{
@@ -3,10 +3,7 @@ using System.Collections.Generic;
using UnityEngine;
using UniFramework.Machine;
/// <summary>
/// 流程更新完毕
/// </summary>
internal class FsmUpdaterDone : IStateNode
internal class FsmStartGame : IStateNode
{
private PatchOperation _owner;
@@ -16,6 +13,7 @@ internal class FsmUpdaterDone : IStateNode
}
void IStateNode.OnEnter()
{
PatchEventDefine.PatchStepsChange.SendEventMessage("开始游戏!");
_owner.SetFinish();
}
void IStateNode.OnUpdate()
@@ -4,9 +4,6 @@ using UnityEngine;
using UniFramework.Machine;
using YooAsset;
/// <summary>
/// 更新资源清单
/// </summary>
public class FsmUpdatePackageManifest : IStateNode
{
private StateMachine _machine;
@@ -17,7 +14,7 @@ public class FsmUpdatePackageManifest : IStateNode
}
void IStateNode.OnEnter()
{
PatchEventDefine.PatchStatesChange.SendEventMessage("更新资源清单!");
PatchEventDefine.PatchStepsChange.SendEventMessage("更新资源清单!");
GameManager.Instance.StartCoroutine(UpdateManifest());
}
void IStateNode.OnUpdate()
@@ -29,8 +26,6 @@ public class FsmUpdatePackageManifest : IStateNode
private IEnumerator UpdateManifest()
{
yield return new WaitForSecondsRealtime(0.5f);
var packageName = (string)_machine.GetBlackboardValue("PackageName");
var packageVersion = (string)_machine.GetBlackboardValue("PackageVersion");
var package = YooAssets.GetPackage(packageName);
@@ -40,12 +35,12 @@ public class FsmUpdatePackageManifest : IStateNode
if (operation.Status != EOperationStatus.Succeed)
{
Debug.LogWarning(operation.Error);
PatchEventDefine.PatchManifestUpdateFailed.SendEventMessage();
PatchEventDefine.PackageManifestUpdateFailed.SendEventMessage();
yield break;
}
else
{
_machine.ChangeState<FsmCreatePackageDownloader>();
_machine.ChangeState<FsmCreateDownloader>();
}
}
}
@@ -1,7 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine;
using UniFramework.Machine;
using UniFramework.Event;
using YooAsset;
@@ -27,20 +24,20 @@ public class PatchOperation : GameAsyncOperation
// 注册监听事件
_eventGroup.AddListener<UserEventDefine.UserTryInitialize>(OnHandleEventMessage);
_eventGroup.AddListener<UserEventDefine.UserBeginDownloadWebFiles>(OnHandleEventMessage);
_eventGroup.AddListener<UserEventDefine.UserTryUpdatePackageVersion>(OnHandleEventMessage);
_eventGroup.AddListener<UserEventDefine.UserTryUpdatePatchManifest>(OnHandleEventMessage);
_eventGroup.AddListener<UserEventDefine.UserTryRequestPackageVersion>(OnHandleEventMessage);
_eventGroup.AddListener<UserEventDefine.UserTryUpdatePackageManifest>(OnHandleEventMessage);
_eventGroup.AddListener<UserEventDefine.UserTryDownloadWebFiles>(OnHandleEventMessage);
// 创建状态机
_machine = new StateMachine(this);
_machine.AddNode<FsmInitializePackage>();
_machine.AddNode<FsmUpdatePackageVersion>();
_machine.AddNode<FsmRequestPackageVersion>();
_machine.AddNode<FsmUpdatePackageManifest>();
_machine.AddNode<FsmCreatePackageDownloader>();
_machine.AddNode<FsmCreateDownloader>();
_machine.AddNode<FsmDownloadPackageFiles>();
_machine.AddNode<FsmDownloadPackageOver>();
_machine.AddNode<FsmClearPackageCache>();
_machine.AddNode<FsmUpdaterDone>();
_machine.AddNode<FsmClearCacheBundle>();
_machine.AddNode<FsmStartGame>();
_machine.SetBlackboardValue("PackageName", packageName);
_machine.SetBlackboardValue("PlayMode", playMode);
@@ -55,7 +52,7 @@ public class PatchOperation : GameAsyncOperation
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
if(_steps == ESteps.Update)
if (_steps == ESteps.Update)
{
_machine.Update();
}
@@ -85,17 +82,17 @@ public class PatchOperation : GameAsyncOperation
{
_machine.ChangeState<FsmDownloadPackageFiles>();
}
else if (message is UserEventDefine.UserTryUpdatePackageVersion)
else if (message is UserEventDefine.UserTryRequestPackageVersion)
{
_machine.ChangeState<FsmUpdatePackageVersion>();
_machine.ChangeState<FsmRequestPackageVersion>();
}
else if (message is UserEventDefine.UserTryUpdatePatchManifest)
else if (message is UserEventDefine.UserTryUpdatePackageManifest)
{
_machine.ChangeState<FsmUpdatePackageManifest>();
}
else if (message is UserEventDefine.UserTryDownloadWebFiles)
{
_machine.ChangeState<FsmCreatePackageDownloader>();
_machine.ChangeState<FsmCreateDownloader>();
}
else
{
@@ -52,7 +52,6 @@ public class PatchWindow : MonoBehaviour
}
}
private readonly EventGroup _eventGroup = new EventGroup();
private readonly List<MessageBox> _msgBoxList = new List<MessageBox>();
@@ -61,7 +60,6 @@ public class PatchWindow : MonoBehaviour
private Slider _slider;
private Text _tips;
void Awake()
{
_slider = transform.Find("UIWindow/Slider").GetComponent<Slider>();
@@ -71,11 +69,11 @@ public class PatchWindow : MonoBehaviour
_messageBoxObj.SetActive(false);
_eventGroup.AddListener<PatchEventDefine.InitializeFailed>(OnHandleEventMessage);
_eventGroup.AddListener<PatchEventDefine.PatchStatesChange>(OnHandleEventMessage);
_eventGroup.AddListener<PatchEventDefine.PatchStepsChange>(OnHandleEventMessage);
_eventGroup.AddListener<PatchEventDefine.FoundUpdateFiles>(OnHandleEventMessage);
_eventGroup.AddListener<PatchEventDefine.DownloadProgressUpdate>(OnHandleEventMessage);
_eventGroup.AddListener<PatchEventDefine.PackageVersionUpdateFailed>(OnHandleEventMessage);
_eventGroup.AddListener<PatchEventDefine.PatchManifestUpdateFailed>(OnHandleEventMessage);
_eventGroup.AddListener<PatchEventDefine.DownloadUpdate>(OnHandleEventMessage);
_eventGroup.AddListener<PatchEventDefine.PackageVersionRequestFailed>(OnHandleEventMessage);
_eventGroup.AddListener<PatchEventDefine.PackageManifestUpdateFailed>(OnHandleEventMessage);
_eventGroup.AddListener<PatchEventDefine.WebFileDownloadFailed>(OnHandleEventMessage);
}
void OnDestroy()
@@ -96,10 +94,11 @@ public class PatchWindow : MonoBehaviour
};
ShowMessageBox($"Failed to initialize package !", callback);
}
else if (message is PatchEventDefine.PatchStatesChange)
else if (message is PatchEventDefine.PatchStepsChange)
{
var msg = message as PatchEventDefine.PatchStatesChange;
var msg = message as PatchEventDefine.PatchStepsChange;
_tips.text = msg.Tips;
UnityEngine.Debug.Log(msg.Tips);
}
else if (message is PatchEventDefine.FoundUpdateFiles)
{
@@ -113,27 +112,27 @@ public class PatchWindow : MonoBehaviour
string totalSizeMB = sizeMB.ToString("f1");
ShowMessageBox($"Found update patch files, Total count {msg.TotalCount} Total szie {totalSizeMB}MB", callback);
}
else if (message is PatchEventDefine.DownloadProgressUpdate)
else if (message is PatchEventDefine.DownloadUpdate)
{
var msg = message as PatchEventDefine.DownloadProgressUpdate;
var msg = message as PatchEventDefine.DownloadUpdate;
_slider.value = (float)msg.CurrentDownloadCount / msg.TotalDownloadCount;
string currentSizeMB = (msg.CurrentDownloadSizeBytes / 1048576f).ToString("f1");
string totalSizeMB = (msg.TotalDownloadSizeBytes / 1048576f).ToString("f1");
_tips.text = $"{msg.CurrentDownloadCount}/{msg.TotalDownloadCount} {currentSizeMB}MB/{totalSizeMB}MB";
}
else if (message is PatchEventDefine.PackageVersionUpdateFailed)
else if (message is PatchEventDefine.PackageVersionRequestFailed)
{
System.Action callback = () =>
{
UserEventDefine.UserTryUpdatePackageVersion.SendEventMessage();
UserEventDefine.UserTryRequestPackageVersion.SendEventMessage();
};
ShowMessageBox($"Failed to update static version, please check the network status.", callback);
}
else if (message is PatchEventDefine.PatchManifestUpdateFailed)
else if (message is PatchEventDefine.PackageManifestUpdateFailed)
{
System.Action callback = () =>
{
UserEventDefine.UserTryUpdatePatchManifest.SendEventMessage();
UserEventDefine.UserTryUpdatePackageManifest.SendEventMessage();
};
ShowMessageBox($"Failed to update patch manifest, please check the network status.", callback);
}
@@ -16,10 +16,10 @@ public class UIBattleWindow : MonoBehaviour
_scoreLabel = this.transform.Find("ScoreView/Score").GetComponent<Text>();
_scoreLabel.text = "Score : 0";
var restartBtn = this.transform.Find("OverView/Restart").GetComponent<Button>();
restartBtn.onClick.AddListener(OnClickRestartBtn);
var restartBtn = this.transform.Find("OverView/ReplayButton").GetComponent<Button>();
restartBtn.onClick.AddListener(OnClickReplayBtn);
var homeBtn = this.transform.Find("OverView/Home").GetComponent<Button>();
var homeBtn = this.transform.Find("OverView/HomeButton").GetComponent<Button>();
homeBtn.onClick.AddListener(OnClickHomeBtn);
_eventGroup.AddListener<BattleEventDefine.ScoreChange>(OnHandleEventMessage);
@@ -30,7 +30,7 @@ public class UIBattleWindow : MonoBehaviour
_eventGroup.RemoveAllListener();
}
private void OnClickRestartBtn()
private void OnClickReplayBtn()
{
SceneEventDefine.ChangeToBattleScene.SendEventMessage();
}
@@ -13,11 +13,10 @@ public class UIHomeWindow : MonoBehaviour
_version = this.transform.Find("version").GetComponent<Text>();
_aboutView = this.transform.Find("AboutView").gameObject;
var loginBtn = this.transform.Find("PlayGameButton").GetComponent<Button>();
loginBtn.onClick.AddListener(OnClickPlayGameBtn);
var loginBtn = this.transform.Find("Start").GetComponent<Button>();
loginBtn.onClick.AddListener(OnClickLoginBtn);
var aboutBtn = this.transform.Find("About").GetComponent<Button>();
var aboutBtn = this.transform.Find("AboutButton").GetComponent<Button>();
aboutBtn.onClick.AddListener(OnClicAboutBtn);
var maskBtn = this.transform.Find("AboutView/mask").GetComponent<Button>();
@@ -26,10 +25,10 @@ public class UIHomeWindow : MonoBehaviour
private void Start()
{
var package = YooAsset.YooAssets.GetPackage("DefaultPackage");
_version.text = "Ver : " + package.GetPackageVersion();
_version.text = "Version : " + package.GetPackageVersion();
}
private void OnClickLoginBtn()
private void OnClickPlayGameBtn()
{
SceneEventDefine.ChangeToBattleScene.SendEventMessage();
}
@@ -6,9 +6,9 @@ using UniFramework.Utility;
public class UILoadingWindow : MonoBehaviour
{
private readonly UniTimer _timer = UniTimer.CreatePepeatTimer(0, 0.2f);
private Text _info;
private int _countdown;
private UniTimer _timer = UniTimer.CreatePepeatTimer(0, 0.2f);
private void Awake()
{
@@ -22,14 +22,14 @@ public class UILoadingWindow : MonoBehaviour
}
private void Update()
{
if(_timer.Update(Time.deltaTime))
if (_timer.Update(Time.deltaTime))
{
_countdown++;
if (_countdown > 6)
_countdown = 0;
string tips = "Loading";
for(int i=0; i<_countdown; i++)
for (int i = 0; i < _countdown; i++)
{
tips += ".";
}