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

Fix merge

parent 92ff0374
......@@ -1395,7 +1395,7 @@ PrefabInstance:
- target: {fileID: 1860626972175017318, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_SizeDelta.x
value: 50
value: 40
objectReference: {fileID: 0}
- target: {fileID: 1860626972175017318, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
......@@ -1442,6 +1442,11 @@ PrefabInstance:
propertyPath: m_Text
value: Queue
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613222, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 30
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
......@@ -4043,7 +4048,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0e8054fbf9fd1da4e8f49cad4f1724ff, type: 3}
m_Name:
m_EditorClassIdentifier:
speed: 0.5
rotateX: 1
rotateY: 0
rotateZ: 0
......@@ -4355,12 +4359,12 @@ PrefabInstance:
- target: {fileID: 1860626972175017318, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_SizeDelta.x
value: 100
value: 85
objectReference: {fileID: 0}
- target: {fileID: 1860626972175017318, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_SizeDelta.y
value: 35
value: 33
objectReference: {fileID: 0}
- target: {fileID: 1860626972175017318, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
......@@ -4407,6 +4411,11 @@ PrefabInstance:
propertyPath: m_FontData.m_Alignment
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613222, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 30
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
......@@ -4656,7 +4665,7 @@ PrefabInstance:
- target: {fileID: 1860626972175017318, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_SizeDelta.x
value: 100
value: 85
objectReference: {fileID: 0}
- target: {fileID: 1860626972175017318, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
......@@ -4703,6 +4712,11 @@ PrefabInstance:
propertyPath: m_Text
value: "F\xE9mur (Gauche)"
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613222, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 30
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
......@@ -5662,7 +5676,7 @@ PrefabInstance:
- target: {fileID: 1860626972175017318, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_SizeDelta.x
value: 90
value: 85
objectReference: {fileID: 0}
- target: {fileID: 1860626972175017318, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
......@@ -5709,6 +5723,11 @@ PrefabInstance:
propertyPath: m_Text
value: Omoplate (Droit)
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613222, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 30
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
......@@ -6014,6 +6033,11 @@ PrefabInstance:
propertyPath: m_Text
value: Tibia (Gauche)
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613222, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 30
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
......@@ -9380,12 +9404,12 @@ PrefabInstance:
- target: {fileID: 1860626972175017318, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_SizeDelta.x
value: 150
value: 100
objectReference: {fileID: 0}
- target: {fileID: 1860626972175017318, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_SizeDelta.y
value: 35
value: 33
objectReference: {fileID: 0}
- target: {fileID: 1860626972175017318, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
......@@ -9427,6 +9451,11 @@ PrefabInstance:
propertyPath: m_Text
value: "Membre post\xE9rieur Gauche (dont Tibia)"
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613222, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 30
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
......@@ -9844,7 +9873,7 @@ PrefabInstance:
- target: {fileID: 1860626972175017318, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_SizeDelta.x
value: 50
value: 40
objectReference: {fileID: 0}
- target: {fileID: 1860626972175017318, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
......@@ -9891,6 +9920,11 @@ PrefabInstance:
propertyPath: m_Text
value: Queue
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613222, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 30
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
......@@ -13042,7 +13076,7 @@ PrefabInstance:
- target: {fileID: 1860626972175017318, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_SizeDelta.x
value: 70
value: 65
objectReference: {fileID: 0}
- target: {fileID: 1860626972175017318, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
......@@ -13089,6 +13123,11 @@ PrefabInstance:
propertyPath: m_Text
value: Tibia (Droit)
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613222, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 30
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
......@@ -22369,7 +22408,7 @@ PrefabInstance:
- target: {fileID: 1860626972175017318, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_SizeDelta.x
value: 100
value: 90
objectReference: {fileID: 0}
- target: {fileID: 1860626972175017318, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
......@@ -22416,6 +22455,11 @@ PrefabInstance:
propertyPath: m_Text
value: Hanche (Gauche)
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613222, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 30
objectReference: {fileID: 0}
- target: {fileID: 1860626972422613223, guid: 0725048a63ac957418507e4a53aed92f,
type: 3}
propertyPath: m_AnchoredPosition.x
......
......@@ -278,8 +278,8 @@
</sevenEditorExtension>
</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="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" />
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp">
<param value="Bravo ! Il y a au moins 3 chats différents dans la momie. " 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" />
......@@ -353,7 +353,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_3" label="texte consignes">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<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="True" type="System.Boolean,mscorlib" name="Wait For End" />
......@@ -371,7 +371,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_4" label="fin appui ">
<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>
......@@ -393,7 +393,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_5" label="appui btn étiquetage">
<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>
......@@ -404,7 +404,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="67236998-9b71-4cbc-87a7-1068eb4bec08" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -421,7 +421,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_6" label="texte consignes">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<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="True" type="System.Boolean,mscorlib" name="Wait For End" />
......@@ -439,7 +439,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_7" label="fin appui">
<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>
......@@ -450,7 +450,7 @@
</param>
<param value="0" type="System.String,mscorlib" name="expectedValue" />
</sensorCheck>
<effectorUpdate classname="MoveObject, Assembly-CSharp">
<effectorUpdate classname="MoveObject, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="37c355df-9830-4cc5-9731-3083d6ce273c" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -880,7 +880,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_25" label="explications">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp">
<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" />
......@@ -972,7 +972,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_31" label="explications">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp">
<param value="Ici, on pouvait compter 3 tibias gauches, il y a donc des os appartenant à au moins 3 chats différents dans cette momie." 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" />
......@@ -1008,7 +1008,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_33" label="clignote">
<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="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" />
......@@ -1054,7 +1054,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_33_1_1" label="clignote">
<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="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" />
......@@ -1163,8 +1163,8 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_38" label="clignote btn plus">
<sensorCheck classname="NoVoicelineSensor, Assembly-CSharp" />
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp">
<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">
<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