diff --git a/Assets/Models/Sample/M_Shadow_01.mat b/Assets/Models/Sample/M_Shadow_01.mat index 0d4f8fc6..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: 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/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 742263cb..26466a6c 100644 --- a/Assets/Scripts/Studio/Managers/AssetManager.cs +++ b/Assets/Scripts/Studio/Managers/AssetManager.cs @@ -36,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(); @@ -68,7 +68,7 @@ namespace Studio.Manage if (folderPaths == null) return; - foreach(var folderPath in folderPaths) + foreach (var folderPath in folderPaths) { if (folderPathList.Contains(folderPath)) { @@ -77,7 +77,7 @@ namespace Studio.Manage folderPathList.Add(folderPath); localAssetPaths.Add(folderPath); } - + LoadLocalFBXDirectorys(); } @@ -88,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/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}