yooasset

GameClient/Assets/AssetBundleCollectorSetting.asset

@@ -22,9 +22,9 @@ MonoBehaviour:
   - PackageName: GameLogic
     PackageDesc: 
     Groups:
-    - GroupName: Game
+    - GroupName: game
       GroupDesc: 
-      AssetTags: 
+      AssetTags: preload
       ActiveRuleName: EnableGroup
       Collectors:
       - CollectPath: Assets/Game/CSShare/Sqlite/excelConfig.sqlite.bytes
@@ -83,9 +83,9 @@ MonoBehaviour:
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
-    - GroupName: Launcher
+    - GroupName: launcher
       GroupDesc: 
-      AssetTags: 
+      AssetTags: preload
       ActiveRuleName: EnableGroup
       Collectors: []
     - GroupName: dressup
@@ -151,7 +151,7 @@ MonoBehaviour:
         FilterRuleName: CollectShaderVariants
         AssetTags: 
         UserData: 
-    - GroupName: preload
+    - GroupName: res
       GroupDesc: 
       AssetTags: preload
       ActiveRuleName: EnableGroup
@@ -164,3 +164,8 @@ MonoBehaviour:
         FilterRuleName: CollectArtPreload
         AssetTags: 
         UserData: 
+    - GroupName: login
+      GroupDesc: 
+      AssetTags: preload
+      ActiveRuleName: EnableGroup
+      Collectors: []

GameClient/Assets/GFGAsset/AssetBundleCollector.asset

@@ -20087,10 +20087,10 @@ MonoBehaviour:
       - Assets/Res/Effect/UI/ui_login/Game_Open_water/tex34.png
   - dir: Assets/Res/Effect/UI
     status: 1
-    bytes: 11213106
+    bytes: 11561845
     list:
     - key: Assets/Res/Effect/UI/ui_LuckyBox
-      bytes: 11213106
+      bytes: 11561845
       list:
       - Assets/Res/Effect/UI/ui_LuckyBox/bg_cloud.prefab
       - Assets/Res/Effect/UI/ui_LuckyBox/bg_liuxing.prefab
@@ -20287,6 +20287,9 @@ MonoBehaviour:
       - Assets/Res/Effect/UI/ui_LuckyBox/STAR_Ready/01/star/Material46.mat
       - Assets/Res/Effect/UI/ui_LuckyBox/STAR_Ready/01/star/star.prefab
       - Assets/Res/Effect/UI/ui_LuckyBox/STAR_Ready_Bule/01/star/Material46.mat
+      - Assets/Res/Effect/UI/ui_LuckyBox/bg_cloud/Material591.mat
+      - Assets/Res/Effect/UI/ui_LuckyBox/bg_cloud/NoiseFHDLHX0012.png
+      - Assets/Res/Effect/UI/ui_LuckyBox/bg_cloud/NoiseGU0031.png
   - dir: Assets/Res/Effect/UI
     status: 1
     bytes: 18808344
@@ -28762,7 +28765,7 @@ MonoBehaviour:
       - Assets/Res/Texture/DressUp/louxia_bg.jpg
   - dir: Assets/Res/Texture/DressUp
     status: 1
-    bytes: 5911886
+    bytes: 6373383
     list:
     - key: Assets/Res/Texture/DressUp/maowu_bg
       bytes: 1628900
@@ -28799,9 +28802,10 @@ MonoBehaviour:
       - Assets/Res/Texture/DressUp/renmo.bytes
       - Assets/Res/Texture/DressUp/renmo.png
     - key: Assets/Res/Texture/DressUp/sanmiaoy_bg
-      bytes: 2307485
+      bytes: 2768982
       list:
       - Assets/Res/Texture/DressUp/sanmiaoy_bg.jpg
+      - Assets/Res/Texture/DressUp/sanmiaoy_bg.png
   - dir: Assets/Res/Texture/DressUp
     status: 1
     bytes: 5679895

GameClient/Assets/Game/Launcher/Version/VersionController.cs

