Skip to content
Snippets Groups Projects
Commit 27cda7f9 authored by Mathieu Loiseau's avatar Mathieu Loiseau
Browse files

**V POST-TEST**

+ arrêt overlay pendant petits sons du GD
parent b2db3e2f
No related branches found
No related tags found
No related merge requests found
......@@ -615,7 +615,7 @@ public class mainManager : MonoBehaviour
}
private void Update()
{
if((mainAudioSource!=null && mainAudioSource.isPlaying ) || (!playerTurn && !gameObjFin.activeSelf))
if((mainAudioSource!=null && mainAudioSource.isPlaying && !playerTurn ) || (!playerTurn && !gameObjFin.activeSelf))
{
fondNoirImage.SetActive(true);
}
......
......@@ -136,7 +136,7 @@ PlayerSettings:
vulkanEnableLateAcquireNextImage: 0
vulkanEnableCommandBufferRecycling: 1
loadStoreDebugModeEnabled: 0
bundleVersion: 1.19
bundleVersion: 1.22
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
......@@ -166,7 +166,7 @@ PlayerSettings:
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 1
AndroidBundleVersionCode: 10
AndroidBundleVersionCode: 13
AndroidMinSdkVersion: 22
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1
......
......@@ -144,7 +144,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 41
controlID: 42
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -169,7 +169,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 50}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 42
controlID: 43
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -413,7 +413,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 18fbffff
m_ExpandedIDs: 22b5ffff5ab5ffffecd5ffff1ed8ffff30d8ffff18fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -920,7 +920,7 @@ MonoBehaviour:
m_SaveData: []
m_OverlaysVisible: 1
m_SearchFilter:
m_NameFilter: main
m_NameFilter: brown
m_ClassNames: []
m_AssetLabels: []
m_AssetBundleNames: []
......@@ -932,7 +932,7 @@ MonoBehaviour:
m_Folders:
- Assets
m_Globs: []
m_OriginalText: main
m_OriginalText: brown
m_ImportLogFlags: 0
m_FilterByTypeIntersection: 0
m_ViewMode: 1
......@@ -945,9 +945,9 @@ MonoBehaviour:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 209f0000
m_LastClickedID: 40736
m_ExpandedIDs: 000000007e9d0000
m_SelectedIDs: 0c9f0000
m_LastClickedID: 40716
m_ExpandedIDs: 000000005e9e0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -975,7 +975,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 000000007e9d0000
m_ExpandedIDs: 000000005e9e0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment