热更系统修改并测试
This commit is contained in:
@@ -247,6 +247,76 @@ Transform:
|
|||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!1 &246745092
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 246745093}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Bottom
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &246745093
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 246745092}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 1171471948}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!1 &251580317
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 251580318}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Mi
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &251580318
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 251580317}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 1171471948}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &330585543
|
--- !u!1 &330585543
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -773,6 +843,9 @@ RectTransform:
|
|||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 1144573927}
|
- {fileID: 1144573927}
|
||||||
|
- {fileID: 246745093}
|
||||||
|
- {fileID: 251580318}
|
||||||
|
- {fileID: 1592395654}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
@@ -794,7 +867,7 @@ PrefabInstance:
|
|||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 22400762, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
|
- target: {fileID: 22400762, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0.0000076293945
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
|
- target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
|
||||||
propertyPath: m_AnchorMax.x
|
propertyPath: m_AnchorMax.x
|
||||||
@@ -804,6 +877,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
|
- target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@@ -1121,6 +1198,41 @@ PrefabInstance:
|
|||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
m_AddedComponents: []
|
m_AddedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
|
||||||
|
--- !u!1 &1592395653
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1592395654}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Top
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1592395654
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1592395653}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 1171471948}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1660057539 &9223372036854775807
|
--- !u!1660057539 &9223372036854775807
|
||||||
SceneRoots:
|
SceneRoots:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ public class Boot : MonoBehaviour
|
|||||||
void Awake()
|
void Awake()
|
||||||
{
|
{
|
||||||
#if UNITY_EDITOR
|
#if UNITY_EDITOR
|
||||||
PlayerPrefs.DeleteAll();
|
//PlayerPrefs.DeleteAll();
|
||||||
#endif
|
#endif
|
||||||
Application.targetFrameRate = 60;
|
Application.targetFrameRate = 60;
|
||||||
Application.runInBackground = true;
|
Application.runInBackground = true;
|
||||||
@@ -35,6 +35,9 @@ public class Boot : MonoBehaviour
|
|||||||
var assetHandle = YooAssets.TryGetPackage("Main").LoadSceneAsync("Test");
|
var assetHandle = YooAssets.TryGetPackage("Main").LoadSceneAsync("Test");
|
||||||
await assetHandle.ToUniTask();
|
await assetHandle.ToUniTask();
|
||||||
if (assetHandle.Status == EOperationStatus.Succeed)
|
if (assetHandle.Status == EOperationStatus.Succeed)
|
||||||
|
{
|
||||||
assetHandle.ActivateScene();
|
assetHandle.ActivateScene();
|
||||||
|
PatchEvent.ClosePatchWindow();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ public class MessageBox : MonoBehaviour
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
var go = Instantiate(prefab, GameManager.Inst.MainUICanvas.transform);
|
var go = Instantiate(prefab, GameManager.Inst.MainUICanvas.transform.Find("Top"));
|
||||||
go.name = "MessageBox";
|
go.name = "MessageBox";
|
||||||
var messageBox = go.GetComponent<MessageBox>();
|
var messageBox = go.GetComponent<MessageBox>();
|
||||||
return messageBox;
|
return messageBox;
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ public static class PatchEvent
|
|||||||
public static event Action<string> OnStatusUpdate;
|
public static event Action<string> OnStatusUpdate;
|
||||||
public static event Action<float> OnProgressUpdate;
|
public static event Action<float> OnProgressUpdate;
|
||||||
public static event Action<string> OnDownloadSizeUpdate;
|
public static event Action<string> OnDownloadSizeUpdate;
|
||||||
|
public static event Action OnClosePatchWindow;
|
||||||
|
|
||||||
public static void UpdateStatus(string status)
|
public static void UpdateStatus(string status)
|
||||||
{
|
{
|
||||||
@@ -21,4 +22,8 @@ public static class PatchEvent
|
|||||||
{
|
{
|
||||||
OnDownloadSizeUpdate?.Invoke(sizeText);
|
OnDownloadSizeUpdate?.Invoke(sizeText);
|
||||||
}
|
}
|
||||||
|
public static void ClosePatchWindow()
|
||||||
|
{
|
||||||
|
OnClosePatchWindow?.Invoke();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,6 +27,9 @@ public class PatchOperation
|
|||||||
{
|
{
|
||||||
this.data = data;
|
this.data = data;
|
||||||
PkgVersionKey = $"{Application.productName}_{data.packageName}";
|
PkgVersionKey = $"{Application.productName}_{data.packageName}";
|
||||||
|
#if !UNITY_EDITOR
|
||||||
|
PkgVersionKey = $"Editor_{Application.productName}_{data.packageName}";
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#region 初始化相关
|
#region 初始化相关
|
||||||
public async UniTask<bool> InitializePackage()
|
public async UniTask<bool> InitializePackage()
|
||||||
@@ -179,10 +182,15 @@ public class PatchOperation
|
|||||||
{
|
{
|
||||||
if (showBox)
|
if (showBox)
|
||||||
{
|
{
|
||||||
MessageBox.Show()
|
if(await CheckUseLocalVersion(operation))
|
||||||
.SetTitle($"{data.packageName}请求版本")
|
{
|
||||||
.SetContent($"{operation.Error}")
|
string cachedVersion = GetCachedPackageVersion();
|
||||||
.AddButton("退出", (box) => { Application.Quit(); });
|
if (!string.IsNullOrEmpty(cachedVersion))
|
||||||
|
{
|
||||||
|
packageVersion = cachedVersion;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -193,6 +201,24 @@ public class PatchOperation
|
|||||||
}
|
}
|
||||||
return operation.Status == EOperationStatus.Succeed;
|
return operation.Status == EOperationStatus.Succeed;
|
||||||
}
|
}
|
||||||
|
public async UniTask<bool> CheckUseLocalVersion(RequestPackageVersionOperation operation)
|
||||||
|
{
|
||||||
|
var completionSource = new UniTaskCompletionSource<bool>();
|
||||||
|
MessageBox.Show()
|
||||||
|
.SetTitle($"{data.packageName}请求版本")
|
||||||
|
.SetContent($"{operation.Error}")
|
||||||
|
.AddButton("继续", (box) =>
|
||||||
|
{
|
||||||
|
completionSource.TrySetResult(true);
|
||||||
|
})
|
||||||
|
.AddButton("退出", (box) =>
|
||||||
|
{
|
||||||
|
completionSource.TrySetResult(false);
|
||||||
|
Application.Quit();
|
||||||
|
});
|
||||||
|
bool shouldContinue = await completionSource.Task;
|
||||||
|
return shouldContinue;
|
||||||
|
}
|
||||||
public async Task<string> GetBuildinPackageVersion()
|
public async Task<string> GetBuildinPackageVersion()
|
||||||
{
|
{
|
||||||
var operation = new GetBuildinPackageVersionOperation(data.packageName);
|
var operation = new GetBuildinPackageVersionOperation(data.packageName);
|
||||||
@@ -218,10 +244,8 @@ public class PatchOperation
|
|||||||
|
|
||||||
public void SaveVersionToCache()
|
public void SaveVersionToCache()
|
||||||
{
|
{
|
||||||
#if !UNITY_EDITOR
|
|
||||||
PlayerPrefs.SetString(PkgVersionKey, packageVersion);
|
PlayerPrefs.SetString(PkgVersionKey, packageVersion);
|
||||||
PlayerPrefs.Save();
|
PlayerPrefs.Save();
|
||||||
#endif
|
|
||||||
PatchEvent.UpdateStatus($"更新完成{data.packageName}");
|
PatchEvent.UpdateStatus($"更新完成{data.packageName}");
|
||||||
Debug.Log($"更新{data.packageName}完成,版本号{packageVersion}");
|
Debug.Log($"更新{data.packageName}完成,版本号{packageVersion}");
|
||||||
|
|
||||||
@@ -263,21 +287,28 @@ public class PatchOperation
|
|||||||
var completionSource = new UniTaskCompletionSource<bool>();
|
var completionSource = new UniTaskCompletionSource<bool>();
|
||||||
MessageBox.Show()
|
MessageBox.Show()
|
||||||
.SetTitle($"{data.packageName}发现更新")
|
.SetTitle($"{data.packageName}发现更新")
|
||||||
.SetContent($"发现资源更新\n{GetCachedPackageVersion()}=>{packageVersion}: {downloader.TotalDownloadBytes / 1024f / 1024f:F1}MB")
|
.SetContent($"发现资源更新\n{GetCachedPackageVersion()}=>{packageVersion}: {FormatFileSize(downloader.TotalDownloadBytes)}")
|
||||||
.AddButton("下载", async (box) =>
|
.AddButton("下载", async (box) =>
|
||||||
{
|
{
|
||||||
bool success = await DownloadPackageFiles();
|
bool success = await DownloadPackageFiles();
|
||||||
completionSource.TrySetResult(success);
|
completionSource.TrySetResult(success);
|
||||||
})
|
})
|
||||||
.AddButton("跳过", (box) =>
|
.AddButton("跳过", async (box) =>
|
||||||
{
|
{
|
||||||
downloader.CancelDownload();
|
downloader.CancelDownload();
|
||||||
|
packageVersion = GetCachedPackageVersion();
|
||||||
|
await UpdatePackageManifest();
|
||||||
completionSource.TrySetResult(true);
|
completionSource.TrySetResult(true);
|
||||||
})
|
})
|
||||||
.AddButton("退出", (box) =>
|
.AddButton("退出", (box) =>
|
||||||
{
|
{
|
||||||
|
downloader.CancelDownload();
|
||||||
completionSource.TrySetResult(false);
|
completionSource.TrySetResult(false);
|
||||||
|
#if UNITY_EDITOR
|
||||||
|
UnityEditor.EditorApplication.isPlaying = false;
|
||||||
|
#else
|
||||||
Application.Quit();
|
Application.Quit();
|
||||||
|
#endif
|
||||||
});
|
});
|
||||||
bool shouldContinue = await completionSource.Task;
|
bool shouldContinue = await completionSource.Task;
|
||||||
return shouldContinue;
|
return shouldContinue;
|
||||||
@@ -318,5 +349,12 @@ public class PatchOperation
|
|||||||
}
|
}
|
||||||
return operation.Status == EOperationStatus.Succeed;
|
return operation.Status == EOperationStatus.Succeed;
|
||||||
}
|
}
|
||||||
|
public string FormatFileSize(long size)
|
||||||
|
{
|
||||||
|
if (size < 1024 * 1024)
|
||||||
|
return $"{(size / 1024f):F1}KB";
|
||||||
|
else
|
||||||
|
return $"{size / 1024f / 1024f:F1}MB";
|
||||||
|
}
|
||||||
#endregion 下载相关
|
#endregion 下载相关
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ public class PreloadOperation
|
|||||||
var assetHandle = operation.package.LoadAssetAsync<GameObject>("PatchWindow");
|
var assetHandle = operation.package.LoadAssetAsync<GameObject>("PatchWindow");
|
||||||
await assetHandle.ToUniTask();
|
await assetHandle.ToUniTask();
|
||||||
if (assetHandle.Status == EOperationStatus.Succeed)
|
if (assetHandle.Status == EOperationStatus.Succeed)
|
||||||
GameObject.Instantiate(assetHandle.AssetObject, GameManager.Inst.MainUICanvas.transform);
|
GameObject.Instantiate(assetHandle.AssetObject, GameManager.Inst.MainUICanvas.transform.Find("Bottom"));
|
||||||
Debug.Log("创建热更信息界面");
|
Debug.Log("创建热更信息界面");
|
||||||
}
|
}
|
||||||
private async UniTask UpdatePreloadPackage()
|
private async UniTask UpdatePreloadPackage()
|
||||||
|
|||||||
Binary file not shown.
@@ -119,6 +119,116 @@ NavMeshSettings:
|
|||||||
debug:
|
debug:
|
||||||
m_Flags: 0
|
m_Flags: 0
|
||||||
m_NavMeshData: {fileID: 0}
|
m_NavMeshData: {fileID: 0}
|
||||||
|
--- !u!1 &215814085
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 215814089}
|
||||||
|
- component: {fileID: 215814088}
|
||||||
|
- component: {fileID: 215814087}
|
||||||
|
- component: {fileID: 215814086}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Capsule
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!136 &215814086
|
||||||
|
CapsuleCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 215814085}
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IncludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_ExcludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_LayerOverridePriority: 0
|
||||||
|
m_IsTrigger: 0
|
||||||
|
m_ProvidesContacts: 0
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Radius: 0.5
|
||||||
|
m_Height: 2
|
||||||
|
m_Direction: 1
|
||||||
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!23 &215814087
|
||||||
|
MeshRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 215814085}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_CastShadows: 1
|
||||||
|
m_ReceiveShadows: 1
|
||||||
|
m_DynamicOccludee: 1
|
||||||
|
m_StaticShadowCaster: 0
|
||||||
|
m_MotionVectors: 1
|
||||||
|
m_LightProbeUsage: 1
|
||||||
|
m_ReflectionProbeUsage: 1
|
||||||
|
m_RayTracingMode: 2
|
||||||
|
m_RayTraceProcedural: 0
|
||||||
|
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||||
|
m_RayTracingAccelStructBuildFlags: 1
|
||||||
|
m_SmallMeshCulling: 1
|
||||||
|
m_RenderingLayerMask: 1
|
||||||
|
m_RendererPriority: 0
|
||||||
|
m_Materials:
|
||||||
|
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
|
||||||
|
m_StaticBatchInfo:
|
||||||
|
firstSubMesh: 0
|
||||||
|
subMeshCount: 0
|
||||||
|
m_StaticBatchRoot: {fileID: 0}
|
||||||
|
m_ProbeAnchor: {fileID: 0}
|
||||||
|
m_LightProbeVolumeOverride: {fileID: 0}
|
||||||
|
m_ScaleInLightmap: 1
|
||||||
|
m_ReceiveGI: 1
|
||||||
|
m_PreserveUVs: 0
|
||||||
|
m_IgnoreNormalsForChartDetection: 0
|
||||||
|
m_ImportantGI: 0
|
||||||
|
m_StitchLightmapSeams: 1
|
||||||
|
m_SelectedEditorRenderState: 3
|
||||||
|
m_MinimumChartSize: 4
|
||||||
|
m_AutoUVMaxDistance: 0.5
|
||||||
|
m_AutoUVMaxAngle: 89
|
||||||
|
m_LightmapParameters: {fileID: 0}
|
||||||
|
m_SortingLayerID: 0
|
||||||
|
m_SortingLayer: 0
|
||||||
|
m_SortingOrder: 0
|
||||||
|
m_AdditionalVertexStreams: {fileID: 0}
|
||||||
|
--- !u!33 &215814088
|
||||||
|
MeshFilter:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 215814085}
|
||||||
|
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
--- !u!4 &215814089
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 215814085}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 2, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &462509699
|
--- !u!1 &462509699
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -131,6 +241,7 @@ GameObject:
|
|||||||
- component: {fileID: 462509702}
|
- component: {fileID: 462509702}
|
||||||
- component: {fileID: 462509701}
|
- component: {fileID: 462509701}
|
||||||
- component: {fileID: 462509700}
|
- component: {fileID: 462509700}
|
||||||
|
- component: {fileID: 462509704}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Cube
|
m_Name: Cube
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -227,6 +338,18 @@ Transform:
|
|||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &462509704
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 462509699}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: e78850d2b34a8e74da183b8235948929, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!1 &1171561947
|
--- !u!1 &1171561947
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -237,6 +360,7 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 1171561949}
|
- component: {fileID: 1171561949}
|
||||||
- component: {fileID: 1171561948}
|
- component: {fileID: 1171561948}
|
||||||
|
- component: {fileID: 1171561950}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Directional Light
|
m_Name: Directional Light
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -324,9 +448,142 @@ Transform:
|
|||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
|
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
|
||||||
|
--- !u!114 &1171561950
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1171561947}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Version: 3
|
||||||
|
m_UsePipelineSettings: 1
|
||||||
|
m_AdditionalLightsShadowResolutionTier: 2
|
||||||
|
m_LightLayerMask: 1
|
||||||
|
m_RenderingLayers: 1
|
||||||
|
m_CustomShadowLayers: 0
|
||||||
|
m_ShadowLayerMask: 1
|
||||||
|
m_ShadowRenderingLayers: 1
|
||||||
|
m_LightCookieSize: {x: 1, y: 1}
|
||||||
|
m_LightCookieOffset: {x: 0, y: 0}
|
||||||
|
m_SoftShadowQuality: 0
|
||||||
|
--- !u!1 &1598712457
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1598712461}
|
||||||
|
- component: {fileID: 1598712460}
|
||||||
|
- component: {fileID: 1598712459}
|
||||||
|
- component: {fileID: 1598712458}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Sphere
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!135 &1598712458
|
||||||
|
SphereCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1598712457}
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IncludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_ExcludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_LayerOverridePriority: 0
|
||||||
|
m_IsTrigger: 0
|
||||||
|
m_ProvidesContacts: 0
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 3
|
||||||
|
m_Radius: 0.5
|
||||||
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!23 &1598712459
|
||||||
|
MeshRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1598712457}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_CastShadows: 1
|
||||||
|
m_ReceiveShadows: 1
|
||||||
|
m_DynamicOccludee: 1
|
||||||
|
m_StaticShadowCaster: 0
|
||||||
|
m_MotionVectors: 1
|
||||||
|
m_LightProbeUsage: 1
|
||||||
|
m_ReflectionProbeUsage: 1
|
||||||
|
m_RayTracingMode: 2
|
||||||
|
m_RayTraceProcedural: 0
|
||||||
|
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||||
|
m_RayTracingAccelStructBuildFlags: 1
|
||||||
|
m_SmallMeshCulling: 1
|
||||||
|
m_RenderingLayerMask: 1
|
||||||
|
m_RendererPriority: 0
|
||||||
|
m_Materials:
|
||||||
|
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
|
||||||
|
m_StaticBatchInfo:
|
||||||
|
firstSubMesh: 0
|
||||||
|
subMeshCount: 0
|
||||||
|
m_StaticBatchRoot: {fileID: 0}
|
||||||
|
m_ProbeAnchor: {fileID: 0}
|
||||||
|
m_LightProbeVolumeOverride: {fileID: 0}
|
||||||
|
m_ScaleInLightmap: 1
|
||||||
|
m_ReceiveGI: 1
|
||||||
|
m_PreserveUVs: 0
|
||||||
|
m_IgnoreNormalsForChartDetection: 0
|
||||||
|
m_ImportantGI: 0
|
||||||
|
m_StitchLightmapSeams: 1
|
||||||
|
m_SelectedEditorRenderState: 3
|
||||||
|
m_MinimumChartSize: 4
|
||||||
|
m_AutoUVMaxDistance: 0.5
|
||||||
|
m_AutoUVMaxAngle: 89
|
||||||
|
m_LightmapParameters: {fileID: 0}
|
||||||
|
m_SortingLayerID: 0
|
||||||
|
m_SortingLayer: 0
|
||||||
|
m_SortingOrder: 0
|
||||||
|
m_AdditionalVertexStreams: {fileID: 0}
|
||||||
|
--- !u!33 &1598712460
|
||||||
|
MeshFilter:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1598712457}
|
||||||
|
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
--- !u!4 &1598712461
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1598712457}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 1, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1660057539 &9223372036854775807
|
--- !u!1660057539 &9223372036854775807
|
||||||
SceneRoots:
|
SceneRoots:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_Roots:
|
m_Roots:
|
||||||
- {fileID: 1171561949}
|
- {fileID: 1171561949}
|
||||||
- {fileID: 462509703}
|
- {fileID: 462509703}
|
||||||
|
- {fileID: 1598712461}
|
||||||
|
- {fileID: 215814089}
|
||||||
|
|||||||
Binary file not shown.
@@ -1,3 +1,17 @@
|
|||||||
{
|
{
|
||||||
"name": "GameScripts.Main"
|
"name": "GameScripts.Main",
|
||||||
}
|
"rootNamespace": "",
|
||||||
|
"references": [
|
||||||
|
"GUID:921b262766d31374c8fd93ad67954b9c",
|
||||||
|
"GUID:63f032f8696ad5b4e99c26f7a9f89060"
|
||||||
|
],
|
||||||
|
"includePlatforms": [],
|
||||||
|
"excludePlatforms": [],
|
||||||
|
"allowUnsafeCode": false,
|
||||||
|
"overrideReferences": false,
|
||||||
|
"precompiledReferences": [],
|
||||||
|
"autoReferenced": true,
|
||||||
|
"defineConstraints": [],
|
||||||
|
"versionDefines": [],
|
||||||
|
"noEngineReferences": false
|
||||||
|
}
|
||||||
@@ -5,12 +5,7 @@ public class GameStart : MonoBehaviour
|
|||||||
// Start is called once before the first execution of Update after the MonoBehaviour is created
|
// Start is called once before the first execution of Update after the MonoBehaviour is created
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
|
Debug.Log("GameStart");
|
||||||
}
|
GamePreload.Inst.Test("call by GameStart");
|
||||||
|
|
||||||
// Update is called once per frame
|
|
||||||
void Update()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
9
Assets/GameScripts/Preload/GamePreload.cs
Normal file
9
Assets/GameScripts/Preload/GamePreload.cs
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class GamePreload : Singleton<GamePreload>
|
||||||
|
{
|
||||||
|
public void Test(string msg)
|
||||||
|
{
|
||||||
|
Debug.Log($"GamePreload.Test:{msg}");
|
||||||
|
}
|
||||||
|
}
|
||||||
2
Assets/GameScripts/Preload/GamePreload.cs.meta
Normal file
2
Assets/GameScripts/Preload/GamePreload.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f70a842d4d8919e41a34b7ad7012e9ff
|
||||||
@@ -14,6 +14,7 @@ public class PatchWindow : MonoBehaviour
|
|||||||
PatchEvent.OnStatusUpdate += OnStatusUpdate;
|
PatchEvent.OnStatusUpdate += OnStatusUpdate;
|
||||||
PatchEvent.OnProgressUpdate += OnProgressUpdate;
|
PatchEvent.OnProgressUpdate += OnProgressUpdate;
|
||||||
PatchEvent.OnDownloadSizeUpdate += OnDownloadSizeUpdate;
|
PatchEvent.OnDownloadSizeUpdate += OnDownloadSizeUpdate;
|
||||||
|
PatchEvent.OnClosePatchWindow += OnClosePatchWindow;
|
||||||
}
|
}
|
||||||
private void OnDestroy()
|
private void OnDestroy()
|
||||||
{
|
{
|
||||||
@@ -39,4 +40,8 @@ public class PatchWindow : MonoBehaviour
|
|||||||
if (downloadSizeText != null)
|
if (downloadSizeText != null)
|
||||||
downloadSizeText.text = sizeText;
|
downloadSizeText.text = sizeText;
|
||||||
}
|
}
|
||||||
|
private void OnClosePatchWindow()
|
||||||
|
{
|
||||||
|
gameObject.SetActive(false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
@@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
"FileVersion": "1.0.0",
|
"FileVersion": "1.0.0",
|
||||||
"PackageName": "Preload",
|
"PackageName": "Preload",
|
||||||
"PackageVersion": "2025-11-03-1019",
|
"PackageVersion": "2025-11-04-975",
|
||||||
"Wrappers": [
|
"Wrappers": [
|
||||||
{
|
{
|
||||||
"BundleGUID": "49ac1e3d3d58ae8797777760ef1fecda",
|
"BundleGUID": "d70ccb763a3f7583ac290041905bd617",
|
||||||
"FileName": "preload_assets_gameres_preload_hotupdatedll.bundle"
|
"FileName": "preload_assets_gameres_preload_hotupdatedll.bundle"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
2025-11-03-1019
|
2025-11-04-975
|
||||||
Binary file not shown.
@@ -1 +0,0 @@
|
|||||||
083e0aa5
|
|
||||||
BIN
Assets/StreamingAssets/yoo/Preload/Preload_2025-11-04-975.bytes
Normal file
BIN
Assets/StreamingAssets/yoo/Preload/Preload_2025-11-04-975.bytes
Normal file
Binary file not shown.
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: c58fac8ca6502e74ea659e06fc529c95
|
guid: e893c5ddae894934083777b0b897372e
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
d24e9634
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: ee4b17a46db391f43aa2c95df5a158a6
|
guid: 9cc797d459f85fe4a895eb329946a258
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
Binary file not shown.
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user