From bb5909bcd36b48b919366c95b4248a3754452698 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 15 九月 2025 10:25:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
/dev/null | 11 -----------
Main/ResModule/AssetBundle/AssetBundleUtility.cs | 2 ++
Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs | 4 ----
Main/Core/GameEngine/Launch/LaunchInHot.cs | 4 ++++
Main/Manager/UIManager.cs | 11 ++++++++++-
Main/Utility/FrameEffect.cs.meta | 0
Main/System/HeroUI/GiftBaseCell.cs | 16 ++++++++--------
Main/Utility/FrameEffect.cs | 0
8 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs b/Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs
index 13755ed..5c2404b 100644
--- a/Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs
+++ b/Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs
@@ -52,10 +52,6 @@
public override void End()
{
- if (AssetSource.isUseAssetBundle)
- {
- AssetBundleUtility.Instance.InitBuiltInAsset();
- }
// ConfigInitiator.SyncInit();
UIManager.Instance.CloseWindow<DownLoadWin>();
UIManager.Instance.CloseWindow<VersionUpdateWin>();
diff --git a/Main/Core/GameEngine/Launch/LaunchInHot.cs b/Main/Core/GameEngine/Launch/LaunchInHot.cs
index 1356eee..a530419 100644
--- a/Main/Core/GameEngine/Launch/LaunchInHot.cs
+++ b/Main/Core/GameEngine/Launch/LaunchInHot.cs
@@ -26,6 +26,10 @@
Application.backgroundLoadingPriority = ThreadPriority.High;
Screen.sleepTimeout = SleepTimeout.NeverSleep;
+ if (AssetSource.isUseAssetBundle)
+ {
+ AssetBundleUtility.Instance.InitBuiltInAsset();
+ }
InitSystemMgr();
SDKUtils.Instance.Init(); //鍘焥dk鎺ュ彛
diff --git a/Main/Manager/UIManager.cs b/Main/Manager/UIManager.cs
index b368998..f4b25eb 100644
--- a/Main/Manager/UIManager.cs
+++ b/Main/Manager/UIManager.cs
@@ -481,8 +481,17 @@
private UIBase LoadUIResource(string uiName)
{
+
// 浠庤祫婧愮鐞嗗櫒鍔犺浇UI棰勫埗浣�
- GameObject prefab = ResManager.Instance.LoadAsset<GameObject>("UI", uiName);
+ GameObject prefab;
+ if (uiName == "LaunchWin")
+ {
+ prefab = BuiltInLoader.LoadPrefab(uiName);
+ }
+ else
+ {
+ prefab = ResManager.Instance.LoadAsset<GameObject>("UI", uiName);
+ }
// 妫�鏌ラ鍒朵綋鏄惁鍔犺浇鎴愬姛
if (prefab == null)
diff --git a/Main/ResModule/AssetBundle/AssetBundleUtility.cs b/Main/ResModule/AssetBundle/AssetBundleUtility.cs
index 0337822..5a1461a 100644
--- a/Main/ResModule/AssetBundle/AssetBundleUtility.cs
+++ b/Main/ResModule/AssetBundle/AssetBundleUtility.cs
@@ -434,6 +434,8 @@
var isBuiltin = assetBundleName.Contains("builtin");
string _path = isBuiltin ? AssetVersionUtility.GetBuiltInAssetFilePath(assetBundleName) : AssetVersionUtility.GetAssetFilePath(assetBundleName);
+ Debug.LogFormat("Sync_LoadAssetBundle(): {0} => {1}", assetBundleName, _path);
+
AssetBundle _assetBundle = AssetBundle.LoadFromFile(_path);
CacheAssetBundle(assetBundleName, _assetBundle);
diff --git a/Main/System/HeroUI/GiftBaseCell.cs b/Main/System/HeroUI/GiftBaseCell.cs
index 2e6eee9..cf7b6cc 100644
--- a/Main/System/HeroUI/GiftBaseCell.cs
+++ b/Main/System/HeroUI/GiftBaseCell.cs
@@ -220,23 +220,23 @@
{
if (quality == 1)
{
- //1D0029
- return new Color32(29, 0, 41, 128);
+ //692088
+ return new Color32(105, 32, 136, 128);
}
else if (quality == 2)
{
- //372300
- return new Color32(55, 35, 0, 128);
+ //886220
+ return new Color32(136, 98, 32, 128);
}
else if (quality == 3)
{
- //3A1800
- return new Color32(58, 24, 0, 128);
+ //884a20
+ return new Color32(136, 74, 32, 128);
}
else if (quality == 4)
{
- //3A0000
- return new Color32(58, 0, 0, 128);
+ //882020
+ return new Color32(136, 32, 32, 128);
}
return new Color32(0, 0, 0, 128);
}
diff --git a/Main/Utility/DontDestroyOnLoad.cs b/Main/Utility/DontDestroyOnLoad.cs
deleted file mode 100644
index 1ab866d..0000000
--- a/Main/Utility/DontDestroyOnLoad.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class DontDestroyOnLoad : MonoBehaviour
-{
- void Awake()
- {
- DontDestroyOnLoad(gameObject);
- }
-}
diff --git a/Main/Utility/DontDestroyOnLoad.cs.meta b/Main/Utility/DontDestroyOnLoad.cs.meta
deleted file mode 100644
index d8483e0..0000000
--- a/Main/Utility/DontDestroyOnLoad.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: ebddc3e48e1baa844a56615981c5c152
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Main/Component/UI/Common/FrameEffect.cs b/Main/Utility/FrameEffect.cs
similarity index 100%
rename from Main/Component/UI/Common/FrameEffect.cs
rename to Main/Utility/FrameEffect.cs
diff --git a/Main/Component/UI/Common/FrameEffect.cs.meta b/Main/Utility/FrameEffect.cs.meta
similarity index 100%
rename from Main/Component/UI/Common/FrameEffect.cs.meta
rename to Main/Utility/FrameEffect.cs.meta
--
Gitblit v1.8.0