DESKTOP-FB72PO8\Administrator 12 tuntia sitten
vanhempi
commit
331f82b583

+ 5 - 2
Assets/Scripts/Core/AssetLoadTool/Asset/AssetBundleLoadManager.cs

@@ -241,7 +241,7 @@ public class AssetBundleLoadManager : Singleton<AssetBundleLoadManager>
         string url = RootPersistentBundleURL + m_manifestName;
         if (BundleLoadType != BundleLoadType.H5 && !File.Exists(url))
         {
-            url = Application.streamingAssetsPath + "/Bundle/" + m_manifestName;
+            url = m_rootStreamingBundleURL + m_manifestName;
         }
 
 
@@ -258,7 +258,10 @@ public class AssetBundleLoadManager : Singleton<AssetBundleLoadManager>
 
 
 #if UNITY_ANDROID&&!UNITY_EDITOR
-        url = "file://" + url;
+       if (!url.Contains("file://"))
+        {
+            url = "file://" + url;
+        }
 #endif
         Debug.Log(url);
         UnityWebRequest webRequest = UnityWebRequestAssetBundle.GetAssetBundle(url);

+ 9 - 4
Assets/Scripts/Core/Editor/BuildEtitor/AssetBundleEditor.cs

@@ -119,7 +119,14 @@ namespace Fort23.Editor
             var assetConfigPath = fold + assetConfigName;
             if (!Directory.Exists(fold)) Directory.CreateDirectory(fold + "/");
 
-            var assetBundleConfigPath = Path.Combine(PathHelper.AppResPath, "assetConfig.txt");
+            string dir = Path.GetDirectoryName(PathHelper.AppResPath + "Bundle/");
+            if (!Directory.Exists(dir))
+            {
+                Directory.CreateDirectory(dir);
+            }
+
+            var assetBundleConfigPath = Path.Combine(dir, "assetConfig.txt");
+
             var assetJsonData = JsonUtility.ToJson(allPackedAssetsInfo);
             Debug.Log(assetBundleConfigPath);
             File.WriteAllText(assetBundleConfigPath, assetJsonData);
@@ -164,7 +171,7 @@ namespace Fort23.Editor
                     {
                         if (Ignore(files[i].Name)) continue;
 
-                        string   fullPath = files[i].FullName.Replace("\\", "/");
+                        string fullPath = files[i].FullName.Replace("\\", "/");
                         var assetPath = fullPath.Replace(Application.dataPath, "Assets");
                         // Debug.Log(assetPath);
                         var importer = AssetImporter.GetAtPath(assetPath);
@@ -173,7 +180,6 @@ namespace Fort23.Editor
                             string fileName = Path.GetFileName(Application.dataPath + "/" + assetPath);
 
 
-
                             var assetInfo = new AssetInfo();
                             assetInfo.bundle = referenceCollectorData.key;
                             assetInfo.name = fileName;
@@ -181,7 +187,6 @@ namespace Fort23.Editor
                             allPackedAssetsInfo.assetsList.Add(assetInfo);
                         }
                     }
-                    
                 }
                 else
                 {

+ 17 - 17
UserSettings/Layouts/default-2022.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Inspector
+  m_Title: Game
   m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 492}
   m_MaxSize: {x: 10000, y: 10000}
@@ -100,7 +100,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 190
+  controlID: 28
   draggingID: 0
 --- !u!114 &5
 MonoBehaviour:
@@ -168,8 +168,8 @@ MonoBehaviour:
     y: 0
     width: 423
     height: 1299
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 12}
   m_Panes:
   - {fileID: 12}
@@ -220,8 +220,8 @@ MonoBehaviour:
     y: 0
     width: 631
     height: 1299
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 13}
@@ -246,8 +246,8 @@ MonoBehaviour:
     y: 0
     width: 855
     height: 368
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 16}
@@ -272,8 +272,8 @@ MonoBehaviour:
     y: 368
     width: 855
     height: 931
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -362,8 +362,8 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -30071
-    y: -31970
+    x: 1929
+    y: 73
     width: 630
     height: 1278
   m_SerializedDataModeController:
@@ -506,7 +506,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
+    m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: 58f70100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -555,8 +555,8 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 441
+    x: -32000
+    y: -31602
     width: 854
     height: 910
   m_SerializedDataModeController:
@@ -654,8 +654,8 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 73
+    x: -32000
+    y: -31970
     width: 854
     height: 347
   m_SerializedDataModeController: