Merge pull request #49 from nievesj/develop

v4.0.0
nievesj · Mar 12, 2021 · b2af5b5 · b2af5b5
2 parents 79c5dc7 + 379a974
commit b2af5b5
Show file tree

Hide file tree

Showing 1,623 changed files with 111,779 additions and 21,162 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/CoreFramework-ASM.asmdef b/CoreFramework-ASM.asmdef
@@ -3,7 +3,13 @@
     "references": [
         "Zenject",
         "UniRx",
-        "UniRx.Async"
+        "Unity.ResourceManager",
+        "Unity.Addressables",
+        "UniTask",
+        "Unity.InputSystem",
+        "UnityInterfaceSupport",
+        "LiteNetLib",
+        "Unity.TextMeshPro"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
@@ -12,5 +18,6 @@
     "precompiledReferences": [],
     "autoReferenced": true,
     "defineConstraints": [],
-    "versionDefines": []
+    "versionDefines": [],
+    "noEngineReferences": false
 }
diff --git a/Editor/AssetServiceConfigurationEditor.cs b/Editor/AssetServiceConfigurationEditor.cs
diff --git a/Editor/AssetServiceConfigurationEditor.cs.meta b/Editor/AssetServiceConfigurationEditor.cs.meta
diff --git a/Editor/ClearCacheMenuItem.cs b/Editor/ClearCacheMenuItem.cs
@@ -21,24 +21,24 @@ private static void ClearAssetBundleCache()
         {
             var cache = Caching.GetCacheByPath(cachePaths[0]);
 
-            Logger.Log(("Cache location: " + s),Colors.Yellow);
-            Logger.Log(("Cache was using: " + cache.spaceOccupied / 1024f / 1024f + " MB"),Colors.Yellow);
+            Logger.Log("Cache location: " + s, Colors.Yellow);
+            Logger.Log("Cache was using: " + cache.spaceOccupied / 1024f / 1024f + " MB", Colors.Yellow);
 
             cache.ClearCache();
 
-            Logger.Log("Cache cleared.",Colors.Yellow);
+            Logger.Log("Cache cleared.", Colors.Yellow);
         }
 
         if (cachePaths.Count < 1)
-            Logger.Log("Cache was empty.",Colors.Yellow);
+            Logger.Log("Cache was empty.", Colors.Yellow);
     }
 
     [MenuItem("Core Framework / Delete Persistent Data Directory (Also deletes any saved data files)")]
     private static void DeletePersistentData()
     {
         //Delete Application.persistentDataPath
         Directory.Delete(Application.persistentDataPath, true);
-        Logger.Log(("Deleting persistent data directory " + Application.persistentDataPath),Colors.Yellow);
+        Logger.Log("Deleting persistent data directory " + Application.persistentDataPath, Colors.Yellow);
     }
 
     [MenuItem("Core Framework / Enable Simulate Asset Bundles")]
@@ -47,7 +47,7 @@ private static void GetEnableCachedInfo()
         ClearAssetBundleCache();
 
         EditorPreferences.EditorprefSimulateAssetBundles = true;
-        Logger.Log("Enabled asset bundle simulation mode.",Colors.Yellow);
+        Logger.Log("Enabled asset bundle simulation mode.", Colors.Yellow);
     }
 
     [MenuItem("Core Framework / Enable Simulate Asset Bundles", true)]
@@ -62,7 +62,7 @@ private static void GetDisableCachedInfo()
         ClearAssetBundleCache();
 
         EditorPreferences.EditorprefSimulateAssetBundles = false;
-        Logger.Log("Disabled asset bundle simulation mode.",Colors.Yellow);
+        Logger.Log("Disabled asset bundle simulation mode.", Colors.Yellow);
     }
 
     [MenuItem("Core Framework / Disable Simulate Asset Bundles", true)]

diff --git a/Editor/CoreFrameworkEditor-ASM.asmdef b/Editor/CoreFrameworkEditor-ASM.asmdef
@@ -2,12 +2,19 @@
     "name": "CoreFrameworkEditor-ASM",
     "references": [
         "CoreFramework-ASM",
-        "Zenject"
+        "Zenject",
+        "UniTask.Editor",
+        "UnityInterfaceSupport.Editor"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [
         "Editor"
     ],
     "excludePlatforms": [],
-    "allowUnsafeCode": false
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }
diff --git a/Editor/EditorStartup.cs b/Editor/EditorStartup.cs
diff --git a/Editor/EditorStartup.cs.meta b/Editor/EditorStartup.cs.meta
diff --git a/Editor/EditorUITools.cs b/Editor/EditorUITools.cs
@@ -57,7 +57,7 @@ public static void LabelUIElement(string message, GUIStyle style)
         /// <returns></returns>
         public static GUIStyle LabelStyle(LabelMessageType messageType)
         {
-            GUIStyle s = new GUIStyle(EditorStyles.textField);
+            var s = new GUIStyle(EditorStyles.textField);
 
             switch (messageType)
             {
@@ -91,8 +91,8 @@ public static GUIStyle LabelStyle(LabelMessageType messageType)
         /// <returns></returns>
         public static string[] GetSortingLayerNames()
         {
-            System.Type internalEditorUtilityType = typeof(InternalEditorUtility);
-            PropertyInfo sortingLayersProperty = internalEditorUtilityType.GetProperty("sortingLayerNames", BindingFlags.Static | BindingFlags.NonPublic);
+            var internalEditorUtilityType = typeof(InternalEditorUtility);
+            var sortingLayersProperty = internalEditorUtilityType.GetProperty("sortingLayerNames", BindingFlags.Static | BindingFlags.NonPublic);
             var sortingLayers = (string[]) sortingLayersProperty.GetValue(null, new object[0]);
             return sortingLayers;
         }

diff --git a/Editor/GameConfigurationEditor.cs b/Editor/GameConfigurationEditor.cs
diff --git a/Editor/GameConfigurationEditor.cs.meta b/Editor/GameConfigurationEditor.cs.meta
diff --git a/Editor/LayerAttributeDrawer.cs b/Editor/LayerAttributeDrawer.cs
diff --git a/Editor/LayerAttributeDrawer.cs.meta b/Editor/LayerAttributeDrawer.cs.meta