fix conflict

Assets/Scripts/SimulationModels/SimulationModel.cs

@@ -1,7 +1,9 @@
-using UnityEngine; 
+using UnityEngine;
 using System.Collections;
 using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
 using System.Collections.Generic;
+using Octopus.Simulator;
 public class SimulationModel : MonoBehaviour, IClickable
 {
     public string modelName;
@@ -12,7 +14,12 @@ public class SimulationModel : MonoBehaviour, IClickable
     void Awake()
     {
         FitCollider();
-    } 
+    }
+
+    private void Start()
+    {
+    }
+
     private void OnEnable()
     {
         Debug.Log(this.name);
@@ -98,4 +105,20 @@ public class SimulationModel : MonoBehaviour, IClickable
         }
         return 0;
     }
+
+    public void UpdatePopupData(string json)
+    {
+        var wrapper=JsonConvert.DeserializeObject<mqttwrab>(json);
+        
+    }
+
+    public void SetPopupData()
+    {
+        var ldmanager = FindAnyObjectByType<LogicDataManager>();
+    }
+
+    public void DeletePopupData()
+    {
+
+    }
 }