移除程序集的使用（装逼失败）

mutouzdl · Mar 9, 2018 · a815fd4 · a815fd4
1 parent 68d2fcc
commit a815fd4
Show file tree

Hide file tree

Showing 15 changed files with 56 additions and 92 deletions.
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
@@ -51,11 +51,17 @@
     </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" />
      <Compile Include="Assets\Demo4\Demo4_ProcedureLaunch.cs" />
      <Compile Include="Assets\Demo4\Demo4_ProcedureMenu.cs" />
      <Compile Include="Assets\Demo4\Demo4_UIMenu.cs" />
-     <None Include="Assets\GameFramework\Libraries\link.xml" />
-     <None Include="Assets\GameFramework\Libraries\GameFramework.xml" />
  <Reference Include="UnityEngine.UI">
  <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
  </Reference>
@@ -153,14 +159,8 @@
   <ItemGroup>
     <ProjectReference Include="UnityGameFramework.Runtime.csproj">
       <Project>{F38CC243-B91A-156C-EB79-96954B9F6FEA}</Project>      <Name>UnityGameFramework.Runtime</Name>    </ProjectReference>
-    <ProjectReference Include="Demo2Assembly.csproj">
-      <Project>{B9C06ABB-312D-E3D0-211F-886D80EDD057}</Project>      <Name>Demo2Assembly</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="Demo3Assembly.csproj">
-      <Project>{FE63C8DC-8BA4-11A9-2E9C-134EB995B167}</Project>      <Name>Demo3Assembly</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. 

diff --git a/Assets/Demo1/Demo1.unity b/Assets/Demo1/Demo1.unity
@@ -245,6 +245,14 @@ Prefab:
       propertyPath: m_EntranceProcedureTypeName
       value: Demo1_ProcedureHelloWorld
       objectReference: {fileID: 0}
+    - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 2}
+      propertyPath: m_AvailableProcedureTypeNames.Array.data[1]
+      value: Demo2_ProcedureGame
+      objectReference: {fileID: 0}
+    - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 2}
+      propertyPath: m_AvailableProcedureTypeNames.Array.data[2]
+      value: Demo2_ProcedureLaunch
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 2}
   m_IsPrefabParent: 0
diff --git a/Assets/Demo1/Demo1Assembly.asmdef b/Assets/Demo1/Demo1Assembly.asmdef
diff --git a/Assets/Demo1/Demo1Assembly.asmdef.meta b/Assets/Demo1/Demo1Assembly.asmdef.meta
diff --git a/Assets/Demo1/Demo1_ProcedureHelloWorld.cs b/Assets/Demo1/Demo1_ProcedureHelloWorld.cs
@@ -10,7 +10,6 @@ protected override void OnEnter (ProcedureOwner procedureOwner) {
 		base.OnEnter (procedureOwner);
 
 		string welcomeMessage = "HelloWorld!";
-
 		Log.Info (welcomeMessage);
 		Log.Warning (welcomeMessage);
 		Log.Error (welcomeMessage);

diff --git a/Assets/Demo2/Demo2Assembly.asmdef b/Assets/Demo2/Demo2Assembly.asmdef
diff --git a/Assets/Demo2/Demo2Assembly.asmdef.meta b/Assets/Demo2/Demo2Assembly.asmdef.meta
diff --git a/Assets/Demo3/Demo3Assembly.asmdef b/Assets/Demo3/Demo3Assembly.asmdef
diff --git a/Assets/Demo4/Demo4.unity b/Assets/Demo4/Demo4.unity
@@ -255,6 +255,14 @@ Prefab:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 11454530, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 2}
+      propertyPath: m_UIGroups.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 2}
+      propertyPath: m_AvailableProcedureTypeNames.Array.size
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 433714, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 2}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -287,6 +295,22 @@ Prefab:
       propertyPath: m_RootOrder
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 2}
+      propertyPath: m_AvailableProcedureTypeNames.Array.data[0]
+      value: Demo4_ProcedureLaunch
+      objectReference: {fileID: 0}
+    - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 2}
+      propertyPath: m_AvailableProcedureTypeNames.Array.data[1]
+      value: Demo4_ProcedureMenu
+      objectReference: {fileID: 0}
+    - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 2}
+      propertyPath: m_EntranceProcedureTypeName
+      value: Demo4_ProcedureLaunch
+      objectReference: {fileID: 0}
+    - target: {fileID: 11454530, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 2}
+      propertyPath: m_UIGroups.Array.data[0].m_Name
+      value: DefaultGroup
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 2}
   m_IsPrefabParent: 0
