Skip to content

Commit b2af5b5

Browse files
authored
Merge pull request #49 from nievesj/develop
v4.0.0
2 parents 79c5dc7 + 379a974 commit b2af5b5

File tree

1,623 files changed

+111779
-21162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,623 files changed

+111779
-21162
lines changed

.DS_Store

6 KB
Binary file not shown.

CoreFramework-ASM.asmdef

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
"references": [
44
"Zenject",
55
"UniRx",
6-
"UniRx.Async"
6+
"Unity.ResourceManager",
7+
"Unity.Addressables",
8+
"UniTask",
9+
"Unity.InputSystem",
10+
"UnityInterfaceSupport",
11+
"LiteNetLib",
12+
"Unity.TextMeshPro"
713
],
814
"includePlatforms": [],
915
"excludePlatforms": [],
@@ -12,5 +18,6 @@
1218
"precompiledReferences": [],
1319
"autoReferenced": true,
1420
"defineConstraints": [],
15-
"versionDefines": []
21+
"versionDefines": [],
22+
"noEngineReferences": false
1623
}

Editor/AssetServiceConfigurationEditor.cs

Lines changed: 0 additions & 55 deletions
This file was deleted.

Editor/AssetServiceConfigurationEditor.cs.meta

Lines changed: 0 additions & 13 deletions
This file was deleted.

Editor/ClearCacheMenuItem.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@ private static void ClearAssetBundleCache()
2121
{
2222
var cache = Caching.GetCacheByPath(cachePaths[0]);
2323

24-
Logger.Log(("Cache location: " + s),Colors.Yellow);
25-
Logger.Log(("Cache was using: " + cache.spaceOccupied / 1024f / 1024f + " MB"),Colors.Yellow);
24+
Logger.Log("Cache location: " + s, Colors.Yellow);
25+
Logger.Log("Cache was using: " + cache.spaceOccupied / 1024f / 1024f + " MB", Colors.Yellow);
2626

2727
cache.ClearCache();
2828

29-
Logger.Log("Cache cleared.",Colors.Yellow);
29+
Logger.Log("Cache cleared.", Colors.Yellow);
3030
}
3131

3232
if (cachePaths.Count < 1)
33-
Logger.Log("Cache was empty.",Colors.Yellow);
33+
Logger.Log("Cache was empty.", Colors.Yellow);
3434
}
3535

3636
[MenuItem("Core Framework / Delete Persistent Data Directory (Also deletes any saved data files)")]
3737
private static void DeletePersistentData()
3838
{
3939
//Delete Application.persistentDataPath
4040
Directory.Delete(Application.persistentDataPath, true);
41-
Logger.Log(("Deleting persistent data directory " + Application.persistentDataPath),Colors.Yellow);
41+
Logger.Log("Deleting persistent data directory " + Application.persistentDataPath, Colors.Yellow);
4242
}
4343

4444
[MenuItem("Core Framework / Enable Simulate Asset Bundles")]
@@ -47,7 +47,7 @@ private static void GetEnableCachedInfo()
4747
ClearAssetBundleCache();
4848

4949
EditorPreferences.EditorprefSimulateAssetBundles = true;
50-
Logger.Log("Enabled asset bundle simulation mode.",Colors.Yellow);
50+
Logger.Log("Enabled asset bundle simulation mode.", Colors.Yellow);
5151
}
5252

5353
[MenuItem("Core Framework / Enable Simulate Asset Bundles", true)]
@@ -62,7 +62,7 @@ private static void GetDisableCachedInfo()
6262
ClearAssetBundleCache();
6363

6464
EditorPreferences.EditorprefSimulateAssetBundles = false;
65-
Logger.Log("Disabled asset bundle simulation mode.",Colors.Yellow);
65+
Logger.Log("Disabled asset bundle simulation mode.", Colors.Yellow);
6666
}
6767

6868
[MenuItem("Core Framework / Disable Simulate Asset Bundles", true)]

Editor/CoreFrameworkEditor-ASM.asmdef

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,19 @@
22
"name": "CoreFrameworkEditor-ASM",
33
"references": [
44
"CoreFramework-ASM",
5-
"Zenject"
5+
"Zenject",
6+
"UniTask.Editor",
7+
"UnityInterfaceSupport.Editor"
68
],
7-
"optionalUnityReferences": [],
89
"includePlatforms": [
910
"Editor"
1011
],
1112
"excludePlatforms": [],
12-
"allowUnsafeCode": false
13+
"allowUnsafeCode": false,
14+
"overrideReferences": false,
15+
"precompiledReferences": [],
16+
"autoReferenced": true,
17+
"defineConstraints": [],
18+
"versionDefines": [],
19+
"noEngineReferences": false
1320
}

Editor/EditorStartup.cs

Lines changed: 0 additions & 25 deletions
This file was deleted.

Editor/EditorStartup.cs.meta

Lines changed: 0 additions & 11 deletions
This file was deleted.

Editor/EditorUITools.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public static void LabelUIElement(string message, GUIStyle style)
5757
/// <returns></returns>
5858
public static GUIStyle LabelStyle(LabelMessageType messageType)
5959
{
60-
GUIStyle s = new GUIStyle(EditorStyles.textField);
60+
var s = new GUIStyle(EditorStyles.textField);
6161

6262
switch (messageType)
6363
{
@@ -91,8 +91,8 @@ public static GUIStyle LabelStyle(LabelMessageType messageType)
9191
/// <returns></returns>
9292
public static string[] GetSortingLayerNames()
9393
{
94-
System.Type internalEditorUtilityType = typeof(InternalEditorUtility);
95-
PropertyInfo sortingLayersProperty = internalEditorUtilityType.GetProperty("sortingLayerNames", BindingFlags.Static | BindingFlags.NonPublic);
94+
var internalEditorUtilityType = typeof(InternalEditorUtility);
95+
var sortingLayersProperty = internalEditorUtilityType.GetProperty("sortingLayerNames", BindingFlags.Static | BindingFlags.NonPublic);
9696
var sortingLayers = (string[]) sortingLayersProperty.GetValue(null, new object[0]);
9797
return sortingLayers;
9898
}

Editor/GameConfigurationEditor.cs

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)