Skip to content
Snippets Groups Projects
Commit c4e452ab authored by Sofiane Lasri's avatar Sofiane Lasri
Browse files

Merge Hub et Course à pieds

parent dbb11493
No related branches found
No related tags found
No related merge requests found
Showing
with 108 additions and 42030 deletions
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="UserContentModel">
<attachedFolders />
<explicitIncludes />
<explicitExcludes />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RiderProjectSettingsUpdater">
<option name="vcsConfiguration" value="2" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="7ff1e697-d7a4-4599-b2ee-d12970e8743f" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/Assets/Scripts/CourseAPieds/changeSceneCourse.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/CourseAPieds/changeSceneCourse.cs.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/Packages/com.unity.probuilder/Settings.json" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/Packages/com.unity.probuilder/Settings.json" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="ProjectId" id="27jp2X7OyMooLZHIjqTzqF4fTWg" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="Discover.Launch.Via.Unity" value="true" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="rider.run.widget.enabled.cache" value="false" />
</component>
<component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
<configuration name="Standalone Player" type="RunUnityExe" factoryName="Unity Executable">
<option name="EXE_PATH" value="$PROJECT_DIR$/Builds/projet-unity.exe" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="D:\Git\projet-unity-s4\Builds" />
<option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<method v="2" />
</configuration>
<configuration name="Attach to Unity Editor &amp; Play" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="UNITY_ATTACH_AND_PLAY" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost">
<option name="allowRunningInParallel" value="false" />
<option name="listenPortForConnections" value="false" />
<option name="pid" />
<option name="projectPathOnTarget" />
<option name="selectedOptions">
<list />
</option>
<method v="2" />
</configuration>
<configuration name="Attach to Unity Editor" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost">
<option name="allowRunningInParallel" value="false" />
<option name="listenPortForConnections" value="false" />
<option name="pid" />
<option name="projectPathOnTarget" />
<option name="selectedOptions">
<list />
</option>
<method v="2" />
</configuration>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="7ff1e697-d7a4-4599-b2ee-d12970e8743f" name="Changes" comment="" />
<created>1649843160136</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1649843160136</updated>
<workItem from="1649843182030" duration="79000" />
</task>
<servers />
</component>
<component name="UnityCheckinConfiguration" checkUnsavedScenes="true" />
<component name="UnityProjectConfiguration" hasMinimizedUI="null" />
<component name="UnityUnitTestConfiguration" currentTestLauncher="EditMode" />
<component name="VcsManagerConfiguration">
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
</component>
</project>
\ No newline at end of file
File deleted
fileFormatVersion: 2
guid: 93d9826b14d274e429551766068d6663
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 15600000
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class changeSceneCourse : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
void onTriggerEnter(collider obj)
{
}
}
fileFormatVersion: 2
guid: bdf882bd31c0ff6408a7243aa08dede2
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 80b72283c06f2534db9db240f3e01972
guid: 44827ff77b3342546ad27c193605fbd1
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
......
No preview for this file type
......@@ -14,14 +14,20 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/Hub/Hub.unity
guid: 548ff420e1a556f44ab8d1326b7d9200
- enabled: 1
path: "Assets/Scenes/CourseAPieds/course \xE0 pied.unity"
guid: 96cc04971e775d946b39cd60ced9dd6f
- enabled: 1
path: Assets/Scenes/Paintball/egypt.unity
guid: 9fc0d4010bbf28b4594072e72b8655ab
- enabled: 1
path: Assets/Scenes/skatepark terraintest/SkateTest.unity
guid: eb42c57e6107d234ea1ce47f3388473c
- enabled: 1
path: Assets/Scenes/CourseAPieds/menuCourse.unity
guid: 0adcb92b15b7a0a48b3d87a068e3652b
- enabled: 1
path: Assets/Scenes/CourseAPieds/sceneCheminPasAleatoire.unity
guid: b7d0fd886f1eff545bd6bc16a1463e9d
- enabled: 1
path: Assets/Scenes/CourseAPieds/sceneV7.unity
guid: b6c4140a91af9c34588bed446eed5f30
m_configObjects:
com.unity.input.settings: {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment