fix merge
This commit is contained in:
@@ -5,9 +5,7 @@ using UnityEngine;
|
||||
using System.Collections;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System.Collections.Concurrent;
|
||||
using RTG;
|
||||
using Unity.VisualScripting;
|
||||
using Best.HTTP.JSON;
|
||||
using Octopus.Simulator.Networks;
|
||||
|
||||
public class SimulationModelConveyor : SimulationModel
|
||||
{
|
||||
|
||||
@@ -3,8 +3,9 @@ using UnityEngine;
|
||||
using System.Collections;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEngine.Events;
|
||||
using Octopus.Simulator.Networks;
|
||||
|
||||
public class SimulationModelMove : SimulationModel
|
||||
{
|
||||
public string eventLoading = "transporter_loading";
|
||||
|
||||
@@ -4,6 +4,8 @@ using System.Collections;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine.Events;
|
||||
using Octopus.Simulator.Networks;
|
||||
|
||||
public class SimulationModelProcess : SimulationModel
|
||||
{
|
||||
public string eventUsingQueue = "processor_using_queue";
|
||||
|
||||
@@ -2,6 +2,7 @@ using Newtonsoft.Json.Linq;
|
||||
using System.Collections.Concurrent;
|
||||
using UnityEngine;
|
||||
using System.Collections;
|
||||
using Octopus.Simulator.Networks;
|
||||
|
||||
public class SimulationModelSink : SimulationModel
|
||||
{
|
||||
|
||||
@@ -3,7 +3,7 @@ using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using System.Collections;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using Best.HTTP.JSON;
|
||||
using Octopus.Simulator.Networks;
|
||||
|
||||
public class SimulationModelSource : SimulationModel
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user