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

onlocal

Browse Source
This commit is contained in:
UVCLimHun
2025-05-29 18:38:43 +09:00
parent 238f0ffbaf
commit a575295c17
9 changed files with 207 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Prefabs/LogicPrefab.prefab
View File

@@ -92,8 +92,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 18
m_fontSizeBase: 18
m_fontSize: 14
m_fontSizeBase: 14
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18

2
Assets/Prefabs/UIBottomItems/Pallet.prefab
View File

@@ -89,7 +89,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
rectTransform: {fileID: 0}
prefabToSpawn: {fileID: 5825089394656910413, guid: 71cb5b14e9e72d047acd0f48e86dbccc, type: 3}
prefabToSpawn: {fileID: 8981091474273742600, guid: 21563eb47b8f04342a149bcabd528e5a, type: 3}
mask:
serializedVersion: 2
m_Bits: 64

122
Assets/Resources/ModelsUpdated/Pallet.prefab Normal file
View File

@@ -0,0 +1,122 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8981091474273742600
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6733763396490065076}
- component: {fileID: 3778496298057829303}
m_Layer: 0
m_Name: Pallet
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6733763396490065076
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8981091474273742600}
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6052881152895185930}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3778496298057829303
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8981091474273742600}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b2c92ea944db86b48b0e0b711555ea37, type: 3}
m_Name:
m_EditorClassIdentifier:
modelName: Pallet
modelType: Source
modelID:
nodeID:
eventGenerateProduct: product_generated
eventGenerateDefect: product_defective
eventQueueProduct: product_queued
productPrefab: {fileID: 0}
defectPrefab: {fileID: 0}
listProducts: []
listDefects: []
productPos: {fileID: 0}
productDistance: {x: 0, y: 0.321, z: 0}
--- !u!1001 &1125099510866031357
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 6733763396490065076}
m_Modifications:
- target: {fileID: 5825089394656910413, guid: 71cb5b14e9e72d047acd0f48e86dbccc, type: 3}
propertyPath: m_Name
value: "\uD314\uB81B\uD2B8"
objectReference: {fileID: 0}
- target: {fileID: 6601449523113608951, guid: 71cb5b14e9e72d047acd0f48e86dbccc, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6601449523113608951, guid: 71cb5b14e9e72d047acd0f48e86dbccc, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6601449523113608951, guid: 71cb5b14e9e72d047acd0f48e86dbccc, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6601449523113608951, guid: 71cb5b14e9e72d047acd0f48e86dbccc, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 6601449523113608951, guid: 71cb5b14e9e72d047acd0f48e86dbccc, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 6601449523113608951, guid: 71cb5b14e9e72d047acd0f48e86dbccc, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6601449523113608951, guid: 71cb5b14e9e72d047acd0f48e86dbccc, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6601449523113608951, guid: 71cb5b14e9e72d047acd0f48e86dbccc, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6601449523113608951, guid: 71cb5b14e9e72d047acd0f48e86dbccc, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6601449523113608951, guid: 71cb5b14e9e72d047acd0f48e86dbccc, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 71cb5b14e9e72d047acd0f48e86dbccc, type: 3}
--- !u!4 &6052881152895185930 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6601449523113608951, guid: 71cb5b14e9e72d047acd0f48e86dbccc, type: 3}
m_PrefabInstance: {fileID: 1125099510866031357}
m_PrefabAsset: {fileID: 0}

7
Assets/Resources/ModelsUpdated/Pallet.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 21563eb47b8f04342a149bcabd528e5a
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

14
Assets/Scenes/Simulation_0.0.1.unity
View File

@@ -6241,23 +6241,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3}
propertyPath: m_SizeDelta.x
value: 100
value: -1492
objectReference: {fileID: 0}
- target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3}
propertyPath: m_SizeDelta.y
@@ -6297,7 +6297,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3}
propertyPath: m_AnchoredPosition.y
value: 475
value: 540
objectReference: {fileID: 0}
- target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -6479,7 +6479,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4141025361698125247, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3}
propertyPath: m_AnchoredPosition.x
value: -1081.1
value: -1202.75
objectReference: {fileID: 0}
- target: {fileID: 4141025361698125247, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3}
propertyPath: m_AnchoredPosition.y

48
Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
View File

