Browse Source

EventSystem.Get方法参数名改成InstanceId,防止大家误会

tanghai 6 years ago
parent
commit
9a2400719d

+ 2 - 2
Unity/Assets/Model/Base/Object/EventSystem.cs

@@ -191,10 +191,10 @@ namespace ETModel
 			this.allComponents.Remove(instanceId);
 		}
 
-		public Component Get(long id)
+		public Component Get(long instanceId)
 		{
 			Component component = null;
-			this.allComponents.TryGetValue(id, out component);
+			this.allComponents.TryGetValue(instanceId, out component);
 			return component;
 		}
 		

+ 1 - 1
Unity/Packages/manifest.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.unity.assetbundlebrowser": "1.7.0",
-    "com.unity.package-manager-ui": "2.0.3",
+    "com.unity.package-manager-ui": "2.0.7",
     "com.unity.textmeshpro": "1.3.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

+ 1 - 0
Unity/ProjectSettings/ProjectSettings.asset

@@ -241,6 +241,7 @@ PlayerSettings:
   tvOSManualSigningProvisioningProfileType: 0
   appleEnableAutomaticSigning: 0
   iOSRequireARKit: 0
+  iOSAutomaticallyDetectAndAddCapabilities: 1
   appleEnableProMotion: 0
   clonedFromGUID: 00000000000000000000000000000000
   templatePackageId: 

+ 1 - 1
Unity/ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 2018.3.6f1
+m_EditorVersion: 2018.3.12f1

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


File diff suppressed because it is too large
+ 0 - 0
Unity/Unity.Hotfix.csproj


File diff suppressed because it is too large
+ 0 - 0
Unity/Unity.Model.csproj


File diff suppressed because it is too large
+ 0 - 0
Unity/Unity.ThirdParty.csproj


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