Merge main into environment
This commit is contained in:
@@ -49,8 +49,10 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Assets\Scripts\SpawnScript.cs" />
|
||||
<Compile Include="Assets\Scripts\AudioPlayer.cs" />
|
||||
<Compile Include="Assets\Scripts\ChatNetworkManager.cs" />
|
||||
<Compile Include="Assets\Scripts\PlayerScript.cs" />
|
||||
<Compile Include="Assets\Scripts\BackgroundMusicManager.cs" />
|
||||
<Compile Include="Assets\Scripts\CharacterMovement.cs" />
|
||||
<Compile Include="Assets\TutorialInfo\Scripts\Readme.cs" />
|
||||
<Compile Include="Assets\Scripts\ChatBehaviour.cs" />
|
||||
@@ -1235,10 +1237,6 @@
|
||||
<HintPath>Library\ScriptAssemblies\Unity.AI.Navigation.Editor.ConversionSystem.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary">
|
||||
<HintPath>Library\ScriptAssemblies\Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Unity.TerrainTools">
|
||||
<HintPath>Library\ScriptAssemblies\Unity.TerrainTools.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
@@ -1259,6 +1257,10 @@
|
||||
<HintPath>Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary">
|
||||
<HintPath>Library\ScriptAssemblies\Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Unity.VisualScripting.Flow.Editor">
|
||||
<HintPath>Library\ScriptAssemblies\Unity.VisualScripting.Flow.Editor.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
@@ -1291,14 +1293,14 @@
|
||||
<HintPath>Library\ScriptAssemblies\Unity.VisualScripting.State.Editor.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Unity.Mathematics">
|
||||
<HintPath>Library\ScriptAssemblies\Unity.Mathematics.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Unity.VisualEffectGraph.Runtime">
|
||||
<HintPath>Library\ScriptAssemblies\Unity.VisualEffectGraph.Runtime.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Unity.Mathematics">
|
||||
<HintPath>Library\ScriptAssemblies\Unity.Mathematics.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Unity.RenderPipelines.Universal.Shaders">
|
||||
<HintPath>Library\ScriptAssemblies\Unity.RenderPipelines.Universal.Shaders.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
@@ -1359,14 +1361,14 @@
|
||||
<HintPath>Library\ScriptAssemblies\Unity.ShaderGraph.Editor.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Unity.RenderPipelines.Core.Editor.Shared">
|
||||
<HintPath>Library\ScriptAssemblies\Unity.RenderPipelines.Core.Editor.Shared.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Unity.RenderPipelines.HighDefinition.Config.Runtime">
|
||||
<HintPath>Library\ScriptAssemblies\Unity.RenderPipelines.HighDefinition.Config.Runtime.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Unity.RenderPipelines.Core.Editor.Shared">
|
||||
<HintPath>Library\ScriptAssemblies\Unity.RenderPipelines.Core.Editor.Shared.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Unity.InputSystem">
|
||||
<HintPath>Library\ScriptAssemblies\Unity.InputSystem.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
|
||||
Reference in New Issue
Block a user