From b03c6108b466042aa774916e39370da00367aade Mon Sep 17 00:00:00 2001 From: wsh Date: Thu, 29 May 2025 14:18:17 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8B=9C=EC=9E=91=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EB=8F=99=EC=A0=81=20=ED=95=B4=EC=83=81=EB=8F=84=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/AddressableAssetsData/link.xml | 24 ++++++++++ Assets/AddressableAssetsData/link.xml.meta | 7 +++ Assets/Models/Sample/Glass_02.mat | 4 +- Assets/Models/Sample/M_Shadow_01.mat | 2 +- .../Models/Sample/Materials/AGV_BaseColor.mat | 2 +- Assets/Models/Sample/PortConveyor_01.mat | 4 +- Assets/Prefabs/AAA/Panel_Start.prefab | 16 +++---- Assets/Scenes/pre-0.24.0.unity | 17 ------- .../Scripts/Studio/Connect/StudioService.cs | 15 ++---- Assets/URPSetting/ISURP_GlobalSettings.asset | 48 +++++++++---------- 10 files changed, 73 insertions(+), 66 deletions(-) create mode 100644 Assets/AddressableAssetsData/link.xml create mode 100644 Assets/AddressableAssetsData/link.xml.meta diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml new file mode 100644 index 00000000..7131edb2 --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/AddressableAssetsData/link.xml.meta b/Assets/AddressableAssetsData/link.xml.meta new file mode 100644 index 00000000..13339776 --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b5f34e41ac1cf6349bc43d51c9116f12 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Sample/Glass_02.mat b/Assets/Models/Sample/Glass_02.mat index 53aa3bc3..b34105e6 100644 --- a/Assets/Models/Sample/Glass_02.mat +++ b/Assets/Models/Sample/Glass_02.mat @@ -121,8 +121,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.37459937, g: 0.4064009, b: 0.43396217, a: 0.5803922} - - _Color: {r: 0.37459937, g: 0.4064009, b: 0.43396217, a: 0.5803922} + - _BaseColor: {r: 0.37459937, g: 0.4064009, b: 0.43396217, a: 1} + - _Color: {r: 0.37459937, g: 0.4064009, b: 0.43396217, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Models/Sample/M_Shadow_01.mat b/Assets/Models/Sample/M_Shadow_01.mat index 9d94db3b..0d4f8fc6 100644 --- a/Assets/Models/Sample/M_Shadow_01.mat +++ b/Assets/Models/Sample/M_Shadow_01.mat @@ -14,7 +14,7 @@ Material: m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: diff --git a/Assets/Models/Sample/Materials/AGV_BaseColor.mat b/Assets/Models/Sample/Materials/AGV_BaseColor.mat index 1f721a29..902fda11 100644 --- a/Assets/Models/Sample/Materials/AGV_BaseColor.mat +++ b/Assets/Models/Sample/Materials/AGV_BaseColor.mat @@ -16,7 +16,7 @@ Material: - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 2 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: diff --git a/Assets/Models/Sample/PortConveyor_01.mat b/Assets/Models/Sample/PortConveyor_01.mat index 4c4b24d8..5dd69e42 100644 --- a/Assets/Models/Sample/PortConveyor_01.mat +++ b/Assets/Models/Sample/PortConveyor_01.mat @@ -118,8 +118,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 0.5803922} - - _Color: {r: 1, g: 1, b: 1, a: 0.5803922} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Prefabs/AAA/Panel_Start.prefab b/Assets/Prefabs/AAA/Panel_Start.prefab index 47d377d2..c43a27e1 100644 --- a/Assets/Prefabs/AAA/Panel_Start.prefab +++ b/Assets/Prefabs/AAA/Panel_Start.prefab @@ -2011,10 +2011,10 @@ RectTransform: - {fileID: 2954933884906149173} m_Father: {fileID: 3425713149264809870} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207, y: -577.5} - m_SizeDelta: {x: 414, y: 1005} + m_AnchoredPosition: {x: 207, y: -37.5} + m_SizeDelta: {x: 414, y: -75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6526523675296979285 CanvasRenderer: @@ -5707,10 +5707,10 @@ RectTransform: - {fileID: 1175761343609887864} m_Father: {fileID: 3425713149264809870} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 190, y: -37.5} - m_SizeDelta: {x: 1540, y: 1005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 199, y: -37.5} + m_SizeDelta: {x: -398, y: -75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &681260949471231692 CanvasRenderer: @@ -7168,7 +7168,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8097777418585433427 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/pre-0.24.0.unity b/Assets/Scenes/pre-0.24.0.unity index 2f57b513..b08e010d 100644 --- a/Assets/Scenes/pre-0.24.0.unity +++ b/Assets/Scenes/pre-0.24.0.unity @@ -3197,7 +3197,6 @@ MonoBehaviour: panel_apisetting: {fileID: 0} panel_mqttsetting: {fileID: 0} panel_assetsetting: {fileID: 0} - panel_3dfactorysetting: {fileID: 0} panel_accessibilitysettings: {fileID: 0} panel_hierarchy: {fileID: 0} panel_assetlibrary: {fileID: 0} @@ -3564,14 +3563,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 545811781} m_Modifications: - - target: {fileID: 2686821592073054891, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2686821592073054891, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3137596492354244850, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3588,14 +3579,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3369443847942175767, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3369443847942175767, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3425713149264809870, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} propertyPath: m_Pivot.x value: 0.5 diff --git a/Assets/Scripts/Studio/Connect/StudioService.cs b/Assets/Scripts/Studio/Connect/StudioService.cs index 71a3174e..09119af3 100644 --- a/Assets/Scripts/Studio/Connect/StudioService.cs +++ b/Assets/Scripts/Studio/Connect/StudioService.cs @@ -334,17 +334,10 @@ namespace Studio if (entity == null) return; - DispatchTypeMachineEvent(type, data); - } - } - - private void DispatchTypeMachineEvent(string type, Dictionary> entities) - { - - - if (listenerTypeMap.ContainsKey(type)) - { - listenerTypeMap[type].Invoke(this, new(type, entities)); + if (listenerTypeMap.ContainsKey(type)) + { + listenerTypeMap[type].Invoke(this, new(type, data)); + } } } diff --git a/Assets/URPSetting/ISURP_GlobalSettings.asset b/Assets/URPSetting/ISURP_GlobalSettings.asset index 8bc63625..6d1512ba 100644 --- a/Assets/URPSetting/ISURP_GlobalSettings.asset +++ b/Assets/URPSetting/ISURP_GlobalSettings.asset @@ -33,28 +33,28 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 3873977040501211216 - - rid: 3873977040501211217 + - rid: 3873977040501211508 + - rid: 3873977040501211509 - rid: 4833515143083327490 - - rid: 3873977040501211218 + - rid: 3873977040501211510 - rid: 4833515143083327492 - - rid: 3873977040501211219 + - rid: 3873977040501211511 - rid: 4833515143083327494 - rid: 4833515143083327495 - rid: 4833515143083327496 - rid: 4833515143083327497 - - rid: 3873977040501211220 + - rid: 3873977040501211512 - rid: 4833515143083327499 - - rid: 3873977040501211221 + - rid: 3873977040501211513 - rid: 4833515143083327501 - - rid: 3873977040501211222 - - rid: 3873977040501211223 - - rid: 3873977040501211224 + - rid: 3873977040501211514 + - rid: 3873977040501211515 + - rid: 3873977040501211516 - rid: 4833515143083327505 - - rid: 3873977040501211225 - - rid: 3873977040501211226 + - rid: 3873977040501211517 + - rid: 3873977040501211518 - rid: 4833515143083327508 - - rid: 3873977040501211227 + - rid: 3873977040501211519 m_RuntimeSettings: m_List: - rid: 4833515143083327490 @@ -90,7 +90,7 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 3873977040501211216 + - rid: 3873977040501211508 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -99,7 +99,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: 3873977040501211217 + - rid: 3873977040501211509 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} @@ -111,7 +111,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: 3873977040501211218 + - rid: 3873977040501211510 type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -126,18 +126,18 @@ 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: 3873977040501211219 + - rid: 3873977040501211511 type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} - - rid: 3873977040501211220 + - rid: 3873977040501211512 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 m_StripUnusedPostProcessingVariants: 0 m_StripUnusedVariants: 1 m_StripScreenCoordOverrideVariants: 1 - - rid: 3873977040501211221 + - rid: 3873977040501211513 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -150,21 +150,21 @@ 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: 3873977040501211222 + - rid: 3873977040501211514 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: 3873977040501211223 + - rid: 3873977040501211515 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 3873977040501211224 + - rid: 3873977040501211516 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -177,7 +177,7 @@ MonoBehaviour: skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 3873977040501211225 + - rid: 3873977040501211517 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -187,12 +187,12 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 3873977040501211226 + - rid: 3873977040501211518 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 3873977040501211227 + - rid: 3873977040501211519 type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}