guodong 1 vuosi sitten
vanhempi
commit
14e9444576

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Assets/AssetReleaser.cs

@@ -51,7 +51,7 @@ namespace GFGGame
         {
             this.assetOperationHandle?.Release();
             this.assetOperationHandle = null;
-            this.spawnHandle?.Discard();
+            //this.spawnHandle?.Discard();
             this.spawnHandle = null;
             this.resPath = null;
         }

+ 27 - 0
GameClient/Assets/Game/HotUpdate/Assets/LoadManager.cs

@@ -0,0 +1,27 @@
+using System.Threading.Tasks;
+using YooAsset;
+
+namespace GFGGame
+{
+    public class LoadManager : SingletonBase<LoadManager>
+    {
+        public async Task CheckResExsitedAndLoad(string location)
+        {
+            if (string.IsNullOrEmpty(location) || !YooAssets.IsNeedDownloadFromRemote(location))
+            {
+                return;
+            }
+            var downloaderOperation = YooAssets.CreateBundleDownloader(new string[] { location}, 3, 3);
+            if (downloaderOperation.TotalDownloadCount == 0)
+            {
+                //文件已在本地,不需要下载
+                return;
+            }
+            ViewManager.Show<ModalStatusView>("加载中...");
+            //下载
+            downloaderOperation.BeginDownload();
+            await downloaderOperation.Task;
+            ViewManager.Hide<ModalStatusView>();
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Assets/LoadManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b065a20ef21109d4eac3e257d00c0477
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Assets/PreloadManager.cs

@@ -4,8 +4,8 @@ namespace GFGGame
 {
     public class PreloadManager : SingletonBase<PreloadManager>
     {
-        private Queue<string> waitLoadList = new Queue<string>();
-
+        private Queue<string> waitQueue = new Queue<string>();
 
+        
     }
 }

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Assets/SpriteHelper.cs

@@ -26,7 +26,8 @@ namespace GFGGame
             AssetReleaser assetReleaser =  spr.gameObject.GetComponent<AssetReleaser>();
             if(assetReleaser != null)
             {
-                GameObject.Destroy(assetReleaser);
+                //必须立即销毁,不能改为Destroy代替
+                GameObject.DestroyImmediate(assetReleaser);
             }
         }
     }

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -336,7 +336,7 @@ namespace GFGGame
             _comLvConsumeGold.m_c1.selectedIndex = 1;
             UI_ComCost.ProxyEnd();
         }
