Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
guo450212436
et
提交
345e7496
E
et
项目概览
guo450212436
/
et
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
et
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
345e7496
编写于
2月 24, 2018
作者:
T
tanghai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.日志重定向去掉,ILRT工具已经自动提供
2.tcp socket在读写前判断canread canwrite,这样可以避免不必要的异常
上级
8f9f53b6
变更
18
隐藏空白更改
内联
并排
Showing
18 changed file
with
129 addition
and
161 deletion
+129
-161
Unity/Assets/Res/Config/GlobalProto.txt
Unity/Assets/Res/Config/GlobalProto.txt
+1
-1
Unity/Assets/Scripts/Base/IL/ILRedirection.cs
Unity/Assets/Scripts/Base/IL/ILRedirection.cs
+0
-83
Unity/Assets/Scripts/Base/IL/ILRedirection.cs.meta
Unity/Assets/Scripts/Base/IL/ILRedirection.cs.meta
+0
-12
Unity/Assets/Scripts/Entity/Hotfix.cs
Unity/Assets/Scripts/Entity/Hotfix.cs
+15
-13
Unity/Assets/Scripts/Helper/ILHelper.cs
Unity/Assets/Scripts/Helper/ILHelper.cs
+14
-27
Unity/Assets/Scripts/Module/Message/Network/TCP/TChannel.cs
Unity/Assets/Scripts/Module/Message/Network/TCP/TChannel.cs
+14
-8
Unity/Assets/ThirdParty/ILRuntime/Generated/CLRBindings.cs
Unity/Assets/ThirdParty/ILRuntime/Generated/CLRBindings.cs
+1
-1
Unity/Assets/ThirdParty/ILRuntime/Generated/System_Runtime_CompilerServices_AsyncTaskMethodBuilder_1_ILTyp_t.cs
...time_CompilerServices_AsyncTaskMethodBuilder_1_ILTyp_t.cs
+23
-0
Unity/Assets/ThirdParty/ILRuntime/Generated/System_Runtime_CompilerServices_AsyncTaskMethodBuilder_1_IResp_t.cs
...time_CompilerServices_AsyncTaskMethodBuilder_1_IResp_t.cs
+23
-0
Unity/Assets/ThirdParty/ILRuntime/Generated/System_Runtime_CompilerServices_AsyncVoidMethodBuilder_Binding.cs
...untime_CompilerServices_AsyncVoidMethodBuilder_Binding.cs
+25
-2
Unity/Hotfix/Component/OperaComponent.cs
Unity/Hotfix/Component/OperaComponent.cs
+1
-1
Unity/Hotfix/Module/Message/SessionHelper.cs
Unity/Hotfix/Module/Message/SessionHelper.cs
+2
-2
Unity/Hotfix/Unity.Hotfix.csproj
Unity/Hotfix/Unity.Hotfix.csproj
+1
-1
Unity/ProjectSettings/ProjectSettings.asset
Unity/ProjectSettings/ProjectSettings.asset
+1
-1
Unity/Unity.Editor.Plugins.csproj
Unity/Unity.Editor.Plugins.csproj
+2
-2
Unity/Unity.Editor.csproj
Unity/Unity.Editor.csproj
+2
-2
Unity/Unity.Plugins.csproj
Unity/Unity.Plugins.csproj
+2
-2
Unity/Unity.csproj
Unity/Unity.csproj
+2
-3
未找到文件。
Unity/Assets/Res/Config/GlobalProto.txt
浏览文件 @
345e7496
{ "_t" : "GlobalProto", "AssetBundleServerUrl" : "http://172.16.10.94:8080/", "Address" : "172.16.10.94:10002" }
\ No newline at end of file
{ "_t" : "GlobalProto", "AssetBundleServerUrl" : "http://127.0.0.1:8080/", "Address" : "127.0.0.1:10002" }
\ No newline at end of file
Unity/Assets/Scripts/Base/IL/ILRedirection.cs
已删除
100644 → 0
浏览文件 @
8f9f53b6
using
System.Collections.Generic
;
using
ILRuntime.CLR.Method
;
using
ILRuntime.CLR.Utils
;
using
ILRuntime.Runtime.Intepreter
;
using
ILRuntime.Runtime.Stack
;
namespace
Model
{
public
static
class
ILRedirection
{
public
static
unsafe
StackObject
*
LogDebug
(
ILIntepreter
__intp
,
StackObject
*
__esp
,
IList
<
object
>
__mStack
,
CLRMethod
__method
,
bool
isNewObj
)
{
//ILRuntime的调用约定为被调用者清理堆栈,因此执行这个函数后需要将参数从堆栈清理干净,并把返回值放在栈顶,具体请看ILRuntime实现原理文档
ILRuntime
.
Runtime
.
Enviorment
.
AppDomain
__domain
=
__intp
.
AppDomain
;
StackObject
*
ptr_of_this_method
;
//这个是最后方法返回后esp栈指针的值,应该返回清理完参数并指向返回值,这里是只需要返回清理完参数的值即可
StackObject
*
__ret
=
ILIntepreter
.
Minus
(
__esp
,
1
);
//取Log方法的参数,如果有两个参数的话,第一个参数是esp - 2,第二个参数是esp -1, 因为Mono的bug,直接-2值会错误,所以要调用ILIntepreter.Minus
ptr_of_this_method
=
ILIntepreter
.
Minus
(
__esp
,
1
);
//这里是将栈指针上的值转换成object,如果是基础类型可直接通过ptr->Value和ptr->ValueLow访问到值,具体请看ILRuntime实现原理文档
object
message
=
typeof
(
object
).
CheckCLRTypes
(
StackObject
.
ToObject
(
ptr_of_this_method
,
__domain
,
__mStack
));
//所有非基础类型都得调用Free来释放托管堆栈
__intp
.
Free
(
ptr_of_this_method
);
//在真实调用Debug.Log前,我们先获取DLL内的堆栈
var
stacktrace
=
__domain
.
DebugService
.
GetStackTrance
(
__intp
);
//我们在输出信息后面加上DLL堆栈
Log
.
Debug
(
message
+
"\n"
+
stacktrace
);
return
__ret
;
}
public
static
unsafe
StackObject
*
LogInfo
(
ILIntepreter
__intp
,
StackObject
*
__esp
,
IList
<
object
>
__mStack
,
CLRMethod
__method
,
bool
isNewObj
)
{
//ILRuntime的调用约定为被调用者清理堆栈,因此执行这个函数后需要将参数从堆栈清理干净,并把返回值放在栈顶,具体请看ILRuntime实现原理文档
ILRuntime
.
Runtime
.
Enviorment
.
AppDomain
__domain
=
__intp
.
AppDomain
;
StackObject
*
ptr_of_this_method
;
//这个是最后方法返回后esp栈指针的值,应该返回清理完参数并指向返回值,这里是只需要返回清理完参数的值即可
StackObject
*
__ret
=
ILIntepreter
.
Minus
(
__esp
,
1
);
//取Log方法的参数,如果有两个参数的话,第一个参数是esp - 2,第二个参数是esp -1, 因为Mono的bug,直接-2值会错误,所以要调用ILIntepreter.Minus
ptr_of_this_method
=
ILIntepreter
.
Minus
(
__esp
,
1
);
//这里是将栈指针上的值转换成object,如果是基础类型可直接通过ptr->Value和ptr->ValueLow访问到值,具体请看ILRuntime实现原理文档
object
message
=
typeof
(
object
).
CheckCLRTypes
(
StackObject
.
ToObject
(
ptr_of_this_method
,
__domain
,
__mStack
));
//所有非基础类型都得调用Free来释放托管堆栈
__intp
.
Free
(
ptr_of_this_method
);
//在真实调用Debug.Log前,我们先获取DLL内的堆栈
var
stacktrace
=
__domain
.
DebugService
.
GetStackTrance
(
__intp
);
//我们在输出信息后面加上DLL堆栈
Log
.
Info
(
message
+
"\n"
+
stacktrace
);
return
__ret
;
}
public
static
unsafe
StackObject
*
LogError
(
ILIntepreter
__intp
,
StackObject
*
__esp
,
IList
<
object
>
__mStack
,
CLRMethod
__method
,
bool
isNewObj
)
{
//ILRuntime的调用约定为被调用者清理堆栈,因此执行这个函数后需要将参数从堆栈清理干净,并把返回值放在栈顶,具体请看ILRuntime实现原理文档
ILRuntime
.
Runtime
.
Enviorment
.
AppDomain
__domain
=
__intp
.
AppDomain
;
StackObject
*
ptr_of_this_method
;
//这个是最后方法返回后esp栈指针的值,应该返回清理完参数并指向返回值,这里是只需要返回清理完参数的值即可
StackObject
*
__ret
=
ILIntepreter
.
Minus
(
__esp
,
1
);
//取Log方法的参数,如果有两个参数的话,第一个参数是esp - 2,第二个参数是esp -1, 因为Mono的bug,直接-2值会错误,所以要调用ILIntepreter.Minus
ptr_of_this_method
=
ILIntepreter
.
Minus
(
__esp
,
1
);
//这里是将栈指针上的值转换成object,如果是基础类型可直接通过ptr->Value和ptr->ValueLow访问到值,具体请看ILRuntime实现原理文档
object
message
=
typeof
(
object
).
CheckCLRTypes
(
StackObject
.
ToObject
(
ptr_of_this_method
,
__domain
,
__mStack
));
//所有非基础类型都得调用Free来释放托管堆栈
__intp
.
Free
(
ptr_of_this_method
);
//在真实调用Debug.Log前,我们先获取DLL内的堆栈
var
stacktrace
=
__domain
.
DebugService
.
GetStackTrance
(
__intp
);
//我们在输出信息后面加上DLL堆栈
Log
.
Error
(
message
+
"\n"
+
stacktrace
);
return
__ret
;
}
}
}
Unity/Assets/Scripts/Base/IL/ILRedirection.cs.meta
已删除
100644 → 0
浏览文件 @
8f9f53b6
fileFormatVersion: 2
guid: 04d37d1b01c652a42a4a9ab9eca299ad
timeCreated: 1495185207
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Unity/Assets/Scripts/Entity/Hotfix.cs
浏览文件 @
345e7496
...
...
@@ -8,8 +8,11 @@ namespace Model
{
public
sealed
class
Hotfix
:
Object
{
public
Assembly
HotfixAssembly
;
public
ILRuntime
.
Runtime
.
Enviorment
.
AppDomain
AppDomain
;
#if ILRuntime
private
ILRuntime
.
Runtime
.
Enviorment
.
AppDomain
appDomain
;
#else
private
Assembly
assembly
;
#endif
private
IStaticMethod
start
;
...
...
@@ -25,7 +28,7 @@ namespace Model
public
void
GotoHotfix
()
{
#if ILRuntime
ILHelper
.
InitILRuntime
();
ILHelper
.
InitILRuntime
(
this
.
appDomain
);
#endif
this
.
start
.
Run
();
}
...
...
@@ -33,18 +36,18 @@ namespace Model
public
Type
[]
GetHotfixTypes
()
{
#if ILRuntime
if
(
this
.
A
ppDomain
==
null
)
if
(
this
.
a
ppDomain
==
null
)
{
return
new
Type
[
0
];
}
return
this
.
A
ppDomain
.
LoadedTypes
.
Values
.
Select
(
x
=>
x
.
ReflectionType
).
ToArray
();
return
this
.
a
ppDomain
.
LoadedTypes
.
Values
.
Select
(
x
=>
x
.
ReflectionType
).
ToArray
();
#else
if
(
this
.
HotfixA
ssembly
==
null
)
if
(
this
.
a
ssembly
==
null
)
{
return
new
Type
[
0
];
}
return
this
.
HotfixA
ssembly
.
GetTypes
();
return
this
.
a
ssembly
.
GetTypes
();
#endif
}
...
...
@@ -53,7 +56,7 @@ namespace Model
{
Game
.
Scene
.
GetComponent
<
ResourcesComponent
>().
LoadBundle
(
$"code.unity3d"
);
#if ILRuntime
this
.
A
ppDomain
=
new
ILRuntime
.
Runtime
.
Enviorment
.
AppDomain
();
this
.
a
ppDomain
=
new
ILRuntime
.
Runtime
.
Enviorment
.
AppDomain
();
GameObject
code
=
Game
.
Scene
.
GetComponent
<
ResourcesComponent
>().
GetAsset
<
GameObject
>(
"code.unity3d"
,
"Code"
);
byte
[]
assBytes
=
code
.
Get
<
TextAsset
>(
"Hotfix.dll"
).
bytes
;
byte
[]
mdbBytes
=
code
.
Get
<
TextAsset
>(
"Hotfix.pdb"
).
bytes
;
...
...
@@ -61,18 +64,17 @@ namespace Model
using
(
MemoryStream
fs
=
new
MemoryStream
(
assBytes
))
using
(
MemoryStream
p
=
new
MemoryStream
(
mdbBytes
))
{
this
.
A
ppDomain
.
LoadAssembly
(
fs
,
p
,
new
Mono
.
Cecil
.
Pdb
.
PdbReaderProvider
());
this
.
a
ppDomain
.
LoadAssembly
(
fs
,
p
,
new
Mono
.
Cecil
.
Pdb
.
PdbReaderProvider
());
}
this
.
start
=
new
ILStaticMethod
(
this
.
A
ppDomain
,
"Hotfix.Init"
,
"Start"
,
0
);
this
.
start
=
new
ILStaticMethod
(
this
.
a
ppDomain
,
"Hotfix.Init"
,
"Start"
,
0
);
#else
GameObject
code
=
Game
.
Scene
.
GetComponent
<
ResourcesComponent
>().
GetAsset
<
GameObject
>(
"code.unity3d"
,
"Code"
);
byte
[]
assBytes
=
code
.
Get
<
TextAsset
>(
"Hotfix.dll"
).
bytes
;
byte
[]
mdbBytes
=
code
.
Get
<
TextAsset
>(
"Hotfix.mdb"
).
bytes
;
Assembly
assembly
=
Assembly
.
Load
(
assBytes
,
mdbBytes
);
this
.
HotfixAssembly
=
assembly
;
this
.
assembly
=
Assembly
.
Load
(
assBytes
,
mdbBytes
);
Type
hotfixInit
=
this
.
HotfixA
ssembly
.
GetType
(
"Hotfix.Init"
);
Type
hotfixInit
=
this
.
a
ssembly
.
GetType
(
"Hotfix.Init"
);
this
.
start
=
new
MonoStaticMethod
(
hotfixInit
,
"Start"
);
#endif
Game
.
Scene
.
GetComponent
<
ResourcesComponent
>().
UnloadBundle
(
$"code.unity3d"
);
...
...
Unity/Assets/Scripts/Helper/ILHelper.cs
浏览文件 @
345e7496
...
...
@@ -11,27 +11,19 @@ namespace Model
{
public
static
class
ILHelper
{
public
static
unsafe
void
InitILRuntime
()
public
static
unsafe
void
InitILRuntime
(
ILRuntime
.
Runtime
.
Enviorment
.
AppDomain
appDomain
)
{
// 注册重定向函数
MethodInfo
mi
=
typeof
(
Log
).
GetMethod
(
"Debug"
,
new
Type
[]
{
typeof
(
string
)
});
Game
.
Hotfix
.
AppDomain
.
RegisterCLRMethodRedirection
(
mi
,
ILRedirection
.
LogDebug
);
MethodInfo
mi2
=
typeof
(
Log
).
GetMethod
(
"Info"
,
new
Type
[]
{
typeof
(
string
)
});
Game
.
Hotfix
.
AppDomain
.
RegisterCLRMethodRedirection
(
mi2
,
ILRedirection
.
LogInfo
);
MethodInfo
mi3
=
typeof
(
Log
).
GetMethod
(
"Error"
,
new
Type
[]
{
typeof
(
string
)
});
Game
.
Hotfix
.
AppDomain
.
RegisterCLRMethodRedirection
(
mi3
,
ILRedirection
.
LogError
);
// 注册委托
Game
.
Hotfix
.
A
ppDomain
.
DelegateManager
.
RegisterMethodDelegate
<
List
<
object
>>();
Game
.
Hotfix
.
A
ppDomain
.
DelegateManager
.
RegisterMethodDelegate
<
AChannel
,
System
.
Net
.
Sockets
.
SocketError
>();
Game
.
Hotfix
.
A
ppDomain
.
DelegateManager
.
RegisterMethodDelegate
<
byte
[],
int
,
int
>();
Game
.
Hotfix
.
A
ppDomain
.
DelegateManager
.
RegisterMethodDelegate
<
IResponse
>();
Game
.
Hotfix
.
A
ppDomain
.
DelegateManager
.
RegisterMethodDelegate
<
Session
,
PacketInfo
>();
Game
.
Hotfix
.
A
ppDomain
.
DelegateManager
.
RegisterMethodDelegate
<
Session
,
uint
,
object
>();
a
ppDomain
.
DelegateManager
.
RegisterMethodDelegate
<
List
<
object
>>();
a
ppDomain
.
DelegateManager
.
RegisterMethodDelegate
<
AChannel
,
System
.
Net
.
Sockets
.
SocketError
>();
a
ppDomain
.
DelegateManager
.
RegisterMethodDelegate
<
byte
[],
int
,
int
>();
a
ppDomain
.
DelegateManager
.
RegisterMethodDelegate
<
IResponse
>();
a
ppDomain
.
DelegateManager
.
RegisterMethodDelegate
<
Session
,
PacketInfo
>();
a
ppDomain
.
DelegateManager
.
RegisterMethodDelegate
<
Session
,
uint
,
object
>();
CLRBindings
.
Initialize
(
Game
.
Hotfix
.
A
ppDomain
);
CLRBindings
.
Initialize
(
a
ppDomain
);
// 注册适配器
Assembly
assembly
=
typeof
(
Init
).
Assembly
;
...
...
@@ -48,27 +40,22 @@ namespace Model
{
continue
;
}
Game
.
Hotfix
.
A
ppDomain
.
RegisterCrossBindingAdaptor
(
adaptor
);
a
ppDomain
.
RegisterCrossBindingAdaptor
(
adaptor
);
}
// 初始化ILRuntime的protobuf
InitializeILRuntimeProtobuf
();
}
public
static
void
AvoidAot
(
GameObject
gameObject
)
{
Input
input
=
gameObject
.
Get
<
Input
>(
"11"
);
InitializeILRuntimeProtobuf
(
appDomain
);
}
public
static
void
InitializeILRuntimeProtobuf
()
public
static
void
InitializeILRuntimeProtobuf
(
ILRuntime
.
Runtime
.
Enviorment
.
AppDomain
appDomain
)
{
ProtoBuf
.
PType
.
RegisterFunctionCreateInstance
(
PType_CreateInstance
);
ProtoBuf
.
PType
.
RegisterFunctionCreateInstance
(
(
typeName
)=>
PType_CreateInstance
(
appDomain
,
typeName
)
);
ProtoBuf
.
PType
.
RegisterFunctionGetRealType
(
PType_GetRealType
);
}
private
static
object
PType_CreateInstance
(
string
typeName
)
private
static
object
PType_CreateInstance
(
ILRuntime
.
Runtime
.
Enviorment
.
AppDomain
appDomain
,
string
typeName
)
{
return
Game
.
Hotfix
.
A
ppDomain
.
Instantiate
(
typeName
);
return
a
ppDomain
.
Instantiate
(
typeName
);
}
private
static
Type
PType_GetRealType
(
object
o
)
...
...
Unity/Assets/Scripts/Module/Message/Network/TCP/TChannel.cs
浏览文件 @
345e7496
...
...
@@ -156,7 +156,14 @@ namespace Model
{
sendSize
=
this
.
sendBuffer
.
Count
;
}
await
this
.
tcpClient
.
GetStream
().
WriteAsync
(
this
.
sendBuffer
.
First
,
this
.
sendBuffer
.
FirstIndex
,
sendSize
);
NetworkStream
stream
=
this
.
tcpClient
.
GetStream
();
if
(!
stream
.
CanWrite
)
{
return
;
}
await
stream
.
WriteAsync
(
this
.
sendBuffer
.
First
,
this
.
sendBuffer
.
FirstIndex
,
sendSize
);
this
.
sendBuffer
.
FirstIndex
+=
sendSize
;
if
(
this
.
sendBuffer
.
FirstIndex
==
sendBuffer
.
ChunkSize
)
{
...
...
@@ -184,7 +191,12 @@ namespace Model
}
int
size
=
this
.
recvBuffer
.
ChunkSize
-
this
.
recvBuffer
.
LastIndex
;
int
n
=
await
this
.
tcpClient
.
GetStream
().
ReadAsync
(
this
.
recvBuffer
.
Last
,
this
.
recvBuffer
.
LastIndex
,
size
);
NetworkStream
stream
=
this
.
tcpClient
.
GetStream
();
if
(!
stream
.
CanRead
)
{
return
;
}
int
n
=
await
stream
.
ReadAsync
(
this
.
recvBuffer
.
Last
,
this
.
recvBuffer
.
LastIndex
,
size
);
if
(
n
==
0
)
{
...
...
@@ -214,12 +226,6 @@ namespace Model
}
}
}
catch
(
ObjectDisposedException
)
{
}
catch
(
IOException
)
{
}
catch
(
Exception
e
)
{
Log
.
Error
(
e
.
ToString
());
...
...
Unity/Assets/ThirdParty/ILRuntime/Generated/CLRBindings.cs
浏览文件 @
345e7496
...
...
@@ -85,8 +85,8 @@ namespace ILRuntime.Runtime.Generated
Model_Disposer_Binding
.
Register
(
app
);
Model_Scene_Binding
.
Register
(
app
);
Model_Session_Binding
.
Register
(
app
);
System_Runtime_CompilerServices_AsyncTaskMethodBuilder_1_ILTypeInstance_Binding
.
Register
(
app
);
Model_SessionHelper_Binding
.
Register
(
app
);
System_Runtime_CompilerServices_AsyncTaskMethodBuilder_1_ILTypeInstance_Binding
.
Register
(
app
);
System_Runtime_CompilerServices_AsyncTaskMethodBuilder_1_IResponse_Binding
.
Register
(
app
);
System_Threading_Tasks_Task_1_PacketInfo_Binding
.
Register
(
app
);
System_Runtime_CompilerServices_TaskAwaiter_1_PacketInfo_Binding
.
Register
(
app
);
...
...
Unity/Assets/ThirdParty/ILRuntime/Generated/System_Runtime_CompilerServices_AsyncTaskMethodBuilder_1_ILTyp_t.cs
浏览文件 @
345e7496
...
...
@@ -76,6 +76,9 @@ namespace ILRuntime.Runtime.Generated
args
=
new
Type
[]{
typeof
(
ILRuntime
.
Runtime
.
Intepreter
.
ILTypeInstance
)};
method
=
type
.
GetMethod
(
"SetResult"
,
flag
,
null
,
args
,
null
);
app
.
RegisterCLRMethodRedirection
(
method
,
SetResult_5
);
args
=
new
Type
[]{
typeof
(
System
.
Runtime
.
CompilerServices
.
IAsyncStateMachine
)};
method
=
type
.
GetMethod
(
"SetStateMachine"
,
flag
,
null
,
args
,
null
);
app
.
RegisterCLRMethodRedirection
(
method
,
SetStateMachine_6
);
app
.
RegisterCLRCreateDefaultInstance
(
type
,
()
=>
new
System
.
Runtime
.
CompilerServices
.
AsyncTaskMethodBuilder
<
ILRuntime
.
Runtime
.
Intepreter
.
ILTypeInstance
>());
...
...
@@ -406,6 +409,26 @@ namespace ILRuntime.Runtime.Generated
return
__ret
;
}
static
StackObject
*
SetStateMachine_6
(
ILIntepreter
__intp
,
StackObject
*
__esp
,
IList
<
object
>
__mStack
,
CLRMethod
__method
,
bool
isNewObj
)
{
ILRuntime
.
Runtime
.
Enviorment
.
AppDomain
__domain
=
__intp
.
AppDomain
;
StackObject
*
ptr_of_this_method
;
StackObject
*
__ret
=
ILIntepreter
.
Minus
(
__esp
,
2
);
ptr_of_this_method
=
ILIntepreter
.
Minus
(
__esp
,
1
);
System
.
Runtime
.
CompilerServices
.
IAsyncStateMachine
stateMachine
=
(
System
.
Runtime
.
CompilerServices
.
IAsyncStateMachine
)
typeof
(
System
.
Runtime
.
CompilerServices
.
IAsyncStateMachine
).
CheckCLRTypes
(
StackObject
.
ToObject
(
ptr_of_this_method
,
__domain
,
__mStack
));
__intp
.
Free
(
ptr_of_this_method
);
ptr_of_this_method
=
ILIntepreter
.
Minus
(
__esp
,
2
);
ptr_of_this_method
=
ILIntepreter
.
GetObjectAndResolveReference
(
ptr_of_this_method
);
System
.
Runtime
.
CompilerServices
.
AsyncTaskMethodBuilder
<
ILRuntime
.
Runtime
.
Intepreter
.
ILTypeInstance
>
instance_of_this_method
;
instance_of_this_method
=
(
System
.
Runtime
.
CompilerServices
.
AsyncTaskMethodBuilder
<
ILRuntime
.
Runtime
.
Intepreter
.
ILTypeInstance
>)
typeof
(
System
.
Runtime
.
CompilerServices
.
AsyncTaskMethodBuilder
<
ILRuntime
.
Runtime
.
Intepreter
.
ILTypeInstance
>).
CheckCLRTypes
(
StackObject
.
ToObject
(
ptr_of_this_method
,
__domain
,
__mStack
));
instance_of_this_method
.
SetStateMachine
(
stateMachine
);
WriteBackInstance
(
__domain
,
ptr_of_this_method
,
__mStack
,
ref
instance_of_this_method
);
return
__ret
;
}
}
...
...
Unity/Assets/ThirdParty/ILRuntime/Generated/System_Runtime_CompilerServices_AsyncTaskMethodBuilder_1_IResp_t.cs
浏览文件 @
345e7496
...
...
@@ -76,6 +76,9 @@ namespace ILRuntime.Runtime.Generated
args
=
new
Type
[]{
typeof
(
Model
.
IResponse
)};
method
=
type
.
GetMethod
(
"SetResult"
,
flag
,
null
,
args
,
null
);
app
.
RegisterCLRMethodRedirection
(
method
,
SetResult_5
);
args
=
new
Type
[]{
typeof
(
System
.
Runtime
.
CompilerServices
.
IAsyncStateMachine
)};
method
=
type
.
GetMethod
(
"SetStateMachine"
,
flag
,
null
,
args
,
null
);
app
.
RegisterCLRMethodRedirection
(
method
,
SetStateMachine_6
);
app
.
RegisterCLRCreateDefaultInstance
(
type
,
()
=>
new
System
.
Runtime
.
CompilerServices
.
AsyncTaskMethodBuilder
<
Model
.
IResponse
>());
...
...
@@ -406,6 +409,26 @@ namespace ILRuntime.Runtime.Generated
return
__ret
;
}
static
StackObject
*
SetStateMachine_6
(
ILIntepreter
__intp
,
StackObject
*
__esp
,
IList
<
object
>
__mStack
,
CLRMethod
__method
,
bool
isNewObj
)
{
ILRuntime
.
Runtime
.
Enviorment
.
AppDomain
__domain
=
__intp
.
AppDomain
;
StackObject
*
ptr_of_this_method
;
StackObject
*
__ret
=
ILIntepreter
.
Minus
(
__esp
,
2
);
ptr_of_this_method
=
ILIntepreter
.
Minus
(
__esp
,
1
);
System
.
Runtime
.
CompilerServices
.
IAsyncStateMachine
stateMachine
=
(
System
.
Runtime
.
CompilerServices
.
IAsyncStateMachine
)
typeof
(
System
.
Runtime
.
CompilerServices
.
IAsyncStateMachine
).
CheckCLRTypes
(
StackObject
.
ToObject
(
ptr_of_this_method
,
__domain
,
__mStack
));
__intp
.
Free
(
ptr_of_this_method
);
ptr_of_this_method
=
ILIntepreter
.
Minus
(
__esp
,
2
);
ptr_of_this_method
=
ILIntepreter
.
GetObjectAndResolveReference
(
ptr_of_this_method
);
System
.
Runtime
.
CompilerServices
.
AsyncTaskMethodBuilder
<
Model
.
IResponse
>
instance_of_this_method
;
instance_of_this_method
=
(
System
.
Runtime
.
CompilerServices
.
AsyncTaskMethodBuilder
<
Model
.
IResponse
>)
typeof
(
System
.
Runtime
.
CompilerServices
.
AsyncTaskMethodBuilder
<
Model
.
IResponse
>).
CheckCLRTypes
(
StackObject
.
ToObject
(
ptr_of_this_method
,
__domain
,
__mStack
));
instance_of_this_method
.
SetStateMachine
(
stateMachine
);
WriteBackInstance
(
__domain
,
ptr_of_this_method
,
__mStack
,
ref
instance_of_this_method
);
return
__ret
;
}
}
...
...
Unity/Assets/ThirdParty/ILRuntime/Generated/System_Runtime_CompilerServices_AsyncVoidMethodBuilder_Binding.cs
浏览文件 @
345e7496
...
...
@@ -73,6 +73,9 @@ namespace ILRuntime.Runtime.Generated
args
=
new
Type
[]{};
method
=
type
.
GetMethod
(
"SetResult"
,
flag
,
null
,
args
,
null
);
app
.
RegisterCLRMethodRedirection
(
method
,
SetResult_4
);
args
=
new
Type
[]{
typeof
(
System
.
Runtime
.
CompilerServices
.
IAsyncStateMachine
)};
method
=
type
.
GetMethod
(
"SetStateMachine"
,
flag
,
null
,
args
,
null
);
app
.
RegisterCLRMethodRedirection
(
method
,
SetStateMachine_5
);
args
=
new
Type
[]{
typeof
(
System
.
Runtime
.
CompilerServices
.
TaskAwaiter
<
Model
.
IResponse
>),
typeof
(
Model
.
IAsyncStateMachineClassInheritanceAdaptor
.
IAsyncStateMachineAdaptor
)};
if
(
genericMethods
.
TryGetValue
(
"AwaitUnsafeOnCompleted"
,
out
lst
))
{
...
...
@@ -81,7 +84,7 @@ namespace ILRuntime.Runtime.Generated
if
(
m
.
GetParameters
().
Length
==
2
)
{
method
=
m
.
MakeGenericMethod
(
args
);
app
.
RegisterCLRMethodRedirection
(
method
,
AwaitUnsafeOnCompleted_
5
);
app
.
RegisterCLRMethodRedirection
(
method
,
AwaitUnsafeOnCompleted_
6
);
break
;
}
...
...
@@ -392,7 +395,27 @@ namespace ILRuntime.Runtime.Generated
return
__ret
;
}
static
StackObject
*
AwaitUnsafeOnCompleted_5
(
ILIntepreter
__intp
,
StackObject
*
__esp
,
IList
<
object
>
__mStack
,
CLRMethod
__method
,
bool
isNewObj
)
static
StackObject
*
SetStateMachine_5
(
ILIntepreter
__intp
,
StackObject
*
__esp
,
IList
<
object
>
__mStack
,
CLRMethod
__method
,
bool
isNewObj
)
{
ILRuntime
.
Runtime
.
Enviorment
.
AppDomain
__domain
=
__intp
.
AppDomain
;
StackObject
*
ptr_of_this_method
;
StackObject
*
__ret
=
ILIntepreter
.
Minus
(
__esp
,
2
);
ptr_of_this_method
=
ILIntepreter
.
Minus
(
__esp
,
1
);
System
.
Runtime
.
CompilerServices
.
IAsyncStateMachine
stateMachine
=
(
System
.
Runtime
.
CompilerServices
.
IAsyncStateMachine
)
typeof
(
System
.
Runtime
.
CompilerServices
.
IAsyncStateMachine
).
CheckCLRTypes
(
StackObject
.
ToObject
(
ptr_of_this_method
,
__domain
,
__mStack
));
__intp
.
Free
(
ptr_of_this_method
);
ptr_of_this_method
=
ILIntepreter
.
Minus
(
__esp
,
2
);
ptr_of_this_method
=
ILIntepreter
.
GetObjectAndResolveReference
(
ptr_of_this_method
);
System
.
Runtime
.
CompilerServices
.
AsyncVoidMethodBuilder
instance_of_this_method
;
instance_of_this_method
=
(
System
.
Runtime
.
CompilerServices
.
AsyncVoidMethodBuilder
)
typeof
(
System
.
Runtime
.
CompilerServices
.
AsyncVoidMethodBuilder
).
CheckCLRTypes
(
StackObject
.
ToObject
(
ptr_of_this_method
,
__domain
,
__mStack
));
instance_of_this_method
.
SetStateMachine
(
stateMachine
);
WriteBackInstance
(
__domain
,
ptr_of_this_method
,
__mStack
,
ref
instance_of_this_method
);
return
__ret
;
}
static
StackObject
*
AwaitUnsafeOnCompleted_6
(
ILIntepreter
__intp
,
StackObject
*
__esp
,
IList
<
object
>
__mStack
,
CLRMethod
__method
,
bool
isNewObj
)
{
ILRuntime
.
Runtime
.
Enviorment
.
AppDomain
__domain
=
__intp
.
AppDomain
;
StackObject
*
ptr_of_this_method
;
...
...
Unity/Hotfix/Component/OperaComponent.cs
浏览文件 @
345e7496
...
...
@@ -41,7 +41,7 @@ namespace Hotfix
if
(
Physics
.
Raycast
(
ray
,
out
hit
,
1000
,
this
.
mapMask
))
{
this
.
ClickPoint
=
hit
.
point
;
SessionComponent
.
Instance
.
Session
.
Send
Model
(
new
Frame_ClickMap
()
{
X
=
(
int
)(
this
.
ClickPoint
.
x
*
1000
),
Z
=
(
int
)(
this
.
ClickPoint
.
z
*
1000
)
});
SessionComponent
.
Instance
.
Session
.
Send
(
new
Frame_ClickMap
()
{
X
=
(
int
)(
this
.
ClickPoint
.
x
*
1000
),
Z
=
(
int
)(
this
.
ClickPoint
.
z
*
1000
)
});
// 测试actor rpc消息
this
.
TestActor
();
...
...
Unity/Hotfix/Module/Message/SessionHelper.cs
浏览文件 @
345e7496
...
...
@@ -26,12 +26,12 @@ namespace Hotfix
return
response
;
}
public
static
void
Send
Model
(
this
Session
session
,
Model
.
IMessage
message
)
public
static
void
Send
(
this
Session
session
,
Model
.
IMessage
message
)
{
Model
.
SessionHelper
.
Send
(
session
,
message
);
}
public
static
async
Task
<
Model
.
IResponse
>
Call
Model
(
this
Session
session
,
Model
.
IRequest
request
)
public
static
async
Task
<
Model
.
IResponse
>
Call
(
this
Session
session
,
Model
.
IRequest
request
)
{
return
await
Model
.
SessionHelper
.
Call
(
session
,
request
);
}
...
...
Unity/Hotfix/Unity.Hotfix.csproj
浏览文件 @
345e7496
...
...
@@ -19,7 +19,7 @@
<DebugType>
full
</DebugType>
<Optimize>
true
</Optimize>
<OutputPath>
..\Temp\UnityVS_bin\Debug\
</OutputPath>
<DefineConstants>
TRACE;DEBUG
</DefineConstants>
<DefineConstants>
TRACE;DEBUG
;ILRuntime
</DefineConstants>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
<Prefer32Bit>
false
</Prefer32Bit>
...
...
Unity/ProjectSettings/ProjectSettings.asset
浏览文件 @
345e7496
...
...
@@ -570,7 +570,7 @@ PlayerSettings:
webGLUseWasm
:
0
webGLCompressionFormat
:
1
scriptingDefineSymbols
:
1
:
NET45
1
:
NET45
;ILRuntime
4
:
NET45
7
:
NET45
platformArchitecture
:
...
...
Unity/Unity.Editor.Plugins.csproj
浏览文件 @
345e7496
...
...
@@ -32,7 +32,7 @@
<IntermediateOutputPath>
Temp\UnityVS_obj\Debug\
</IntermediateOutputPath>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
<DefineConstants>
DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_1_1;UNITY_2017_1;UNITY_2017;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;NET45
</DefineConstants>
<DefineConstants>
DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_1_1;UNITY_2017_1;UNITY_2017;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;NET45
;ILRuntime
</DefineConstants>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "
>
...
...
@@ -42,7 +42,7 @@
<IntermediateOutputPath>
Temp\UnityVS_obj\Release\
</IntermediateOutputPath>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
<DefineConstants>
TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_1_1;UNITY_2017_1;UNITY_2017;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;NET45
</DefineConstants>
<DefineConstants>
TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_1_1;UNITY_2017_1;UNITY_2017;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;NET45
;ILRuntime
</DefineConstants>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
...
...
Unity/Unity.Editor.csproj
浏览文件 @
345e7496
...
...
@@ -32,7 +32,7 @@
<IntermediateOutputPath>
Temp\UnityVS_obj\Debug\
</IntermediateOutputPath>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
<DefineConstants>
DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_1_1;UNITY_2017_1;UNITY_2017;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;NET45
</DefineConstants>
<DefineConstants>
DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_1_1;UNITY_2017_1;UNITY_2017;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;NET45
;ILRuntime
</DefineConstants>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "
>
...
...
@@ -42,7 +42,7 @@
<IntermediateOutputPath>
Temp\UnityVS_obj\Release\
</IntermediateOutputPath>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
<DefineConstants>
TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_1_1;UNITY_2017_1;UNITY_2017;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;NET45
</DefineConstants>
<DefineConstants>
TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_1_1;UNITY_2017_1;UNITY_2017;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;NET45
;ILRuntime
</DefineConstants>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
...
...
Unity/Unity.Plugins.csproj
浏览文件 @
345e7496
...
...
@@ -32,7 +32,7 @@
<IntermediateOutputPath>
Temp\UnityVS_obj\Debug\
</IntermediateOutputPath>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
<DefineConstants>
DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_1_1;UNITY_2017_1;UNITY_2017;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;NET45
</DefineConstants>
<DefineConstants>
DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_1_1;UNITY_2017_1;UNITY_2017;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;NET45
;ILRuntime
</DefineConstants>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "
>
...
...
@@ -42,7 +42,7 @@
<IntermediateOutputPath>
Temp\UnityVS_obj\Release\
</IntermediateOutputPath>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
<DefineConstants>
TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_1_1;UNITY_2017_1;UNITY_2017;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;NET45
</DefineConstants>
<DefineConstants>
TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_1_1;UNITY_2017_1;UNITY_2017;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;NET45
;ILRuntime
</DefineConstants>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
...
...
Unity/Unity.csproj
浏览文件 @
345e7496
...
...
@@ -32,7 +32,7 @@
<IntermediateOutputPath>
Temp\UnityVS_obj\Debug\
</IntermediateOutputPath>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
<DefineConstants>
DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_1_1;UNITY_2017_1;UNITY_2017;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;NET45
</DefineConstants>
<DefineConstants>
DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_1_1;UNITY_2017_1;UNITY_2017;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;NET45
;ILRuntime
</DefineConstants>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "
>
...
...
@@ -42,7 +42,7 @@
<IntermediateOutputPath>
Temp\UnityVS_obj\Release\
</IntermediateOutputPath>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
<DefineConstants>
TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_1_1;UNITY_2017_1;UNITY_2017;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;NET45
</DefineConstants>
<DefineConstants>
TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_1_1;UNITY_2017_1;UNITY_2017;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;NET45
;ILRuntime
</DefineConstants>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
...
...
@@ -140,7 +140,6 @@
<Compile
Include=
"Assets\Scripts\Base\IL\IDisposableAdaptor.cs"
/>
<Compile
Include=
"Assets\Scripts\Base\IL\ILAdapterAttribute.cs"
/>
<Compile
Include=
"Assets\Scripts\Base\IL\ILBindingAttribute.cs"
/>
<Compile
Include=
"Assets\Scripts\Base\IL\ILRedirection.cs"
/>
<Compile
Include=
"Assets\Scripts\Base\Log.cs"
/>
<Compile
Include=
"Assets\Scripts\Base\LogType.cs"
/>
<Compile
Include=
"Assets\Scripts\Base\Math\AcosLookupTable.cs"
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录