diff --git a/projectMDE/conversions/ResultProgram_modded.xmi b/projectMDE/conversions/ResultProgram_modded.xmi index 237d3c7411047bd547f10810d0493d6299cf7537..ecbaa77168dc77c3059023419e7df81922bcd1d9 100644 --- a/projectMDE/conversions/ResultProgram_modded.xmi +++ b/projectMDE/conversions/ResultProgram_modded.xmi @@ -56,27 +56,6 @@ </typedefs> </namespaces> </files> - <files filename="TextDisplayLives"> - <namespaces namespace="DSL"> - <using>UnityEngine</using> - <using>System</using> - <typedefs xsi:type="cs:Class" identifier="TextDisplayLives" baseType="//@externalTypes.0"> - <members identifier="text"> - <type xsi:type="cs:CompoundType" referencedType="//@externalTypes.3"/> - </members> - <members identifier="prefix"> - <type xsi:type="cs:PrimitiveType" type="string"/> - </members> - <members identifier="postfix"> - <type xsi:type="cs:PrimitiveType" type="string"/> - </members> - <methods identifier="Update" accessability="none"> - <body>text.text = prefix + DataManager.instance.GetLives() +postfix;</body> - <returnType xsi:type="cs:PrimitiveType"/> - </methods> - </typedefs> - </namespaces> - </files> <files filename="Enemy"> <namespaces namespace="DSL"> <using>UnityEngine</using> @@ -109,9 +88,9 @@ <namespaces namespace="DSL"> <using>UnityEngine</using> <using>System</using> - <typedefs xsi:type="cs:Class" identifier="DataManager"> + <typedefs xsi:type="cs:Class" identifier="DataManager" baseType="//@externalTypes.0"> <members identifier="instance" specifier="static"> - <type xsi:type="cs:CompoundType" referencedType="//@files.3/@namespaces.0/@typedefs.0"/> + <type xsi:type="cs:CompoundType" referencedType="//@files.2/@namespaces.0/@typedefs.0"/> </members> <members identifier="lives"> <type xsi:type="cs:PrimitiveType" type="int"/> @@ -175,6 +154,27 @@ </typedefs> </namespaces> </files> + <files filename="TextDisplayLives"> + <namespaces namespace="DSL"> + <using>UnityEngine</using> + <using>System</using> + <typedefs xsi:type="cs:Class" identifier="TextDisplayLives" baseType="//@externalTypes.0"> + <members identifier="text"> + <type xsi:type="cs:CompoundType" referencedType="//@externalTypes.3"/> + </members> + <members identifier="prefix"> + <type xsi:type="cs:PrimitiveType" type="string"/> + </members> + <members identifier="postfix"> + <type xsi:type="cs:PrimitiveType" type="string"/> + </members> + <methods identifier="Update" accessability="none"> + <body>text.text = prefix + DataManager.instance.GetLives() +postfix;</body> + <returnType xsi:type="cs:PrimitiveType"/> + </methods> + </typedefs> + </namespaces> + </files> <files filename="TextDisplayScore"> <namespaces namespace="DSL"> <using>UnityEngine</using> diff --git a/projectMDE/transforms/UGameTransform_modded.qvto b/projectMDE/transforms/UGameTransform_modded.qvto index aa3023773cd120fa01bfa7e1c269d0d62000eb30..d003310f8ed8d51975da9de379d40f951f85abf8 100644 --- a/projectMDE/transforms/UGameTransform_modded.qvto +++ b/projectMDE/transforms/UGameTransform_modded.qvto @@ -389,6 +389,7 @@ mapping Unity::GUIElement::GUIElement2Class() : Prog::Class { mapping Unity::DataManager::DataManager2Class () : Prog::Class { identifier := 'DataManager'; + baseType := monoBehaviour; var instance := object MemberDef { specifier := Specifier::_static; identifier := 'instance'; diff --git a/projectMDE_acceleo/bin/DataManager.cs b/projectMDE_acceleo/bin/DataManager.cs index 2c1994d097baa31af8b801fa88cf33c770e7eb59..12c06f04c6c31d7d5d94f62298e082e0502fab8f 100644 --- a/projectMDE_acceleo/bin/DataManager.cs +++ b/projectMDE_acceleo/bin/DataManager.cs @@ -3,7 +3,7 @@ namespace DSL { using UnityEngine; using System; // Type definitions - public class DataManager { + public class DataManager : UnityEngine.MonoBehaviour { // members public static DSL.DataManager instance; diff --git a/projectMDE_acceleo/src-gen/DataManager.cs b/projectMDE_acceleo/src-gen/DataManager.cs index 2c1994d097baa31af8b801fa88cf33c770e7eb59..12c06f04c6c31d7d5d94f62298e082e0502fab8f 100644 --- a/projectMDE_acceleo/src-gen/DataManager.cs +++ b/projectMDE_acceleo/src-gen/DataManager.cs @@ -3,7 +3,7 @@ namespace DSL { using UnityEngine; using System; // Type definitions - public class DataManager { + public class DataManager : UnityEngine.MonoBehaviour { // members public static DSL.DataManager instance;