Sfoglia il codice sorgente

修复非ILRuntime模式的编译错误

tanghai 7 anni fa
parent
commit
3fac9b7b7f

+ 4 - 0
Tools/cwRsync/Config/exclude.txt

@@ -8,3 +8,7 @@ Unity/Library/
 Unity/Temp/
 */obj
 IOS-Build
+Unity/Assets/Res/
+Unity/Assets/Resources/
+Unity/Assets/Bundles/
+Unity/Assets/Scenes/

+ 1 - 1
Tools/cwRsync/Config/rsyncConfig.txt

@@ -1 +1 @@
-{ "_t" : "RsyncConfig", "Host" : "172.16.20.48", "Account" : "mac", "Password" : "1234567890", "RelativePath" : "Source/Egametang", "Exclude" : [".git/", "Logs/", "Bin/", "Server/packages/", "Temp/", "Server/Server.sdf", "Unity/Library/", "Unity/Temp/", "*/obj", "IOS-Build"] }
+{ "_t" : "RsyncConfig", "Host" : "127.0.0.1", "Account" : "ubuntu", "Password" : "1234567890", "RelativePath" : "Source/ET", "Exclude" : [".git/", "Logs/", "Bin/", "Server/packages/", "Temp/", "Server/Server.sdf", "Unity/Library/", "Unity/Temp/", "*/obj", "IOS-Build", "Unity/Assets/Res/", "Unity/Assets/Resources/", "Unity/Assets/Bundles/", "Unity/Assets/Scenes/"] }

+ 2 - 2
Tools/cwRsync/Config/rsyncd.conf

@@ -7,7 +7,7 @@ write only = no
 log file =/var/log/rsyncd.log
 fake super = yes
 [Upload]
-path = /home/mac/
-auth users = mac
+path = /home/ubuntu/
+auth users = ubuntu
 secrets file = /etc/rsyncd.secrets
 list = yes

+ 1 - 1
Tools/cwRsync/Config/rsyncd.secrets

@@ -1 +1 @@
-mac:1234567890
+ubuntu:1234567890

+ 1 - 1
Unity/Assets/Scripts/Entity/Hotfix.cs

@@ -69,7 +69,7 @@ namespace ETModel
 
 			this.start = new ILStaticMethod(this.appDomain, "ETHotfix.Init", "Start", 0);
 #else
-			GameObject code = Game.Scene.GetComponent<ResourcesComponent>().GetAsset<GameObject>("code.unity3d", "Code");
+			GameObject code = (GameObject)Game.Scene.GetComponent<ResourcesComponent>().GetAsset("code.unity3d", "Code");
 			byte[] assBytes = code.Get<TextAsset>("Hotfix.dll").bytes;
 			byte[] mdbBytes = code.Get<TextAsset>("Hotfix.mdb").bytes;
 			this.assembly = Assembly.Load(assBytes, mdbBytes);

+ 2 - 2
Unity/Hotfix/Unity.Hotfix.csproj

@@ -27,9 +27,9 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>true</Optimize>
     <OutputPath>..\Temp\UnityVS_bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;ILRuntime</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

+ 4 - 7
Unity/Unity.csproj

@@ -12,15 +12,12 @@
     <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <CompilerResponseFile>
-    </CompilerResponseFile>
+    <TargetFrameworkProfile></TargetFrameworkProfile>
+    <CompilerResponseFile></CompilerResponseFile>
     <UnityProjectType>Game:1</UnityProjectType>
     <UnityBuildTarget>StandaloneWindows:5</UnityBuildTarget>
     <UnityVersion>2017.1.1p4</UnityVersion>
-    <RootNamespace>
-    </RootNamespace>
+    <RootNamespace></RootNamespace>
     <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
@@ -783,4 +780,4 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="GenerateTargetFrameworkMonikerAttribute" />
-</Project>
+</Project>