@@ -33,28 +33,28 @@ MonoBehaviour:
m_Settings:
m_SettingsList:
m_List:
- rid: 1324587790643495317
- rid: 1324587790643495318
- rid: 1324587819248648298
- rid: 1324587819248648299
- rid: 6852985685364965378
- rid: 6852985685364965379
- rid: 6852985685364965380
- rid: 6852985685364965381
- rid: 1324587790643495319
- rid: 1324587790643495320
- rid: 1324587819248648300
- rid: 1324587819248648301
- rid: 6852985685364965384
- rid: 6852985685364965385
- rid: 1324587790643495321
- rid: 1324587790643495322
- rid: 1324587790643495323
- rid: 1324587790643495324
- rid: 1324587790643495325
- rid: 1324587790643495326
- rid: 1324587819248648302
- rid: 1324587819248648303
- rid: 1324587819248648304
- rid: 1324587819248648305
- rid: 1324587819248648306
- rid: 1324587819248648307
- rid: 6852985685364965392
- rid: 1324587790643495327
- rid: 1324587819248648308
- rid: 6852985685364965394
- rid: 8712630790384254976
- rid: 5092397466944798720
- rid: 1324587790643495328
- rid: 1324587819248648309
m_RuntimeSettings:
m_List:
- rid: 6852985685364965378
@@ -97,14 +97,14 @@ MonoBehaviour:
references:
version: 2
RefIds:
- rid: 1324587790643495317
- rid: 1324587819248648298
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
m_StripUnusedPostProcessingVariants: 1
m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1
- rid: 1324587790643495318
- rid: 1324587819248648299
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
@@ -116,7 +116,7 @@ MonoBehaviour:
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
- rid: 1324587790643495319
- rid: 1324587819248648300
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
@@ -131,7 +131,7 @@ MonoBehaviour:
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
- rid: 1324587790643495320
- rid: 1324587819248648301
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
@@ -140,7 +140,7 @@ MonoBehaviour:
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- rid: 1324587790643495321
- rid: 1324587819248648302
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data:
m_Version: 0
@@ -153,13 +153,13 @@ MonoBehaviour:
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
- rid: 1324587790643495322
- rid: 1324587819248648303
type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}
m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3}
m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3}
- rid: 1324587790643495323
- rid: 1324587819248648304
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
@@ -172,12 +172,12 @@ MonoBehaviour:
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
- rid: 1324587790643495324
- rid: 1324587819248648305
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0
- rid: 1324587790643495325
- rid: 1324587819248648306
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
@@ -187,21 +187,21 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 1324587790643495326
- rid: 1324587819248648307
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0
m_LabelToInclude:
- rid: 1324587790643495327
- rid: 1324587819248648308
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3}
probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3}
probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3}
- rid: 1324587790643495328
- rid: 1324587819248648309
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}

24
Assets/WorkSpace/LH/MQTTManager.cs
View File

@@ -47,8 +47,28 @@ namespace Octopus.Simulator.Networks
void Awake()
{
mqttManager = this;
FindAnyObjectByType<WebReceiver>().onMqttConfigReceived += SetMqttConfig;
//SetMqttConfig();
//FindAnyObjectByType<WebReceiver>().onMqttConfigReceived += SetMqttConfig;
SetMqttConfig();
}
public void SetMqttConfig()
{
/*
string path = Application.streamingAssetsPath + MQTTpath;
string json;
using (StreamReader reader = new StreamReader(path))
{
json = reader.ReadToEnd();
}
*/
TextAsset json = Resources.Load<TextAsset>(MQTTpath);
MQTTConfigList ConfigList = JsonConvert.DeserializeObject<MQTTConfigList>(json.text);
var config = ConfigList.configs[0];
string clientName = config.name;
string host = config.host;
int port = config.port;
Connect(clientName, host, port);
}
public void SetMqttConfig(string json)

23
Assets/WorkSpace/LH/WebManager.cs
View File

@@ -33,8 +33,8 @@ namespace Octopus.Simulator.Networks
void Awake()
{
webManager = this;
FindAnyObjectByType<WebReceiver>().onWebConfigReceived += SetWebConfig;
//SetWebConfig();
//FindAnyObjectByType<WebReceiver>().onWebConfigReceived += SetWebConfig;
SetWebConfig();
SetApiConfig();
}
@@ -57,6 +57,25 @@ namespace Octopus.Simulator.Networks
http = $"{host}:{port}";
}
private void SetWebConfig()
{
/*
string path = Application.streamingAssetsPath + WebPath;
string json;
using (StreamReader reader = new StreamReader(path))
{
json = reader.ReadToEnd();
}
*/
var json = Resources.Load<TextAsset>(WebPath);
WebConfigList ConfigList = JsonConvert.DeserializeObject<WebConfigList>(json.text);
var config = ConfigList.configs[0];
host = config.host;
port = config.port;
token = config.accessToken;
http = $"{host}:{port}";
}
private void SetApiConfig()
{
/*

6
Assets/WorkSpace/LH/WebReceiver.cs
View File

@@ -15,8 +15,7 @@ public class WebReceiver : MonoBehaviour
public void Start()
{
Application.ExternalCall("loadingComplete");
/*
// Application.ExternalCall("loadingComplete");
config.projectId = "17";
//config.simulationId = "15";
config.logicId = "71";
@@ -24,9 +23,6 @@ public class WebReceiver : MonoBehaviour
onParameterRecived += FindAnyObjectByType<ProjectDataManager>().RequestInfo;
onParameterRecived += FindAnyObjectByType<LogicDataManager>().RequestInfo;
onParameterRecived?.Invoke();
*/
}
public void ReceiveWebParameterJson(string json)