【修改】测试代码场景加载

billwillman · Jul 17, 2016 · 7996176 · 7996176
1 parent e342a52
commit 7996176
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj
@@ -49,6 +49,7 @@
      <Compile Include="Assets\Scripts\Res\Editor\ResourceMgrMonitorEditor.cs" />
      <None Include="Assets\Resources\@Shaders\Lightmap-Unlit-Wind.shader" />
      <None Include="Assets\Resources\@Shaders\SkyBox-Alpha Blend.shader" />
+     <None Include="Assets\StreamingAssets\Windows\AssetBundles.xml" />
  <Reference Include="UnityEditor.Advertisements">
  <HintPath>D:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
  </Reference>
@@ -98,10 +99,6 @@
  <HintPath>D:/Program Files/Unity/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
  </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="Assembly-CSharp.csproj">
-      <Project>{C9FDEFFB-4FAB-3868-9F69-14816408FD50}</Project>      <Name>Assembly-CSharp</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/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
@@ -86,6 +86,7 @@
      <Compile Include="Assets\Scripts\Utils\TimerMgr.cs" />
      <None Include="Assets\Resources\@Shaders\Lightmap-Unlit-Wind.shader" />
      <None Include="Assets\Resources\@Shaders\SkyBox-Alpha Blend.shader" />
+     <None Include="Assets\StreamingAssets\Windows\AssetBundles.xml" />
  <Reference Include="UnityEngine.UI">
  <HintPath>D:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
  </Reference>

diff --git a/Assets/StreamingAssets/Windows/AssetBundles.xml.meta b/Assets/StreamingAssets/Windows/AssetBundles.xml.meta
diff --git a/UnityResourceMgr.sln b/UnityResourceMgr.sln
@@ -23,7 +23,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																									GlobalSection(MonoDevelopProperties) = preSolution
+																										GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1