修复mac工程错误

Unity/Assembly-CSharp-Editor-firstpass.csproj

@@ -54,9 +54,6 @@
     <Compile Include="Assets\Plugins\Editor\JetBrains\Unity3DRider.cs" />
     <None Include="Assets\Res\Config\BuffConfig.txt" />
     <None Include="Assets\Res\Config\UnitConfig.txt" />
-    <Reference Include="UnityEditor.Advertisements">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEngine.UI">
       <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
     </Reference>
@@ -78,6 +75,15 @@
     <Reference Include="nunit.framework">
       <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.Analytics">
+      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEditor.Analytics">
+      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/Editor/UnityEditor.Analytics.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEditor.Advertisements">
+      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine.Timeline">
       <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
     </Reference>
@@ -87,12 +93,6 @@
     <Reference Include="UnityEditor.TreeEditor">
       <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.Analytics">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEditor.Analytics">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/Editor/UnityEditor.Analytics.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEditor.HoloLens">
       <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityHoloLens/Editor/UnityEditor.HoloLens.dll</HintPath>
     </Reference>

Unity/Assembly-CSharp-Editor.csproj

@@ -96,9 +96,6 @@
     <Compile Include="Assets\Editor\ServerCommandLineEditor\ServerCommandLineEditor.cs" />
     <None Include="Assets\Res\Config\BuffConfig.txt" />
     <None Include="Assets\Res\Config\UnitConfig.txt" />
-    <Reference Include="UnityEditor.Advertisements">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEngine.UI">
       <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
     </Reference>
@@ -120,6 +117,15 @@
     <Reference Include="nunit.framework">
       <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.Analytics">
+      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEditor.Analytics">
+      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/Editor/UnityEditor.Analytics.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEditor.Advertisements">
+      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine.Timeline">
       <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
     </Reference>
@@ -129,12 +135,6 @@
     <Reference Include="UnityEditor.TreeEditor">
       <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.Analytics">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEditor.Analytics">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/Editor/UnityEditor.Analytics.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEditor.HoloLens">
       <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityHoloLens/Editor/UnityEditor.HoloLens.dll</HintPath>
     </Reference>

Unity/Assembly-CSharp-firstpass.csproj

@@ -478,12 +478,12 @@
     <Reference Include="nunit.framework">
       <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.Timeline">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEngine.Analytics">
       <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.Timeline">
+      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine.HoloLens">
       <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
     </Reference>

Unity/Assembly-CSharp.csproj

@@ -328,6 +328,7 @@
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Enviorment\CLRRedirections.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Enviorment\CrossBindingAdaptor.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Enviorment\DelegateManager.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Enviorment\ValueTypeBinder.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Extensions.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Intepreter\DelegateAdapter.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Intepreter\ILIntepreter.cs" />
@@ -463,34 +464,6 @@
     <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.20\MonoCecil\Mono\Actions.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.20\MonoCecil\Mono\Empty.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.20\MonoCecil\Mono\Funcs.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.Cecil.Mdb\MdbReader.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.Cecil.Mdb\MdbReaderProvider.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\AnonymousScopeEntry.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\CapturedScope.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\CapturedVariable.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\CodeBlockEntry.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\CompileUnitEntry.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\ICompileUnit.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\IMethodDef.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\ISourceFile.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\LineNumberEntry.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\LineNumberTable.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\LocalVariableEntry.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\MethodEntry.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\MonoSymbolFileException.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\MonoSymbolWriter.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\MyBinaryReader.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\MyBinaryWriter.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\NamespaceEntry.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\NamespaceInfo.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\OffsetTable.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\ScopeVariable.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\SourceFileEntry.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\SourceMethodBuilder.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\SourceMethodImpl.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\SymbolDocumentWriterImpl.cs" />
-    <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Mdb\mdb\Mono.CompilerServices.SymbolWriter\SymbolWriterImpl.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Pdb\pdb\Microsoft.Cci.Pdb\BitAccess.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Pdb\pdb\Microsoft.Cci.Pdb\BitSet.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Pdb\pdb\Microsoft.Cci.Pdb\CvInfo.cs" />
@@ -537,12 +510,12 @@
     <Reference Include="nunit.framework">
       <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.Timeline">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEngine.Analytics">
       <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.Timeline">
+      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine.HoloLens">
       <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
     </Reference>

Unity/Hotfix/Assembly-CSharp-Hotfix.csproj

@@ -70,10 +70,6 @@
     <Compile Include="Base\Object\ObjectEvents.cs" />
     <Compile Include="Base\Object\ObjectPool.cs" />
     <Compile Include="Base\Other\IUIFactory.cs" />
-    <Compile Include="Component\GameObjectComponent.cs" />
-    <Compile Include="Component\KVComponent.cs" />
-    <Compile Include="Component\TimeComponent.cs" />
-    <Compile Include="Component\TimerComponent.cs" />
     <Compile Include="Component\UIComponent.cs" />
     <Compile Include="Entity\Hotfix.cs" />
     <Compile Include="Entity\Scene.cs" />

Unity/Unity-Mac.sln

@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{2662B409-6332-1E56-D797-C9025C53BDD6}"
@@ -9,7 +8,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "A
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor-firstpass", "Assembly-CSharp-Editor-firstpass.csproj", "{F534D6C4-3368-032B-289C-A943CC171719}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Hotfix", "Hotfix\Assembly-CSharp-Hotfix.csproj", "{40533600-4E69-4F7D-A924-E1A3B4127255}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hotfix\Assembly-CSharp-Hotfix", "Hotfix\Assembly-CSharp-Hotfix.csproj", "{40533600-4E69-4F7D-A924-E1A3B4127255}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution