diff --git a/Assets/Masters/C.O.meta b/Assets/Masters/C.O.meta new file mode 100644 index 0000000000000000000000000000000000000000..bdd08437e5278646ce9dbc37fa12c42938f2c11c --- /dev/null +++ b/Assets/Masters/C.O.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 76efd00a4d0d98b4abf03a1bf90d3191 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Masters/C.O/triangle_purple.svg.meta b/Assets/Masters/C.O/triangle_purple.svg.meta new file mode 100644 index 0000000000000000000000000000000000000000..5accaf65c11fb084115fb32094dbc3bf6549d10d --- /dev/null +++ b/Assets/Masters/C.O/triangle_purple.svg.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ef99e11060486ce4484e53ee623d0036 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Masters/C.O/triangle_yellow.svg.meta b/Assets/Masters/C.O/triangle_yellow.svg.meta new file mode 100644 index 0000000000000000000000000000000000000000..84b1bf7018ea3919db21c133b291826ca2dfc600 --- /dev/null +++ b/Assets/Masters/C.O/triangle_yellow.svg.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 83b559b71757d5c4682c33a572ead884 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Positionnement.cs b/Assets/Positionnement.cs index 6451b8dbf2efb96be1b231fd0ca2d00859eb76cd..a9ee41e2e7f4b0df9085887cd5375db522aa466c 100644 --- a/Assets/Positionnement.cs +++ b/Assets/Positionnement.cs @@ -38,7 +38,12 @@ public class Positionnement : MonoBehaviour screenWidth = screenHeight * mainCamera.aspect; // Calculate the maximum allowable sprite height - float maxSpriteHeight = screenHeight * 0.2f; // 20% of the screen height + float heightToUse = 0.2f; + if ((mM.i!=null && (mM.i.fond == null || mM.i.fond.Length == 0)) && (mM.e.modalite != "GD")) + { + heightToUse = 0.35f; + } + float maxSpriteHeight = screenHeight * heightToUse; // 20% of the screen height // Calculate the width of the sprites to make them have the same size spriteWidthBouton = (screenWidth - (screenWidth*spriteSpacingPercentage * (listeDeChoix.Count - 1))) / listeDeChoix.Count; diff --git a/Assets/Resources/C.O/v2/3. circle_purple.png.meta b/Assets/Resources/C.O/v2/3. triangle_purple.png.meta similarity index 98% rename from Assets/Resources/C.O/v2/3. circle_purple.png.meta rename to Assets/Resources/C.O/v2/3. triangle_purple.png.meta index a4044efb0266d7645eade28c9c106a45a81601e3..d72df058d79aabbd216558faa09bcf53ac81d3cb 100644 --- a/Assets/Resources/C.O/v2/3. circle_purple.png.meta +++ b/Assets/Resources/C.O/v2/3. triangle_purple.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6fe869f3d813ee338b929559e74172cb +guid: 5dd5b1bdfb4c00540a9a0ef1d617c82f TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/C.O/v2/3. circle_yellow.png.meta b/Assets/Resources/C.O/v2/3. triangle_yellow.png.meta similarity index 98% rename from Assets/Resources/C.O/v2/3. circle_yellow.png.meta rename to Assets/Resources/C.O/v2/3. triangle_yellow.png.meta index ce3f58fd546eb42068c3d096d6a37fd746244143..5fc1ce86021f02e10b44b640666a43be1d442b80 100644 --- a/Assets/Resources/C.O/v2/3. circle_yellow.png.meta +++ b/Assets/Resources/C.O/v2/3. triangle_yellow.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 23cdd473f01ed6573b413292d81732da +guid: 8ffaf7162ae6f1e4fb93879676084bdf TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index fb19702cdec5e7246eeb382da5193ec133184d64..c7389b8c6fe86e7cabab2f193192517d06bf169d 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -308,7 +308,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0.5529412} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -5658,10 +5658,10 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 170093759} + - {fileID: 2143504475} - {fileID: 2006134183} - {fileID: 1886587952} - - {fileID: 2143504475} - - {fileID: 170093759} - {fileID: 234776228} - {fileID: 532516269} m_Father: {fileID: 0} @@ -5891,7 +5891,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 18 + m_fontSize: 18.5 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 diff --git a/Assets/mainManager.cs b/Assets/mainManager.cs index f16592803b5429df09871c86a9e19664db33e602..a87e3a2336c90d4d3bf0fb04216172b0a8c71562 100644 --- a/Assets/mainManager.cs +++ b/Assets/mainManager.cs @@ -598,7 +598,17 @@ public class mainManager : MonoBehaviour } private void Update() { - if(playerTurn && current_step >= 5 && !reveilEnCours) + if((mainAudioSource!=null && mainAudioSource.isPlaying ) || (!playerTurn && !gameObjFin.activeSelf)) + { + fondNoirImage.SetActive(true); + } + else + { + fondNoirImage.SetActive(false); + + } + + if (playerTurn && current_step >= 5 && !reveilEnCours) { if ((Time.time - actionUtilisateurStartTimeItem_Reveil > 10.0f && i.type == "tuto") || (Time.time - actionUtilisateurStartTimeItem_Reveil > 20.0f)) {