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..43a89233 100644 --- a/Assets/Models/Sample/M_Shadow_01.mat +++ b/Assets/Models/Sample/M_Shadow_01.mat @@ -11,16 +11,20 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: - RenderType: Opaque + RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -95,8 +99,8 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -112,13 +116,13 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - - _Surface: 0 + - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0.2735849, g: 0.2735849, b: 0.2735849, a: 1} + - _Color: {r: 0.2735849, g: 0.2735849, b: 0.2735849, 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/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/Resources/Sample/Stacker.prefab b/Assets/Resources/Sample/Stacker.prefab index d9e96a2e..9db05ddb 100644 --- a/Assets/Resources/Sample/Stacker.prefab +++ b/Assets/Resources/Sample/Stacker.prefab @@ -7030,7 +7030,7 @@ GameObject: m_Component: - component: {fileID: 5740182585067874946} m_Layer: 0 - m_Name: HFF11AGN0400_1 + m_Name: Stacker m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scripts/Studio/Managers/AssetManager.cs b/Assets/Scripts/Studio/Managers/AssetManager.cs index 385de3ba..26466a6c 100644 --- a/Assets/Scripts/Studio/Managers/AssetManager.cs +++ b/Assets/Scripts/Studio/Managers/AssetManager.cs @@ -1,5 +1,4 @@ -using Mono.Cecil; -using Studio.AssetTool; +using Studio.AssetTool; using Studio.Command; using Studio.HierarchyTree; using Studio.Services; @@ -37,11 +36,11 @@ namespace Studio.Manage fbxFileManager.onLoadComplete += OnLoadCustomAsset; onAddSettingPaths += canvas_Popup.panel_assetsetting.SetAssetPathItmes; onSetAssetSetting += canvas_Popup.panel_assetsetting.SetAssetManager; - + onAssetManagerDatas += (data) => projectManager.OpenProjectSettingsDataAfterDataLoad(); - + } - + public void ClearFolderPathList() { localAssetPaths.Clear(); @@ -69,7 +68,7 @@ namespace Studio.Manage if (folderPaths == null) return; - foreach(var folderPath in folderPaths) + foreach (var folderPath in folderPaths) { if (folderPathList.Contains(folderPath)) { @@ -78,7 +77,7 @@ namespace Studio.Manage folderPathList.Add(folderPath); localAssetPaths.Add(folderPath); } - + LoadLocalFBXDirectorys(); } @@ -89,7 +88,7 @@ namespace Studio.Manage fbxFileManager.LoadResource(assets); } - + public void LoadLocalFBXDirectorys() { var fbxFileManager = ManagerHub.instance.Get(); diff --git a/Assets/Scripts/Studio/TwinObject/DynamicObject/AGVManager.cs b/Assets/Scripts/Studio/TwinObject/DynamicObject/AGVManager.cs index 593ac7e0..10e329af 100644 --- a/Assets/Scripts/Studio/TwinObject/DynamicObject/AGVManager.cs +++ b/Assets/Scripts/Studio/TwinObject/DynamicObject/AGVManager.cs @@ -50,6 +50,8 @@ namespace Studio.Dynamic.Manager continue; } var item = CreateAGV(e.Type, key, value); + if (item == null) + continue; SetRenderObject(key, item.GetComponent()); agvs.Add(item); } @@ -57,23 +59,27 @@ namespace Studio.Dynamic.Manager private AGV CreateAGV(string type, string id, Dictionary entity) { + var xPos = entity.FirstOrDefault(x => x.Key.Equals("X", StringComparison.OrdinalIgnoreCase)); + var yPos = entity.FirstOrDefault(x => x.Key.Equals("Y", StringComparison.OrdinalIgnoreCase)); + float.TryParse(xPos.Value, out var x); + float.TryParse(yPos.Value, out var y); + + if (y * 0.001f > 200f) + return null; var agv = ManagerHub.instance.Get().CreateAsset(asset.assetData.assetName).AddComponent(); agv.gameObject.SetActive(true); agv.transform.position = Vector3.zero; agv.name = id; agv.SetMoveSpeed(AGVMoveSpeed); agv.SetRotateSpeed(AGVRotateSpeed); - var xPos = entity.FirstOrDefault(x => x.Key.Equals("X", StringComparison.OrdinalIgnoreCase)); - var yPos = entity.FirstOrDefault(x => x.Key.Equals("Y", StringComparison.OrdinalIgnoreCase)); - float.TryParse(xPos.Value, out var x); - float.TryParse(yPos.Value, out var y); + var pos = new Vector3(x * 0.001f, 0, y * 0.001f); agv.Init(type, pos); return agv; } - private void SetRenderObject(string key ,CustomAssetRenderObject obj) + private void SetRenderObject(string key, CustomAssetRenderObject obj) { obj.LoadCreate(key, asset.renderObject.topic, asset.renderObject.componetKey, asset.renderObject.isAutoId); } diff --git a/Assets/URPSetting/ISURP_GlobalSettings.asset b/Assets/URPSetting/ISURP_GlobalSettings.asset index 8cb3bd4d..384d05b1 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: 2393467941640208624 - - rid: 2393467941640208625 + - rid: 876601683515539680 + - rid: 876601683515539681 - rid: 4833515143083327490 - - rid: 2393467941640208626 + - rid: 876601683515539682 - rid: 4833515143083327492 - - rid: 2393467941640208627 + - rid: 876601683515539683 - rid: 4833515143083327494 - rid: 4833515143083327495 - rid: 4833515143083327496 - rid: 4833515143083327497 - - rid: 2393467941640208628 + - rid: 876601683515539684 - rid: 4833515143083327499 - - rid: 2393467941640208629 + - rid: 876601683515539685 - rid: 4833515143083327501 - - rid: 2393467941640208630 - - rid: 2393467941640208631 - - rid: 2393467941640208632 + - rid: 876601683515539686 + - rid: 876601683515539687 + - rid: 876601683515539688 - rid: 4833515143083327505 - - rid: 2393467941640208633 - - rid: 2393467941640208634 + - rid: 876601683515539689 + - rid: 876601683515539690 - rid: 4833515143083327508 - - rid: 2393467941640208635 + - rid: 876601683515539691 m_RuntimeSettings: m_List: - rid: 4833515143083327490 @@ -90,7 +90,7 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 2393467941640208624 + - rid: 876601683515539680 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: 2393467941640208625 + - rid: 876601683515539681 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: 2393467941640208626 + - rid: 876601683515539682 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: 2393467941640208627 + - rid: 876601683515539683 type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} - - rid: 2393467941640208628 + - rid: 876601683515539684 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: 2393467941640208629 + - rid: 876601683515539685 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: 2393467941640208630 + - rid: 876601683515539686 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: 2393467941640208631 + - rid: 876601683515539687 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 2393467941640208632 + - rid: 876601683515539688 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: 2393467941640208633 + - rid: 876601683515539689 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: 2393467941640208634 + - rid: 876601683515539690 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 2393467941640208635 + - rid: 876601683515539691 type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index bf4a0f0e..235e4619 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,8 +6,8 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/0.17.5.unity - guid: cc941d4f14d41b041b46185232e3d04b + path: Assets/Scenes/pre-0.24.0.unity + guid: e1c09b3e71b9b7742913a7b5e309ec82 m_configObjects: com.unity.addressableassets: {fileID: 11400000, guid: 0e9579a90d161f540a9047e131bc3996, type: 2} com.unity.localization.settings: {fileID: 11400000, guid: d783f8b1535e6be489d55740adbafda0, type: 2} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index f00782be..b840e4fb 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: DefaultCompany - productName: XRISEditor + productName: Octopus Studio defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}