@@ -13,23 +13,13 @@ namespace GFGGame
     public class VersionController : SingletonMonoBase<VersionController>
     {
         //private UpdateVersions updateVersions;
-        public const string PackageName_GameLogic = "GameLogic";
-        public const string PackageName_GameArt = "ArtRes";
-
-        private string[] packageNameArr = new string[] {PackageName_GameLogic, PackageName_GameArt };
-        private Dictionary<string, bool> packageStateDic = new Dictionary<string, bool>();
+        public const string DefaultPackage = "GameLogic";
 
         /// <summary>
         /// 包裹的版本信息
         /// </summary>
         public string PackageVersion { set; get; }
 
-        /// <summary>
-        /// 下载器
-        /// </summary>
-        public ResourceDownloaderOperation Downloader { set; get; }
-
-
 
         public void Init()
         {
@@ -46,23 +36,17 @@ namespace GFGGame
             //var operation = Versions.InitializeAsync(LauncherConfig.CDN_ROOT);
             //yield return operation;
 
-            yield return InitGameLogicPackage();
-
-            yield return InitGameArtPackage();
-
-            yield return GetStaticVersion(PackageName_GameLogic);
-            yield return UpdateManifest(PackageName_GameLogic);
+            yield return InitDefaultPackage();
+            yield return GetStaticVersion(DefaultPackage);
+            yield return UpdateManifest(DefaultPackage);
 
-            yield return GetStaticVersion(PackageName_GameArt);
-            yield return UpdateManifest(PackageName_GameArt);
-
-            OnPackageDownloadCompleted(null);
+            CreateDownloader(DefaultPackage);
         }
 
-        private IEnumerator InitGameLogicPackage()
+        private IEnumerator InitDefaultPackage()
         {
             // 创建默认的资源包
-            string packageName = PackageName_GameLogic;
+            string packageName = DefaultPackage;
             var package = YooAssets.TryGetPackage(packageName);
             if (package == null)
             {
@@ -82,7 +66,7 @@ namespace GFGGame
             else if (playMode == EPlayMode.HostPlayMode)
             {
                 // 联机运行模式
-                string defaultHostServer = GetHostServerURL(PackageName_GameLogic);
+                string defaultHostServer = GetHostServerURL(DefaultPackage);
                 string fallbackHostServer = defaultHostServer;
                 var createParameters = new HostPlayModeParameters();
                 //createParameters.DecryptionServices = new GameDecryptionServices();
@@ -98,24 +82,6 @@ namespace GFGGame
             }
         }
 
-        private IEnumerator InitGameArtPackage()
-        {
-            InitializationOperation initializationOperation = null;
-            var package = YooAssets.CreatePackage(PackageName_GameArt);
-            string defaultHostServer = GetHostServerURL(PackageName_GameArt);
-            string fallbackHostServer = defaultHostServer;
-            var createParameters = new HostPlayModeParameters();
-            //createParameters.DecryptionServices = new GameDecryptionServices();
-            createParameters.QueryServices = new GameQueryServices();
-            createParameters.RemoteServices = new RemoteServices(defaultHostServer, fallbackHostServer);
-            initializationOperation = package.InitializeAsync(createParameters);
-            yield return initializationOperation;
-            if (initializationOperation.Status != EOperationStatus.Succeed)
-            {
-                Debug.LogWarning($"{initializationOperation.Error}");
-            }
-        }
-
         private IEnumerator GetStaticVersion(string packageName)
         {
             var package = YooAssets.GetPackage(packageName);
@@ -145,20 +111,19 @@ namespace GFGGame
                 Debug.LogWarning(operation.Error);
                 Alert.Show("更新版本信息失败，请检测网络链接后重试。")
                         .SetLeftButton(true, "重试", (data) => { StartCoroutine(UpdateManifest(packageName)); });
-                }
+            }
         }
 
-        void CreateDownloader(string packageName)
+        private void CreateDownloader(string packageName)
         {
             int downloadingMaxNum = 10;
             int failedTryAgain = 3;
             ResourcePackage package = YooAssets.GetPackage(packageName);
-            var downloaderOperation = package.CreateResourceDownloader(downloadingMaxNum, failedTryAgain);
-            VersionController.Instance.Downloader = downloaderOperation;
+            var downloaderOperation = package.CreateResourceDownloader(new string[] { "preload" }, downloadingMaxNum, failedTryAgain);
 
             if (downloaderOperation.TotalDownloadCount == 0)
             {
-                OnPackageDownloadCompleted(packageName);
+                LauncherController.OnVersionCompleted();
             }
             else
             {
@@ -172,7 +137,7 @@ namespace GFGGame
                 float sizeMB = totalDownloadBytes / 1048576f;
                 sizeMB = Mathf.Clamp(sizeMB, 0.1f, float.MaxValue);
                 string totalSizeMB = sizeMB.ToString("f1");
-                string message = $"游戏有新的版本，{packageName}需要更新{totalSizeMB}MB大小的内容";
+                string message = $"游戏有新的内容，{packageName}需要更新{totalSizeMB}MB大小的内容";
                 Alert.Show(message)
                     .SetLeftButton(true, "更新", (data) =>
                     {
@@ -211,28 +176,6 @@ namespace GFGGame
                     });
                 yield break;
             }
-            OnPackageDownloadCompleted(packageName);
-        }
-
-        private void OnPackageDownloadCompleted(string packageNameCompleted)
-        {
-            if(packageNameCompleted != null)
-            {
-                packageStateDic[packageNameCompleted] = true;
-            }
-            //if(updateVersions != null)
-            //{
-            //    updateVersions.Override();
-            //}
-            foreach (var packageName in packageNameArr)
-            {
-                packageStateDic.TryGetValue(packageName, out bool done);
-                if(!done)
-                {
-                    CreateDownloader(packageName);
-                    return;
-                }
-            }
             LauncherController.OnVersionCompleted();
         }
 
@@ -241,7 +184,7 @@ namespace GFGGame
         /// </summary>
         private string GetHostServerURL(string packageName)
         {
-            string hostServerIP = "http://127.0.0.1";
+            string hostServerIP = "http://10.108.64.127";
 
 #if UNITY_EDITOR
             if (UnityEditor.EditorUserBuildSettings.activeBuildTarget == UnityEditor.BuildTarget.Android)

GameClient/Assets/Game/Launcher/Xasset/GFGAsset.cs

@@ -23,7 +23,7 @@ namespace GFGGame
                 //}
                 //else
                 //{
-                    package = YooAssets.GetPackage(VersionController.PackageName_GameLogic);
+                    package = YooAssets.GetPackage(VersionController.DefaultPackage);
                 //}
                 AssetOperationHandle handle = package.LoadAssetSync<T>(path);
                 if(handle != null)