Commit 4c7888bf authored by DESKTOP-B3V7GVI\MOCAH's avatar DESKTOP-B3V7GVI\MOCAH
Browse files

MaJ Monitoring.dll + MaJ RdP

parent 19f6d401
Pipeline #444 failed with stages
......@@ -509,18 +509,27 @@ namespace DIG.GBLXAPI {
// appended null check catches invalid extensionName
JToken res = null;
try { res = this.standardsJson[extensionType][extensionName]; }
catch (NullReferenceException) {
catch (NullReferenceException)
{
//DARKAOUI ---
//Previously an error was throwed if the extension wasn't in the json file
//this verification was removed because we can't dynamicaly change the json with the game content modification
res = extensionName;
//this.ThrowVocabError("extension type", extensionType);
//---
}
if (res == null)
if (res == null)
{
//DARKAOUI ---
//Previously an error was throwed if the extension wasn't in the json file
//this verification was removed because we can't dynamicaly change the json with the game content modification
res = extensionName;
//this.ThrowVocabError("extension", extensionName);
//---
}
return res;
return res;
}
// ------------------------------------------------------------------------
......@@ -552,9 +561,13 @@ namespace DIG.GBLXAPI {
}
catch (NullReferenceException)
{
Uri extURI = new Uri(string.Concat("https://www.lip6.fr/mocah/invalidURI/extensions/", extensionType));
//DARKAOUI ---
//Previously an error was throwed if the extension wasn't in the json file
//this verification was removed because we can't dynamicaly change the json with the game content modification
Uri extURI = new Uri(extensionType);
target.Add(extURI, JToken.FromObject(trackedStandards));
//this.ThrowVocabError("extension type", extensionType);
//---
}
}
......
......@@ -54926,6 +54926,201 @@ Prefab:
Transform:
m_PrefabParentObject: {fileID: 400000, guid: 76830aac7952e9347962a2f9a95feff7, type: 3}
m_PrefabInternal: {fileID: 420703778}
--- !u!1 &423081489
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 423081491}
- component: {fileID: 423081490}
m_Layer: 0
m_Name: equivWith_PlankAndWireManager_f_wrongWords
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &423081490
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 423081489}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -223350820, guid: 7dbb6531cef020e4e9078d1f537899d1, type: 3}
m_Name:
m_EditorClassIdentifier:
canFreeUniqueId: 1
PnmlFile: {fileID: 102900000, guid: b1d140b269ac4ce478c9de748b4b16e9, type: 3}
comments:
id: 44
petriNet:
label: activable
id: 44
transitions:
- id: 44
label: turnOff
overridedLabel:
initialMarking: -1
offset: {x: 0, y: -10}
position: {x: 115, y: 50}
- id: 44
label: turnOn
overridedLabel:
initialMarking: -1
offset: {x: 0, y: -10}
position: {x: 115, y: 145}
places:
- id: 44
label: off
overridedLabel:
initialMarking: 1
offset: {x: 0, y: -10}
position: {x: 200, y: 80}
- id: 44
label: on
overridedLabel:
initialMarking: 0
offset: {x: 0, y: -10}
position: {x: 30, y: 85}
arcs:
- source:
id: 44
label: turnOff
overridedLabel:
initialMarking: -1
offset: {x: 0, y: -10}
position: {x: 115, y: 50}
target:
id: 44
label: off
overridedLabel:
initialMarking: 1
offset: {x: 0, y: -10}
position: {x: 200, y: 80}
type: 0
weight: 1
- source:
id: 44
label: turnOn
overridedLabel:
initialMarking: -1
offset: {x: 0, y: -10}
position: {x: 115, y: 145}
target:
id: 44
label: on
overridedLabel:
initialMarking: 0
offset: {x: 0, y: -10}
position: {x: 30, y: 85}
type: 0
weight: 1
- source:
id: 44
label: off
overridedLabel:
initialMarking: 1
offset: {x: 0, y: -10}
position: {x: 200, y: 80}
target:
id: 44
label: turnOn
overridedLabel:
initialMarking: -1
offset: {x: 0, y: -10}
position: {x: 115, y: 145}
type: 0
weight: 1
- source:
id: 44
label: on
overridedLabel:
initialMarking: 0
offset: {x: 0, y: -10}
position: {x: 30, y: 85}
target:
id: 44
label: turnOff
overridedLabel:
initialMarking: -1
offset: {x: 0, y: -10}
position: {x: 115, y: 50}
type: 0
weight: 1
fullPnSelected: 3
transitionLinks:
- links:
- label: l0
type: 2
flagsType: 0
weight: 1
placeId: 1
scroll: {x: 0, y: 0}
linkedObject: {fileID: 1158835599}
- label: l1
type: 2
flagsType: 0
weight: 1
placeId: 1
scroll: {x: 0, y: 0}
linkedObject: {fileID: 1824160206}
transition:
id: 44
label: turnOff
overridedLabel:
initialMarking: -1
offset: {x: 0, y: -10}
position: {x: 115, y: 50}
isSystemAction: 0
isEndAction: 0
logic:
- links:
- label: l2
type: 2
flagsType: 0
weight: 1
placeId: 1
scroll: {x: 0, y: 0}
linkedObject: {fileID: 1158835599}
- label: l3
type: 2
flagsType: 0
weight: 1
placeId: 1
scroll: {x: 0, y: 0}
linkedObject: {fileID: 1824160206}
transition:
id: 44
label: turnOn
overridedLabel:
initialMarking: -1
offset: {x: 0, y: -10}
position: {x: 115, y: 145}
isSystemAction: 0
isEndAction: 0
logic:
equivalentName: equivWith_PlankAndWireManager_f_wrongWords
descriptor:
- FYFY.AnyOfTags:PlankText
- FYFY.AllOfComponents:22/31
- FYFY.NoneOfComponents:32
--- !u!4 &423081491
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 423081489}
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_Children: []
m_Father: {fileID: 1737372999}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &424965892
GameObject:
m_ObjectHideFlags: 0
......@@ -104542,6 +104737,173 @@ Prefab:
Transform:
m_PrefabParentObject: {fileID: 400000, guid: 8c401545298edc74ca373611834928e5, type: 3}
m_PrefabInternal: {fileID: 863766793}
--- !u!1 &865128611
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 865128613}
- component: {fileID: 865128612}
m_Layer: 0
m_Name: equivWith_ToggleObject_f_wrongChair
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &865128612
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 865128611}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -223350820, guid: 7dbb6531cef020e4e9078d1f537899d1, type: 3}
m_Name:
m_EditorClassIdentifier:
canFreeUniqueId: 1
PnmlFile: {fileID: 102900000, guid: b1d140b269ac4ce478c9de748b4b16e9, type: 3}
comments:
id: 45
petriNet:
label: activable
id: 45
transitions:
- id: 45
label: turnOff
overridedLabel:
initialMarking: -1
offset: {x: 0, y: -10}
position: {x: 115, y: 50}
- id: 45
label: turnOn
overridedLabel:
initialMarking: -1
offset: {x: 0, y: -10}
position: {x: 115, y: 145}
places:
- id: 45
label: off
overridedLabel:
initialMarking: 1
offset: {x: 0, y: -10}
position: {x: 200, y: 80}
- id: 45
label: on
overridedLabel:
initialMarking: 0
offset: {x: 0, y: -10}
position: {x: 30, y: 85}
arcs:
- source:
id: 45
label: turnOff
overridedLabel:
initialMarking: -1
offset: {x: 0, y: -10}
position: {x: 115, y: 50}
target:
id: 45
label: off
overridedLabel:
initialMarking: 1
offset: {x: 0, y: -10}
position: {x: 200, y: 80}
type: 0
weight: 1
- source:
id: 45
label: turnOn
overridedLabel:
initialMarking: -1
offset: {x: 0, y: -10}
position: {x: 115, y: 145}
target:
id: 45
label: on
overridedLabel:
initialMarking: 0
offset: {x: 0, y: -10}
position: {x: 30, y: 85}
type: 0
weight: 1
- source:
id: 45
label: off
overridedLabel:
initialMarking: 1
offset: {x: 0, y: -10}
position: {x: 200, y: 80}
target:
id: 45
label: turnOn
overridedLabel:
initialMarking: -1
offset: {x: 0, y: -10}
position: {x: 115, y: 145}
type: 0
weight: 1
- source:
id: 45
label: on
overridedLabel:
initialMarking: 0
offset: {x: 0, y: -10}
position: {x: 30, y: 85}
target:
id: 45
label: turnOff
overridedLabel:
initialMarking: -1
offset: {x: 0, y: -10}
position: {x: 115, y: 50}
type: 0
weight: 1
fullPnSelected: 4
transitionLinks:
- links: []
transition:
id: 45
label: turnOff
overridedLabel:
initialMarking: -1
offset: {x: 0, y: -10}
position: {x: 115, y: 50}
isSystemAction: 0
isEndAction: 0
logic:
- links: []
transition:
id: 45
label: turnOn
overridedLabel:
initialMarking: -1
offset: {x: 0, y: -10}
position: {x: 115, y: 145}
isSystemAction: 0
isEndAction: 0
logic:
equivalentName: equivWith_ToggleObject_f_wrongChair
descriptor:
- FYFY.AnyOfTags:Chair
- FYFY.AllOfComponents:19
- FYFY.NoneOfComponents:32
--- !u!4 &865128613
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 865128611}
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_Children: []
m_Father: {fileID: 1737372999}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &866180515
Prefab:
m_ObjectHideFlags: 0
......@@ -207647,7 +208009,9 @@ Transform:
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_Children: []
m_Children:
- {fileID: 423081491}
- {fileID: 865128613}
m_Father: {fileID: 0}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -207663,170 +208027,172 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
c_monitors:
- {fileID: 2066844750}
- {fileID: 813716720}
- {fileID: 276334563}
- {fileID: 138238932}
- {fileID: 813716719}
- {fileID: 1020790341}
- {fileID: 1158835600}
- {fileID: 1530102702}
- {fileID: 813716724}
- {fileID: 1422173299}
- {fileID: 68555331}
- {fileID: 106258172}
- {fileID: 1303274858}
- {fileID: 253567856}
- {fileID: 48132180}
- {fileID: 1560149284}
- {fileID: 1497461435}
- {fileID: 1451311625}
- {fileID: 813716726}
- {fileID: 1855301999}
- {fileID: 1326884029}
- {fileID: 1583962861}
- {fileID: 1627035793}
- {fileID: 1892966959}
- {fileID: 813716722}
- {fileID: 430591727}
- {fileID: 1273834412}
- {fileID: 102254405}
- {fileID: 170571799}
- {fileID: 1345243246}
- {fileID: 741468219}
- {fileID: 150416164}
- {fileID: 1539615819}
- {fileID: 813716723}
- {fileID: 1158835601}
- {fileID: 67540852}
- {fileID: 738297716}
- {fileID: 1560149283}
- {fileID: 138238935}
- {fileID: 136535439}
- {fileID: 813716721}
- {fileID: 468406279}
- {fileID: 138238936}
- {fileID: 992299968}
- {fileID: 1560149282}
- {fileID: 2118094184}
- {fileID: 1974599827}
- {fileID: 1974599825}
- {fileID: 1933769102}
- {fileID: 1974599826}
- {fileID: 1920080813}
- {fileID: 1767686407}
- {fileID: 1767870056}
- {fileID: 1972311501}
- {fileID: 1970961244}
- {fileID: 1560149284}
- {fileID: 2108315593}
- {fileID: 1988339814}
- {fileID: 1970961244}
- {fileID: 1682659608}
- {fileID: 1767686407}
- {fileID: 1974599825}
- {fileID: 1409258153}
- {fileID: 1619195532}
- {fileID: 1152834371}
- {fileID: 1988339812}
- {fileID: 1020790341}
- {fileID: 1824160208}
- {fileID: 1720067731}
- {fileID: 1119125279}
- {fileID: 1938425746}
- {fileID: 2118292464}
- {fileID: 856793579}
- {fileID: 858314400}
- {fileID: 1855155709}
- {fileID: 751145479}
- {fileID: 1273834412}
- {fileID: 1560149283}
- {fileID: 1154728060}
- {fileID: 1122167455}
- {fileID: 1122167453}
- {fileID: 1077425591}
- {fileID: 641502222}
- {fileID: 1007284762}
- {fileID: 717168837}
- {fileID: 1507413842}
- {fileID: 1191735082}
- {fileID: 1191735088}
- {fileID: 1191735085}
- {fileID: 162963788}
- {fileID: 1122167454}
- {fileID: 1539606892}
- {fileID: 1759748093}
- {fileID: 2066844750}
- {fileID: 1892966959}
- {fileID: 1909804867}
- {fileID: 1623124872}
- {fileID: 1933769102}
- {fileID: 1560149282}
- {fileID: 1627035794}
- {fileID: 813716723}
- {fileID: 1409258155}
- {fileID: 1409258154}
- {fileID: 2118094184}
- {fileID: 1855155709}
- {fileID: 1988339812}
- {fileID: 1720067731}
- {fileID: 1824160208}
- {fileID: 1759748090}
- {fileID: 1770016039}
- {fileID: 1720067730}
- {fileID: 1720067732}
- {fileID: 1686708515}
- {fileID: 1974599827}
- {fileID: 1938425746}
- {fileID: 1770016039}
- {fileID: 1289495029}
- {fileID: 813716724}
- {fileID: 1392330527}
- {fileID: 468406279}
- {fileID: 730818034}
- {fileID: 507705618}
- {fileID: 1500712451}
- {fileID: 1419552649}
- {fileID: 813716725}
- {fileID: 1855301999}
- {fileID: 1720067732}
- {fileID: 1627035793}
- {fileID: 29995954}
- {fileID: 1007284762}
- {fileID: 655969446}
- {fileID: 767870618}
- {fileID: 1409258153}
- {fileID: 155442149}
- {fileID: 816269756}
- {fileID: 1122167454}
- {fileID: 1119125279}
- {fileID: 549946178}
- {fileID: 327901089}
- {fileID: 1500712451}
- {fileID: 1263164480}
- {fileID: 162963787}
- {fileID: 1426435719}
- {fileID: 730818034}
- {fileID: 1539615819}
- {fileID: 1426435718}
- {fileID: 574406767}
- {fileID: 1191735085}
- {fileID: 162963789}
- {fileID: 1367008180}
- {fileID: 729871283}
- {fileID: 947533001}
- {fileID: 1102081398}
- {fileID: 747416170}
- {fileID: 106258172}
- {fileID: 813716719}
- {fileID: 767870618}
- {fileID: 276334563}
- {fileID: 354583689}
- {fileID: 813716727}
- {fileID: 574406766}
- {fileID: 1143096263}
- {fileID: 170571799}
- {fileID: 575830262}
- {fileID: 1507413842}
- {fileID: 1583962861}
- {fileID: 479531773}
- {fileID: 1122167455}
- {fileID: 641502222}
- {fileID: 327901089}
- {fileID: 346110626}
- {fileID: 1191735088}
- {fileID: 751145479}
- {fileID: 1436045079}
- {fileID: 816269756}
- {fileID: 138238932}
- {fileID: 573238078}
- {fileID: 992299969}
- {fileID: 928927559}
- {fileID: 491470756}
- {fileID: 997161690}
- {fileID: 138238936}
- {fileID: 1221763709}
- {fileID: 1060577469}
- {fileID: 1426435715}
- {fileID: 1438369246}
- {fileID: 162963788}
- {fileID: 575830262}
- {fileID: 430792825}
- {fileID: 1129962591}
- {fileID: 150860499}
- {fileID: 425248011}
- {fileID: 1158835600}