Compare commits

...

11 Commits

Author SHA1 Message Date
f36578c429 merging dev to avoid conflicts 2025-01-16 09:27:35 +01:00
8ca5097604 Fix winner detection 2025-01-15 17:18:38 +01:00
be419b5c78 Merge branch 'UIScoreAndSeparator' into dev
# Conflicts:
#	Assets/Scenes/SoloGameScene.unity
2025-01-15 17:06:36 +01:00
ced8078398 Added seaprator for UI 1v1 and changed score UI 2025-01-15 16:57:53 +01:00
teddy
2b8dec8ba7 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	.idea/workspace.xml
2025-01-15 16:35:24 +01:00
teddy
06af055344 correction merge 2025-01-15 16:35:09 +01:00
teddy
b3a2d8b1e6 correction merge 2025-01-15 16:23:03 +01:00
teddy
3b1774515b Merge remote-tracking branch 'origin/UI' into dev
# Conflicts:
#	Assets/Scenes/DeathScreen.unity
#	Assets/Scenes/DeathScreen1VS1.unity
#	Assets/Scenes/MainMenu.unity
2025-01-15 16:19:16 +01:00
teddy
27e4584d88 UI manque score 2025-01-15 15:54:12 +01:00
fc7914f4c5 Bug Fix : Menu pause, resume qui relance en mode solo même en mode 1VS1 2025-01-15 15:01:04 +01:00
9401b9fc8a Bug FIX :
- Player null dans les deathscreens
- Utilisaton d'une Gamesession inutiles dans les DeathScreens
- Fix bouton rejouer qui lance en solo dans deathscreen 1v&
2025-01-15 14:42:38 +01:00
36 changed files with 20712 additions and 2792 deletions

13
.idea/.idea.AwesomeRunner-/.idea/.gitignore generated vendored Normal file
View File

@ -0,0 +1,13 @@
# Default ignored files
/shelf/
/workspace.xml
# Rider ignored files
/projectSettingsUpdater.xml
/contentModel.xml
/.idea.AwesomeRunner-.iml
/modules.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
</project>

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="UserContentModel">
<attachedFolders />
<explicitIncludes />
<explicitExcludes />
</component>
</project>

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

8
.idea/indexLayout.xml generated Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="UserContentModel">
<attachedFolders />
<explicitIncludes />
<explicitExcludes />
</component>
</project>

7
.idea/projectSettingsUpdater.xml generated Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RiderProjectSettingsUpdater">
<option name="singleClickDiffPreview" value="1" />
<option name="vcsConfiguration" value="3" />
</component>
</project>

6
.idea/vcs.xml generated Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

70
.idea/workspace.xml generated Normal file
View File

@ -0,0 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="bbce60c9-b020-43bc-ac91-3e747354e409" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/Assets/Scenes/DeathScreen1VS1.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/DeathScreen1VS1.unity" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Sprites/CameraRenderTexture.renderTexture" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Sprites/CameraRenderTexture.renderTexture" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/Packages/com.unity.testtools.codecoverage/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="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/DeathScreen.unity" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/DeathScreen.unity" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/DeathScreen1VS1.unity" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/DeathScreen1VS1.unity" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/DeathScreen1VS1.unity" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/MainMenu.unity" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/MainMenu.unity" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json" root0="FORCE_HIGHLIGHTING" />
</component>
<component name="ProjectColorInfo"><![CDATA[{
"associatedIndex": 8
}]]></component>
<component name="ProjectId" id="2rfdTSaHd8CQV55SaQfRGNTGbwL" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.ShowReadmeOnStart": "true",
"git-widget-placeholder": "dev",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"vue.rearranger.settings.migration": "true"
}
}]]></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="bbce60c9-b020-43bc-ac91-3e747354e409" name="Changes" comment="" />
<created>1736954071558</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1736954071558</updated>
<workItem from="1736954074577" duration="429000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="UnityProjectConfiguration" hasMinimizedUI="false" />
<component name="UnityProjectDiscoverer">
<option name="unityProjectFolder" value="true" />
</component>
<component name="VcsManagerConfiguration">
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
</component>
</project>

