From 37305a6ed1207503a414817b49e94e50a60677f0 Mon Sep 17 00:00:00 2001
From: MrWarzo <warzo1403@gmail.com>
Date: Fri, 20 Jan 2023 12:51:18 +0100
Subject: [PATCH] Merge scenes
---
.../Assets/Prefabs/Breakable Wall.prefab | 12 +--
UnityGoesBruh/Assets/Scenes/Level.unity | 94 +++++++++++++++++--
.../Scripts/Game/MinigameScript/Keypad.cs | 7 +-
3 files changed, 97 insertions(+), 16 deletions(-)
diff --git a/UnityGoesBruh/Assets/Prefabs/Breakable Wall.prefab b/UnityGoesBruh/Assets/Prefabs/Breakable Wall.prefab
index 1e6a762c..50802d7a 100644
--- a/UnityGoesBruh/Assets/Prefabs/Breakable Wall.prefab
+++ b/UnityGoesBruh/Assets/Prefabs/Breakable Wall.prefab
@@ -435,7 +435,7 @@ MeshCollider:
m_GameObject: {fileID: 4473577592099010918}
m_Material: {fileID: 0}
m_IsTrigger: 0
- m_Enabled: 0
+ m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
@@ -600,7 +600,7 @@ MeshCollider:
m_GameObject: {fileID: 5370626071720537669}
m_Material: {fileID: 0}
m_IsTrigger: 0
- m_Enabled: 0
+ m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
@@ -614,7 +614,7 @@ MeshCollider:
m_GameObject: {fileID: 5370626071720537669}
m_Material: {fileID: 0}
m_IsTrigger: 0
- m_Enabled: 0
+ m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
@@ -668,7 +668,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7516004826788876447, guid: fe8624b8239b6d44e8dba978b745de2a, type: 3}
propertyPath: m_LocalRotation.w
- value: 0.7071068
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 7516004826788876447, guid: fe8624b8239b6d44e8dba978b745de2a, type: 3}
propertyPath: m_LocalRotation.x
@@ -676,7 +676,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7516004826788876447, guid: fe8624b8239b6d44e8dba978b745de2a, type: 3}
propertyPath: m_LocalRotation.y
- value: 0.7071068
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 7516004826788876447, guid: fe8624b8239b6d44e8dba978b745de2a, type: 3}
propertyPath: m_LocalRotation.z
@@ -688,7 +688,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7516004826788876447, guid: fe8624b8239b6d44e8dba978b745de2a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 90
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 7516004826788876447, guid: fe8624b8239b6d44e8dba978b745de2a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
diff --git a/UnityGoesBruh/Assets/Scenes/Level.unity b/UnityGoesBruh/Assets/Scenes/Level.unity
index dbe796bf..954878ee 100644
--- a/UnityGoesBruh/Assets/Scenes/Level.unity
+++ b/UnityGoesBruh/Assets/Scenes/Level.unity
@@ -237,7 +237,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &420896859
GameObject:
@@ -268,7 +268,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 6
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &573095410 stripped
MonoBehaviour:
@@ -329,7 +329,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &638912595
GameObject:
@@ -382,7 +382,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &667618030
GameObject:
@@ -432,7 +432,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &682573620
GameObject:
@@ -482,7 +482,85 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 5
+ m_RootOrder: 6
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1328898107
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1328898110}
+ - component: {fileID: 1328898109}
+ - component: {fileID: 1328898108}
+ m_Layer: 0
+ m_Name: Terrain
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 4294967295
+ m_IsActive: 1
+--- !u!154 &1328898108
+TerrainCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1328898107}
+ m_Material: {fileID: 0}
+ m_Enabled: 0
+ m_TerrainData: {fileID: 15600000, guid: bcc00276e3c6f482bb6d47fd04ead463, type: 2}
+ m_EnableTreeColliders: 0
+--- !u!218 &1328898109
+Terrain:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1328898107}
+ m_Enabled: 1
+ serializedVersion: 6
+ m_TerrainData: {fileID: 15600000, guid: bcc00276e3c6f482bb6d47fd04ead463, type: 2}
+ m_TreeDistance: 512
+ m_TreeBillboardDistance: 512
+ m_TreeCrossFadeLength: 128
+ m_TreeMaximumFullLODCount: 2000
+ m_DetailObjectDistance: 0
+ m_DetailObjectDensity: 0
+ m_HeightmapPixelError: 1
+ m_SplatMapDistance: 100
+ m_HeightmapMaximumLOD: 0
+ m_ShadowCastingMode: 1
+ m_DrawHeightmap: 1
+ m_DrawInstanced: 0
+ m_DrawTreesAndFoliage: 1
+ m_StaticShadowCaster: 0
+ m_ReflectionProbeUsage: 1
+ m_MaterialTemplate: {fileID: 10652, guid: 0000000000000000f000000000000000, type: 0}
+ m_BakeLightProbesForTrees: 0
+ m_PreserveTreePrototypeLayers: 0
+ m_DeringLightProbesForTrees: 1
+ m_ScaleInLightmap: 0.1024
+ m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
+ m_GroupingID: 0
+ m_RenderingLayerMask: 1
+ m_AllowAutoConnect: 1
+--- !u!4 &1328898110
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1328898107}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -122.3, y: -9.2, z: -135}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1536038025 stripped
GameObject:
@@ -498,7 +576,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 4298483535738884810, guid: c734a74a53239c312bd0365490ad11b2, type: 3}
propertyPath: m_RootOrder
- value: 1
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 4298483535738884810, guid: c734a74a53239c312bd0365490ad11b2, type: 3}
propertyPath: m_LocalScale.x
@@ -590,7 +668,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1830644942908338429, guid: 67a51bbee122bdc46bc2291445bdaf75, type: 3}
propertyPath: m_RootOrder
- value: 2
+ value: 3
objectReference: {fileID: 0}
- target: {fileID: 1830644942908338429, guid: 67a51bbee122bdc46bc2291445bdaf75, type: 3}
propertyPath: m_LocalPosition.x
diff --git a/UnityGoesBruh/Assets/Scripts/Game/MinigameScript/Keypad.cs b/UnityGoesBruh/Assets/Scripts/Game/MinigameScript/Keypad.cs
index bd21100c..3afa44ac 100644
--- a/UnityGoesBruh/Assets/Scripts/Game/MinigameScript/Keypad.cs
+++ b/UnityGoesBruh/Assets/Scripts/Game/MinigameScript/Keypad.cs
@@ -33,7 +33,9 @@ namespace Game.MinigameScript
{ "Qui est caroline dans Portal2\n1: Le petit robot qui nous accompagne\n2: Le personnage principal\n3: L'assistant personnel du PDG de Aperture Science", 3 },
{ "Date de sortie du premier Mario\n1: 1983\n2: 1991\n3: 1985", 1 },
{ "Quand est sortie le premier fps\n1: 1974\n2: 1993\n3: 1996", 1 },
- { "Quand est sortie la première version de l'editeur Unity", 2005 }
+ { "Quand est sortie la première version de l'editeur Unity", 2005 },
+ { "Lieux qui n'existe pas\n1: Kirghizie\n2: Llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch \n3: Sainte-Verge \n4: Lurenberg", 4 },
+ {"Qu'est-ce que payara ?\n1: de la merde\n1: dépassé\n3: chiant", 1}
};
}
@@ -44,7 +46,8 @@ namespace Game.MinigameScript
ChooseRandomQuestion();
}
- private void ChooseRandomQuestion() {
+ private void ChooseRandomQuestion()
+ {
KeyValuePair<String, int> question = _quiz.ElementAt(Random.Range(0, _quiz.Count));
_keypadController.password = question.Value.ToString();
_tmpText.text = question.Key;
--
GitLab