提交 807c5f70 编写于 作者: T tanghai

Hotfix放到Unity中,利用asmdef自动生成Hotfix.dll, 带来巨大方便:

1.不用再处理Hotfix工程的引用了
2.ILRuntime宏只需要修改Unity中的就行了
3.不必要每次都去编译Hotfix了
4.log双击利用Console插件能够方便的跳到Hotfix的代码中
5.Unity2018兼容应该十分简单了
上级 8342a4a3

要显示的变更太多。

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -3,22 +3,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2036
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Plugins", "Unity\Unity.Plugins.csproj", "{D1FDB199-0FB7-099D-3771-C6A942E4E326}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity", "Unity\Unity.csproj", "{CF118143-7E37-744F-BE45-3F55345FEC40}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Hotfix", "Unity\Hotfix\Unity.Hotfix.csproj", "{40533600-4E69-4F7D-A924-E1A3B4127255}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{914C77C9-212A-4DD0-8D9A-074620E77FAA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ThirdParty", "ThirdParty", "{78640FA0-9F11-412D-A639-61F03D02407A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Editor", "Unity\Unity.Editor.csproj", "{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Editor.Plugins", "Unity\Unity.Editor.Plugins.csproj", "{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server.App", "Server\App\Server.App.csproj", "{69F1AA11-D05A-4843-B0DD-56B5E2E212A8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server.Model", "Server\Model\Server.Model.csproj", "{EE38E3D2-3D2A-4061-BD50-AE8568126C7D}"
......@@ -37,6 +27,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Google.Protobuf", "Server\T
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KcpLib", "Server\ThirdParty\Libs\KcpLib.csproj", "{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Model", "Unity\Unity.Model.csproj", "{6396AEEA-8EF9-9740-4CEF-891CC997106C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Hotfix", "Unity\Unity.Hotfix.csproj", "{350246F3-F094-675F-855B-FB9B18C2B23E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Editor", "Unity\Unity.Editor.csproj", "{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -47,66 +43,6 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Debug|x64.ActiveCfg = Debug|Any CPU
{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Debug|x64.Build.0 = Debug|Any CPU
{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Debug|x86.ActiveCfg = Debug|Any CPU
{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Debug|x86.Build.0 = Debug|Any CPU
{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Release|Any CPU.Build.0 = Release|Any CPU
{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Release|x64.ActiveCfg = Release|Any CPU
{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Release|x64.Build.0 = Release|Any CPU
{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Release|x86.ActiveCfg = Release|Any CPU
{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Release|x86.Build.0 = Release|Any CPU
{CF118143-7E37-744F-BE45-3F55345FEC40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CF118143-7E37-744F-BE45-3F55345FEC40}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CF118143-7E37-744F-BE45-3F55345FEC40}.Debug|x64.ActiveCfg = Debug|Any CPU
{CF118143-7E37-744F-BE45-3F55345FEC40}.Debug|x64.Build.0 = Debug|Any CPU
{CF118143-7E37-744F-BE45-3F55345FEC40}.Debug|x86.ActiveCfg = Debug|Any CPU
{CF118143-7E37-744F-BE45-3F55345FEC40}.Debug|x86.Build.0 = Debug|Any CPU
{CF118143-7E37-744F-BE45-3F55345FEC40}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CF118143-7E37-744F-BE45-3F55345FEC40}.Release|Any CPU.Build.0 = Release|Any CPU
{CF118143-7E37-744F-BE45-3F55345FEC40}.Release|x64.ActiveCfg = Release|Any CPU
{CF118143-7E37-744F-BE45-3F55345FEC40}.Release|x64.Build.0 = Release|Any CPU
{CF118143-7E37-744F-BE45-3F55345FEC40}.Release|x86.ActiveCfg = Release|Any CPU
{CF118143-7E37-744F-BE45-3F55345FEC40}.Release|x86.Build.0 = Release|Any CPU
{40533600-4E69-4F7D-A924-E1A3B4127255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{40533600-4E69-4F7D-A924-E1A3B4127255}.Debug|Any CPU.Build.0 = Debug|Any CPU
{40533600-4E69-4F7D-A924-E1A3B4127255}.Debug|x64.ActiveCfg = Debug|Any CPU
{40533600-4E69-4F7D-A924-E1A3B4127255}.Debug|x64.Build.0 = Debug|Any CPU
{40533600-4E69-4F7D-A924-E1A3B4127255}.Debug|x86.ActiveCfg = Debug|Any CPU
{40533600-4E69-4F7D-A924-E1A3B4127255}.Debug|x86.Build.0 = Debug|Any CPU
{40533600-4E69-4F7D-A924-E1A3B4127255}.Release|Any CPU.ActiveCfg = Release|Any CPU
{40533600-4E69-4F7D-A924-E1A3B4127255}.Release|Any CPU.Build.0 = Release|Any CPU
{40533600-4E69-4F7D-A924-E1A3B4127255}.Release|x64.ActiveCfg = Release|Any CPU
{40533600-4E69-4F7D-A924-E1A3B4127255}.Release|x64.Build.0 = Release|Any CPU
{40533600-4E69-4F7D-A924-E1A3B4127255}.Release|x86.ActiveCfg = Release|Any CPU
{40533600-4E69-4F7D-A924-E1A3B4127255}.Release|x86.Build.0 = Release|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|x64.ActiveCfg = Debug|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|x64.Build.0 = Debug|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|x86.ActiveCfg = Debug|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|x86.Build.0 = Debug|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|Any CPU.Build.0 = Release|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|x64.ActiveCfg = Release|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|x64.Build.0 = Release|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|x86.ActiveCfg = Release|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|x86.Build.0 = Release|Any CPU
{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Debug|x64.ActiveCfg = Debug|Any CPU
{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Debug|x64.Build.0 = Debug|Any CPU
{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Debug|x86.ActiveCfg = Debug|Any CPU
{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Debug|x86.Build.0 = Debug|Any CPU
{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Release|Any CPU.Build.0 = Release|Any CPU
{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Release|x64.ActiveCfg = Release|Any CPU
{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Release|x64.Build.0 = Release|Any CPU
{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Release|x86.ActiveCfg = Release|Any CPU
{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Release|x86.Build.0 = Release|Any CPU
{69F1AA11-D05A-4843-B0DD-56B5E2E212A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{69F1AA11-D05A-4843-B0DD-56B5E2E212A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{69F1AA11-D05A-4843-B0DD-56B5E2E212A8}.Debug|x64.ActiveCfg = Debug|Any CPU
......@@ -203,17 +139,48 @@ Global
{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}.Release|x64.Build.0 = Release|Any CPU
{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}.Release|x86.ActiveCfg = Release|Any CPU
{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}.Release|x86.Build.0 = Release|Any CPU
{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Debug|x64.ActiveCfg = Debug|Any CPU
{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Debug|x64.Build.0 = Debug|Any CPU
{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Debug|x86.ActiveCfg = Debug|Any CPU
{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Debug|x86.Build.0 = Debug|Any CPU
{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Release|Any CPU.Build.0 = Release|Any CPU
{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Release|x64.ActiveCfg = Release|Any CPU
{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Release|x64.Build.0 = Release|Any CPU
{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Release|x86.ActiveCfg = Release|Any CPU
{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Release|x86.Build.0 = Release|Any CPU
{350246F3-F094-675F-855B-FB9B18C2B23E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{350246F3-F094-675F-855B-FB9B18C2B23E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{350246F3-F094-675F-855B-FB9B18C2B23E}.Debug|x64.ActiveCfg = Debug|Any CPU
{350246F3-F094-675F-855B-FB9B18C2B23E}.Debug|x64.Build.0 = Debug|Any CPU
{350246F3-F094-675F-855B-FB9B18C2B23E}.Debug|x86.ActiveCfg = Debug|Any CPU
{350246F3-F094-675F-855B-FB9B18C2B23E}.Debug|x86.Build.0 = Debug|Any CPU
{350246F3-F094-675F-855B-FB9B18C2B23E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{350246F3-F094-675F-855B-FB9B18C2B23E}.Release|Any CPU.Build.0 = Release|Any CPU
{350246F3-F094-675F-855B-FB9B18C2B23E}.Release|x64.ActiveCfg = Release|Any CPU
{350246F3-F094-675F-855B-FB9B18C2B23E}.Release|x64.Build.0 = Release|Any CPU
{350246F3-F094-675F-855B-FB9B18C2B23E}.Release|x86.ActiveCfg = Release|Any CPU
{350246F3-F094-675F-855B-FB9B18C2B23E}.Release|x86.Build.0 = Release|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|x64.ActiveCfg = Debug|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|x64.Build.0 = Debug|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|x86.ActiveCfg = Debug|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|x86.Build.0 = Debug|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|Any CPU.Build.0 = Release|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|x64.ActiveCfg = Release|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|x64.Build.0 = Release|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|x86.ActiveCfg = Release|Any CPU
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{D1FDB199-0FB7-099D-3771-C6A942E4E326} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
{CF118143-7E37-744F-BE45-3F55345FEC40} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
{40533600-4E69-4F7D-A924-E1A3B4127255} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
{78640FA0-9F11-412D-A639-61F03D02407A} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
{81A6E58E-BFF2-F1C8-1C4E-6316985F642C} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
{69F1AA11-D05A-4843-B0DD-56B5E2E212A8} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
{EE38E3D2-3D2A-4061-BD50-AE8568126C7D} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
{C305ED5B-8425-47A1-BEE1-85830CADC27A} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
......@@ -223,6 +190,9 @@ Global
{831276B2-B7EB-4FD0-93E5-4D2109C78950} = {4940CE10-6652-4AC6-9D30-CF200A217643}
{BC06C46E-79F3-4AB6-800E-FA080CA54A0B} = {78640FA0-9F11-412D-A639-61F03D02407A}
{B055A8CF-EF01-4100-A73F-9A26CBBBC57F} = {78640FA0-9F11-412D-A639-61F03D02407A}
{6396AEEA-8EF9-9740-4CEF-891CC997106C} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
{350246F3-F094-675F-855B-FB9B18C2B23E} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
{C17F48D3-964E-E97C-3D2E-966F7A6C6D93} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}
......
......@@ -17,7 +17,7 @@
</PropertyGroup>
<ItemGroup>
<Compile Remove="Other\**" />
<Compile Include="..\..\Unity\Assets\Scripts\Module\Message\NetOuterComponentSystem.cs">
<Compile Include="..\..\Unity\Assets\Model\Module\Message\NetOuterComponentSystem.cs">
<Link>Module\Message\NetOuterComponentSystem.cs</Link>
</Compile>
<EmbeddedResource Remove="Other\**" />
......
此差异已折叠。
......@@ -15,29 +15,59 @@
<OutputPath>..\..\..\Bin\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\ByteArray.cs" Link="ByteArray.cs" />
<Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\ByteString.cs" Link="ByteString.cs" />
<Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\CodedInputStream.cs" Link="CodedInputStream.cs" />
<Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\CodedOutputStream.ComputeSize.cs" Link="CodedOutputStream.ComputeSize.cs" />
<Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\CodedOutputStream.cs" Link="CodedOutputStream.cs" />
<Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\Collections\RepeatedField.cs" Link="Collections\RepeatedField.cs" />
<Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\Compatibility\PropertyInfoExtensions.cs" Link="Compatibility\PropertyInfoExtensions.cs" />
<Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\Compatibility\StreamExtensions.cs" Link="Compatibility\StreamExtensions.cs" />
<Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\FieldCodec.cs" Link="FieldCodec.cs" />
<Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\ICustomDiagnosticMessage.cs" Link="ICustomDiagnosticMessage.cs" />
<Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\IMessage.cs" Link="IMessage.cs" />
<Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\InvalidProtocolBufferException.cs" Link="InvalidProtocolBufferException.cs" />
<Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\LimitedInputStream.cs" Link="LimitedInputStream.cs" />
<Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\MessageExtensions.cs" Link="MessageExtensions.cs" />
<Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\MessageParser.cs" Link="MessageParser.cs" />
<Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\ProtoPreconditions.cs" Link="ProtoPreconditions.cs" />
<Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\WireFormat.cs" Link="WireFormat.cs" />
<Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\ByteArray.cs">
<Link>ByteArray.cs</Link>
</Compile>
<Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\ByteString.cs">
<Link>ByteString.cs</Link>
</Compile>
<Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\CodedInputStream.cs">
<Link>CodedInputStream.cs</Link>
</Compile>
<Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\CodedOutputStream.ComputeSize.cs">
<Link>CodedOutputStream.ComputeSize.cs</Link>
</Compile>
<Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\CodedOutputStream.cs">
<Link>CodedOutputStream.cs</Link>
</Compile>
<Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\FieldCodec.cs">
<Link>FieldCodec.cs</Link>
</Compile>
<Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\ICustomDiagnosticMessage.cs">
<Link>ICustomDiagnosticMessage.cs</Link>
</Compile>
<Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\IMessage.cs">
<Link>IMessage.cs</Link>
</Compile>
<Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\InvalidProtocolBufferException.cs">
<Link>InvalidProtocolBufferException.cs</Link>
</Compile>
<Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\LimitedInputStream.cs">
<Link>LimitedInputStream.cs</Link>
</Compile>
<Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\MessageExtensions.cs">
<Link>MessageExtensions.cs</Link>
</Compile>
<Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\MessageParser.cs">
<Link>MessageParser.cs</Link>
</Compile>
<Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\PropertyInfoExtensions.cs">
<Link>PropertyInfoExtensions.cs</Link>
</Compile>
<Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\ProtoPreconditions.cs">
<Link>ProtoPreconditions.cs</Link>
</Compile>
<Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\RepeatedField.cs">
<Link>RepeatedField.cs</Link>
</Compile>
<Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\StreamExtensions.cs">
<Link>StreamExtensions.cs</Link>
</Compile>
<Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\WireFormat.cs">
<Link>WireFormat.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MongodbDriver\DotNetCoreDriver\MongoDB.Bson\MongoDB.Bson.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Collections\" />
<Folder Include="Compatibility\" />
</ItemGroup>
</Project>
\ No newline at end of file
......@@ -11,9 +11,6 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputPath>..\..\..\Bin\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\..\Unity\Assets\Scripts\Module\Message\Network\KCP\Kcp.cs" Link="Kcp.cs" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\Unity\Assets\Plugins\x86_64\kcp.dll" Link="kcp.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
......@@ -27,4 +24,9 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\..\Unity\Assets\Model\Module\Message\Network\KCP\Kcp.cs">
<Link>Kcp.cs</Link>
</Compile>
</ItemGroup>
</Project>
\ No newline at end of file
using System.Diagnostics;
using System.IO;
using ETModel;
using UnityEditor;
using UnityEngine;
namespace ETEditor
{
//#if !ASYNC && !ILRUNTIME
// public class BuildHotifxEditor
// {
// [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad )]
// private static void BeforeSceneLoad ()
// {
// string batPath = $"../Tools/DevAutoCompile.bat";
//
// ProcessStartInfo info = new ProcessStartInfo
// {
// FileName = batPath,
// WindowStyle = ProcessWindowStyle.Hidden,
// ErrorDialog = true,
// UseShellExecute = Application.platform == RuntimePlatform.WindowsEditor,
// Arguments = $"\"{MSBuildPath}\" \"{HotfixPath}\""
// };
//
// Process p = Process.Start ( info );
// p.WaitForExit ();
//
// AssetDatabase.Refresh ();
// }
//
// private const string MSBuildPath = "D:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\Tools\\VsDevCmd.bat";
//
// private const string HotfixPath = "D:\\Projects\\Unity Project\\TDGo\\Client\\Trunk\\Client\\Hotfix\\Unity.Hotfix.csproj";
// }
//#endif
[InitializeOnLoad]
public class Startup
{
private const string ScriptAssembliesDir = "Library/ScriptAssemblies";
private const string DebugDir = "Temp/UnityVS_bin/Debug";
private const string CodeDir = "Assets/Res/Code/";
private const string HotfixDll = "Unity.Hotfix.dll";
private const string HotfixPdb = "Unity.Hotfix.pdb";
private const string HotfixMdb = "Unity.Hotfix.dll.mdb";
static Startup()
{
string batPath = $"Tools{Path.DirectorySeparatorChar}pdb2mdb.exe";
ProcessStartInfo info = new ProcessStartInfo
{
FileName = batPath,
WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = true,
UseShellExecute = true,
Arguments = Path.Combine(ScriptAssembliesDir, HotfixDll)
};
Process p = Process.Start ( info );
p.WaitForExit ();
if (File.Exists(Path.Combine(DebugDir, HotfixPdb)))
{
File.Copy(Path.Combine(DebugDir, HotfixPdb), Path.Combine(CodeDir, "Hotfix.pdb.bytes"), true);
Log.Info($"复制Hotfix.pdb到Res/Code完成");
}
File.Copy(Path.Combine(ScriptAssembliesDir, HotfixDll), Path.Combine(CodeDir, "Hotfix.dll.bytes"), true);
File.Copy(Path.Combine(ScriptAssembliesDir, HotfixMdb), Path.Combine(CodeDir, "Hotfix.mdb.bytes"), true);
Log.Info($"复制Hotfix.dll, Hotfix.mdb到Res/Code完成");
AssetDatabase.Refresh ();
}
}
}
\ No newline at end of file
......@@ -17,8 +17,8 @@ namespace ETEditor
public class Proto2CSEditor : EditorWindow
{
private const string protoPath = "../Proto/";
private const string clientMessagePath = "Assets/Scripts/Module/Message/";
private const string hotfixMessagePath = "Hotfix/Module/Message/";
private const string clientMessagePath = "Assets/Model/Module/Message/";
private const string hotfixMessagePath = "Assets/Hotfix/Module/Message/";
private static readonly char[] splitChars = { ' ', '\t' };
private static readonly List<OpcodeInfo> msgOpcode = new List<OpcodeInfo>();
......@@ -32,7 +32,7 @@ namespace ETEditor
Proto2CS("ETModel", "OuterMessage.proto", clientMessagePath, "OuterOpcode", 100);
msgOpcode.Clear();
Proto2CS("ETModel", "FrameMessage.proto", "Assets/Scripts/Module/FrameSync/", "FrameOpcode", 10);
Proto2CS("ETModel", "FrameMessage.proto", "Assets/Model/Module/FrameSync/", "FrameOpcode", 10);
msgOpcode.Clear();
Proto2CS("ETHotfix", "HotfixMessage.proto", hotfixMessagePath, "HotfixOpcode", 10000);
......
{
"name": "Unity.Editor",
"references": [
"Unity.Model"
],
"includePlatforms": [
"Editor"
],
"excludePlatforms": []
}
\ No newline at end of file
fileFormatVersion: 2
guid: 000a53018e5e7c14aa75273e1f7be8e2
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 5218b2e5df5649645b404a334d5aad62
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: b486b6f59b25fa642aee6aa32d28f5c4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: e5753701719ff2449bc647ac7a31fe34
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 471b16be87d827f4389d4f55212aa81a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: c32ba0eec527e664badf3a7a29d8b894
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 0cabbc334226763498eaba87eafba590
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 1f2a6005fcdb22f42be4ac21e53d6bee
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: f7f36b13193378e4aa88091093cd8121
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: c7d82afb13a6ed042a9ec8a424b09637
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 7cfdf084c7e13ca4f96a7a642fe59fd6
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 10f3df1a26afb3949bd7977673de9712
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 326628f9cad8d714e999eaf89d7f9041
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: c96c5a8a96fa26346b787c9c93326ccc
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: c64e254e31a2d6d4eae9a8bf702a3411
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: e995f2e3932b56545828011138d084bf
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 8b636cc8b4ed2884ab14e6fbb43cefd4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: ea832b9e31d126945a46cc3647845351
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: c14736bcd1c414343ba1f641e8b49d24
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: e443784a49d795e419c961a06ca9d77f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 42f42a84140bc6e40a4f15a8a776fd9f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: f4c02bef60f3a024eb86be6cbe51eefe
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 5f6f4fcc01146734980248904ec6b718
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 28ee4e0e85f6ebe4cba7f2e9641b810e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 54f66da55f7fd6d4baddafe5a2aca486
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 2a8e85aac06cc0647b9c3bed19f63a98
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 42bd58ac809b44d42b22c62ae42b7a1b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 7a73c3b31bae6f24292e7fedc5139461
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 3dd57844f3c0abc419d98a2609816055
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: f9e092aa1d82fb145ba5bb4ab80220c0
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: ce148fd41ef597f448d8f59df8d6f581
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: ccf31d544df569945bd2d44bf8481e1e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 3ef42703c36d4014280636b1365af539
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 6e09ac15182253a4b9ea9921731125a8
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: cc53bf1b1d3d3ba4c953ecadc273e3d0
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 3e3d9517be262a747aa77f82dd3d98f0
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 7d9f2f9e14522b3449495e87afa43556
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: f4fbb37865d0c8546be6f607c67f1713
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: b089511a75c4772478c74f4cfcfd6830
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 737b42cafca02ea4ba4e091eb6f7046e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 7a76756cd2171544bbeb6de7347f444f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: c0f4a497c0c232744a787132a1b766d6
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: fa155af0657177d48bf7f1f42ef761b8
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 14ada40722b476047abbee1b87e7a544
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 363688f81ea32cb408447cb42b3b63bf
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: cac18a6c9f68dac48ae4d71734e4c52a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 3d7de456f78088243b135cb59f29214b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 37047d194cf0dc44692d280313f97928
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 66df6afb34c860445b47e7d3c62eb862
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 2fb16f2a21fc4bc4f8a2173116f4db7f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: c833478da9922b94a8280054b3ad824d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: a97c23c7b3ee24a46934af9d77541948
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册