UVCXR/Simulation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
lwj
2025-05-29 09:27:13 +09:00
parent 8a75eaa23e 824e312de7
commit 9fca1235e5
88 changed files with 267489 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Scripts/ClickHandler.cs
View File

@@ -50,15 +50,15 @@ public class ClickHandler : MonoBehaviour
if (hit.collider.TryGetComponent<IClickable>(out var clickable))
{
highLight.ShowHighlight((BoxCollider)hit.collider);
objStatus.gameObject.SetActive(true);
objStatus.SetStatus(hit.transform.GetComponent<SimulationModel>());
//objStatus.gameObject.SetActive(true);
//objStatus.SetStatus(hit.transform.GetComponent<SimulationModel>());
RTGController.I.SetGizmoTargetObject(hit.transform.gameObject);
clickable.OnClick();
}
else
{
highLight.HideHighlight();
objStatus.gameObject.SetActive(false);
//objStatus.gameObject.SetActive(false);
RTGController.I.SetWorkGizmoId(RTGController.GizmoId.None);
RTGController.I.ClearGizmoTargetObjects();
}

27
Assets/Scripts/SimulationModels/SimulationModel.cs
View File

@@ -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()
{
}
}