From b73f26c36b282d920b9e0a3f9e81338326be0b8c Mon Sep 17 00:00:00 2001 From: jianmingyong Date: Sat, 15 Apr 2017 20:33:46 +0800 Subject: [PATCH] Update gitignore and submodule ref. --- .gitignore | 3 +- 2.5DHero_Jian_MGCB.sln | 90 ++++++++++++++++++++++++++++++++++++++- Universal Content Builder | 2 +- 3 files changed, 92 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5bd333d18..899cfe70c 100644 --- a/.gitignore +++ b/.gitignore @@ -307,4 +307,5 @@ Temporary Items !2.5DHero/2.5DHero/ !2.5DHero/2.5DHero/Debug/ !2.5DHero/2.5DHero/Debug/**/* -/2.5DHero/2.5DHero/DataModel +!2.5DHero/2.5DHero/DataModel/ +!2.5DHero/2.5DHero/DataModel/**/* \ No newline at end of file diff --git a/2.5DHero_Jian_MGCB.sln b/2.5DHero_Jian_MGCB.sln index 23aaa2e44..a5c3fe28a 100644 --- a/2.5DHero_Jian_MGCB.sln +++ b/2.5DHero_Jian_MGCB.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26228.9 +VisualStudioVersion = 15.0.26403.3 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "2.5DHero", "2.5DHero\2.5DHero\2.5DHero.vbproj", "{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}" ProjectSection(ProjectDependencies) = postProject @@ -10,46 +10,134 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "2.5DHero", "2.5DHero\2.5DHe EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Universal Content Builder", "Universal Content Builder\Universal Content Builder\Universal Content Builder.csproj", "{EE057806-FAE2-4F37-B85B-A5DE693E6E79}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Modules.System", "Universal Content Builder\Modules.System\Modules.System\Modules.System.csproj", "{ABDB3EEC-AB40-466F-9FCC-D4EA21385962}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|MonoGame 3.5.1 = Debug|MonoGame 3.5.1 + Debug|MonoGame 3.6 = Debug|MonoGame 3.6 + DebugJian|Any CPU = DebugJian|Any CPU DebugJian|MonoGame 3.5.1 = DebugJian|MonoGame 3.5.1 DebugJian|MonoGame 3.6 = DebugJian|MonoGame 3.6 + DebugNoContent|Any CPU = DebugNoContent|Any CPU DebugNoContent|MonoGame 3.5.1 = DebugNoContent|MonoGame 3.5.1 DebugNoContent|MonoGame 3.6 = DebugNoContent|MonoGame 3.6 + Release|Any CPU = Release|Any CPU + Release|MonoGame 3.5.1 = Release|MonoGame 3.5.1 + Release|MonoGame 3.6 = Release|MonoGame 3.6 + ReleaseJian|Any CPU = ReleaseJian|Any CPU ReleaseJian|MonoGame 3.5.1 = ReleaseJian|MonoGame 3.5.1 ReleaseJian|MonoGame 3.6 = ReleaseJian|MonoGame 3.6 + ReleaseNoContent|Any CPU = ReleaseNoContent|Any CPU ReleaseNoContent|MonoGame 3.5.1 = ReleaseNoContent|MonoGame 3.5.1 ReleaseNoContent|MonoGame 3.6 = ReleaseNoContent|MonoGame 3.6 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Debug|Any CPU.ActiveCfg = DebugJian|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Debug|Any CPU.Build.0 = DebugJian|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Debug|MonoGame 3.5.1.ActiveCfg = DebugJian|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Debug|MonoGame 3.5.1.Build.0 = DebugJian|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Debug|MonoGame 3.6.ActiveCfg = DebugJian|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Debug|MonoGame 3.6.Build.0 = DebugJian|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|Any CPU.ActiveCfg = DebugJian|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|Any CPU.Build.0 = DebugJian|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|MonoGame 3.5.1.ActiveCfg = DebugJianNew|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|MonoGame 3.5.1.Build.0 = DebugJianNew|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|MonoGame 3.6.ActiveCfg = DebugJianNew|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|MonoGame 3.6.Build.0 = DebugJianNew|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|Any CPU.ActiveCfg = DebugNoContent|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|Any CPU.Build.0 = DebugNoContent|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|MonoGame 3.5.1.ActiveCfg = DebugNoContent|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|MonoGame 3.5.1.Build.0 = DebugNoContent|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|MonoGame 3.6.ActiveCfg = DebugNoContent|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|MonoGame 3.6.Build.0 = DebugNoContent|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Release|Any CPU.ActiveCfg = ReleaseJian|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Release|Any CPU.Build.0 = ReleaseJian|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Release|MonoGame 3.5.1.ActiveCfg = ReleaseJian|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Release|MonoGame 3.5.1.Build.0 = ReleaseJian|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Release|MonoGame 3.6.ActiveCfg = ReleaseJian|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Release|MonoGame 3.6.Build.0 = ReleaseJian|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|Any CPU.ActiveCfg = ReleaseJian|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|Any CPU.Build.0 = ReleaseJian|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|MonoGame 3.5.1.ActiveCfg = ReleaseJianNew|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|MonoGame 3.5.1.Build.0 = ReleaseJianNew|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|MonoGame 3.6.ActiveCfg = ReleaseJianNew|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|MonoGame 3.6.Build.0 = ReleaseJianNew|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|Any CPU.ActiveCfg = ReleaseNoContent|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|Any CPU.Build.0 = ReleaseNoContent|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|MonoGame 3.5.1.ActiveCfg = ReleaseNoContent|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|MonoGame 3.5.1.Build.0 = ReleaseNoContent|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|MonoGame 3.6.ActiveCfg = ReleaseNoContent|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|MonoGame 3.6.Build.0 = ReleaseNoContent|Any CPU + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Debug|Any CPU.ActiveCfg = MonoGame|x86 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Debug|Any CPU.Build.0 = MonoGame|x86 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Debug|MonoGame 3.5.1.ActiveCfg = MonoGame|x86 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Debug|MonoGame 3.5.1.Build.0 = MonoGame|x86 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Debug|MonoGame 3.6.ActiveCfg = MonoGame|x86 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Debug|MonoGame 3.6.Build.0 = MonoGame|x86 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugJian|Any CPU.ActiveCfg = MonoGame|x86 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugJian|Any CPU.Build.0 = MonoGame|x86 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugJian|MonoGame 3.5.1.ActiveCfg = MonoGame|3.5.1 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugJian|MonoGame 3.5.1.Build.0 = MonoGame|3.5.1 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugJian|MonoGame 3.6.ActiveCfg = MonoGame|3.6 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugJian|MonoGame 3.6.Build.0 = MonoGame|3.6 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugNoContent|Any CPU.ActiveCfg = MonoGame|x86 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugNoContent|Any CPU.Build.0 = MonoGame|x86 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugNoContent|MonoGame 3.5.1.ActiveCfg = MonoGame|3.5.1 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugNoContent|MonoGame 3.6.ActiveCfg = MonoGame|3.6 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Release|Any CPU.ActiveCfg = MonoGame|x86 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Release|Any CPU.Build.0 = MonoGame|x86 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Release|MonoGame 3.5.1.ActiveCfg = MonoGame|x86 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Release|MonoGame 3.5.1.Build.0 = MonoGame|x86 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Release|MonoGame 3.6.ActiveCfg = MonoGame|x86 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Release|MonoGame 3.6.Build.0 = MonoGame|x86 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseJian|Any CPU.ActiveCfg = MonoGame|x86 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseJian|Any CPU.Build.0 = MonoGame|x86 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseJian|MonoGame 3.5.1.ActiveCfg = MonoGame|3.5.1 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseJian|MonoGame 3.5.1.Build.0 = MonoGame|3.5.1 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseJian|MonoGame 3.6.ActiveCfg = MonoGame|3.6 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseJian|MonoGame 3.6.Build.0 = MonoGame|3.6 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseNoContent|Any CPU.ActiveCfg = MonoGame|x86 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseNoContent|Any CPU.Build.0 = MonoGame|x86 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseNoContent|MonoGame 3.5.1.ActiveCfg = MonoGame|3.5.1 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseNoContent|MonoGame 3.6.ActiveCfg = MonoGame|3.6 + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Debug|MonoGame 3.5.1.ActiveCfg = Debug|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Debug|MonoGame 3.5.1.Build.0 = Debug|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Debug|MonoGame 3.6.ActiveCfg = Debug|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Debug|MonoGame 3.6.Build.0 = Debug|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugJian|Any CPU.ActiveCfg = Debug|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugJian|Any CPU.Build.0 = Debug|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugJian|MonoGame 3.5.1.ActiveCfg = Debug|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugJian|MonoGame 3.5.1.Build.0 = Debug|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugJian|MonoGame 3.6.ActiveCfg = Debug|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugJian|MonoGame 3.6.Build.0 = Debug|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugNoContent|Any CPU.ActiveCfg = Debug|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugNoContent|Any CPU.Build.0 = Debug|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugNoContent|MonoGame 3.5.1.ActiveCfg = Debug|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugNoContent|MonoGame 3.5.1.Build.0 = Debug|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugNoContent|MonoGame 3.6.ActiveCfg = Debug|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugNoContent|MonoGame 3.6.Build.0 = Debug|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Release|Any CPU.Build.0 = Release|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Release|MonoGame 3.5.1.ActiveCfg = Release|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Release|MonoGame 3.5.1.Build.0 = Release|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Release|MonoGame 3.6.ActiveCfg = Release|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Release|MonoGame 3.6.Build.0 = Release|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseJian|Any CPU.ActiveCfg = Release|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseJian|Any CPU.Build.0 = Release|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseJian|MonoGame 3.5.1.ActiveCfg = Release|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseJian|MonoGame 3.5.1.Build.0 = Release|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseJian|MonoGame 3.6.ActiveCfg = Release|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseJian|MonoGame 3.6.Build.0 = Release|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseNoContent|Any CPU.ActiveCfg = Release|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseNoContent|Any CPU.Build.0 = Release|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseNoContent|MonoGame 3.5.1.ActiveCfg = Release|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseNoContent|MonoGame 3.5.1.Build.0 = Release|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseNoContent|MonoGame 3.6.ActiveCfg = Release|Any CPU + {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseNoContent|MonoGame 3.6.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Universal Content Builder b/Universal Content Builder index b7a6b0764..f8b6f0171 160000 --- a/Universal Content Builder +++ b/Universal Content Builder @@ -1 +1 @@ -Subproject commit b7a6b076455b2398f8245af5fb23446f6df47e5b +Subproject commit f8b6f017112091d667202d1b7bf6effa4ce1ab88