Binary file not shown.

Binary file not shown.

View File

@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: m_jammo_metal 1
m_Shader: {fileID: 4800000, guid: 73ef4de7c429719438a73d771100db7c, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords:
- _METALLICGLOSSMAP
@ -19,6 +21,7 @@ Material:
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -85,3 +88,4 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@ -2,20 +2,26 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: m_jammo_metal
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _METALLICGLOSSMAP _NORMALMAP
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _METALLICGLOSSMAP
- _NORMALMAP
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -55,6 +61,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
@ -75,3 +82,5 @@ Material:
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@ -2,19 +2,25 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: No Name
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 5
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _EMISSION
m_InvalidKeywords: []
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -54,19 +60,26 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4865203f6c333ec41aa9c857891d9921
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6e6131461623f7f4e9622a07b5ea2f48
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -26,7 +26,7 @@ RenderSettings:
m_AmbientIntensity: 1
m_AmbientMode: 3
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_SkyboxMaterial: {fileID: 2100000, guid: 56d63adb06e62c745852a4e1e4f43902, type: 2}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
@ -168,7 +168,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
@ -217,8 +217,10 @@ RectTransform:
- {fileID: 1425101074}
- {fileID: 344149855}
- {fileID: 1726438702}
- {fileID: 1809258969}
- {fileID: 532422007}
- {fileID: 2089165861}
- {fileID: 117032978}
- {fileID: 142150282}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -226,6 +228,291 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &28337891
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 28337886}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5827ef60d322c73468e816b5411af65a, type: 3}
m_Name:
m_EditorClassIdentifier:
restartButton: {fileID: 0}
--- !u!1 &117032977
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 117032978}
- component: {fileID: 117032980}
- component: {fileID: 117032979}
m_Layer: 5
m_Name: TextCoins
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &117032978
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 117032977}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 28337890}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 8, y: 12}
m_SizeDelta: {x: 293.0168, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &117032979
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 117032977}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 'Coins earned :'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278255615
m_fontColor: {r: 1, g: 1, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 19
m_fontSizeBase: 19
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 1
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &117032980
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 117032977}
m_CullTransparentMesh: 1
--- !u!1 &142150281
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 142150282}
- component: {fileID: 142150284}
- component: {fileID: 142150283}
m_Layer: 5
m_Name: NumberCoins
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &142150282
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 142150281}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 28337890}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 18, y: 25}
m_SizeDelta: {x: 109.9835, y: 50}
m_Pivot: {x: 0.32881245, y: 0.5}
--- !u!114 &142150283
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 142150281}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 5024
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278255615
m_fontColor: {r: 1, g: 1, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 26
m_fontSizeBase: 26
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 9
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &142150284
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 142150281}
m_CullTransparentMesh: 1
--- !u!1 &344149854
GameObject:
m_ObjectHideFlags: 0
@ -261,8 +548,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -93.06824, y: -141.89418}
m_SizeDelta: {x: 111.4353, y: 151.2302}
m_AnchoredPosition: {x: -72.838036, y: -109.738655}
m_SizeDelta: {x: 83.1114, y: 117.0469}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &344149856
MonoBehaviour:
@ -308,8 +595,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 934295240}
m_TargetAssemblyTypeName: GameSession, Assembly-CSharp
- m_Target: {fileID: 934295243}
m_TargetAssemblyTypeName: Assets.Scripts.GameSession.GoToScene, Assembly-CSharp
m_MethodName: GoToSoloMode
m_Mode: 1
m_Arguments:
@ -392,8 +679,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -339.51, y: -51.875}
m_SizeDelta: {x: 347.4745, y: 331.2676}
m_AnchoredPosition: {x: -267, y: -23}
m_SizeDelta: {x: 215.7859, y: 191.7685}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &532422008
MonoBehaviour:
@ -536,8 +823,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 934295242}
- component: {fileID: 934295241}
- component: {fileID: 934295240}
- component: {fileID: 934295243}
- component: {fileID: 934295244}
m_Layer: 0
m_Name: GameManager
m_TagString: Untagged
@ -545,37 +832,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &934295240
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 934295239}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 412e4ad20c347ce47b62391fe298974c, type: 3}
m_Name:
m_EditorClassIdentifier:
player1: {fileID: 0}
player2: {fileID: 0}
scoreboard: {fileID: 0}
isDuoMode: 0
--- !u!114 &934295241
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 934295239}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8c734ff3b010f1640a238a992583af1f, type: 3}
m_Name:
m_EditorClassIdentifier:
<CurveStrengthY>k__BackingField: 0
<CurveStrengthX>k__BackingField: 0
curveOrigin: {fileID: 0}
--- !u!4 &934295242
Transform:
m_ObjectHideFlags: 0
@ -591,19 +847,35 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &28337891
--- !u!114 &934295243
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 28337886}
m_GameObject: {fileID: 934295239}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5827ef60d322c73468e816b5411af65a, type: 3}
m_Script: {fileID: 11500000, guid: 90560e670cf9430d920225316b227914, type: 3}
m_Name:
m_EditorClassIdentifier:
restartButton: {fileID: 585937283}
--- !u!114 &934295244
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 934295239}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2278264f81ffe464da1a99450675b475, type: 3}
m_Name:
m_EditorClassIdentifier:
distanceText: {fileID: 2089165862}
numberCoinsText: {fileID: 142150283}
joueur1Text: {fileID: 0}
joueur2Text: {fileID: 0}
is1v1Mode: 0
--- !u!1 &963194225
GameObject:
m_ObjectHideFlags: 0
@ -704,98 +976,79 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3596407935928064896, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 3596407935928064896, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: 104b61ba2d831c84e9200f18cdf2cd2f, type: 2}
- target: {fileID: 6031424829095203416, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 6031424829095203416, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6456075115708800826, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 6456075115708800826, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: healthBarView
value:
objectReference: {fileID: 0}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: m_LocalScale.x
value: 104.64
objectReference: {fileID: 0}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: m_LocalScale.y
value: 129.97945
objectReference: {fileID: 0}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: m_LocalPosition.x
value: 1991
objectReference: {fileID: 0}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: m_LocalPosition.y
value: 52
objectReference: {fileID: 0}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: m_LocalPosition.z
value: -176
objectReference: {fileID: 0}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: m_LocalRotation.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7509186232753540492, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 7509186232753540492, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: laneSystem
value:
objectReference: {fileID: 0}
- target: {fileID: 7581911058254726377, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 7581911058254726377, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
- target: {fileID: 7896966939631641298, guid: 01fa89ab9028c864b8560621b7d51f50,
type: 3}
- target: {fileID: 7896966939631641298, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
propertyPath: PlayerHUD
value:
objectReference: {fileID: 0}
@ -838,8 +1091,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -0.0060005}
m_SizeDelta: {x: 104.8, y: 117.85}
m_AnchoredPosition: {x: 0.000041962, y: -0.00017548}
m_SizeDelta: {x: 80, y: 90.028}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1425101075
MonoBehaviour:
@ -861,7 +1114,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 2800000, guid: f3bf48d62eb8db4488ff8d833e011574, type: 3}
m_Texture: {fileID: 2800000, guid: 590b8a48d28b68a48b63b55d69a491ff, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
@ -1100,8 +1353,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 81, y: -141.89418}
m_SizeDelta: {x: 111.4353, y: 151.2302}
m_AnchoredPosition: {x: 62.2088, y: -109.74}
m_SizeDelta: {x: 85.2889, y: 117.05}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1726438703
MonoBehaviour:
@ -1147,8 +1400,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 934295240}
m_TargetAssemblyTypeName: GameSession, Assembly-CSharp
- m_Target: {fileID: 934295243}
m_TargetAssemblyTypeName: Assets.Scripts.GameSession.GoToScene, Assembly-CSharp
m_MethodName: GoToMainMenu
m_Mode: 1
m_Arguments:
@ -1197,78 +1450,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1726438701}
m_CullTransparentMesh: 1
--- !u!1 &1809258968
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1809258969}
- component: {fileID: 1809258970}
m_Layer: 5
m_Name: Video Player
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1809258969
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1809258968}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 28337890}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 81, y: -141.89418}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!328 &1809258970
VideoPlayer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1809258968}
m_Enabled: 1
m_VideoClip: {fileID: 0}
m_TargetCameraAlpha: 1
m_TargetCamera3DLayout: 0
m_TargetCamera: {fileID: 0}
m_TargetTexture: {fileID: 0}
m_TimeReference: 0
m_TargetMaterialRenderer: {fileID: 0}
m_TargetMaterialProperty: <noninit>
m_RenderMode: 2
m_AspectRatio: 2
m_DataSource: 0
m_TimeUpdateMode: 2
m_PlaybackSpeed: 1
m_AudioOutputMode: 2
m_TargetAudioSources:
- {fileID: 0}
m_DirectAudioVolumes:
- 1
m_Url:
m_EnabledAudioTracks: 01
m_DirectAudioMutes: 00
m_ControlledAudioTrackCount: 1
m_PlayOnAwake: 1
m_SkipOnDrop: 1
m_Looping: 0
m_WaitForFirstFrame: 1
m_FrameReadyEventEnabled: 0
m_VideoShaders: []
--- !u!1 &2056363842
GameObject:
m_ObjectHideFlags: 0
@ -1337,6 +1518,142 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2089165860
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2089165861}
- component: {fileID: 2089165863}
- component: {fileID: 2089165862}
m_Layer: 5
m_Name: Distance
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2089165861
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2089165860}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 28337890}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.0000019073, y: 124}
m_SizeDelta: {x: 236.3232, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2089165862
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2089165860}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 15202M
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 56
m_fontSizeBase: 56
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 1
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: -4.0126266, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &2089165863
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2089165860}
m_CullTransparentMesh: 1
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@ -407,7 +407,7 @@ GameObject:
- component: {fileID: 100036930}
- component: {fileID: 100036929}
- component: {fileID: 100036928}
m_Layer: 5
m_Layer: 3
m_Name: Back
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -573,7 +573,7 @@ GameObject:
- component: {fileID: 139585262}
- component: {fileID: 139585263}
- component: {fileID: 139585264}
m_Layer: 5
m_Layer: 3
m_Name: Content
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -596,7 +596,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.000050159586, y: 0.0000019978345}
m_AnchoredPosition: {x: -0.000050159586, y: -0.0000038146973}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &139585263
@ -648,7 +648,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 178371325}
m_Layer: 5
m_Layer: 3
m_Name: Sliding Area
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -807,7 +807,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 220002225}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 46.84}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -852,8 +852,8 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1858832248}
- {fileID: 1791311983}
- {fileID: 1858832248}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &377940177
@ -1350,7 +1350,7 @@ GameObject:
- component: {fileID: 812835471}
- component: {fileID: 812835470}
- component: {fileID: 812835469}
m_Layer: 5
m_Layer: 3
m_Name: Viewport
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -1439,7 +1439,7 @@ GameObject:
- component: {fileID: 839969255}
- component: {fileID: 839969257}
- component: {fileID: 839969256}
m_Layer: 5
m_Layer: 3
m_Name: BackText
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -1576,7 +1576,7 @@ GameObject:
- component: {fileID: 868437932}
- component: {fileID: 868437931}
- component: {fileID: 868437930}
m_Layer: 5
m_Layer: 3
m_Name: Scrollbar Vertical
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -2094,7 +2094,7 @@ GameObject:
- component: {fileID: 1055376734}
- component: {fileID: 1055376733}
- component: {fileID: 1055376732}
m_Layer: 5
m_Layer: 3
m_Name: Scroll View
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -2303,7 +2303,7 @@ GameObject:
- component: {fileID: 1237272501}
- component: {fileID: 1237272503}
- component: {fileID: 1237272502}
m_Layer: 5
m_Layer: 3
m_Name: Handle
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -3327,6 +3327,156 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
--- !u!1 &1733628372
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1733628373}
- component: {fileID: 1733628375}
- component: {fileID: 1733628374}
m_Layer: 5
m_Name: Separator
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1733628373
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1733628372}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 678372250}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 5, y: 598.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1733628374
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1733628372}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1733628375
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1733628372}
m_CullTransparentMesh: 1
--- !u!1 &1772075871
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1772075872}
- component: {fileID: 1772075874}
- component: {fileID: 1772075873}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1772075872
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1772075871}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 678372250}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 274.87}
m_SizeDelta: {x: 128.84, y: 30.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1772075873
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1772075871}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9056604, g: 0.9056604, b: 0.9056604, a: 0.8980392}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1772075874
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1772075871}
m_CullTransparentMesh: 1
--- !u!1 &1791311979
GameObject:
m_ObjectHideFlags: 0
@ -3656,8 +3806,8 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 220002229}
- {fileID: 678372250}
- {fileID: 220002229}
- {fileID: 552140505}
m_Father: {fileID: 245285643}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4102,7 +4252,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1856934115903457218}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 28.65}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -4114,8 +4264,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -60.000004, y: -200}
m_AnchoredPosition: {x: 0, y: -5}
m_SizeDelta: {x: -60.000004, y: -110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1856934115903457218
GameObject:
@ -4129,7 +4279,7 @@ GameObject:
- component: {fileID: 1856934115903457221}
- component: {fileID: 1856934115903457222}
- component: {fileID: 4920621562230953387}
m_Layer: 5
m_Layer: 3
m_Name: ScoreboardView
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -4157,7 +4307,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_Color: {r: 0.59119487, g: 0.59119487, b: 0.59119487, a: 0.7019608}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@ -4236,7 +4386,7 @@ GameObject:
m_Component:
- component: {fileID: 2749335941631071934}
- component: {fileID: 5068000569768891960}
m_Layer: 5
m_Layer: 3
m_Name: VerticalLayout
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -4913,6 +5063,14 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1858832248}
m_Modifications:
- target: {fileID: 6634832997822410792, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410792, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410792, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_SizeDelta.x
value: 129.0279
@ -4921,18 +5079,26 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 32
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410792, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_LocalPosition.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410792, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_AnchoredPosition.x
value: -64.514404
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410792, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_AnchoredPosition.y
value: -16
value: -25.2
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410793, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410798, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_CullTransparentMesh
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410799, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_fontSize
value: 30.25
@ -4947,7 +5113,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410799, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_margin.z
value: 8.811302
value: -0.043342564
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410799, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_fontStyle
value: 2
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410799, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_HorizontalAlignment
value: 2
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410799, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_Pivot.x
@ -5007,7 +5185,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_LocalPosition.z
value: 0
value: -5.05
objectReference: {fileID: 0}
- target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_LocalRotation.w
@ -5055,7 +5233,13 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
insertIndex: 0
addedObject: {fileID: 1733628373}
- targetCorrespondingSourceObject: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
insertIndex: 1
addedObject: {fileID: 1772075872}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
--- !u!1 &6871074651254400895
@ -5100,7 +5284,7 @@ GameObject:
- component: {fileID: 4191864465036188526}
- component: {fileID: 334265878197336758}
- component: {fileID: 3413095558211005055}
m_Layer: 5
m_Layer: 3
m_Name: ScoreboardText
m_TagString: Untagged
m_Icon: {fileID: 0}

View File

@ -167,7 +167,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
@ -506,8 +506,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 533191358}
- component: {fileID: 533191357}
- component: {fileID: 533191356}
- component: {fileID: 533191359}
m_Layer: 0
m_Name: GameManager
m_TagString: Untagged
@ -515,36 +514,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &533191356
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 533191355}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 412e4ad20c347ce47b62391fe298974c, type: 3}
m_Name:
m_EditorClassIdentifier:
currentPlayer: {fileID: 0}
scoreboard: {fileID: 0}
isPlayer2: 0
--- !u!114 &533191357
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 533191355}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8c734ff3b010f1640a238a992583af1f, type: 3}
m_Name:
m_EditorClassIdentifier:
<CurveStrengthY>k__BackingField: 0
<CurveStrengthX>k__BackingField: 0
curveOrigin: {fileID: 963194228}
--- !u!4 &533191358
Transform:
m_ObjectHideFlags: 0
@ -560,6 +529,18 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &533191359
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 533191355}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 90560e670cf9430d920225316b227914, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &565350509
GameObject:
m_ObjectHideFlags: 0
@ -594,7 +575,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -16}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &565350511
@ -732,8 +713,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -273.40057, y: -40.693207}
m_SizeDelta: {x: 127.3032, y: 299.7355}
m_AnchoredPosition: {x: -252.8, y: -42.3}
m_SizeDelta: {x: 142.5, y: 288.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &585937283
MonoBehaviour:
@ -779,8 +760,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 533191356}
m_TargetAssemblyTypeName: GameSession, Assembly-CSharp
- m_Target: {fileID: 533191359}
m_TargetAssemblyTypeName: Assets.Scripts.GameSession.GoToScene, Assembly-CSharp
m_MethodName: GoToSoloMode
m_Mode: 1
m_Arguments:
@ -865,8 +846,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 265.5, y: -153.16}
m_SizeDelta: {x: 177.9763, y: 190.8653}
m_AnchoredPosition: {x: 212.75699, y: -113.52}
m_SizeDelta: {x: 117.196, y: 152.05}
m_Pivot: {x: 0.5, y: 0.50000006}
--- !u!114 &641718692
MonoBehaviour:
@ -912,7 +893,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 533191356}
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: GameSession, Assembly-CSharp
m_MethodName: GoToSoloMode
m_Mode: 1
@ -1185,8 +1166,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.014961, y: -0.00024796}
m_SizeDelta: {x: 130.55, y: 115.45}
m_AnchoredPosition: {x: 36.30214, y: 0.00042725}
m_SizeDelta: {x: 91.8535, y: 74.982}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1425101075
MonoBehaviour:
@ -1395,8 +1376,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 268, y: 71}
m_SizeDelta: {x: 177.9763, y: 190.8653}
m_AnchoredPosition: {x: 212.76, y: 54}
m_SizeDelta: {x: 117.19, y: 151.4374}
m_Pivot: {x: 0.49999997, y: 0.5}
--- !u!114 &1715640246
MonoBehaviour:
@ -1442,7 +1423,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 533191356}
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: GameSession, Assembly-CSharp
m_MethodName: GoToSoloMode
m_Mode: 1
@ -1528,8 +1509,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -112, y: -45.2294}
m_SizeDelta: {x: 201.0648, y: 364.0289}
m_AnchoredPosition: {x: -39.7636, y: -34}
m_SizeDelta: {x: 144.9, y: 300.43}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2040053554
MonoBehaviour:
@ -1575,8 +1556,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 533191356}
m_TargetAssemblyTypeName: GameSession, Assembly-CSharp
- m_Target: {fileID: 533191359}
m_TargetAssemblyTypeName: Assets.Scripts.GameSession.GoToScene, Assembly-CSharp
m_MethodName: GoToDuoMode
m_Mode: 1
m_Arguments:

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Assets.Scripts.GameSession;
using JetBrains.Annotations;
using UnityEngine;
using UnityEngine.SceneManagement;
@ -160,20 +161,21 @@ public class GameSession : MonoBehaviour,IResettable
SceneManager.LoadScene("DeathScreen1VS1");
}
public void GoToSoloMode()
public void PausePlayAgain()
{
SceneManager.LoadScene("SoloGameScene", LoadSceneMode.Single);
if (isDuoMode)
{
GoToScene.GoToDuoMode();
}
else
{
GoToScene.GoToSoloMode();
}
ResetToDefault();
}
public void GoToDuoMode()
public void PauseBackToMainMenu()
{
SceneManager.LoadScene("DuoGameScene", LoadSceneMode.Single);
ResetToDefault();
}
public void GoToMainMenu()
{
SceneManager.LoadScene("MainMenu", LoadSceneMode.Single);
GoToScene.GoToMainMenu();
ResetToDefault();
}