-        private void UpdateCardRes()
+        private async void UpdateCardRes()
         {
             if (_effectUI1 != null)
             {
@@ -349,6 +349,7 @@ namespace GFGGame
                 && _cardData.star >= _cardData.itemCfg.animationCardStar 
                 && YooAssets.CheckResExist(resPath))
             {
+                await LoadManager.Instance.CheckResExsitedAndLoad(resPath);
                 _effectUI1 = new EffectUI();
                 _effectUI1.Reset(_ui.m_comCard.m_comCardHolder.m_holder, resName, resName, 100, EffectUIType.Card);
                 _ui.m_c1.selectedIndex = 1;

+ 206 - 0
GameClient/Assets/Resources/BuildinFileManifest.asset

@@ -0,0 +1,206 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 71b02dfa7aa9d4545b3417a18477fbee, type: 3}
+  m_Name: BuildinFileManifest
+  m_EditorClassIdentifier: 
+  BuildinFiles:
+  - 040f55bf1ee3f98abc4d9804eedec76e.bundle
+  - 050f1e157be62bd8ee5d24432e43bbcb.bundle
+  - 054863532e2e560a5cb19b30dfad1ca0.bundle
+  - 075491d0704494daa8de8678814fa7de.bundle
+  - 080c2d419af7c8ac141a56754145c685.bundle
+  - 082dec7a27d13ed7f90638d090b40fa4.bundle
+  - 09a0197d8748a0f9eced1920e257066e.bundle
+  - 0ad4875fd95a64dca125ed0ffb08b769.bundle
+  - 0af6c381e44d02a04bd555d00d9486ed.bundle
+  - 0b029509b7ebb6618311ec4efa425b40.bundle
+  - 0b439b9b7105946a8272fc40aa434e95.bundle
+  - 0fa0461e5a54e00e9ac633194671e902.bundle
+  - 0ff43397fd334ae99d8a7d3cf3dfb4a9.bundle
+  - 10c848a16b9e0e045fdc0d4a21ab400f.bundle
+  - 116cc3604898b17747b846f150e9ab50.bundle
+  - 12a842a68504e30342a864d439b4aa53.bundle
+  - 12d15c825109752c59a3cdcfc7fe71e7.bundle
+  - 13c062da354bc5b2e3eb13fc68197fec.bundle
+  - 14ab28d46fb5c587b56859b3e71bcb0f.bundle
+  - 14e1f62a5cce6cc6fabf0b6674f8c3be.bundle
+  - 158f05f624957192a7d8bdc742088108.bundle
+  - 15e240e3f0b1b7c78932d7d2796d6c75.bundle
+  - 175ec6f3984e9a6ebe1355fffe5fbda1.bundle
+  - 18ecec62e844ad425d08945ddac71886.bundle
+  - 19753c311c8f8721a2b96e6c7a6f1b4c.bundle
+  - 1bc09b10bc63b305509705b2dbf88055.bundle
+  - 1ced95b45cf0db006b3ef7056ee8e714.bundle
+  - 1d833506acc13716f26c7041f26555aa.bundle
+  - 2020b153191b5599cb9b2445aef43b0b.bundle
+  - 2188d491d7274bfa39aa2f0286ac1477.bundle
+  - 21e24c355725701d086954268943e2c9.bundle
+  - 22dbc9da2e6e4979fa6f50879eb679ff.bundle
+  - 239ba3e78b912fa08b94cbb29002dd20.bundle
+  - 23d9e0e5eadc26d11fe62d26dc7ee026.bundle
+  - 25047ab48213e0821b350200fda1fdec.bundle
+  - 260713b72ae58f497c77f86bea22ca91.bundle
+  - 2619bd96be0c4e92bd65462dab89d453.bundle
+  - 262223f934652544a5e37c51dec35922.bundle
+  - 26490e46db15e7f560bd8707125cd74d.bundle
+  - 272d0274a2caef75d64942704398aa48.bundle
+  - 27590be071239bd82609fba292de65dd.bundle
+  - 2c7495ddd0e5ab064fb54af5143096d8.bundle
+  - 2c916a6a6247b6cbc3299dfe07ce8ef0.bundle
+  - 2dc5b50b6e6d2921ff2840af818b33b2.bundle
+  - 2e615848817f1239befad372f5851c0b.bundle
+  - 2e64e69babf262242d388ae4f8a20d84.bundle
+  - 2e683ec2d22a0a0088c703280d16cd91.bundle
+  - 2e857e8ac28756710a78bb6b0a2b0259.bundle
+  - 3074bd545c3216903268c814b83b1f24.bundle
+  - 31cfda192f8d80370bad64ee0fb8ae84.bundle
+  - 32ff0d940efa72d7f1a5cb9fd340794c.bundle
+  - 3473b8502aac2cec2b8d64d689d00af4.bundle
+  - 387d323a034c182b05d85b854a588312.bundle
+  - 39959f04b4134c3e051b6d4a67675a5a.bundle
+  - 3cf3e183eba24619774f34dddfe05c98.bundle
+  - 3d7c6f9938c954709399223549b76b3b.bundle
+  - 3eeb8a5e3a9d30053be6c2553a0625a1.bundle
+  - 441e4011d607b50320091a25cdbe3bfc.bundle
+  - 4595391f4b01c2187bb20cb5832fa553.bundle
+  - 466f575b3f4ae9c1363f606ebec703eb.bundle
+  - 46e58baef09dec5eaf20349cb5141cdd.bundle
+  - 4782ec48a4da95e11db822559656e8c7.bundle
+  - 48a9b9ddb0824a60e2e17d856081fb17.bundle
+  - 49deb832b7b674b4913e19eb6e44e03d.bundle
+  - 4d324f05ed15f466ecdddd5ec4d6a023.bundle
+  - 4e46fae1e2190a3bbc2149fa0954b13c.bundle
+  - 50f35cb2a5700daad9bd27a9990e8d68.bundle
+  - 5257f458f99c3159bab33d3c03d0561e.bundle
+  - 556404fb01ca38651647aa7203ac76c9.bundle
+  - 577a9dbe8fb6d3ff7a799bef7606c9b4.bundle
+  - 5ba80abd8fac2ba6be0d29ab5625b706.bundle
+  - 5bcbccdd67cc167474b342701bbb8aac.bundle
+  - 5c67c6d67753c4fd92ed3016c1b5f6ba.bundle
+  - 5d1e9fdd3008cb9b8a3c370e11934cf7.bundle
+  - 5e4b8565450269c17d65cf10bf668fb3.bundle
+  - 5f092de9d429deeb4a28a5df441fe8df.bundle
+  - 63e6afa476fb0dc90b32a7e36baa2846.bundle
+  - 66d391bf91eb3af14bb338943b5b764d.bundle
+  - 68728bf9f1c6d881e9a0c823682c8d88.bundle
+  - 6e64e29925851284e20dbed4932a6ab1.bundle
+  - 6f21900325a86d8dcc902a6f7c444355.bundle
+  - 70c119f57c1b2bea00aadda63ea96818.bundle
+  - 70d70f1858279ea4e2c52ce3202acae3.bundle
+  - 76b00fd2c9eb448eb3dd2d4ee1fc0d45.bundle
+  - 77af17d5f38acde1a0df3acce1865cb5.bundle
+  - 785704866a667eebe9ea70ac1db22752.bundle
+  - 78f81934f6ffd77560fa8dd56be20039.bundle
+  - 7e6012ddf3813c6d414c2cebc56efaca.bundle
+  - 7e7c5f410e0c3b77150d800ade12792a.bundle
+  - 7f79709c816d3504eee0a77356b717b5.bundle
+  - 80c97e59e4f258ce452d4afddf6cca8b.bundle
+  - 8111518fb5c7419afae10e7241a6ee0c.bundle
+  - 81bdd4fe70ac9f1dc53cf6561561fd05.bundle
+  - 82ea00e7eb7118d004a3b38ac1571fed.bundle
+  - 83ed18fc4e31997219d50d72725d37d7.bundle
+  - 83fcd01fb8807b2a1631d6da8f8d0285.bundle
+  - 86e7842bd7626a5d256f6d9e7c427d0a.bundle
+  - 87606992e0dae5d9ad30366715f73db6.bundle
+  - 8c4d12a5aa740ac222c36dcf5ca54a37.bundle
+  - 8d2bdcfd84b981063b0438d6e373f74a.bundle
+  - 8da660c52c3223ca79a46549c5e4d9d2.bundle
+  - 8e4fd217307a54fed8018556317384c4.bundle
+  - 8ed1ea306119f690e147f0adcd53f81c.bundle
+  - 8ffdedc7d1d7c6d14d3d34af723bef3c.bundle
+  - 91065e88658cf678338ae089caa347d0.bundle
+  - 9196b7570c8a062583a7101e3476a8ec.bundle
+  - 970a9b4507f476f11c7a01f310696f80.bundle
+  - 99f428398ecb1efb0693b1f7ed32b29c.bundle
+  - 9bb149d5a5a97424e6e222d91b4ed190.bundle
+  - 9ee9d22f1c62aee2657f923d1333e428.bundle
+  - 9f1024e68a7858034246b7f0b2e8d18a.rawfile
+  - a0b907eed96efd281962e950c73d4ab9.bundle
+  - a234436a0a729ba07f013c1488b73594.bundle
+  - a3a82494dfd8e72dc85caac01333edf5.bundle
+  - a3d1de8217332a1ce446b642a2a5bc86.bundle
+  - a42625bebcc94e2fab575754677bad92.bundle
+  - a54cf29df933b426f44cbf7195ef6673.bundle
+  - a5dded3ed1cb30e91b3036423dd9e71c.bundle
+  - a803daf646fe480bf9734f188038fb9f.bundle
+  - a9dcc72882c30ef48e12d186db1f6802.bundle
+  - ac00e9d1615c80397acbb09309d57792.bundle
+  - ac088892f07ade5324ab2aaa19d40193.bundle
+  - aed017e2cf74902990704cc7f3b7ec17.bundle
+  - afa93035c5279b6b6ab0bf1c6a108651.bundle
+  - b0114c0d34fafa1c904ce82bf824c6cf.bundle
+  - b6077006d91ccc0b19459ba74b00384e.bundle
+  - b6968abc6d9c702c2ed14f44274ed25c.bundle
+  - b73f0b6d3c4b29f85333ae63379cfb15.bundle
+  - b85f65b06a3bb76f70b872b7738ea668.bundle
+  - b9e349a018a2d56d5c30e45a7ce3c81b.bundle
+  - bb3d3949389b450294031dbba8a9bf0c.bundle
+  - bc0a368b68dc5821c3d915a581e8b393.bundle
+  - bccca9c98df0aaa538837b056e1a3bb8.bundle
+  - bcf8a7cfe1222766c69103a4e76e512f.bundle
+  - bd839c9a83c48f76869d72b3d5a9244b.bundle
+  - bda34824195b9ba41e4e4b6eeafe061d.bundle
+  - bdef9ae792745e329527d6f5ed51311b.bundle
+  - bf6376721c30345a5225357a2319b4de.bundle
+  - bfc049ee1190ac8013b946d49058043d.bundle
+  - bfc47e3e8f5804add0e49a62b0ecb4df.bundle
+  - c394983b4fba0e1912fde1cc1be9750e.bundle
+  - c5b2e35ebc920f3d4d0dea168441c669.bundle
+  - c5bed66a1d3ceef63594f54d29b93740.bundle
+  - c7e27f3c5ae5036c264cc18a47c8efc9.bundle
+  - c7ea5b7bb096117479634419cf57959d.bundle
+  - c9da6e9b84c95c60010e55c6bffe176c.bundle
+  - cae6429eb80d622a13fc794f1baed6c1.bundle
+  - cb4c5f3a6776445acdcb99c401c02729.bundle
+  - cd7d7d5380c32379012c8fec81b4b022.bundle
+  - ce3a75c762793d679a7d663c7a919f3c.bundle
+  - cfdb7b3fce65fd6b2bc56a79ee6e46fb.bundle
+  - d5b34df1bc271487c813726e7f5199e9.bundle
+  - d8c3503e7efd6fcd428e4dff7578a3f8.bundle
+  - d94a287ac27da3fe1d66811d09d1e5d6.bundle
+  - dacabb00c1f1fb5e76389c78597809b2.bundle
+  - db4b020cac5671c6f6c213456ab39834.bundle
+  - ddd6cdc3498f014d148d0245f426cb85.bundle
+  - e0d0b09baa5dcb944fe26757874ec492.bundle
+  - e11e0c885c711c8dacb35ddfab1a22b0.bundle
+  - e159838ed79107ebd8ad4c1eded1e120.bundle
+  - e2a69b5af6b877dc547934b61a5a79d1.bundle
+  - e32ddbd47349b4915dd482e0be747f25.bundle
+  - e4c6f2f5a1c22be0e094c90046cf6869.bundle
+  - e4fc341b7a0994a19a749b82dd373ce3.bundle
+  - e56ec6b4c6ab6586edc3daed40698fb1.bundle
+  - e6c649adb5799097fc94b55c5259a014.bundle
+  - e700a0a3ffa35137bd96d303c3cf34f6.bundle
+  - e9d479ab12101c79c67df4d51f948573.bundle
+  - ecb5dc335090c1fcc0b07d0d12145101.bundle
+  - ed38f8d78edf8522f1799a70dc93a3f2.bundle
+  - ed474264fe61ab64ebcafa9e5bb859ce.bundle
+  - eda2640532ada969d8e1e8ccee1db6d0.bundle
+  - eed2bdffa7939f68d634a403452effd5.bundle
+  - ef6fba5a39b43911c4f8cf5054be4b38.bundle
+  - efa2e2c2d42c0988327e6af2c247fdd6.bundle
+  - f1253f303355dc02374b11af4e4c9eda.bundle
+  - f1d94c78c4de70e6c8020960f6a981ce.bundle
+  - f4ac927bab0d4ac230cda56bac02e022.bundle
+  - f558a32a402b605cc0ce2ca105292c93.bundle
+  - f57abd9b258c5f39de0ee323ee300a47.bundle
+  - f588f8db77ffae37e927a45f2b2ff47b.bundle
+  - f6823c00587fd91123ac1b79bfdd16a1.bundle
+  - f6f24d0f7b8a659037f5f5fbc59f4fb6.bundle
+  - f7db0874002ced2461ad6a2408005cb6.bundle
+  - f7e79dc6552d4fb50d0c2962a9f01ef2.bundle
+  - f81874b9e22565272b28733b1ac90462.bundle
+  - f896169e9a1bde9f56c69dd879b84f31.bundle
+  - f8abfd943bac5b41b96a35e39ca24822.bundle
+  - f98433b6970f87cd5d3ea1a0062c25be.bundle
+  - ffbed72e2023bc16a40f41236144c66d.bundle
+  - ffd8a5ee9a882bb58e92b65a6fb93e1d.bundle

+ 8 - 0
GameClient/Assets/Resources/BuildinFileManifest.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bed13f57a7bebfb4e937bd98ba8507aa
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
GameClient/Assets/Scenes/GameLauncher.unity

@@ -596,7 +596,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4b2b7d724105420439593585dd395c41, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  PlayMode: 0
+  PlayMode: 2
 --- !u!1 &1597865575
 GameObject:
   m_ObjectHideFlags: 0