From b4d5a32a7cc9035bb1efa29ad062cd2bd70ad898 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 04 九月 2018 16:15:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 UI/Common/UI3DShowHero.cs |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/UI/Common/UI3DShowHero.cs b/UI/Common/UI3DShowHero.cs
index 3837d50..33738ec 100644
--- a/UI/Common/UI3DShowHero.cs
+++ b/UI/Common/UI3DShowHero.cs
@@ -48,7 +48,7 @@
 
             if (weaponId != 0)
             {
-                prefab = InstanceResourcesLoader.LoadModelRes(weaponId);
+                prefab = InstanceResourcesLoader.LoadModelRes(weaponId, true);
                 if (prefab)
                 {
                     pool = GameObjectPoolManager.Instance.RequestPool(prefab);
@@ -59,7 +59,7 @@
 
             if (secondaryId != 0)
             {
-                prefab = InstanceResourcesLoader.LoadModelRes(secondaryId);
+                prefab = InstanceResourcesLoader.LoadModelRes(secondaryId, true);
                 if (prefab)
                 {
                     if (secondaryModel)
@@ -74,7 +74,7 @@
 
             if (wingsId != 0)
             {
-                prefab = InstanceResourcesLoader.LoadModelRes(wingsId);
+                prefab = InstanceResourcesLoader.LoadModelRes(wingsId, true);
                 if (prefab)
                 {
                     pool = GameObjectPoolManager.Instance.RequestPool(prefab);
@@ -86,7 +86,7 @@
 
             if (clothesId != 0)
             {
-                prefab = InstanceResourcesLoader.LoadModelRes(clothesId);
+                prefab = InstanceResourcesLoader.LoadModelRes(clothesId, true);
                 if (prefab)
                 {
                     pool = GameObjectPoolManager.Instance.RequestPool(prefab);
@@ -137,7 +137,7 @@
 
             if (weaponModel)
             {
-                GameObject prefab = InstanceResourcesLoader.LoadModelRes(weaponId);
+                GameObject prefab = InstanceResourcesLoader.LoadModelRes(weaponId, true);
                 if (prefab)
                 {
                     GameObjectPoolManager.Instance.ReleaseGameObject(prefab, weaponModel);
@@ -177,7 +177,7 @@
                 UnloadClothes();
             }
 
-            var _prefab = InstanceResourcesLoader.LoadModelRes(newClothes);
+            var _prefab = InstanceResourcesLoader.LoadModelRes(newClothes, true);
             if (!_prefab)
             {
                 newClothes = config.BaseEquip[0];
@@ -212,7 +212,7 @@
 
         private void LoadClothes(int resID)
         {
-            var prefab = InstanceResourcesLoader.LoadModelRes(resID);
+            var prefab = InstanceResourcesLoader.LoadModelRes(resID, true);
             if (prefab)
             {
                 var pool = GameObjectPoolManager.Instance.RequestPool(prefab);
@@ -247,7 +247,7 @@
                 return;
             }
 
-            var prefab = InstanceResourcesLoader.LoadModelRes(clothesId);
+            var prefab = InstanceResourcesLoader.LoadModelRes(clothesId, true);
             var pool = GameObjectPoolManager.Instance.RequestPool(prefab);
             pool.Release(clothesModel);
             clothesModel = null;
@@ -289,18 +289,18 @@
 
             if (oldWeapon != 0)
             {
-                prefab = InstanceResourcesLoader.LoadModelRes(oldWeapon);
+                prefab = InstanceResourcesLoader.LoadModelRes(oldWeapon, true);
                 pool = GameObjectPoolManager.Instance.RequestPool(prefab);
                 pool.Release(weaponModel);
                 weaponModel = null;
             }
 
-            prefab = InstanceResourcesLoader.LoadModelRes(newWeapon);
+            prefab = InstanceResourcesLoader.LoadModelRes(newWeapon, true);
 
             if (!prefab)
             {
                 newWeapon = config.BaseEquip[1];
-                prefab = InstanceResourcesLoader.LoadModelRes(newWeapon);
+                prefab = InstanceResourcesLoader.LoadModelRes(newWeapon, true);
             }
 
             if (prefab)
@@ -345,7 +345,7 @@
 
             if (oldSecondary != 0)
             {
-                prefab = InstanceResourcesLoader.LoadModelRes(oldSecondary);
+                prefab = InstanceResourcesLoader.LoadModelRes(oldSecondary, true);
                 pool = GameObjectPoolManager.Instance.RequestPool(prefab);
                 pool.Release(secondaryModel);
                 secondaryModel = null;
@@ -353,11 +353,11 @@
 
             if (newSecondary != 0)
             {
-                prefab = InstanceResourcesLoader.LoadModelRes(newSecondary);
+                prefab = InstanceResourcesLoader.LoadModelRes(newSecondary, true);
                 if (!prefab)
                 {
                     newSecondary = config.BaseEquip[2];
-                    prefab = InstanceResourcesLoader.LoadModelRes(newSecondary);
+                    prefab = InstanceResourcesLoader.LoadModelRes(newSecondary, true);
                 }
 
                 if (prefab)
@@ -395,7 +395,7 @@
 
             if (oldWings != 0)
             {
-                prefab = InstanceResourcesLoader.LoadModelRes(oldWings);
+                prefab = InstanceResourcesLoader.LoadModelRes(oldWings, true);
                 pool = GameObjectPoolManager.Instance.RequestPool(prefab);
                 pool.Release(wingsModel);
                 wingsModel = null;
@@ -403,12 +403,12 @@
 
             if (newWings != 0)
             {
-                prefab = InstanceResourcesLoader.LoadModelRes(newWings);
+                prefab = InstanceResourcesLoader.LoadModelRes(newWings, true);
 
                 if (!prefab)
                 {
                     newWings = config.BaseEquip[3];
-                    prefab = InstanceResourcesLoader.LoadModelRes(newWings);
+                    prefab = InstanceResourcesLoader.LoadModelRes(newWings, true);
                 }
 
                 if (prefab)

--
Gitblit v1.8.0