View File

@ -0,0 +1,30 @@
using UnityEngine;
using UnityEngine.SceneManagement;
namespace Assets.Scripts.GameSession
{
public class GoToScene : MonoBehaviour
{
public static void GoToSoloMode()
{
SceneManager.LoadScene("SoloGameScene", LoadSceneMode.Single);
}
public static void GoToDuoMode()
{
SceneManager.LoadScene("DuoGameScene", LoadSceneMode.Single);
}
public static void GoToMainMenu()
{
SceneManager.LoadScene("MainMenu", LoadSceneMode.Single);
}
public static void GoToDeathScreenSolo()
{
SceneManager.LoadScene("DeathScreen", LoadSceneMode.Single);
}
public static void GoToDeathScreen1VS1()
{
SceneManager.LoadScene("DeathScreen1VS1", LoadSceneMode.Single);
}
}
}

View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 90560e670cf9430d920225316b227914
timeCreated: 1736947730

View File

@ -41,15 +41,15 @@ public class Health : MonoBehaviour, IDamageable,IHealable, IResettable
}
public void TakeDamage(int amount)
{
// if (CurrentHealth > 0)
// {
// CurrentHealth -= amount;
// if (CurrentHealth <= 0){
// CurrentHealth = 0;
// OnOutOfHealth?.Invoke();
// }
// OnHealthChanged(this, healthArgs.GetUpdatedArgs(CurrentHealth, MaxHealth));
// }
if (CurrentHealth > 0)
{
CurrentHealth -= amount;
if (CurrentHealth <= 0){
CurrentHealth = 0;
OnOutOfHealth?.Invoke();
}
OnHealthChanged(this, healthArgs.GetUpdatedArgs(CurrentHealth, MaxHealth));
}
}
public void Heal(int amount)
{

View File

@ -82,11 +82,6 @@ public class Player : MonoBehaviour, IResettable, ICommandTranslator
{
PlayerHealth.OnOutOfHealth += Die;
}
// private void OnDisable()
// {
// PlayerHealth.OnOutOfHealth -= Die;
// }
private void Start()
{
PlayerStateMachine.SetState(PlayerStateMachine.PlayerStartingIdleState);

View File

@ -30,11 +30,6 @@ public class ChunkGenerator : MonoBehaviour
transform.localPosition.y,
transform.localPosition.z
);
//TODO: A enlever (pour fix bug)
// if (obstacle.IsOnAllLanes)
// {
// obstacle.transform.localPosition = new Vector3(LaneSystem.CenterLane * LaneSystem.LaneWidth, transform.localPosition.y, transform.localPosition.z);
// }
}
return chunkToFill;
}

