Commit 92ff0374 authored by juliette bonnard's avatar juliette bonnard
Browse files

Merge branch 'master' of https://gitlab.insa-rennes.fr/Gwenn.Rouet/momie

merge
parents f9140077 7d4f0a88
......@@ -145,16 +145,16 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1860626972422613216}
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_LocalPosition: {x: 0, y: 0, z: -0.0000009966}
m_LocalScale: {x: 0.31969, y: 0.31969, z: 0.31969}
m_Children: []
m_Father: {fileID: 1860626972175017318}
m_RootOrder: 0
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: 0, y: 0}
m_AnchoredPosition: {x: 0.056224823, y: -0.021572113}
m_SizeDelta: {x: 169.89069, y: 44.553078}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1860626972422613221
CanvasRenderer:
......@@ -185,7 +185,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 11
m_FontSize: 27
m_FontStyle: 2
m_BestFit: 0
m_MinSize: 1
......
......@@ -314,6 +314,11 @@ PrefabInstance:
propertyPath: m_Text
value: Patte
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056222916
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &23714299 stripped
......@@ -1302,6 +1307,11 @@ PrefabInstance:
propertyPath: m_Text
value: Patte
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056222916
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &117772651 stripped
......@@ -1432,6 +1442,16 @@ PrefabInstance:
propertyPath: m_Text
value: Queue
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056222916
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.021572113
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &121449227 stripped
......@@ -4387,6 +4407,16 @@ PrefabInstance:
propertyPath: m_FontData.m_Alignment
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056224823
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.021572113
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &349444333 stripped
......@@ -4673,6 +4703,16 @@ PrefabInstance:
propertyPath: m_Text
value: "F\xE9mur (Gauche)"
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056224823
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.021572113
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &375809465 stripped
......@@ -5669,6 +5709,16 @@ PrefabInstance:
propertyPath: m_Text
value: Omoplate (Droit)
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056224823
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.021572113
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &431864746 stripped
......@@ -5964,6 +6014,16 @@ PrefabInstance:
propertyPath: m_Text
value: Tibia (Gauche)
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056224823
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.021572113
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &468644349 stripped
......@@ -6860,6 +6920,11 @@ PrefabInstance:
propertyPath: m_Text
value: Patte
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056222916
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &545293340 stripped
......@@ -9116,6 +9181,11 @@ PrefabInstance:
propertyPath: m_Text
value: Patte
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056222916
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &737611546 stripped
......@@ -9357,6 +9427,16 @@ PrefabInstance:
propertyPath: m_Text
value: "Membre post\xE9rieur Gauche (dont Tibia)"
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.05622101
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.021572113
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &760881750 stripped
......@@ -9811,6 +9891,16 @@ PrefabInstance:
propertyPath: m_Text
value: Queue
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056222916
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.021572113
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &793656670 stripped
......@@ -12673,6 +12763,11 @@ PrefabInstance:
propertyPath: m_Text
value: "F\xE9mur"
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056222916
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &1068733156 stripped
......@@ -12994,6 +13089,16 @@ PrefabInstance:
propertyPath: m_Text
value: Tibia (Droit)
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056224823
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.021572113
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &1085414380 stripped
......@@ -14807,6 +14912,11 @@ PrefabInstance:
propertyPath: m_Name
value: "\xE9tiquette (7)"
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056222916
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &1309468112 stripped
......@@ -19044,6 +19154,11 @@ PrefabInstance:
 
'
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056222916
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &1746487726 stripped
......@@ -19752,6 +19867,11 @@ PrefabInstance:
propertyPath: m_Text
value: Patte
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056222916
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &1798167349 stripped
......@@ -22296,6 +22416,16 @@ PrefabInstance:
propertyPath: m_Text
value: Hanche (Gauche)
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056224823
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.021572113
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &1967664574 stripped
......@@ -22586,6 +22716,11 @@ PrefabInstance:
propertyPath: m_Text
value: Patte
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056222916
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &1977978175 stripped
......@@ -23055,6 +23190,11 @@ PrefabInstance:
propertyPath: m_Text
value: Patte
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056222916
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!224 &2016462932 stripped
......@@ -25514,6 +25654,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.056222916
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0725048a63ac957418507e4a53aed92f, type: 3}
--- !u!1 &1896040279065232984
......
......@@ -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)
{
......
......@@ -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
}
}
......
......@@ -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" />
......
......@@ -56,13 +56,6 @@
</sevenEditorExtension>
</extendedInfo>
</sequence>
<sequence xsi:type="Place" id="Place_7" label="Place_7">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="200.974258" y="-299.472443" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
<sequence xsi:type="Place" id="Place_8" label="Place_8">
<extendedInfo>
<sevenEditorExtension xmlns="">
......@@ -112,13 +105,6 @@
</sevenEditorExtension>
</extendedInfo>
</sequence>
<sequence xsi:type="Place" id="Place_15" label="Place_15">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="700.0412" y="-199.5999" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
<sequence xsi:type="Place" id="Place_16" label="Place_16">
<extendedInfo>
<sevenEditorExtension xmlns="">
......@@ -161,7 +147,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_1" label="Transition_1">
<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="e26bac2e-edcc-42d4-b06b-737a5cfed2b1" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -178,7 +164,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_2" label="Transition_2">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param value="Une fois que l'on connait les os que contient la momie, il faut identifier quels os sont présents à l'intérieur" type="System.String,mscorlib" name="Text" />
<param value="False" type="System.Boolean,mscorlib" name="Stays on screen" />
<param value="False" type="System.Boolean,mscorlib" name="Wait For End" />
......@@ -243,26 +229,12 @@
</extendedInfo>
<event id="Transition_6" label="Transition_6">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp">
<param value="Prenons par exemple cet os, et trouvons de quel os il sagit" type="System.String,mscorlib" name="Text" />
<param value="Prenons par exemple cet os, et trouvons de quel os il s'agit." type="System.String,mscorlib" name="Text" />
<param value="False" 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" />
</effectorUpdate>
</event>
<upstreamSequence idref="Place_6" />
<downstreamSequence idref="Place_7" />
</transition>
<transition id="Transition_7" label="Transition_7">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="299.974274" y="-299.472443" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_7" label="Transition_7">
<effectorUpdate classname="SEVEN.Time.WaitEffector, SEVEN.Extra">
<param value="5" type="System.Double,mscorlib" name="delay" />
</effectorUpdate>
</event>
<upstreamSequence idref="Place_7" />
<downstreamSequence idref="Place_13" />
</transition>
<transition id="Transition_8" label="Transition_8">
......@@ -289,7 +261,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_9" label="Transition_9">
<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="1b653c5d-37f7-4216-b27d-72064ba1114e" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -355,31 +327,17 @@
<transition id="Transition_14" label="Transition_14">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="699.8104" y="-299.9845" />
<position x="620.8104" y="-196.9845" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_14" label="Transition_14">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp">
<param value="Pour cela, comparons le avec un squelette de chat" type="System.String,mscorlib" name="Text" />
<param value="Pour cela, comparons-le avec un squelette de chat" 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" />
</effectorUpdate>
</event>
<upstreamSequence idref="Place_14" />
<downstreamSequence idref="Place_15" />
</transition>
<transition id="Transition_15" label="Transition_15">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="600.8104" y="-199.215271" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_15" label="Transition_15">
<effectorUpdate classname="SEVEN.Time.WaitEffector, SEVEN.Extra">
<param value="1" type="System.Double,mscorlib" name="delay" />
</effectorUpdate>
</event>
<upstreamSequence idref="Place_15" />
<downstreamSequence idref="Place_16" />
</transition>
<transition id="Transition_13" label="Transition_13">
......
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