Commit 447be7a7 authored by PAUL MICHEL's avatar PAUL MICHEL
Browse files

rendu final

parent e32c3c01
# ===========================
# Default Collab Ignore Rules
# ===========================
# OS Generated
# ============
.DS_Store
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
[Tt]humbs.db
[Dd]esktop.ini
# Visual Studio / MonoDevelop generated
# =====================================
[Ee]xported[Oo]bj/
*.userprefs
*.csproj
*.pidb
*.suo
*.sln
*.user
*.unityproj
*.booproj
# Unity generated
# ===============
[Oo]bj/
[Bb]uild
sysinfo.txt
*.stackdump
......@@ -60,6 +60,7 @@
<Compile Include="Assets\NatureStarterKit2\Editor\ImageEffects\SunShaftsEditor.cs" />
<Compile Include="Assets\NatureStarterKit2\Editor\ImageEffects\TonemappingEditor.cs" />
<Compile Include="Assets\NatureStarterKit2\Editor\ImageEffects\VignetteAndChromaticAberrationEditor.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Editor\CrossPlatformInput\CrossPlatformInputInitialize.cs" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\GlassRefraction\Shaders\GlassStainedBumpDistort.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendOneOne.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\NoiseEffectShaderRGB.shader" />
......@@ -86,7 +87,7 @@
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\FXAAPreset3.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\FisheyeShader.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\Contrast Stretch\Apply.shader" />
<None Include="Assets\Standard Assets\Environment\Water\Water4\Shaders\FXWater4Simple.shader" />
<None Include="Assets\Scripts\Standard Assets\Environment\Water\Water4\Shaders\FXWater4Simple.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\frag_ao.cginc" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ToonShading\Shaders\ToonBasicOutline.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_DepthOfField\DepthOfField34.shader" />
......@@ -96,10 +97,10 @@
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\ColorCorrectionCurvesSimple.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\NoiseEffectShaderYUV.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\CreaseApply.shader" />
<None Include="Assets\Standard Assets\Environment\Water (Basic)\Shaders\FXWaterBasic.shader" />
<None Include="Assets\Scripts\Standard Assets\Environment\Water (Basic)\Shaders\FXWaterBasic.shader" />
<None Include="Assets\sky5X\README.txt" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\ChromaticAberrationShader.shader" />
<None Include="Assets\Standard Assets\CrossPlatformInput\CrossPlatformInputGuidelines.txt" />
<None Include="Assets\Scripts\Standard Assets\CrossPlatformInput\CrossPlatformInputGuidelines.txt" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\GlobalFog.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ToonShading\Shaders\ToonLitOutline.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\Contrast Stretch\Luminance.shader" />
......@@ -112,7 +113,7 @@
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\MultiPassHollywoodFlares.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\BlurEffectConeTaps.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\CameraMotionBlur.shader" />
<None Include="Assets\Standard Assets\Environment\Water\Water\Shaders\FXWaterPro.shader" />
<None Include="Assets\Scripts\Standard Assets\Environment\Water\Water\Shaders\FXWaterPro.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\DLAA.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\NoiseAndGrainDX11.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BrightPassFilter2.shader" />
......@@ -127,7 +128,7 @@
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\NoiseAndGrain.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\Projectors\Shaders\ProjectorMultiply.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\VignettingShader.shader" />
<None Include="Assets\Standard Assets\Characters\ThirdPersonCharacter\ThirdPersonCharacterGuidelines.txt" />
<None Include="Assets\Scripts\Standard Assets\Characters\ThirdPersonCharacter\ThirdPersonCharacterGuidelines.txt" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\Tonemapper.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BrightPassFilter.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\FXAA2.shader" />
......@@ -135,12 +136,12 @@
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\LensFlareCreate.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\EdgeDetectNormals.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\PrepareSunShaftsBlur.shader" />
<None Include="Assets\Standard Assets\Characters\FirstPersonCharacter\FirstPersonCharacterGuidelines.txt" />
<None Include="Assets\Scripts\Standard Assets\Characters\FirstPersonCharacter\FirstPersonCharacterGuidelines.txt" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\Blend.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\BlendModesOverlay.shader" />
<None Include="Assets\Standard Assets\Environment\Water\Water4\Shaders\WaterInclude.cginc" />
<None Include="Assets\Standard Assets\Environment\Water\Water4\Shaders\FXWater4Advanced.shader" />
<None Include="Assets\Standard Assets\Characters\RollerBall\RollerBallGuidelines.txt" />
<None Include="Assets\Scripts\Standard Assets\Environment\Water\Water4\Shaders\WaterInclude.cginc" />
<None Include="Assets\Scripts\Standard Assets\Environment\Water\Water4\Shaders\FXWater4Advanced.shader" />
<None Include="Assets\Scripts\Standard Assets\Characters\RollerBall\RollerBallGuidelines.txt" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\SimpleClear.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\TessellationShaders\Shaders\BumpedSpecularDisplacement.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\FXAA3Console.shader" />
......@@ -203,14 +204,10 @@
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="Assembly-CSharp-firstpass.csproj">
<Project>{B26B01A5-C8C5-D928-ACB6-11CD0A274A21}</Project> <Name>Assembly-CSharp-firstpass</Name> </ProjectReference>
<ProjectReference Include="Assembly-CSharp.csproj">
<Project>{4F10470B-BA77-7AF3-65C4-4981CEAE913A}</Project> <Name>Assembly-CSharp</Name> </ProjectReference>
<ProjectReference Include="Assembly-UnityScript.unityproj">
<Project>{B8B500F5-00B6-078C-1144-09CC3C3826B0}</Project> <Name>Assembly-UnityScript</Name> </ProjectReference>
<ProjectReference Include="Assembly-CSharp-Editor-firstpass.csproj">
<Project>{107F285D-723B-57E9-A9EA-30574C5522F9}</Project> <Name>Assembly-CSharp-Editor-firstpass</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.
......
......@@ -46,8 +46,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\AthPlayer.cs" />
<Compile Include="Assets\GoToColloque.cs" />
<Compile Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Scripts\Antialiasing.cs" />
<Compile Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Scripts\Bloom.cs" />
<Compile Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Scripts\BloomAndFlares.cs" />
......@@ -86,15 +84,72 @@
<Compile Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Scripts\Twirl.cs" />
<Compile Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Scripts\VignetteAndChromaticAberration.cs" />
<Compile Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Scripts\Vortex.cs" />
<Compile Include="Assets\NotDestroyPlayer.cs" />
<Compile Include="Assets\TriggerBureau.cs" />
<Compile Include="Assets\TriggerBureau2.cs" />
<Compile Include="Assets\TriggerColloque.cs" />
<Compile Include="Assets\TriggerEditeur.cs" />
<Compile Include="Assets\TriggerEditeur2.cs" />
<Compile Include="Assets\TriggerTest.cs" />
<Compile Include="Assets\TriggerTest2.cs" />
<Compile Include="Assets\returnToMap.cs" />
<Compile Include="Assets\Scripts\AthPlayer.cs" />
<Compile Include="Assets\Scripts\GoToColloque.cs" />
<Compile Include="Assets\Scripts\NotDestroyPlayer.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Characters\FirstPersonCharacter\Scripts\FirstPersonController.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Characters\FirstPersonCharacter\Scripts\HeadBob.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Characters\FirstPersonCharacter\Scripts\MouseLook.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Characters\FirstPersonCharacter\Scripts\RigidbodyFirstPersonController.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Characters\RollerBall\Scripts\Ball.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Characters\RollerBall\Scripts\BallUserControl.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Characters\ThirdPersonCharacter\Scripts\AICharacterControl.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Characters\ThirdPersonCharacter\Scripts\ThirdPersonCharacter.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Characters\ThirdPersonCharacter\Scripts\ThirdPersonUserControl.cs" />
<Compile Include="Assets\Scripts\Standard Assets\CrossPlatformInput\Scripts\AxisTouchButton.cs" />
<Compile Include="Assets\Scripts\Standard Assets\CrossPlatformInput\Scripts\ButtonHandler.cs" />
<Compile Include="Assets\Scripts\Standard Assets\CrossPlatformInput\Scripts\CrossPlatformInputManager.cs" />
<Compile Include="Assets\Scripts\Standard Assets\CrossPlatformInput\Scripts\InputAxisScrollbar.cs" />
<Compile Include="Assets\Scripts\Standard Assets\CrossPlatformInput\Scripts\Joystick.cs" />
<Compile Include="Assets\Scripts\Standard Assets\CrossPlatformInput\Scripts\MobileControlRig.cs" />
<Compile Include="Assets\Scripts\Standard Assets\CrossPlatformInput\Scripts\PlatformSpecific\MobileInput.cs" />
<Compile Include="Assets\Scripts\Standard Assets\CrossPlatformInput\Scripts\PlatformSpecific\StandaloneInput.cs" />
<Compile Include="Assets\Scripts\Standard Assets\CrossPlatformInput\Scripts\TiltInput.cs" />
<Compile Include="Assets\Scripts\Standard Assets\CrossPlatformInput\Scripts\TouchPad.cs" />
<Compile Include="Assets\Scripts\Standard Assets\CrossPlatformInput\Scripts\VirtualInput.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Environment\Water (Basic)\Scripts\WaterBasic.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Environment\Water\Water\Scripts\Displace.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Environment\Water\Water\Scripts\GerstnerDisplace.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Environment\Water\Water\Scripts\MeshContainer.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Environment\Water\Water\Scripts\PlanarReflection.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Environment\Water\Water\Scripts\SpecularLighting.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Environment\Water\Water\Scripts\Water.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Environment\Water\Water\Scripts\WaterBase.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Environment\Water\Water\Scripts\WaterTile.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\ActivateTrigger.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\AlphaButtonClickMask.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\AutoMobileShaderSwitch.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\AutoMoveAndRotate.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\CameraRefocus.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\CurveControlledBob.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\DragRigidbody.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\DynamicShadowSettings.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\EventSystemChecker.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\FOVKick.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\FPSCounter.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\FollowTarget.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\ForcedReset.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\LerpControlledBob.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\ObjectResetter.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\ParticleSystemDestroyer.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\PlatformSpecificContent.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\SimpleActivatorMenu.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\SimpleMouseRotator.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\SmoothFollow.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\TimedObjectActivator.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\TimedObjectDestructor.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\WaypointCircuit.cs" />
<Compile Include="Assets\Scripts\Standard Assets\Utility\WaypointProgressTracker.cs" />
<Compile Include="Assets\Scripts\TriggerBureau.cs" />
<Compile Include="Assets\Scripts\TriggerBureau2.cs" />
<Compile Include="Assets\Scripts\TriggerColloque.cs" />
<Compile Include="Assets\Scripts\TriggerColloque1.cs" />
<Compile Include="Assets\Scripts\TriggerEditeur.cs" />
<Compile Include="Assets\Scripts\TriggerEditeur2.cs" />
<Compile Include="Assets\Scripts\TriggerTest.cs" />
<Compile Include="Assets\Scripts\TriggerTest2.cs" />
<Compile Include="Assets\Scripts\TriggerVol.cs" />
<Compile Include="Assets\Scripts\returnToMap.cs" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\GlassRefraction\Shaders\GlassStainedBumpDistort.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendOneOne.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\NoiseEffectShaderRGB.shader" />
......@@ -121,7 +176,7 @@
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\FXAAPreset3.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\FisheyeShader.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\Contrast Stretch\Apply.shader" />
<None Include="Assets\Standard Assets\Environment\Water\Water4\Shaders\FXWater4Simple.shader" />
<None Include="Assets\Scripts\Standard Assets\Environment\Water\Water4\Shaders\FXWater4Simple.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\frag_ao.cginc" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ToonShading\Shaders\ToonBasicOutline.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_DepthOfField\DepthOfField34.shader" />
......@@ -131,10 +186,10 @@
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\ColorCorrectionCurvesSimple.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\NoiseEffectShaderYUV.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\CreaseApply.shader" />
<None Include="Assets\Standard Assets\Environment\Water (Basic)\Shaders\FXWaterBasic.shader" />
<None Include="Assets\Scripts\Standard Assets\Environment\Water (Basic)\Shaders\FXWaterBasic.shader" />
<None Include="Assets\sky5X\README.txt" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\ChromaticAberrationShader.shader" />
<None Include="Assets\Standard Assets\CrossPlatformInput\CrossPlatformInputGuidelines.txt" />
<None Include="Assets\Scripts\Standard Assets\CrossPlatformInput\CrossPlatformInputGuidelines.txt" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\GlobalFog.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ToonShading\Shaders\ToonLitOutline.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\Contrast Stretch\Luminance.shader" />
......@@ -147,7 +202,7 @@
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\MultiPassHollywoodFlares.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\BlurEffectConeTaps.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\CameraMotionBlur.shader" />
<None Include="Assets\Standard Assets\Environment\Water\Water\Shaders\FXWaterPro.shader" />
<None Include="Assets\Scripts\Standard Assets\Environment\Water\Water\Shaders\FXWaterPro.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\DLAA.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\NoiseAndGrainDX11.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BrightPassFilter2.shader" />
......@@ -162,7 +217,7 @@
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\NoiseAndGrain.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\Projectors\Shaders\ProjectorMultiply.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\VignettingShader.shader" />
<None Include="Assets\Standard Assets\Characters\ThirdPersonCharacter\ThirdPersonCharacterGuidelines.txt" />
<None Include="Assets\Scripts\Standard Assets\Characters\ThirdPersonCharacter\ThirdPersonCharacterGuidelines.txt" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\Tonemapper.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BrightPassFilter.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\FXAA2.shader" />
......@@ -170,12 +225,12 @@
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\LensFlareCreate.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\EdgeDetectNormals.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\PrepareSunShaftsBlur.shader" />
<None Include="Assets\Standard Assets\Characters\FirstPersonCharacter\FirstPersonCharacterGuidelines.txt" />
<None Include="Assets\Scripts\Standard Assets\Characters\FirstPersonCharacter\FirstPersonCharacterGuidelines.txt" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\Blend.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\BlendModesOverlay.shader" />
<None Include="Assets\Standard Assets\Environment\Water\Water4\Shaders\WaterInclude.cginc" />
<None Include="Assets\Standard Assets\Environment\Water\Water4\Shaders\FXWater4Advanced.shader" />
<None Include="Assets\Standard Assets\Characters\RollerBall\RollerBallGuidelines.txt" />
<None Include="Assets\Scripts\Standard Assets\Environment\Water\Water4\Shaders\WaterInclude.cginc" />
<None Include="Assets\Scripts\Standard Assets\Environment\Water\Water4\Shaders\FXWater4Advanced.shader" />
<None Include="Assets\Scripts\Standard Assets\Characters\RollerBall\RollerBallGuidelines.txt" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\SimpleClear.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\TessellationShaders\Shaders\BumpedSpecularDisplacement.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\FXAA3Console.shader" />
......@@ -204,10 +259,6 @@
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/RuntimeEditor/UnityEngine.VR.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="Assembly-CSharp-firstpass.csproj">
<Project>{B26B01A5-C8C5-D928-ACB6-11CD0A274A21}</Project> <Name>Assembly-CSharp-firstpass</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.
......
......@@ -46,7 +46,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\script\mainMenu.js" />
<Compile Include="Assets\Scripts\mainMenu.js" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\GlassRefraction\Shaders\GlassStainedBumpDistort.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendOneOne.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\NoiseEffectShaderRGB.shader" />
......@@ -73,7 +73,7 @@
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\FXAAPreset3.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\FisheyeShader.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\Contrast Stretch\Apply.shader" />
<None Include="Assets\Standard Assets\Environment\Water\Water4\Shaders\FXWater4Simple.shader" />
<None Include="Assets\Scripts\Standard Assets\Environment\Water\Water4\Shaders\FXWater4Simple.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\frag_ao.cginc" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ToonShading\Shaders\ToonBasicOutline.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_DepthOfField\DepthOfField34.shader" />
......@@ -83,10 +83,10 @@
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\ColorCorrectionCurvesSimple.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\NoiseEffectShaderYUV.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\CreaseApply.shader" />
<None Include="Assets\Standard Assets\Environment\Water (Basic)\Shaders\FXWaterBasic.shader" />
<None Include="Assets\Scripts\Standard Assets\Environment\Water (Basic)\Shaders\FXWaterBasic.shader" />
<None Include="Assets\sky5X\README.txt" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\ChromaticAberrationShader.shader" />
<None Include="Assets\Standard Assets\CrossPlatformInput\CrossPlatformInputGuidelines.txt" />
<None Include="Assets\Scripts\Standard Assets\CrossPlatformInput\CrossPlatformInputGuidelines.txt" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\GlobalFog.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ToonShading\Shaders\ToonLitOutline.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\Contrast Stretch\Luminance.shader" />
......@@ -99,7 +99,7 @@
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\MultiPassHollywoodFlares.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\BlurEffectConeTaps.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\CameraMotionBlur.shader" />
<None Include="Assets\Standard Assets\Environment\Water\Water\Shaders\FXWaterPro.shader" />
<None Include="Assets\Scripts\Standard Assets\Environment\Water\Water\Shaders\FXWaterPro.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\DLAA.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\NoiseAndGrainDX11.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BrightPassFilter2.shader" />
......@@ -114,7 +114,7 @@
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\NoiseAndGrain.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\Projectors\Shaders\ProjectorMultiply.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\VignettingShader.shader" />
<None Include="Assets\Standard Assets\Characters\ThirdPersonCharacter\ThirdPersonCharacterGuidelines.txt" />
<None Include="Assets\Scripts\Standard Assets\Characters\ThirdPersonCharacter\ThirdPersonCharacterGuidelines.txt" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\Tonemapper.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BrightPassFilter.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\FXAA2.shader" />
......@@ -122,12 +122,12 @@
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\LensFlareCreate.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\EdgeDetectNormals.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\PrepareSunShaftsBlur.shader" />
<None Include="Assets\Standard Assets\Characters\FirstPersonCharacter\FirstPersonCharacterGuidelines.txt" />
<None Include="Assets\Scripts\Standard Assets\Characters\FirstPersonCharacter\FirstPersonCharacterGuidelines.txt" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\Blend.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\BlendModesOverlay.shader" />
<None Include="Assets\Standard Assets\Environment\Water\Water4\Shaders\WaterInclude.cginc" />
<None Include="Assets\Standard Assets\Environment\Water\Water4\Shaders\FXWater4Advanced.shader" />
<None Include="Assets\Standard Assets\Characters\RollerBall\RollerBallGuidelines.txt" />
<None Include="Assets\Scripts\Standard Assets\Environment\Water\Water4\Shaders\WaterInclude.cginc" />
<None Include="Assets\Scripts\Standard Assets\Environment\Water\Water4\Shaders\FXWater4Advanced.shader" />
<None Include="Assets\Scripts\Standard Assets\Characters\RollerBall\RollerBallGuidelines.txt" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\SimpleClear.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\TessellationShaders\Shaders\BumpedSpecularDisplacement.shader" />
<None Include="Assets\NatureStarterKit2\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\FXAA3Console.shader" />
......@@ -156,10 +156,6 @@
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/RuntimeEditor/UnityEngine.VR.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="Assembly-CSharp-firstpass.csproj">
<Project>{B26B01A5-C8C5-D928-ACB6-11CD0A274A21}</Project> <Name>Assembly-CSharp-firstpass</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.
......
fileFormatVersion: 2
guid: ac688df683ec9524abb3805b5dffd76e
timeCreated: 1491520126
licenseType: Free
AudioImporter:
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: f9f6e6477bb8fda408250ff0293f132b
guid: 7fa0b7bcd708a904884f2575026bb610
folderAsset: yes
timeCreated: 1491471543
timeCreated: 1491557261
licenseType: Free
DefaultImporter:
userData:
......
......@@ -10,6 +10,7 @@ public class AthPlayer : MonoBehaviour
private int recherche;
private int temps;
private int nbpublications;
private int nbvol;
// Use this for initialization
void Start()
......@@ -19,7 +20,7 @@ public class AthPlayer : MonoBehaviour
void initAll()
{
this.reputation = 0; this.nbarticles = 0; this.reseau = 0; this.recherche = 0; this.temps = 0; this.nbpublications = 0;
this.reputation = 0; this.nbarticles = 0; this.reseau = 0; this.recherche = 0; this.temps = 0; this.nbpublications = 0; this.nbvol = 0;
}
public int getReputation(){return this.reputation;}
......@@ -28,6 +29,7 @@ public class AthPlayer : MonoBehaviour
public int getRecherche(){return this.recherche;}
public int getTemps(){return this.temps;}
public int getPubli(){return this.nbpublications;}
public int getVol(){return this.nbvol;}
public void setReputation(int i){this.reputation=i;}
public void setNbarticles(int i){this.nbarticles=i;}
......@@ -35,6 +37,7 @@ public class AthPlayer : MonoBehaviour
public void setRecherche(int i){this.recherche=i;}
public void setTemps(int i){this.temps=i;}
public void setPubli(int i){this.nbpublications = i;}
public void setVol(int i){this.nbvol = i;}
void OnGUI()
{
......@@ -43,10 +46,16 @@ public class AthPlayer : MonoBehaviour
GUI.Box(new Rect(0, 50, 150, 25), "Reseau : " + getReseau().ToString());
GUI.Box(new Rect(0, 75, 150, 25), "Recherche : " + getRecherche().ToString());
GUI.Box(new Rect(Screen.width - 150, 0, 150, 25), "Mois restant : " + (36 - getTemps()).ToString());
if (getTemps () >= 36) {
// texte explicatif de votre CV selon vos stats
GUI.Box(new Rect(Screen.width / 2 - 165, Screen.height / 2 - 75, 330, 150), "Vous avez fini le jeu !");
if (getReputation () < 100) {
GUI.Box (new Rect (Screen.width / 2 - 500, Screen.height / 2 - 75, 1000, 150), "Vous avez fini le jeu !\n Votre réputation est trop basse... Vous n'avez aucun avenir !");
} else if (getReseau () < 100) {
GUI.Box (new Rect (Screen.width / 2 - 500, Screen.height / 2 - 75, 1000, 150), "Vous avez fini le jeu !\n Votre réseau est trop petit... Vous n'avez aucun avenir !");
} else {
GUI.Box (new Rect (Screen.width / 2 - 500, Screen.height / 2 - 75, 1000, 150), "Vous avez fini le jeu ! Bravo votre avenir est tout tracé !");
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment