Commit ec5f01b4 authored by Cancoin Pablo's avatar Cancoin Pablo
Browse files

Affichage des os correspondants lors de la selection - Reco os

parent a0c7a022
......@@ -2792,6 +2792,10 @@ PrefabInstance:
propertyPath: m_Name
value: ceiling_light
objectReference: {fileID: 0}
- target: {fileID: 117088, guid: 947e113398f058643a47464fff50cae1, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 403928, guid: 947e113398f058643a47464fff50cae1, type: 3}
propertyPath: m_LocalPosition.x
value: -1.492
......@@ -6074,7 +6078,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &479611881
RectTransform:
m_ObjectHideFlags: 0
......@@ -10306,7 +10310,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &827803968
Transform:
m_ObjectHideFlags: 0
......@@ -12055,6 +12059,26 @@ MonoBehaviour:
Obj: {fileID: 919132148543809271}
- UFIdstring: 58174073-0a8a-4ac4-a050-613477676fbb
Obj: {fileID: 0}
- UFIdstring: cd33e5a6-92c2-44c2-8603-0390874c8390
Obj: {fileID: 827803967}
- UFIdstring: 3a36c943-ae72-4613-8b1c-e5f0ea0ae500
Obj: {fileID: 110394779573303476}
- UFIdstring: 468241d3-b93f-4342-a72c-453930ab8041
Obj: {fileID: 1711669391}
- UFIdstring: 54a772ef-8d4e-47c2-9767-2e708ba7e31f
Obj: {fileID: 458043056}
- UFIdstring: 2f68e967-43fc-4429-903f-5ba031f87440
Obj: {fileID: 1239997137}
- UFIdstring: 3709412b-dff1-440a-9898-5bbc73e6f101
Obj: {fileID: 705151612}
- UFIdstring: c4d22b48-e00a-41e8-9989-169a90c1e422
Obj: {fileID: 111617726188635848}
- UFIdstring: 11b54501-c1d5-4af1-b693-a352005891e3
Obj: {fileID: 1716582716}
- UFIdstring: 1debe851-fb5e-4586-98e5-f54d42778728
Obj: {fileID: 1693221168}
- UFIdstring: 0d34a393-c57c-4c52-86ab-d04a3a5e225d
Obj: {fileID: 83822547}
assetsReferences: {fileID: 0}
--- !u!114 &1008082595
MonoBehaviour:
......@@ -17615,7 +17639,7 @@ PrefabInstance:
- target: {fileID: 919132149155446097, guid: cc8520bb8723399498e80fa04ac4314f,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cc8520bb8723399498e80fa04ac4314f, type: 3}
......@@ -23846,6 +23870,10 @@ PrefabInstance:
propertyPath: m_Name
value: ceiling_light (1)
objectReference: {fileID: 0}
- target: {fileID: 117088, guid: 947e113398f058643a47464fff50cae1, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 403928, guid: 947e113398f058643a47464fff50cae1, type: 3}
propertyPath: m_LocalPosition.x
value: 2.39
......
......@@ -4,7 +4,10 @@
<sequence xsi:type="SafePetriNet" id="Root" label="Root">
<extendedInfo>
<sevenEditorExtension xmlns="">
<comments />
<comments>
<comment>
</comment>
</comments>
</sevenEditorExtension>
</extendedInfo>
<sequence xsi:type="Place" id="Place_0" label="Debut">
......@@ -17,14 +20,14 @@
<sequence xsi:type="Place" id="Place_1" label="Fin">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="0" y="100.5" />
<position x="0" y="600.5" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
<sequence xsi:type="Place" id="Place_2" label="Place_2">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="100" y="0.25" />
<position x="100" y="500.25" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
......@@ -63,14 +66,7 @@
</sevenEditorExtension>
</extendedInfo>
</sequence>
<sequence xsi:type="Place" id="Place_9" label="Place_9">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="100.243118" y="-199.609512" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
<sequence xsi:type="Place" id="Place_10" label="Place_10">
<sequence xsi:type="Place" id="Place_10" label="Attente_selection_partie">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="0.243133545" y="-99.6095047" />
......@@ -80,14 +76,14 @@
<sequence xsi:type="Place" id="Place_11" label="Place_11">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="200.243134" y="-99.6095" />
<position x="399.243134" y="400.3905" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
<sequence xsi:type="Place" id="Place_12" label="Place_12">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="300.243134" y="0.390503168" />
<position x="300.243134" y="500.3905" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
......@@ -112,14 +108,42 @@
</sevenEditorExtension>
</extendedInfo>
</sequence>
<sequence xsi:type="Place" id="Place_7" label="Place_7">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="-199.809738" y="99.10538" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
<sequence xsi:type="Place" id="Place_9" label="Place_9">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="0.9045658" y="99.10537" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
<sequence xsi:type="Place" id="Place_15" label="Place_15">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="199.33316" y="99.96252" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
<sequence xsi:type="Place" id="Place_17" label="Place_17">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="0.475991726" y="300.3911" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
<transition id="Transition_0" label="Transition_0">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="0" y="0.5" />
<position x="0" y="500.5" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_0" label="Transition_0">
<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="7da7d54a-682b-4a40-a758-2a40dbfdfab8" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -130,7 +154,7 @@
</param>
<param value="1" type="System.String,mscorlib" name="expectedValue" />
</sensorCheck>
<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="e26bac2e-edcc-42d4-b06b-737a5cfed2b1" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -143,11 +167,11 @@
<transition id="Transition_1" label="Transition_1">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="200" y="0" />
<position x="200" y="500" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_1" label="Transition_1">
<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="e26bac2e-edcc-42d4-b06b-737a5cfed2b1" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -164,7 +188,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" />
......@@ -180,7 +204,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_3" label="Transition_3">
<effectorUpdate classname="SEVEN.Time.WaitEffector, SEVEN.Extra">
<effectorUpdate classname="SEVEN.Time.WaitEffector, SEVEN.Extra, Version=4.5.1.0, Culture=neutral, PublicKeyToken=null">
<param value="5" type="System.Double,mscorlib" name="delay" />
</effectorUpdate>
</event>
......@@ -194,7 +218,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_4" label="Transition_4">
<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="401b9666-2eba-4bfd-b95e-00c4831d71c7" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -211,7 +235,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_5" label="Transition_5">
<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="6343fb9c-7f3d-4e65-a3e7-5059fe9e1668" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -228,7 +252,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_6" label="Transition_6">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<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="True" type="System.Boolean,mscorlib" name="Wait For End" />
......@@ -240,51 +264,24 @@
<transition id="Transition_8" label="Transition_8">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="200.243134" y="-199.609512" />
<position x="0.243133545" y="-199.609512" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_8" label="Transition_8">
<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="e1016aa9-74a6-4770-b88e-9d083a8c5c7e" type="System.Guid,mscorlib" name="UFID" />
<param value="cd33e5a6-92c2-44c2-8603-0390874c8390" type="System.Guid,mscorlib" name="UFID" />
</param>
<param value="True" type="System.Boolean,mscorlib" name="setActiveValue" />
</effectorUpdate>
</event>
<upstreamSequence idref="Place_8" />
<downstreamSequence idref="Place_9" />
</transition>
<transition id="Transition_9" label="Transition_9">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="0.243133545" y="-199.609512" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_9" label="Transition_9">
<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>
<param value="True" type="System.Boolean,mscorlib" name="setActiveValue" />
</effectorUpdate>
</event>
<upstreamSequence idref="Place_9" />
<downstreamSequence idref="Place_10" />
</transition>
<transition id="Transition_10" label="Transition_10">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="100.243134" y="-99.6095047" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_10" label="Transition_10" />
<upstreamSequence idref="Place_10" />
<downstreamSequence idref="Place_11" />
</transition>
<transition id="Transition_11" label="Transition_11">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="300.243134" y="-99.6095047" />
<position x="400.243134" y="500.3905" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_11" label="Transition_11" />
......@@ -298,7 +295,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_12" label="Transition_12">
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp">
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param value="MoveObj,Assembly-CSharp" type="System.Type,mscorlib" name="type" />
<param type="System.Reflection.MethodInfo,mscorlib" name="method">
<param value="MoveObj,Assembly-CSharp" type="System.Type,mscorlib" name="DeclaringType" />
......@@ -331,7 +328,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_14" label="Transition_14">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<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="True" type="System.Boolean,mscorlib" name="Wait For End" />
......@@ -350,6 +347,137 @@
<upstreamSequence idref="Place_16" />
<downstreamSequence idref="Place_8" />
</transition>
<transition id="Transition_7" label="Clic_partie_avant">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="-199.8812" y="-0.383575439" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_7" label="Clic_partie_avant">
<sensorCheck classname="CheckValueSensor, Assembly-CSharp">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="2f68e967-43fc-4429-903f-5ba031f87440" type="System.Guid,mscorlib" name="UFID" />
</param>
<param value="Bouton,Assembly-CSharp" type="System.Type,mscorlib" name="type" />
<param type="System.Reflection.MemberInfo,mscorlib" name="member">
<param value="Bouton,Assembly-CSharp" name="DeclaringType" />
<param value="isPressed" name="MemberName" />
</param>
<param value="1" type="System.String,mscorlib" name="expectedValue" />
</sensorCheck>
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="11b54501-c1d5-4af1-b693-a352005891e3" type="System.Guid,mscorlib" name="UFID" />
</param>
<param value="True" type="System.Boolean,mscorlib" name="setActiveValue" />
</effectorUpdate>
</event>
<upstreamSequence idref="Place_10" />
<downstreamSequence idref="Place_7" />
</transition>
<transition id="Transition_9" label="Clic_partie_arriere">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="0.118774414" y="-0.383575439" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_9" label="Clic_partie_arriere">
<sensorCheck classname="CheckValueSensor, Assembly-CSharp">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="3709412b-dff1-440a-9898-5bbc73e6f101" type="System.Guid,mscorlib" name="UFID" />
</param>
<param value="Bouton,Assembly-CSharp" type="System.Type,mscorlib" name="type" />
<param type="System.Reflection.MemberInfo,mscorlib" name="member">
<param value="Bouton,Assembly-CSharp" name="DeclaringType" />
<param value="isPressed" name="MemberName" />
</param>
<param value="1" type="System.String,mscorlib" name="expectedValue" />
</sensorCheck>
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="1debe851-fb5e-4586-98e5-f54d42778728" type="System.Guid,mscorlib" name="UFID" />
</param>
<param value="True" type="System.Boolean,mscorlib" name="setActiveValue" />
</effectorUpdate>
</event>
<upstreamSequence idref="Place_10" />
<downstreamSequence idref="Place_9" />
</transition>
<transition id="Transition_15" label="Clic_partie_tete">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="200.118774" y="-0.383575439" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_15" label="Clic_partie_tete">
<sensorCheck classname="CheckValueSensor, Assembly-CSharp">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="c4d22b48-e00a-41e8-9989-169a90c1e422" type="System.Guid,mscorlib" name="UFID" />
</param>
<param value="Bouton,Assembly-CSharp" type="System.Type,mscorlib" name="type" />
<param type="System.Reflection.MemberInfo,mscorlib" name="member">
<param value="Bouton,Assembly-CSharp" name="DeclaringType" />
<param value="isPressed" name="MemberName" />
</param>
<param value="1" type="System.String,mscorlib" name="expectedValue" />
</sensorCheck>
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="0d34a393-c57c-4c52-86ab-d04a3a5e225d" type="System.Guid,mscorlib" name="UFID" />
</param>
<param value="True" type="System.Boolean,mscorlib" name="setActiveValue" />
</effectorUpdate>
</event>
<upstreamSequence idref="Place_10" />
<downstreamSequence idref="Place_15" />
</transition>
<transition id="Transition_10" label="Transition_10">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="-199.809738" y="199.962524" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_10" label="Transition_10" />
<upstreamSequence idref="Place_7" />
<downstreamSequence idref="Place_17" />
</transition>
<transition id="Transition_16" label="Transition_16">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="0.7617111" y="199.533951" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_16" label="Transition_16" />
<upstreamSequence idref="Place_9" />
<downstreamSequence idref="Place_17" />
</transition>
<transition id="Transition_17" label="Transition_17">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="199.04744" y="199.105377" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_17" label="Transition_17" />
<upstreamSequence idref="Place_15" />
<downstreamSequence idref="Place_17" />
</transition>
<transition id="Transition_8_1" label="Transition_8">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="0.115600586" y="399.494934" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_8_1_1" label="Transition_8">
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="cd33e5a6-92c2-44c2-8603-0390874c8390" type="System.Guid,mscorlib" name="UFID" />
</param>
<param value="False" type="System.Boolean,mscorlib" name="setActiveValue" />
</effectorUpdate>
</event>
<upstreamSequence idref="Place_17" />
<downstreamSequence idref="Place_11" />
</transition>
<initialSequence idref="Place_0" />
<finalSequence idref="Place_1" />
</sequence>
......
......@@ -19,7 +19,7 @@
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.test-framework": "1.1.1"
"com.unity.test-framework": "1.1.3"
},
"url": "https://packages.unity.com"
},
......
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