diff --git a/Assets/Demo4/Demo4Assembly.asmdef b/Assets/Demo4/Demo4Assembly.asmdef
diff --git a/Assets/Demo4/Demo4Assembly.asmdef.meta b/Assets/Demo4/Demo4Assembly.asmdef.meta
diff --git a/Assets/GameFramework/GameFrameworkAssembly.asmdef b/Assets/GameFramework/GameFrameworkAssembly.asmdef
@@ -0,0 +1,3 @@
+{
+	"name": "GameFrameworkAssembly"
+}
diff --git a/Assets/Demo3/Demo3Assembly.asmdef.meta → ...amework/GameFrameworkAssembly.asmdef.meta b/Assets/Demo3/Demo3Assembly.asmdef.meta → ...amework/GameFrameworkAssembly.asmdef.meta
diff --git a/Demo1Assembly.csproj b/Demo1Assembly.csproj
@@ -147,6 +147,12 @@
  <HintPath>C:/Users/mutou/AppData/LocalLow/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.StandardEvents.dll</HintPath>
  </Reference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="UnityGameFramework.Runtime.csproj">
+      <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>
+  </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.

diff --git a/gameframework_demo.sln b/gameframework_demo.sln
@@ -1,16 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gameframework_demo", "Demo2Assembly.csproj", "{B9C06ABB-312D-E3D0-211F-886D80EDD057}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gameframework_demo", "Assembly-CSharp.csproj", "{AFBED23F-80CD-5F7F-0E5F-A2AFFCC6A63D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gameframework_demo", "UnityGameFramework.Runtime.csproj", "{F38CC243-B91A-156C-EB79-96954B9F6FEA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gameframework_demo", "Demo1Assembly.csproj", "{7D979141-2033-F3BA-82E5-8DBDBC09BD01}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gameframework_demo", "Demo4Assembly.csproj", "{EE623DA2-B997-75FE-3EF1-3A4A6B68FA6B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gameframework_demo", "Demo3Assembly.csproj", "{FE63C8DC-8BA4-11A9-2E9C-134EB995B167}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gameframework_demo", "UnityGameFramework.Editor.csproj", "{ACF3DA97-8F1E-0B22-8AB4-6F7F12E49231}"
 EndProject
 Global
@@ -19,26 +13,14 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B9C06ABB-312D-E3D0-211F-886D80EDD057}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B9C06ABB-312D-E3D0-211F-886D80EDD057}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9C06ABB-312D-E3D0-211F-886D80EDD057}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B9C06ABB-312D-E3D0-211F-886D80EDD057}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFBED23F-80CD-5F7F-0E5F-A2AFFCC6A63D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFBED23F-80CD-5F7F-0E5F-A2AFFCC6A63D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFBED23F-80CD-5F7F-0E5F-A2AFFCC6A63D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFBED23F-80CD-5F7F-0E5F-A2AFFCC6A63D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F38CC243-B91A-156C-EB79-96954B9F6FEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F38CC243-B91A-156C-EB79-96954B9F6FEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F38CC243-B91A-156C-EB79-96954B9F6FEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F38CC243-B91A-156C-EB79-96954B9F6FEA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7D979141-2033-F3BA-82E5-8DBDBC09BD01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D979141-2033-F3BA-82E5-8DBDBC09BD01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D979141-2033-F3BA-82E5-8DBDBC09BD01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7D979141-2033-F3BA-82E5-8DBDBC09BD01}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EE623DA2-B997-75FE-3EF1-3A4A6B68FA6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE623DA2-B997-75FE-3EF1-3A4A6B68FA6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE623DA2-B997-75FE-3EF1-3A4A6B68FA6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE623DA2-B997-75FE-3EF1-3A4A6B68FA6B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FE63C8DC-8BA4-11A9-2E9C-134EB995B167}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE63C8DC-8BA4-11A9-2E9C-134EB995B167}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE63C8DC-8BA4-11A9-2E9C-134EB995B167}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FE63C8DC-8BA4-11A9-2E9C-134EB995B167}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ACF3DA97-8F1E-0B22-8AB4-6F7F12E49231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ACF3DA97-8F1E-0B22-8AB4-6F7F12E49231}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ACF3DA97-8F1E-0B22-8AB4-6F7F12E49231}.Release|Any CPU.ActiveCfg = Release|Any CPU