Browse Source

Merge branch 'Branch_V2.0'

tanghai 8 years ago
parent
commit
1ba2e39bc6

+ 1 - 1
Server/Hotfix/Handler/DBSaveRequestHandler.cs

@@ -12,7 +12,7 @@ namespace Hotfix
 			try
 			{
 				DBCacheComponent dbCacheComponent = Game.Scene.GetComponent<DBCacheComponent>();
-				if (message.CollectionName == "")
+				if (string.IsNullOrEmpty(message.CollectionName))
 				{
 					message.CollectionName = message.Disposer.GetType().Name;
 				}

+ 0 - 3
Unity/Assets/ThirdParty/ILRuntime/Mono.Cecil.Mdb/mdb.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: a904e30b95ce4008bfa38291917fba7e
-timeCreated: 1509538086

File diff suppressed because it is too large
+ 1 - 1
Unity/Unity.Editor.Plugins.csproj


File diff suppressed because it is too large
+ 1 - 1
Unity/Unity.Editor.csproj


File diff suppressed because it is too large
+ 1 - 1
Unity/Unity.Plugins.csproj


File diff suppressed because it is too large
+ 4 - 7
Unity/Unity.csproj


Some files were not shown because too many files changed in this diff