Skip to content

GitLab

Commit ad474237 authored by Daniel Remi's avatar Daniel Remi
Browse files

Correction bug affichage sous-titres en haut

parent 143454a5
Hide whitespace changes
Inline Side-by-side
Assets/Scripts/SevenEffectors/PlayVoicelineEffector.cs
View file @ ad474237
......@@ -58,6 +58,7 @@ public class PlayVoicelineEffector : AUnityEffector
{
if (audio == null) audio = manager.defaultAudioClip;
if(displayAtTop) manager.changeSubtitlePosition(topSubtitlePosition);
else manager.resetSubtitlePosition();
manager.play(line, audio, length, stay);
if (waitForEnd)
{
......
Assets/Scripts/Voiceover/VOManager.cs
View file @ ad474237
......@@ -67,7 +67,6 @@ public class VOManager : MonoBehaviour
if (!stay) // If stay is false, then reset and hide the subtitle
{
subtitle.text = "";
resetSubtitlePosition();
} // Else the text stays on screen to keep the information displayed to the user
}
}
......
Assets/SevenScenarios/Nb_indiv.xml
View file @ ad474237
......@@ -279,7 +279,7 @@
</extendedInfo>
<event id="Transition_0" label="texte bonne réponse">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param value="Bravo ! Il y a en effet au minimum 3 individus dans la momie." type="System.String,mscorlib" name="Text" />
<param value="En effet, le tibia étant situé sur les pattes arrière, un tibia gauche est donc unique pour un chat." type="System.String,mscorlib" name="Text" />
<param value="False" type="System.Boolean,mscorlib" name="Stays on screen" />
<param value="True" type="System.Boolean,mscorlib" name="Wait For End" />
<param value="True" type="System.Boolean,mscorlib" name="Display at the top" />
......@@ -295,7 +295,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_1" label="appui sur btn fin">
<sensorCheck classname="CheckValueSensor, Assembly-CSharp">
<sensorCheck classname="CheckValueSensor, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="7f143957-d4f8-4841-bd2a-bb4397de4fe6" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -353,10 +353,10 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_3" label="texte consignes">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp">
<param value="Appuyez sur le bouton &quot;filtrage&quot; pour effectuer une sélection des ossements utiles à l'analyse." type="System.String,mscorlib" name="Text" />
<param value="True" type="System.Boolean,mscorlib" name="Stays on screen" />
<param value="False" type="System.Boolean,mscorlib" name="Wait For End" />
<param value="True" type="System.Boolean,mscorlib" name="Wait For End" />
<param value="3" type="System.Single,mscorlib" name="Length" />
<param value="True" type="System.Boolean,mscorlib" name="Display at the top" />
</effectorUpdate>
......@@ -371,7 +371,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_4" label="fin appui ">
<sensorCheck classname="CheckValueSensor, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<sensorCheck classname="CheckValueSensor, Assembly-CSharp">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="7f143957-d4f8-4841-bd2a-bb4397de4fe6" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -393,7 +393,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_5" label="appui btn étiquetage">
<sensorCheck classname="CheckValueSensor, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<sensorCheck classname="CheckValueSensor, Assembly-CSharp">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="7f143957-d4f8-4841-bd2a-bb4397de4fe6" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -404,7 +404,7 @@
</param>
<param value="1" type="System.String,mscorlib" name="expectedValue" />
</sensorCheck>
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="67236998-9b71-4cbc-87a7-1068eb4bec08" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -421,10 +421,10 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_6" label="texte consignes">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp">
<param value="Appuyez sur le bouton &quot;étiquetage&quot; afin de nommer chacun des os." type="System.String,mscorlib" name="Text" />
<param value="True" type="System.Boolean,mscorlib" name="Stays on screen" />
<param value="False" type="System.Boolean,mscorlib" name="Wait For End" />
<param value="True" type="System.Boolean,mscorlib" name="Wait For End" />
<param value="3" type="System.Single,mscorlib" name="Length" />
<param value="True" type="System.Boolean,mscorlib" name="Display at the top" />
</effectorUpdate>
......@@ -439,7 +439,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_7" label="fin appui">
<sensorCheck classname="CheckValueSensor, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<sensorCheck classname="CheckValueSensor, Assembly-CSharp">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="7f143957-d4f8-4841-bd2a-bb4397de4fe6" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -450,7 +450,7 @@
</param>
<param value="0" type="System.String,mscorlib" name="expectedValue" />
</sensorCheck>
<effectorUpdate classname="MoveObject, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<effectorUpdate classname="MoveObject, Assembly-CSharp">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="37c355df-9830-4cc5-9731-3083d6ce273c" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -881,7 +881,7 @@
</extendedInfo>
<event id="Transition_25" label="explications">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param value="En effet, le tibia étant situé sur les pattes arrières, un tibia gauche est donc unique pour un chat." type="System.String,mscorlib" name="Text" />
<param value="En effet, le tibia étant situé sur les pattes arrières, un squelette de chat ne compte qu'un tibia gauche." type="System.String,mscorlib" name="Text" />
<param value="False" type="System.Boolean,mscorlib" name="Stays on screen" />
<param value="True" type="System.Boolean,mscorlib" name="Wait For End" />
<param value="4" type="System.Single,mscorlib" name="Length" />
......@@ -1008,8 +1008,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_33" label="clignote">
<sensorCheck classname="NoVoicelineSensor, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp">
<param value="Clignote,Assembly-CSharp" type="System.Type,mscorlib" name="type" />
<param type="System.Reflection.MethodInfo,mscorlib" name="method">
<param value="Clignote,Assembly-CSharp" type="System.Type,mscorlib" name="DeclaringType" />
......@@ -1055,8 +1054,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_33_1_1" label="clignote">
<sensorCheck classname="NoVoicelineSensor, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp">
<param value="Clignote,Assembly-CSharp" type="System.Type,mscorlib" name="type" />
<param type="System.Reflection.MethodInfo,mscorlib" name="method">
<param value="Clignote,Assembly-CSharp" type="System.Type,mscorlib" name="DeclaringType" />
......@@ -1165,8 +1163,8 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_38" label="clignote btn plus">
<sensorCheck classname="NoVoicelineSensor, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<sensorCheck classname="NoVoicelineSensor, Assembly-CSharp" />
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp">
<param value="Clignote,Assembly-CSharp" type="System.Type,mscorlib" name="type" />
<param type="System.Reflection.MethodInfo,mscorlib" name="method">
<param value="Clignote,Assembly-CSharp" type="System.Type,mscorlib" name="DeclaringType" />
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment