Skip to content

GitLab

Commit dbdbc63e authored by juliette bonnard's avatar juliette bonnard
Browse files

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

merge
parents e2d608dd 1c713430
Expand all Hide whitespace changes
Inline Side-by-side
Assets/Scenes/Demo.unity
View file @ dbdbc63e
This diff is collapsed.
Assets/SevenScenarios/Reco_os.xml
View file @ dbdbc63e
......@@ -178,6 +178,13 @@
</sevenEditorExtension>
</extendedInfo>
</sequence>
<sequence xsi:type="Place" id="Place_24" label="Place_24">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="500.2319" y="599.62085" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
<transition id="Transition_0" label="Transition_0">
<extendedInfo>
<sevenEditorExtension xmlns="">
......@@ -326,7 +333,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_11" label="Transition_11">
<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="26eff213-5272-41fd-bcb4-50590590ee87" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -521,7 +528,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_8_1_1" label="disp_squelette_et_bouton">
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp">
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="cd33e5a6-92c2-44c2-8603-0390874c8390" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -538,7 +545,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_18" label="affichage_retour">
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp">
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="f064c437-89f2-4502-ae49-179eebff38f2" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -555,7 +562,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_19" label="disp_boutou_retour">
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp">
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="f064c437-89f2-4502-ae49-179eebff38f2" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -606,7 +613,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_19_3_1" label="disp_tete">
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp">
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="0d34a393-c57c-4c52-86ab-d04a3a5e225d" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -623,7 +630,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_11_1_1" label="Appui_faire_un_choix">
<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="d122834d-00af-4cbd-9633-1cd53132e241" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -636,7 +643,7 @@
</sensorCheck>
</event>
<upstreamSequence idref="Place_22" />
<downstreamSequence idref="Place_23" />
<downstreamSequence idref="Place_24" />
</transition>
<transition id="Transition_20" label="affichage_bouton_choix">
<extendedInfo>
......@@ -645,7 +652,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_20" label="affichage_bouton_choix">
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp">
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="c701b3bd-fe83-4aef-9af8-0b7ad10fc631" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -662,7 +669,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_21" label="Transition_21">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param value="Faite votre choix" 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" />
......@@ -671,6 +678,23 @@
<upstreamSequence idref="Place_23" />
<downstreamSequence idref="Place_22" />
</transition>
<transition id="Transition_22" label="Transition_22">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="500.693665" y="699.487244" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_22" label="Transition_22">
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="c0b66283-e155-485a-bf15-7cc006e0a541" type="System.Guid,mscorlib" name="UFID" />
</param>
<param value="True" type="System.Boolean,mscorlib" name="setActiveValue" />
</effectorUpdate>
</event>
<upstreamSequence idref="Place_24" />
<downstreamSequence idref="Place_23" />
</transition>
<initialSequence idref="Place_0" />
<finalSequence idref="Place_1" />
</sequence>
......
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