Skip to content

Commit

Permalink
将各个Demo定义成不同的程序集
Browse files Browse the repository at this point in the history
  • Loading branch information
mutouzdl committed Mar 8, 2018
1 parent 9d223bc commit 8b9b406
Show file tree
Hide file tree
Showing 14 changed files with 720 additions and 11 deletions.
9 changes: 4 additions & 5 deletions Assembly-CSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\Demo1\Demo1_ProcedureHelloWorld.cs" />
<Compile Include="Assets\Demo2\Demo2_Controller.cs" />
<Compile Include="Assets\Demo2\Demo2_ProcedureGame.cs" />
<Compile Include="Assets\Demo2\Demo2_ProcedureLaunch.cs" />
<Compile Include="Assets\Demo2\Demo2_ProcedureMenu.cs" />
<Compile Include="Assets\Demo3\Demo3_ProcedureLaunch.cs" />
<Compile Include="Assets\Demo3\Demo3_ProcedureMenu.cs" />
<Compile Include="Assets\Demo3\Demo3_UIMenu.cs" />
Expand Down Expand Up @@ -160,6 +155,10 @@
<Project>{F38CC243-B91A-156C-EB79-96954B9F6FEA}</Project> <Name>UnityGameFramework.Runtime</Name> </ProjectReference>
<ProjectReference Include="UnityGameFramework.Editor.csproj">
<Project>{ACF3DA97-8F1E-0B22-8AB4-6F7F12E49231}</Project> <Name>UnityGameFramework.Editor</Name> </ProjectReference>
<ProjectReference Include="Demo1Assembly.csproj">
<Project>{7D979141-2033-F3BA-82E5-8DBDBC09BD01}</Project> <Name>Demo1Assembly</Name> </ProjectReference>
<ProjectReference Include="Demo2Assembly.csproj">
<Project>{B9C06ABB-312D-E3D0-211F-886D80EDD057}</Project> <Name>Demo2Assembly</Name> </ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
6 changes: 6 additions & 0 deletions Assets/Demo1/Demo1Assembly.asmdef
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "Demo1Assembly",
"references": [],
"includePlatforms": [],
"excludePlatforms": []
}
9 changes: 9 additions & 0 deletions Assets/Demo1/Demo1Assembly.asmdef.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Assets/Demo1/Demo1_ProcedureHelloWorld.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ protected override void OnEnter (ProcedureOwner procedureOwner) {
base.OnEnter (procedureOwner);

string welcomeMessage = "HelloWorld!";

Log.Info (welcomeMessage);
Log.Warning (welcomeMessage);
Log.Error (welcomeMessage);
Expand Down
8 changes: 8 additions & 0 deletions Assets/Demo2/Demo2Assembly.asmdef
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "Demo2Assembly",
"references": [
"UnityGameFramework.Runtime"
],
"includePlatforms": [],
"excludePlatforms": []
}
9 changes: 9 additions & 0 deletions Assets/Demo2/Demo2Assembly.asmdef.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/Demo2/Demo2_ProcedureGame.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
public class Demo2_ProcedureGame : ProcedureBase {
protected override void OnEnter(ProcedureOwner procedureOwner)
{
base.OnEnter(procedureOwner);
base.OnEnter(procedureOwner);

Log.Debug("进入游戏流程,可以在这里处理游戏逻辑,这条日志不会打印,因为没有切换到Game流程");
}
Expand Down
8 changes: 8 additions & 0 deletions Assets/Demo3/Demo3Assembly.asmdef
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "Demo3Assembly",
"references": [
"UnityGameFramework.Runtime"
],
"includePlatforms": [],
"excludePlatforms": []
}
9 changes: 9 additions & 0 deletions Assets/Demo3/Demo3Assembly.asmdef.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

159 changes: 159 additions & 0 deletions Demo1Assembly.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LangVersion>4</LangVersion>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<RootNamespace></RootNamespace>
<ProjectGuid>{7D979141-2033-F3BA-82E5-8DBDBC09BD01}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<AssemblyName>Demo1Assembly</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<BaseDirectory>Assets</BaseDirectory>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath>
<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_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_3_1;UNITY_2017_3;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;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_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;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_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;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_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_2_0_SUBSET;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>Temp\bin\Release\</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.XML" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml.Linq" />
<Reference Include="UnityEngine">
<HintPath>C:/Program Files/Unity/Editor/Data/Managed\UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEditor">
<HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\Demo1\Demo1_ProcedureHelloWorld.cs" />
<None Include="Assets\Demo1\Demo1Assembly.asmdef" />
<Reference Include="UnityEngine.UI">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.UI">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Networking">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Networking">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.TestRunner">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/Editor/UnityEditor.TestRunner.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.TestRunner">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Timeline">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Timeline">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Timeline/Editor/UnityEditor.Timeline.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.TreeEditor">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UIAutomation">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UIAutomation/UnityEngine.UIAutomation.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.UIAutomation">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UIAutomation/Editor/UnityEditor.UIAutomation.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.GoogleAudioSpatializer">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityGoogleAudioSpatializer/Editor/UnityEditor.GoogleAudioSpatializer.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.GoogleAudioSpatializer">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityGoogleAudioSpatializer/RuntimeEditor/UnityEngine.GoogleAudioSpatializer.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.HoloLens">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/Editor/UnityEditor.HoloLens.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.HoloLens">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.SpatialTracking">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnitySpatialTracking/Editor/UnityEditor.SpatialTracking.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.SpatialTracking">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnitySpatialTracking/RuntimeEditor/UnityEngine.SpatialTracking.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.VR">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/Editor/UnityEditor.VR.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Graphs">
<HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEditor.Graphs.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Android.Extensions">
<HintPath>C:/Program Files/Unity/Editor/Data/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.WindowsStandalone.Extensions">
<HintPath>C:/Program Files/Unity/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
</Reference>
<Reference Include="GameFramework">
<HintPath>C:/Users/mutou/Documents/Unity/gameframework_demo/Assets/GameFramework/Libraries/GameFramework.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib">
<HintPath>C:/Users/mutou/Documents/Unity/gameframework_demo/Assets/GameFramework/Libraries/ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Advertisements">
<HintPath>C:/Users/mutou/AppData/LocalLow/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.Advertisements.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Advertisements">
<HintPath>C:/Users/mutou/AppData/LocalLow/Unity/cache/packages/packages.unity.com/[email protected]/Editor/UnityEditor.Advertisements.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Analytics">
<HintPath>C:/Users/mutou/AppData/LocalLow/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.Analytics.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Analytics">
<HintPath>C:/Users/mutou/AppData/LocalLow/Unity/cache/packages/packages.unity.com/[email protected]/Editor/UnityEditor.Analytics.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Purchasing">
<HintPath>C:/Users/mutou/AppData/LocalLow/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.Purchasing.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Purchasing">
<HintPath>C:/Users/mutou/AppData/LocalLow/Unity/cache/packages/packages.unity.com/[email protected]/Editor/UnityEditor.Purchasing.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.StandardEvents">
<HintPath>C:/Users/mutou/AppData/LocalLow/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.StandardEvents.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->

</Project>
Loading

0 comments on commit 8b9b406

Please sign in to comment.