View File

@ -0,0 +1,19 @@
using System.Globalization;
using UnityEngine;
using TMPro; // Nécessaire pour TextMeshPro
public class UIManager : MonoBehaviour
{
// Références pour la distance et les pièces (mode normal)
public TextMeshProUGUI distanceText;
public TextMeshProUGUI numberCoinsText;
// Variables pour distance et pièces
private float distance = 0f;
private int coins = 0;
void Update()
{
distanceText.text = distance.ToString("F1", CultureInfo.InvariantCulture) + "M";
numberCoinsText.text = coins.ToString();
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 2278264f81ffe464da1a99450675b475

View File

@ -26,12 +26,12 @@ public class PausedView : BaseView
mainMenuButton.onClick.AddListener(() =>
{
GameSession.Instance.GoToMainMenu();
GameSession.Instance.PauseBackToMainMenu();
});
restartButton.onClick.AddListener(() =>
{
GameSession.Instance.GoToSoloMode();
GameSession.Instance.PausePlayAgain();
});
base.Init();
}

BIN
Assets/Sprites/Deathscreen (1).png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f3bf48d62eb8db4488ff8d833e011574
guid: 590b8a48d28b68a48b63b55d69a491ff
TextureImporter:
internalIDToNameTable: []
externalObjects: {}

BIN
Assets/Sprites/Deathscreen.png (Stored with Git LFS)

Binary file not shown.

File diff suppressed because one or more lines are too long