From 87d82126c97d0153a577e17c98bf1a2936a55b3a Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Tue, 12 Aug 2025 14:05:18 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=ED=99=98=EA=B2=BD=20=ED=94=84=EB=9E=8D=20?= =?UTF-8?q?=EC=9E=90=EB=8F=99=ED=99=94=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetPostprocessorEnvironment.cs | 172 +++++++++++------- Assets/_DDD/_Scripts/Utilities/Constants.cs | 4 - 2 files changed, 109 insertions(+), 67 deletions(-) diff --git a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorEnvironment.cs b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorEnvironment.cs index 3d1a51d14..c13ca73ad 100644 --- a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorEnvironment.cs +++ b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorEnvironment.cs @@ -1,44 +1,56 @@ #if UNITY_EDITOR +using System; using System.Collections.Generic; using System.IO; +using Unity.VisualScripting; using UnityEditor; using UnityEditor.AddressableAssets; using UnityEditor.AddressableAssets.Settings; using UnityEngine; +using Object = UnityEngine.Object; namespace DDD { public static class AssetPostprocessorEnvironment { - private static readonly HashSet PropTargetPaths = new(); - private static readonly HashSet FoodTargetPaths = new(); - private static readonly HashSet GeometryTargetPaths = new(); - - private const string BasePrefabPath_Prop = "Assets/_DDD/_Raw/Environments/Env_Mesh_Prop.prefab"; - private const string BasePrefabPath_Geometry = "Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab"; - private const string BasePrefabPath_Food = "Assets/_DDD/_Raw/Environments/Env_Unlit_Food.prefab"; private const string ShaderName = "Universal Render Pipeline/LitEnvironment"; - private const string Prop = "Prop_"; - private const string BaseUpper = "_BASE"; - private const string NormalUpper = "_NORMAL"; - - public enum EnvPrefabType + private const string BaseMapPropertyName = "_BaseMap"; + private const string NormalMapPropertyName = "_NormalMap"; + + private static readonly Dictionary> PrefabTargetPaths = new() + { + {EnvPrefabType.Prop, new HashSet()}, + {EnvPrefabType.Item, new HashSet() }, + {EnvPrefabType.Geometry, new HashSet() }, + {EnvPrefabType.Ground, new HashSet() }, + }; + + private static readonly Dictionary BasePrefabPaths = new() + { + { EnvPrefabType.Prop, "Assets/_DDD/_Raw/Environments/Env_Mesh_Prop.prefab" }, + { EnvPrefabType.Item, "Assets/_DDD/_Raw/Environments/Env_Unlit_Item.prefab" }, + { EnvPrefabType.Geometry, "Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab" }, + { EnvPrefabType.Ground, "Assets/_DDD/_Raw/Environments/Env_Mesh_Ground.prefab" }, + }; + + public enum EnvPrefabType : uint { Prop, - Food, - Geometry + Item, + Geometry, + Ground, } - + public static void OnPreprocessTexture(TextureImporter importer) { var path = importer.assetPath; string fileNameUpper = Utils.FileName(path).ToUpper(); - - if (fileNameUpper.Contains(NormalUpper)) + + if (IsTextureMatchingPropertyBySuffix(fileNameUpper, NormalMapPropertyName)) { importer.textureType = TextureImporterType.NormalMap; } - else if (fileNameUpper.Contains(BaseUpper)) + else if (IsTextureMatchingPropertyBySuffix(fileNameUpper, BaseMapPropertyName)) { importer.textureType = TextureImporterType.Sprite; importer.spriteImportMode = SpriteImportMode.Single; @@ -62,32 +74,43 @@ public static void OnRemove(string path, string movePath = "") AddTargetPath(path); } + + private static string GetEnvironmentPath(EnvPrefabType prefabType) + { + string prefabPath = PathConstants.RawEnvironmentsPathUpper + prefabType.ToString(); + prefabPath = prefabPath.ToUpper(); + return prefabPath; + } private static void AddTargetPath(string path) { string upperPath = path.ToUpper(); - - if (upperPath.Contains(PathConstants.RawEnvPathUpper_Prop) && - upperPath.Contains(ExtenstionConstants.PngExtensionUpper)) - { - PropTargetPaths.Add(path); - } - else if (upperPath.Contains(PathConstants.RawEnvPathUpper_Food) && - upperPath.Contains(ExtenstionConstants.PngExtensionUpper)) - { - FoodTargetPaths.Add(path); - } - else if(upperPath.Contains(PathConstants.RawEnvPathUpper_Geometry) && - upperPath.Contains(ExtenstionConstants.PngExtensionUpper)) - { - GeometryTargetPaths.Add(path); - } - else + if (upperPath.Contains(ExtenstionConstants.PngExtensionUpper) == false) { + // Not a texture. return; } + for (uint i = 0; i < PrefabTargetPaths.Count; i++) + { + var prefabType = (EnvPrefabType)i; + var targetPaths = PrefabTargetPaths[prefabType]; + if (upperPath.Contains(GetEnvironmentPath(prefabType))) + { + targetPaths.Add(path); + } + } } + private static string GetPrefabPrefix(EnvPrefabType prefabType) + { + return prefabType.ToString() + "_"; + } + + private static string GetMaterialPrefix() + { + return "Mat_"; + } + public static void BuildMaterialAndPrefab(string path, EnvPrefabType prefabType) { var di = new DirectoryInfo(path); @@ -98,13 +121,13 @@ public static void BuildMaterialAndPrefab(string path, EnvPrefabType prefabType) string addrRoot = PathConstants.AddressablesFolderPath; // "/_Addressables" string destDir = path.Replace(rawRoot, addrRoot); - string materialPath = $"{destDir}/{folderName}{ExtenstionConstants.MaterialExtenstionLower}"; - string prefabPath = $"{destDir}/{prefabType.ToString()}{folderName}{ExtenstionConstants.PrefabExtenstionLower}"; + string materialPath = $"{destDir}/{GetMaterialPrefix()}{folderName}{ExtenstionConstants.MaterialExtenstionLower}"; + string prefabPath = $"{destDir}/{GetPrefabPrefix(prefabType)}{folderName}{ExtenstionConstants.PrefabExtenstionLower}"; Utils.MakeFolderFromFilePath(materialPath); bool bShouldCreateMaterial = false; - bShouldCreateMaterial = prefabType != EnvPrefabType.Food; // Add conditions if needed. + bShouldCreateMaterial = prefabType != EnvPrefabType.Item; // Add conditions if needed. if (bShouldCreateMaterial) { // 머티리얼 생성 또는 로드 @@ -124,8 +147,10 @@ public static void BuildMaterialAndPrefab(string path, EnvPrefabType prefabType) Sprite tex = AssetDatabase.LoadAssetAtPath(file); if (tex == null) continue; // 셰이더 프로퍼티명과 텍스처 파일명의 접미사 매칭 - if (IsTextureMatchingPropertyBySuffix(texName, BaseUpper)) + if (IsTextureMatchingPropertyBySuffix(texName, BaseMapPropertyName)) + { CreateSpritePrefabVariantIfNotExist(folderName, tex, prefabPath, prefabType); + } } } } @@ -170,13 +195,41 @@ private static void MatchTexturesToShaderProperties(Shader shader, string[] file } } + private static string[] GetPropertyAliases(string propertyName) + { + if (propertyName == "_BaseMap") + { + return new[] {"_Base", "_BC", "BaseColor"}; + } + if (propertyName == "_NormalMap") + { + return new[] {"_Normal", "_Bump", "_BumpMap", "_N"}; + } + if (propertyName == "_MOHS") + { + return new[] {"_Mask"}; + } + if (propertyName == "_Emiss") + { + return new[] {"_Emissive", "_Emission", "_E"}; + } + return Array.Empty(); + } private static bool IsTextureMatchingPropertyBySuffix(string textureName, string propertyName) { + string[] aliases = GetPropertyAliases(propertyName); + foreach (var alias in aliases) + { + if (textureName.ToUpper().EndsWith(alias.ToUpper())) + { + return true; + } + } + // 셰이더 프로퍼티명에서 접미사 추출 (예: _BaseMap -> BASEMAP) string propertySuffix = propertyName.TrimStart('_').ToUpper(); - // 텍스처 파일명이 해당 접미사로 끝나는지 확인 - return textureName.Contains($"_{propertySuffix}"); + return textureName.EndsWith($"_{propertySuffix}"); } private static void CreateMaterialPrefabVariantIfNotExist(string folderName, Material mat, string prefabPath, EnvPrefabType prefabType) @@ -235,11 +288,12 @@ private static bool InstantiatePrefabByType(string folderName, string prefabPath return true; } + string prefix = prefabType.ToString() + "_"; instancePrefab = AssetDatabase.LoadAssetAtPath(prefabPath); if (instancePrefab == null) { instancePrefab = (GameObject)PrefabUtility.InstantiatePrefab(basePrefab); - instancePrefab.name = $"{Prop}{folderName}"; + instancePrefab.name = $"{prefix}{folderName}"; } return false; @@ -247,34 +301,26 @@ private static bool InstantiatePrefabByType(string folderName, string prefabPath private static string GetBasePrefabPath(EnvPrefabType prefabType) { - return prefabType switch + if (BasePrefabPaths.TryGetValue(prefabType, out var path)) { - EnvPrefabType.Prop => BasePrefabPath_Prop, - EnvPrefabType.Food => BasePrefabPath_Food, - EnvPrefabType.Geometry => BasePrefabPath_Geometry, - _ => BasePrefabPath_Prop - }; + return path; + } + Debug.LogError($"Base prefab path not found: {prefabType}"); + return ""; } public static void BuildTarget() { - foreach (var path in PropTargetPaths) + foreach (var envTargets in PrefabTargetPaths) { - BuildMaterialAndPrefab(Utils.FolderPath(path), EnvPrefabType.Prop); + var envType = envTargets.Key; + var TargetPaths= envTargets.Value; + foreach (var path in TargetPaths) + { + BuildMaterialAndPrefab(Utils.FolderPath(path), envType); + } + TargetPaths.Clear(); } - - foreach (var path in FoodTargetPaths) - { - BuildMaterialAndPrefab(Utils.FolderPath(path), EnvPrefabType.Food); - } - - foreach (var path in GeometryTargetPaths) - { - BuildMaterialAndPrefab(Utils.FolderPath(path), EnvPrefabType.Geometry); - } - PropTargetPaths.Clear(); - FoodTargetPaths.Clear(); - GeometryTargetPaths.Clear(); } } } diff --git a/Assets/_DDD/_Scripts/Utilities/Constants.cs b/Assets/_DDD/_Scripts/Utilities/Constants.cs index 55e564616..3610128db 100644 --- a/Assets/_DDD/_Scripts/Utilities/Constants.cs +++ b/Assets/_DDD/_Scripts/Utilities/Constants.cs @@ -44,10 +44,6 @@ public static class PathConstants public const string RawFolderPath = "/_Raw"; public const string AddressablesFolderPath = "/_Addressables"; public const string RawEnvironmentsPathUpper = "ASSETS/_DDD/_RAW/ENVIRONMENTS/"; - public const string RawEnvPathUpper_Tile = "ASSETS/_DDD/_RAW/ENVIRONMENTS/TILES/"; - public const string RawEnvPathUpper_Prop = "ASSETS/_DDD/_RAW/ENVIRONMENTS/PROPS/"; - public const string RawEnvPathUpper_Food = "ASSETS/_DDD/_RAW/ENVIRONMENTS/FOODS/"; - public const string RawEnvPathUpper_Geometry = "ASSETS/_DDD/_RAW/ENVIRONMENTS/GEOMETRIES/"; } public static class ExtenstionConstants From 2e4dbaf7a638167d25dd14bbc41dab15fb9c0f43 Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Tue, 12 Aug 2025 14:09:22 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=ED=99=98=EA=B2=BD=20=ED=94=84=EB=A6=AC?= =?UTF-8?q?=ED=8C=B9=20=EB=A8=B8=ED=8B=B0=EB=A6=AC=EC=96=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20-=20Opaque?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- .../Common/Shaders/LitEnvironment.shadergraph | 2 +- .../Geometries/BlockLine/BlockLine.mat | 13 +- .../Geometries/KitchenTile/KitchenTile.mat | 2 +- .../Environments/Props/Barrel/Barrel.mat | 15 +-- .../Props/Lantern/LanternLight.mat | 20 +-- .../Environments/Props/Rope2/Rope2.mat | 15 +-- .../Environments/Props/Window2/WindowBack.mat | 15 +-- .../{Foods.meta => Geometry.meta} | 2 +- .../TestGeometry.meta} | 2 +- .../TestGeometry/Geometry_TestGeometry.prefab | 63 ++++++++++ .../Geometry_TestGeometry.prefab.meta} | 2 +- .../TestGeometry/Mat_TestGeometry.mat} | 35 +++--- .../TestGeometry/Mat_TestGeometry.mat.meta} | 2 +- .../Environments/{Tiles.meta => Ground.meta} | 2 +- .../TestGround.meta} | 2 +- .../TestGround/Ground_TestGround.prefab | 63 ++++++++++ .../TestGround/Ground_TestGround.prefab.meta} | 2 +- .../TestGround/Mat_TestGround.mat} | 45 ++++--- .../TestGround/Mat_TestGround.mat.meta} | 2 +- .../_DDD/_Addressables/Environments/Item.meta | 8 ++ .../Environments/Item/BarrelTestItem.meta | 8 ++ .../Item_BarrelTestItem.prefab} | 4 +- .../Item_BarrelTestItem.prefab.meta} | 2 +- .../Environments/{Props.meta => Prop.meta} | 0 .../{Props => Prop}/BarrelTestProp.meta | 2 +- .../BarrelTestProp/Mat_BarrelTestProp.mat | 101 +++++++++++++++ .../Mat_BarrelTestProp.mat.meta} | 2 +- .../BarrelTestProp/Prop_BarrelTestProp.prefab | 63 ++++++++++ .../Prop_BarrelTestProp.prefab.meta} | 2 +- .../{Props => Prop}/BlockLine.meta | 0 .../{Props => Prop}/BlockLine/BlockLine.mat | 18 ++- .../BlockLine/BlockLine.mat.meta | 0 .../Prop/BlockLine/Mat_BlockLine.mat | 101 +++++++++++++++ .../Prop/BlockLine/Mat_BlockLine.mat.meta | 8 ++ .../BlockLine/PropBlockLine.prefab | 0 .../BlockLine/PropBlockLine.prefab.meta | 0 .../BlockLine/Prop_BlockLine.prefab} | 6 +- .../Prop/BlockLine/Prop_BlockLine.prefab.meta | 7 ++ .../Environments/{Props => Prop}/Box.meta | 0 .../Environments/{Props => Prop}/Box/Box.mat | 0 .../{Props => Prop}/Box/Box.mat.meta | 0 .../Environments/Prop/Box/Mat_Box.mat | 101 +++++++++++++++ .../Environments/Prop/Box/Mat_Box.mat.meta | 8 ++ .../{Props => Prop}/Box/PropBox.prefab | 0 .../{Props => Prop}/Box/PropBox.prefab.meta | 0 .../Box/Prop_Box.prefab} | 6 +- .../Prop/Box/Prop_Box.prefab.meta | 7 ++ .../{Props => Prop}/FrontWallPart1.meta | 0 .../FrontWallPart1/FrontWallPart1.mat | 18 ++- .../FrontWallPart1/FrontWallPart1.mat.meta | 0 .../FrontWallPart1/Mat_FrontWallPart1.mat | 101 +++++++++++++++ .../Mat_FrontWallPart1.mat.meta | 8 ++ .../FrontWallPart1/PropFrontWallPart1.prefab | 0 .../PropFrontWallPart1.prefab.meta | 0 .../FrontWallPart1/Prop_FrontWallPart1.prefab | 63 ++++++++++ .../Prop_FrontWallPart1.prefab.meta | 7 ++ .../{Props => Prop}/FrontWallPart2.meta | 0 .../FrontWallPart2/FrontWallPart2.mat | 18 ++- .../FrontWallPart2/FrontWallPart2.mat.meta | 0 .../FrontWallPart2/Mat_FrontWallPart2.mat | 101 +++++++++++++++ .../Mat_FrontWallPart2.mat.meta | 8 ++ .../FrontWallPart2/PropFrontWallPart2.prefab | 0 .../PropFrontWallPart2.prefab.meta | 0 .../FrontWallPart2/Prop_FrontWallPart2.prefab | 63 ++++++++++ .../Prop_FrontWallPart2.prefab.meta | 7 ++ .../{Props => Prop}/FrontWallPart3.meta | 0 .../FrontWallPart3/FrontWallPart3.mat | 18 ++- .../FrontWallPart3/FrontWallPart3.mat.meta | 0 .../FrontWallPart3/Mat_FrontWallPart3.mat | 101 +++++++++++++++ .../Mat_FrontWallPart3.mat.meta | 8 ++ .../FrontWallPart3/PropFrontWallPart3.prefab | 0 .../PropFrontWallPart3.prefab.meta | 0 .../FrontWallPart3/Prop_FrontWallPart3.prefab | 63 ++++++++++ .../Prop_FrontWallPart3.prefab.meta | 7 ++ .../{Props => Prop}/FrontWallPartDoor.meta | 0 .../FrontWallPartDoor/FrontWallPartDoor.mat | 18 ++- .../FrontWallPartDoor.mat.meta | 0 .../Mat_FrontWallPartDoor.mat | 101 +++++++++++++++ .../Mat_FrontWallPartDoor.mat.meta | 8 ++ .../PropFrontWallPartDoor.prefab | 0 .../PropFrontWallPartDoor.prefab.meta | 0 .../Prop_FrontWallPartDoor.prefab | 63 ++++++++++ .../Prop_FrontWallPartDoor.prefab.meta | 7 ++ .../Environments/{Props => Prop}/Lantern.meta | 0 .../{Props => Prop}/Lantern/Lantern.mat | 0 .../{Props => Prop}/Lantern/Lantern.mat.meta | 0 .../Environments/Prop/Lantern/Mat_Lantern.mat | 101 +++++++++++++++ .../Prop/Lantern/Mat_Lantern.mat.meta | 8 ++ .../Lantern/PropLantern.prefab | 2 +- .../Lantern/PropLantern.prefab.meta | 0 .../Prop/Lantern/Prop_Lantern.prefab | 63 ++++++++++ .../Prop/Lantern/Prop_Lantern.prefab.meta | 7 ++ .../{Props => Prop}/MenuBoard.meta | 0 .../Prop/MenuBoard/Mat_MenuBoard.mat | 101 +++++++++++++++ .../Prop/MenuBoard/Mat_MenuBoard.mat.meta | 8 ++ .../{Props => Prop}/MenuBoard/MenuBoard.mat | 0 .../MenuBoard/MenuBoard.mat.meta | 0 .../MenuBoard/PropMenuBoard.prefab | 0 .../MenuBoard/PropMenuBoard.prefab.meta | 0 .../Prop/MenuBoard/Prop_MenuBoard.prefab | 63 ++++++++++ .../Prop/MenuBoard/Prop_MenuBoard.prefab.meta | 7 ++ .../Environments/{Props => Prop}/Sink.meta | 0 .../Props.mat => Prop/Sink/Mat_Sink.mat} | 29 ++--- .../Environments/Prop/Sink/Mat_Sink.mat.meta | 8 ++ .../{Props => Prop}/Sink/PropSink.prefab | 0 .../{Props => Prop}/Sink/PropSink.prefab.meta | 0 .../Environments/Prop/Sink/Prop_Sink.prefab | 63 ++++++++++ .../Prop/Sink/Prop_Sink.prefab.meta | 7 ++ .../{Props => Prop}/Sink/Sink.mat | 0 .../{Props => Prop}/Sink/Sink.mat.meta | 0 .../BarrelTestTile/TileBarrelTestTile.prefab | 63 ---------- .../_Raw/Environments/Env_Mesh_Ground.prefab | 108 ++++++++++++++++ .../Environments/Env_Mesh_Ground.prefab.meta | 7 ++ ...nlit_Food.prefab => Env_Unlit_Item.prefab} | 0 ...prefab.meta => Env_Unlit_Item.prefab.meta} | 0 Assets/_DDD/_Raw/Environments/Geometries.meta | 8 -- Assets/_DDD/_Raw/Environments/Geometry.meta | 8 ++ .../Environments/Geometry/TestGeometry.meta | 8 ++ .../TestGeometry/TestGeometry_Base.png | 3 + .../TestGeometry/TestGeometry_Base.png.meta | 117 ++++++++++++++++++ .../TestGeometry/TestGeometry_MOHS.png | 3 + .../TestGeometry/TestGeometry_MOHS.png.meta | 117 ++++++++++++++++++ .../TestGeometry/TestGeometry_Normal.png | 3 + .../TestGeometry/TestGeometry_Normal.png.meta | 117 ++++++++++++++++++ Assets/_DDD/_Raw/Environments/Ground.meta | 8 ++ .../_Raw/Environments/Ground/TestGround.meta | 8 ++ .../Ground/TestGround/TestGround_Base.png | 3 + .../TestGround/TestGround_Base.png.meta | 117 ++++++++++++++++++ .../Ground/TestGround/TestGround_MOHS.png | 3 + .../TestGround/TestGround_MOHS.png.meta | 117 ++++++++++++++++++ .../Ground/TestGround/TestGround_Normal.png | 3 + .../TestGround/TestGround_Normal.png.meta | 117 ++++++++++++++++++ .../Environments/{Foods.meta => Item.meta} | 0 .../BarrelTestItem.meta} | 0 .../BarrelTestItem}/Barrel_BaseColor.png | 0 .../BarrelTestItem}/Barrel_BaseColor.png.meta | 0 .../Environments/{Props.meta => Prop.meta} | 0 .../{Props => Prop}/BarrelTestProp.meta | 0 .../BarrelTestProp/Barrel_BaseColor.png | 0 .../BarrelTestProp/Barrel_BaseColor.png.meta | 0 .../BarrelTestProp/Barrel_MOHS.png | 0 .../BarrelTestProp/Barrel_MOHS.png.meta | 0 .../BarrelTestProp/Barrel_Normal.png | 0 .../BarrelTestProp/Barrel_Normal.png.meta | 0 .../{Props => Prop}/BlockLine.meta | 0 .../BlockLine/BlockLine_basemap.png | 0 .../BlockLine/BlockLine_basemap.png.meta | 0 .../Environments/{Props => Prop}/Box.meta | 0 .../{Props => Prop}/Box/Box_basemap.png | 0 .../{Props => Prop}/Box/Box_basemap.png.meta | 0 .../{Props => Prop}/FrontWallPart1.meta | 0 .../FrontWallPart1/FrontWallPart1_basemap.png | 0 .../FrontWallPart1_basemap.png.meta | 0 .../{Props => Prop}/FrontWallPart2.meta | 0 .../FrontWallPart2/FrontWallPart2_basemap.png | 0 .../FrontWallPart2_basemap.png.meta | 0 .../{Props => Prop}/FrontWallPart3.meta | 0 .../FrontWallPart3/FrontWallPart3_basemap.png | 0 .../FrontWallPart3_basemap.png.meta | 0 .../{Props => Prop}/FrontWallPartDoor.meta | 0 .../FrontWallPartDoor_basemap.png | 0 .../FrontWallPartDoor_basemap.png.meta | 0 .../Environments/{Props => Prop}/Lantern.meta | 0 .../Lantern/Lantern_BaseMap.png | 0 .../Lantern/Lantern_BaseMap.png.meta | 0 .../{Props => Prop}/MenuBoard.meta | 0 .../MenuBoard/MenuBoard_basemap.png | 0 .../MenuBoard/MenuBoard_basemap.png.meta | 0 .../Environments/{Props => Prop}/Sink.meta | 0 .../{Props => Prop}/Sink/Sink_basemap.png | 0 .../Sink/Sink_basemap.png.meta | 0 Assets/_DDD/_Raw/Environments/_old.meta | 8 ++ .../{ => _old}/Env_Sprite_Background.prefab | 0 .../Env_Sprite_Background.prefab.meta | 0 .../_Raw/Environments/{ => _old}/Tiles.meta | 0 .../{ => _old}/Tiles/BarrelTestTile.meta | 0 .../Tiles/BarrelTestTile/Barrel_BaseColor.png | 0 .../BarrelTestTile/Barrel_BaseColor.png.meta | 0 .../Tiles/BarrelTestTile/Barrel_MOHS.png | 0 .../Tiles/BarrelTestTile/Barrel_MOHS.png.meta | 0 .../Tiles/BarrelTestTile/Barrel_Normal.png | 0 .../BarrelTestTile/Barrel_Normal.png.meta | 0 .../com.unity.probuilder/Settings.json | 36 ------ 184 files changed, 2710 insertions(+), 288 deletions(-) rename Assets/_DDD/_Addressables/Environments/{Foods.meta => Geometry.meta} (77%) rename Assets/_DDD/_Addressables/Environments/{Foods/BarrelTestFood.meta => Geometry/TestGeometry.meta} (77%) create mode 100644 Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry/Geometry_TestGeometry.prefab rename Assets/_DDD/_Addressables/Environments/{Props/PropProps.prefab.meta => Geometry/TestGeometry/Geometry_TestGeometry.prefab.meta} (74%) rename Assets/_DDD/_Addressables/Environments/{Tiles/BarrelTestTile/BarrelTestTile.mat => Geometry/TestGeometry/Mat_TestGeometry.mat} (75%) rename Assets/_DDD/_Addressables/Environments/{Props/Props.mat.meta => Geometry/TestGeometry/Mat_TestGeometry.mat.meta} (79%) rename Assets/_DDD/_Addressables/Environments/{Tiles.meta => Ground.meta} (77%) rename Assets/_DDD/_Addressables/Environments/{Tiles/BarrelTestTile.meta => Ground/TestGround.meta} (77%) create mode 100644 Assets/_DDD/_Addressables/Environments/Ground/TestGround/Ground_TestGround.prefab rename Assets/_DDD/_Addressables/Environments/{Tiles/BarrelTestTile/TileBarrelTestTile.prefab.meta => Ground/TestGround/Ground_TestGround.prefab.meta} (74%) rename Assets/_DDD/_Addressables/Environments/{Props/BarrelTestProp/BarrelTestProp.mat => Ground/TestGround/Mat_TestGround.mat} (84%) rename Assets/_DDD/_Addressables/Environments/{Tiles/BarrelTestTile/BarrelTestTile.mat.meta => Ground/TestGround/Mat_TestGround.mat.meta} (79%) create mode 100644 Assets/_DDD/_Addressables/Environments/Item.meta create mode 100644 Assets/_DDD/_Addressables/Environments/Item/BarrelTestItem.meta rename Assets/_DDD/_Addressables/Environments/{Foods/BarrelTestFood/FoodBarrelTestFood.prefab => Item/BarrelTestItem/Item_BarrelTestItem.prefab} (97%) rename Assets/_DDD/_Addressables/Environments/{Props/BarrelTestProp/PropBarrelTestProp.prefab.meta => Item/BarrelTestItem/Item_BarrelTestItem.prefab.meta} (74%) rename Assets/_DDD/_Addressables/Environments/{Props.meta => Prop.meta} (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/BarrelTestProp.meta (77%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/BarrelTestProp/Mat_BarrelTestProp.mat rename Assets/_DDD/_Addressables/Environments/{Props/BarrelTestProp/BarrelTestProp.mat.meta => Prop/BarrelTestProp/Mat_BarrelTestProp.mat.meta} (79%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/BarrelTestProp/Prop_BarrelTestProp.prefab rename Assets/_DDD/_Addressables/Environments/{Foods/BarrelTestFood/FoodBarrelTestFood.prefab.meta => Prop/BarrelTestProp/Prop_BarrelTestProp.prefab.meta} (74%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/BlockLine.meta (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/BlockLine/BlockLine.mat (93%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/BlockLine/BlockLine.mat.meta (100%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/BlockLine/Mat_BlockLine.mat create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/BlockLine/Mat_BlockLine.mat.meta rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/BlockLine/PropBlockLine.prefab (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/BlockLine/PropBlockLine.prefab.meta (100%) rename Assets/_DDD/_Addressables/Environments/{Props/BarrelTestProp/PropBarrelTestProp.prefab => Prop/BlockLine/Prop_BlockLine.prefab} (94%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/BlockLine/Prop_BlockLine.prefab.meta rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/Box.meta (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/Box/Box.mat (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/Box/Box.mat.meta (100%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/Box/Mat_Box.mat create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/Box/Mat_Box.mat.meta rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/Box/PropBox.prefab (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/Box/PropBox.prefab.meta (100%) rename Assets/_DDD/_Addressables/Environments/{Props/PropProps.prefab => Prop/Box/Prop_Box.prefab} (94%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/Box/Prop_Box.prefab.meta rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPart1.meta (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPart1/FrontWallPart1.mat (93%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPart1/FrontWallPart1.mat.meta (100%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/Mat_FrontWallPart1.mat create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/Mat_FrontWallPart1.mat.meta rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPart1/PropFrontWallPart1.prefab (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPart1/PropFrontWallPart1.prefab.meta (100%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/Prop_FrontWallPart1.prefab create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/Prop_FrontWallPart1.prefab.meta rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPart2.meta (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPart2/FrontWallPart2.mat (93%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPart2/FrontWallPart2.mat.meta (100%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/Mat_FrontWallPart2.mat create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/Mat_FrontWallPart2.mat.meta rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPart2/PropFrontWallPart2.prefab (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPart2/PropFrontWallPart2.prefab.meta (100%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/Prop_FrontWallPart2.prefab create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/Prop_FrontWallPart2.prefab.meta rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPart3.meta (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPart3/FrontWallPart3.mat (93%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPart3/FrontWallPart3.mat.meta (100%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/Mat_FrontWallPart3.mat create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/Mat_FrontWallPart3.mat.meta rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPart3/PropFrontWallPart3.prefab (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPart3/PropFrontWallPart3.prefab.meta (100%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/Prop_FrontWallPart3.prefab create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/Prop_FrontWallPart3.prefab.meta rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPartDoor.meta (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPartDoor/FrontWallPartDoor.mat (93%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPartDoor/FrontWallPartDoor.mat.meta (100%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/Mat_FrontWallPartDoor.mat create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/Mat_FrontWallPartDoor.mat.meta rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPartDoor/PropFrontWallPartDoor.prefab (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/FrontWallPartDoor/PropFrontWallPartDoor.prefab.meta (100%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/Prop_FrontWallPartDoor.prefab create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/Prop_FrontWallPartDoor.prefab.meta rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/Lantern.meta (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/Lantern/Lantern.mat (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/Lantern/Lantern.mat.meta (100%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/Lantern/Mat_Lantern.mat create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/Lantern/Mat_Lantern.mat.meta rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/Lantern/PropLantern.prefab (99%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/Lantern/PropLantern.prefab.meta (100%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/Lantern/Prop_Lantern.prefab create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/Lantern/Prop_Lantern.prefab.meta rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/MenuBoard.meta (100%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/Mat_MenuBoard.mat create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/Mat_MenuBoard.mat.meta rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/MenuBoard/MenuBoard.mat (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/MenuBoard/MenuBoard.mat.meta (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/MenuBoard/PropMenuBoard.prefab (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/MenuBoard/PropMenuBoard.prefab.meta (100%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/Prop_MenuBoard.prefab create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/Prop_MenuBoard.prefab.meta rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/Sink.meta (100%) rename Assets/_DDD/_Addressables/Environments/{Props/Props.mat => Prop/Sink/Mat_Sink.mat} (83%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/Sink/Mat_Sink.mat.meta rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/Sink/PropSink.prefab (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/Sink/PropSink.prefab.meta (100%) create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/Sink/Prop_Sink.prefab create mode 100644 Assets/_DDD/_Addressables/Environments/Prop/Sink/Prop_Sink.prefab.meta rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/Sink/Sink.mat (100%) rename Assets/_DDD/_Addressables/Environments/{Props => Prop}/Sink/Sink.mat.meta (100%) delete mode 100644 Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/TileBarrelTestTile.prefab create mode 100644 Assets/_DDD/_Raw/Environments/Env_Mesh_Ground.prefab create mode 100644 Assets/_DDD/_Raw/Environments/Env_Mesh_Ground.prefab.meta rename Assets/_DDD/_Raw/Environments/{Env_Unlit_Food.prefab => Env_Unlit_Item.prefab} (100%) rename Assets/_DDD/_Raw/Environments/{Env_Unlit_Food.prefab.meta => Env_Unlit_Item.prefab.meta} (100%) delete mode 100644 Assets/_DDD/_Raw/Environments/Geometries.meta create mode 100644 Assets/_DDD/_Raw/Environments/Geometry.meta create mode 100644 Assets/_DDD/_Raw/Environments/Geometry/TestGeometry.meta create mode 100644 Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_Base.png create mode 100644 Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_Base.png.meta create mode 100644 Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_MOHS.png create mode 100644 Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_MOHS.png.meta create mode 100644 Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_Normal.png create mode 100644 Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_Normal.png.meta create mode 100644 Assets/_DDD/_Raw/Environments/Ground.meta create mode 100644 Assets/_DDD/_Raw/Environments/Ground/TestGround.meta create mode 100644 Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_Base.png create mode 100644 Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_Base.png.meta create mode 100644 Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_MOHS.png create mode 100644 Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_MOHS.png.meta create mode 100644 Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_Normal.png create mode 100644 Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_Normal.png.meta rename Assets/_DDD/_Raw/Environments/{Foods.meta => Item.meta} (100%) rename Assets/_DDD/_Raw/Environments/{Foods/BarrelTestFood.meta => Item/BarrelTestItem.meta} (100%) rename Assets/_DDD/_Raw/Environments/{Foods/BarrelTestFood => Item/BarrelTestItem}/Barrel_BaseColor.png (100%) rename Assets/_DDD/_Raw/Environments/{Foods/BarrelTestFood => Item/BarrelTestItem}/Barrel_BaseColor.png.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props.meta => Prop.meta} (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/BarrelTestProp.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/BarrelTestProp/Barrel_BaseColor.png (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/BarrelTestProp/Barrel_BaseColor.png.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/BarrelTestProp/Barrel_MOHS.png (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/BarrelTestProp/Barrel_MOHS.png.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/BarrelTestProp/Barrel_Normal.png (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/BarrelTestProp/Barrel_Normal.png.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/BlockLine.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/BlockLine/BlockLine_basemap.png (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/BlockLine/BlockLine_basemap.png.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/Box.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/Box/Box_basemap.png (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/Box/Box_basemap.png.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/FrontWallPart1.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/FrontWallPart1/FrontWallPart1_basemap.png (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/FrontWallPart1/FrontWallPart1_basemap.png.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/FrontWallPart2.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/FrontWallPart2/FrontWallPart2_basemap.png (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/FrontWallPart2/FrontWallPart2_basemap.png.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/FrontWallPart3.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/FrontWallPart3/FrontWallPart3_basemap.png (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/FrontWallPart3/FrontWallPart3_basemap.png.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/FrontWallPartDoor.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/FrontWallPartDoor/FrontWallPartDoor_basemap.png (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/FrontWallPartDoor/FrontWallPartDoor_basemap.png.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/Lantern.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/Lantern/Lantern_BaseMap.png (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/Lantern/Lantern_BaseMap.png.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/MenuBoard.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/MenuBoard/MenuBoard_basemap.png (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/MenuBoard/MenuBoard_basemap.png.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/Sink.meta (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/Sink/Sink_basemap.png (100%) rename Assets/_DDD/_Raw/Environments/{Props => Prop}/Sink/Sink_basemap.png.meta (100%) create mode 100644 Assets/_DDD/_Raw/Environments/_old.meta rename Assets/_DDD/_Raw/Environments/{ => _old}/Env_Sprite_Background.prefab (100%) rename Assets/_DDD/_Raw/Environments/{ => _old}/Env_Sprite_Background.prefab.meta (100%) rename Assets/_DDD/_Raw/Environments/{ => _old}/Tiles.meta (100%) rename Assets/_DDD/_Raw/Environments/{ => _old}/Tiles/BarrelTestTile.meta (100%) rename Assets/_DDD/_Raw/Environments/{ => _old}/Tiles/BarrelTestTile/Barrel_BaseColor.png (100%) rename Assets/_DDD/_Raw/Environments/{ => _old}/Tiles/BarrelTestTile/Barrel_BaseColor.png.meta (100%) rename Assets/_DDD/_Raw/Environments/{ => _old}/Tiles/BarrelTestTile/Barrel_MOHS.png (100%) rename Assets/_DDD/_Raw/Environments/{ => _old}/Tiles/BarrelTestTile/Barrel_MOHS.png.meta (100%) rename Assets/_DDD/_Raw/Environments/{ => _old}/Tiles/BarrelTestTile/Barrel_Normal.png (100%) rename Assets/_DDD/_Raw/Environments/{ => _old}/Tiles/BarrelTestTile/Barrel_Normal.png.meta (100%) delete mode 100644 ProjectSettings/Packages/com.unity.probuilder/Settings.json diff --git a/.gitignore b/.gitignore index 78d821b5d..a36b4dbfa 100644 --- a/.gitignore +++ b/.gitignore @@ -102,4 +102,5 @@ Assets/AddressableAssetsData/AssetGroups/ Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset.meta Assets/AddressableAssetsData/AddressableAssetSettings.asset -Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta \ No newline at end of file +Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta +ProjectSettings/Packages/com.unity.probuilder/Settings.json diff --git a/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph b/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph index ce7e1904b..021257ebf 100644 --- a/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph +++ b/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph @@ -2008,7 +2008,7 @@ "m_Id": "65b8adaa035f432688ba9f42d9595d47" }, "m_AllowMaterialOverride": true, - "m_SurfaceType": 1, + "m_SurfaceType": 0, "m_ZTestMode": 4, "m_ZWriteControl": 0, "m_AlphaMode": 0, diff --git a/Assets/_DDD/Restaurant/Environments/Geometries/BlockLine/BlockLine.mat b/Assets/_DDD/Restaurant/Environments/Geometries/BlockLine/BlockLine.mat index ec84636ec..470a070cc 100644 --- a/Assets/_DDD/Restaurant/Environments/Geometries/BlockLine/BlockLine.mat +++ b/Assets/_DDD/Restaurant/Environments/Geometries/BlockLine/BlockLine.mat @@ -25,23 +25,20 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON - _METALLICSPECGLOSSMAP - _NORMALMAP - _OCCLUSIONMAP - _PARALLAXMAP - - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: 2000 stringTagMap: - RenderType: Transparent + RenderType: Opaque disabledShaderPasses: - MOTIONVECTORS - SHADOWCASTER - - DepthOnly m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,7 +130,7 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 10 + - _DstBlend: 0 - _DstBlendAlpha: 0 - _EMISSION: 0 - _EnvironmentReflections: 1 @@ -155,12 +152,12 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - - _Surface: 1 + - _Surface: 0 - _UseOpacityMask: 0 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZTest: 4 - - _ZWrite: 0 + - _ZWrite: 1 - _ZWriteControl: 0 m_Colors: - _BaseColor: {r: 0.28, g: 0.19749334, b: 0.13440001, a: 1} diff --git a/Assets/_DDD/Restaurant/Environments/Geometries/KitchenTile/KitchenTile.mat b/Assets/_DDD/Restaurant/Environments/Geometries/KitchenTile/KitchenTile.mat index 2a4b5c7e2..879bb698d 100644 --- a/Assets/_DDD/Restaurant/Environments/Geometries/KitchenTile/KitchenTile.mat +++ b/Assets/_DDD/Restaurant/Environments/Geometries/KitchenTile/KitchenTile.mat @@ -45,7 +45,7 @@ Material: m_TexEnvs: - _BaseMap: m_Texture: {fileID: 2800000, guid: 8fba16e0e5e499649a3908a4a94a7b30, type: 3} - m_Scale: {x: 12.35, y: 1.86} + m_Scale: {x: 12, y: 4} m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} diff --git a/Assets/_DDD/Restaurant/Environments/Props/Barrel/Barrel.mat b/Assets/_DDD/Restaurant/Environments/Props/Barrel/Barrel.mat index 4cdc75b3a..f2e2ed51a 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Barrel/Barrel.mat +++ b/Assets/_DDD/Restaurant/Environments/Props/Barrel/Barrel.mat @@ -25,21 +25,18 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON - _ALPHATEST_ON - _OCCLUSIONMAP - _PARALLAXMAP - - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: 2450 stringTagMap: - RenderType: Transparent + RenderType: TransparentCutout disabledShaderPasses: - MOTIONVECTORS - - DepthOnly m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -120,7 +117,7 @@ Material: m_Floats: - _AddPrecomputedVelocity: 0 - _AlphaClip: 1 - - _AlphaToMask: 0 + - _AlphaToMask: 1 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 5 @@ -131,7 +128,7 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 10 + - _DstBlend: 0 - _DstBlendAlpha: 0 - _EMISSION: 0 - _EnvironmentReflections: 1 @@ -153,12 +150,12 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - - _Surface: 1 + - _Surface: 0 - _UseOpacityMask: 0 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZTest: 4 - - _ZWrite: 0 + - _ZWrite: 1 - _ZWriteControl: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternLight.mat b/Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternLight.mat index 17c5f8917..83d93576c 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternLight.mat +++ b/Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternLight.mat @@ -12,24 +12,21 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON - _ALPHATEST_ON - _EMISSION - _METALLICSPECGLOSSMAP - _NORMALMAP - _OCCLUSIONMAP - _PARALLAXMAP - - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: 2450 stringTagMap: - RenderType: Transparent + RenderType: TransparentCutout disabledShaderPasses: - MOTIONVECTORS - - DepthOnly m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -82,6 +79,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _OpacityMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _ParallaxMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -106,7 +107,7 @@ Material: m_Floats: - _AddPrecomputedVelocity: 0 - _AlphaClip: 1 - - _AlphaToMask: 0 + - _AlphaToMask: 1 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 @@ -117,7 +118,7 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 10 + - _DstBlend: 0 - _DstBlendAlpha: 0 - _EMISSION: 1 - _EnvironmentReflections: 1 @@ -139,11 +140,12 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - - _Surface: 1 + - _Surface: 0 + - _UseOpacityMask: 0 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZTest: 4 - - _ZWrite: 0 + - _ZWrite: 1 - _ZWriteControl: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/_DDD/Restaurant/Environments/Props/Rope2/Rope2.mat b/Assets/_DDD/Restaurant/Environments/Props/Rope2/Rope2.mat index f7342369f..bf3ea8315 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Rope2/Rope2.mat +++ b/Assets/_DDD/Restaurant/Environments/Props/Rope2/Rope2.mat @@ -25,23 +25,20 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON - _ALPHATEST_ON - _METALLICSPECGLOSSMAP - _NORMALMAP - _OCCLUSIONMAP - _PARALLAXMAP - - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: 2450 stringTagMap: - RenderType: Transparent + RenderType: TransparentCutout disabledShaderPasses: - MOTIONVECTORS - - DepthOnly - SHADOWCASTER m_LockedProperties: m_SavedProperties: @@ -178,7 +175,7 @@ Material: - _AlphaOutlineMinAlpha: 0 - _AlphaOutlinePower: 1 - _AlphaRoundThreshold: 0.5 - - _AlphaToMask: 0 + - _AlphaToMask: 1 - _BUILTIN_QueueControl: -1 - _BUILTIN_QueueOffset: 0 - _BillboardY: 0 @@ -217,7 +214,7 @@ Material: - _DistortAmount: 0.5 - _DistortTexXSpeed: 5 - _DistortTexYSpeed: 5 - - _DstBlend: 10 + - _DstBlend: 0 - _DstBlendAlpha: 0 - _EMISSION: 0 - _EditorDrawers: 6 @@ -333,7 +330,7 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - - _Surface: 1 + - _Surface: 0 - _TextureScrollXSpeed: 1 - _TextureScrollYSpeed: 0 - _TwistUvAmount: 1 @@ -353,7 +350,7 @@ Material: - _XRMotionVectorsPass: 1 - _ZTest: 4 - _ZTestMode: 4 - - _ZWrite: 0 + - _ZWrite: 1 - _ZWriteControl: 0 - _ZoomUvAmount: 0.5 m_Colors: diff --git a/Assets/_DDD/Restaurant/Environments/Props/Window2/WindowBack.mat b/Assets/_DDD/Restaurant/Environments/Props/Window2/WindowBack.mat index 91352cbdf..66be7fda2 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Window2/WindowBack.mat +++ b/Assets/_DDD/Restaurant/Environments/Props/Window2/WindowBack.mat @@ -12,20 +12,17 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON - _ALPHATEST_ON - _PARALLAXMAP - - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: 2450 stringTagMap: - RenderType: Transparent + RenderType: TransparentCutout disabledShaderPasses: - MOTIONVECTORS - - DepthOnly m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -106,7 +103,7 @@ Material: m_Floats: - _AddPrecomputedVelocity: 0 - _AlphaClip: 1 - - _AlphaToMask: 0 + - _AlphaToMask: 1 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 @@ -117,7 +114,7 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 10 + - _DstBlend: 0 - _DstBlendAlpha: 0 - _EMISSION: 0 - _EnvironmentReflections: 1 @@ -139,13 +136,13 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - - _Surface: 1 + - _Surface: 0 - _UseOpacityMask: 1 - _UseOpacityMaskAsOriginalAlpha: 1 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZTest: 4 - - _ZWrite: 0 + - _ZWrite: 1 - _ZWriteControl: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/_DDD/_Addressables/Environments/Foods.meta b/Assets/_DDD/_Addressables/Environments/Geometry.meta similarity index 77% rename from Assets/_DDD/_Addressables/Environments/Foods.meta rename to Assets/_DDD/_Addressables/Environments/Geometry.meta index 1083c8a31..e203cec0e 100644 --- a/Assets/_DDD/_Addressables/Environments/Foods.meta +++ b/Assets/_DDD/_Addressables/Environments/Geometry.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9b35ab787d8b0437098e77d47aed46c3 +guid: 9ee06e1ca26484551b4a5961ee0bb0b1 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_DDD/_Addressables/Environments/Foods/BarrelTestFood.meta b/Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry.meta similarity index 77% rename from Assets/_DDD/_Addressables/Environments/Foods/BarrelTestFood.meta rename to Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry.meta index 37a8bfc66..b3afd6da3 100644 --- a/Assets/_DDD/_Addressables/Environments/Foods/BarrelTestFood.meta +++ b/Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3140e5f62496848a9abb823d2016cd77 +guid: 7a806ed5bfd444d0c80100e298b18d58 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry/Geometry_TestGeometry.prefab b/Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry/Geometry_TestGeometry.prefab new file mode 100644 index 000000000..c13e2e21b --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry/Geometry_TestGeometry.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &5587954395373699335 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2204914584875671904, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_Name + value: Geometry_TestGeometry + objectReference: {fileID: 0} + - target: {fileID: 8467019391491472137, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 5529a166f9f014cf9b1b8d6fc8178b20, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} diff --git a/Assets/_DDD/_Addressables/Environments/Props/PropProps.prefab.meta b/Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry/Geometry_TestGeometry.prefab.meta similarity index 74% rename from Assets/_DDD/_Addressables/Environments/Props/PropProps.prefab.meta rename to Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry/Geometry_TestGeometry.prefab.meta index 8a4c2c035..2f8af69f6 100644 --- a/Assets/_DDD/_Addressables/Environments/Props/PropProps.prefab.meta +++ b/Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry/Geometry_TestGeometry.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ea71ba958560908489cfa7192d604860 +guid: 42a7da168dd0a4b349da0b5cc21e0188 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/BarrelTestTile.mat b/Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry/Mat_TestGeometry.mat similarity index 75% rename from Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/BarrelTestTile.mat rename to Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry/Mat_TestGeometry.mat index d131219b4..c3a169625 100644 --- a/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/BarrelTestTile.mat +++ b/Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry/Mat_TestGeometry.mat @@ -1,18 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-2250678344118640832 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -20,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: BarrelTestTile + m_Name: Mat_TestGeometry m_Shader: {fileID: -6465566751694194690, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -31,20 +18,21 @@ Material: - _OCCLUSIONMAP - _PARALLAXMAP m_InvalidKeywords: [] - m_LightmapFlags: 2 + m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: + - SHADOWCASTER - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _Base: - m_Texture: {fileID: 2800000, guid: 9e3e41f5375f0477ea843b5f6aff3e9c, type: 3} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 4b4cf6e285d3d4fed9102c9a403e3c08, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Emiss: @@ -52,11 +40,15 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MOHS: - m_Texture: {fileID: 2800000, guid: efc0a8a7da4244e4ca3716534343b9e7, type: 3} + m_Texture: {fileID: 2800000, guid: ca484ae873a004754b62cc9d53b01ff8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Normal: - m_Texture: {fileID: 2800000, guid: 5065b680750834465b52cebe19f5b46e, type: 3} + m_Texture: {fileID: 2800000, guid: 7fb18a759867142889b20a646a586bfe, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OpacityMap: + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: @@ -78,8 +70,8 @@ Material: - _Blend: 0 - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - - _CastShadows: 1 - - _Cull: 2 + - _CastShadows: 0 + - _Cull: 0 - _Cutoff: 0.5 - _DstBlend: 0 - _EMISSION: 0 @@ -97,6 +89,7 @@ Material: - _Smoothness: 0.5 - _SrcBlend: 1 - _Surface: 0 + - _UseOpacityMask: 0 - _WorkflowMode: 1 - _ZTest: 4 - _ZWrite: 1 diff --git a/Assets/_DDD/_Addressables/Environments/Props/Props.mat.meta b/Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry/Mat_TestGeometry.mat.meta similarity index 79% rename from Assets/_DDD/_Addressables/Environments/Props/Props.mat.meta rename to Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry/Mat_TestGeometry.mat.meta index d077bcc07..a5e84ccdf 100644 --- a/Assets/_DDD/_Addressables/Environments/Props/Props.mat.meta +++ b/Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry/Mat_TestGeometry.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6745359e19e667c418eea884946d5b13 +guid: 5529a166f9f014cf9b1b8d6fc8178b20 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/_DDD/_Addressables/Environments/Tiles.meta b/Assets/_DDD/_Addressables/Environments/Ground.meta similarity index 77% rename from Assets/_DDD/_Addressables/Environments/Tiles.meta rename to Assets/_DDD/_Addressables/Environments/Ground.meta index 39fc3c018..e6475fbf6 100644 --- a/Assets/_DDD/_Addressables/Environments/Tiles.meta +++ b/Assets/_DDD/_Addressables/Environments/Ground.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 304ca71daceb442e9a2d77d0ae9b9d1a +guid: 5b991dd1eda4e41bbae0482b23ca2230 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile.meta b/Assets/_DDD/_Addressables/Environments/Ground/TestGround.meta similarity index 77% rename from Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile.meta rename to Assets/_DDD/_Addressables/Environments/Ground/TestGround.meta index 029802477..bc32cc1a3 100644 --- a/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile.meta +++ b/Assets/_DDD/_Addressables/Environments/Ground/TestGround.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e89c0aea2d3ff4247b6974c9c257bcfe +guid: 7fcf736dbec25417cbe2ee7817849f3a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_DDD/_Addressables/Environments/Ground/TestGround/Ground_TestGround.prefab b/Assets/_DDD/_Addressables/Environments/Ground/TestGround/Ground_TestGround.prefab new file mode 100644 index 000000000..4711bfbe7 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Ground/TestGround/Ground_TestGround.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &8136757195811756201 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2204914584875671904, guid: 355e43181ac8c438b9736b7e15fa8d43, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 355e43181ac8c438b9736b7e15fa8d43, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 355e43181ac8c438b9736b7e15fa8d43, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 355e43181ac8c438b9736b7e15fa8d43, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 355e43181ac8c438b9736b7e15fa8d43, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 355e43181ac8c438b9736b7e15fa8d43, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 355e43181ac8c438b9736b7e15fa8d43, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 355e43181ac8c438b9736b7e15fa8d43, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 355e43181ac8c438b9736b7e15fa8d43, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 355e43181ac8c438b9736b7e15fa8d43, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 355e43181ac8c438b9736b7e15fa8d43, type: 3} + propertyPath: m_Name + value: Ground_TestGround + objectReference: {fileID: 0} + - target: {fileID: 8467019391491472137, guid: 355e43181ac8c438b9736b7e15fa8d43, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 3bd3fbbbdf7f246b78d5f5fb887ca339, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 355e43181ac8c438b9736b7e15fa8d43, type: 3} diff --git a/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/TileBarrelTestTile.prefab.meta b/Assets/_DDD/_Addressables/Environments/Ground/TestGround/Ground_TestGround.prefab.meta similarity index 74% rename from Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/TileBarrelTestTile.prefab.meta rename to Assets/_DDD/_Addressables/Environments/Ground/TestGround/Ground_TestGround.prefab.meta index 129e70375..a07da3203 100644 --- a/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/TileBarrelTestTile.prefab.meta +++ b/Assets/_DDD/_Addressables/Environments/Ground/TestGround/Ground_TestGround.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cd49da51493584ecf98e21cd4eeb3e2b +guid: d29e471092149441dab2dae5f254947c PrefabImporter: externalObjects: {} userData: diff --git a/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/BarrelTestProp.mat b/Assets/_DDD/_Addressables/Environments/Ground/TestGround/Mat_TestGround.mat similarity index 84% rename from Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/BarrelTestProp.mat rename to Assets/_DDD/_Addressables/Environments/Ground/TestGround/Mat_TestGround.mat index 1c54a0e30..aa9b5ba30 100644 --- a/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/BarrelTestProp.mat +++ b/Assets/_DDD/_Addressables/Environments/Ground/TestGround/Mat_TestGround.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2439963475659973636 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -7,7 +20,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: BarrelTestProp + m_Name: Mat_TestGround m_Shader: {fileID: -6465566751694194690, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -21,21 +34,18 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2450 + m_CustomRenderQueue: -1 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: + - SHADOWCASTER - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _Base: - m_Texture: {fileID: 2800000, guid: 3be98eb8461344cf19e8d0698c18d9fe, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _BaseMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 8dfc4f571f0fa466f98c2b3d548020e4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Emiss: @@ -43,11 +53,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MOHS: - m_Texture: {fileID: 2800000, guid: c86e16527dc8841eabd95bd7d867e6d8, type: 3} + m_Texture: {fileID: 2800000, guid: 7e1340a2091f246ab8cd71c4d0a3c70b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Normal: - m_Texture: {fileID: 2800000, guid: 2187501ce91064de6bc2fb7df8864050, type: 3} + m_Texture: {fileID: 2800000, guid: c13033eb142d049539400ecdd4040d6a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OpacityMap: @@ -73,8 +83,8 @@ Material: - _Blend: 0 - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - - _CastShadows: 1 - - _Cull: 2 + - _CastShadows: 0 + - _Cull: 0 - _Cutoff: 0.5 - _DstBlend: 0 - _EMISSION: 0 @@ -102,16 +112,3 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 ---- !u!114 &8638708388352262353 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 9 diff --git a/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/BarrelTestTile.mat.meta b/Assets/_DDD/_Addressables/Environments/Ground/TestGround/Mat_TestGround.mat.meta similarity index 79% rename from Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/BarrelTestTile.mat.meta rename to Assets/_DDD/_Addressables/Environments/Ground/TestGround/Mat_TestGround.mat.meta index 31a88dea1..cb273fbc9 100644 --- a/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/BarrelTestTile.mat.meta +++ b/Assets/_DDD/_Addressables/Environments/Ground/TestGround/Mat_TestGround.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2986d47c2acd84257866fc5e3180f833 +guid: 3bd3fbbbdf7f246b78d5f5fb887ca339 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/_DDD/_Addressables/Environments/Item.meta b/Assets/_DDD/_Addressables/Environments/Item.meta new file mode 100644 index 000000000..e209bda88 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Item.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c1891427638a44750905725d7f41a60b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Item/BarrelTestItem.meta b/Assets/_DDD/_Addressables/Environments/Item/BarrelTestItem.meta new file mode 100644 index 000000000..56ab49fd5 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Item/BarrelTestItem.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3f61593bc063044aea4fef468cb5867d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Foods/BarrelTestFood/FoodBarrelTestFood.prefab b/Assets/_DDD/_Addressables/Environments/Item/BarrelTestItem/Item_BarrelTestItem.prefab similarity index 97% rename from Assets/_DDD/_Addressables/Environments/Foods/BarrelTestFood/FoodBarrelTestFood.prefab rename to Assets/_DDD/_Addressables/Environments/Item/BarrelTestItem/Item_BarrelTestItem.prefab index 458621cee..6298a7750 100644 --- a/Assets/_DDD/_Addressables/Environments/Foods/BarrelTestFood/FoodBarrelTestFood.prefab +++ b/Assets/_DDD/_Addressables/Environments/Item/BarrelTestItem/Item_BarrelTestItem.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &8152534763188943799 +--- !u!1001 &2060336909935895087 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -10,7 +10,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3849439458660134528, guid: 8108ecb638808448dbf086652864796a, type: 3} propertyPath: m_Name - value: FoodBarrelTestFood + value: Item_BarrelTestItem objectReference: {fileID: 0} - target: {fileID: 6264680826521292420, guid: 8108ecb638808448dbf086652864796a, type: 3} propertyPath: m_Sprite diff --git a/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/PropBarrelTestProp.prefab.meta b/Assets/_DDD/_Addressables/Environments/Item/BarrelTestItem/Item_BarrelTestItem.prefab.meta similarity index 74% rename from Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/PropBarrelTestProp.prefab.meta rename to Assets/_DDD/_Addressables/Environments/Item/BarrelTestItem/Item_BarrelTestItem.prefab.meta index 1e8c2b340..d5393a1c6 100644 --- a/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/PropBarrelTestProp.prefab.meta +++ b/Assets/_DDD/_Addressables/Environments/Item/BarrelTestItem/Item_BarrelTestItem.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7a110f482049d4062b4545dc94852fea +guid: 1a3a4f2ef6c714d1e8cafb8020595d26 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/_DDD/_Addressables/Environments/Props.meta b/Assets/_DDD/_Addressables/Environments/Prop.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props.meta rename to Assets/_DDD/_Addressables/Environments/Prop.meta diff --git a/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp.meta b/Assets/_DDD/_Addressables/Environments/Prop/BarrelTestProp.meta similarity index 77% rename from Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp.meta rename to Assets/_DDD/_Addressables/Environments/Prop/BarrelTestProp.meta index 69ac6475a..59fe46232 100644 --- a/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp.meta +++ b/Assets/_DDD/_Addressables/Environments/Prop/BarrelTestProp.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 11ee7a37b72e54ce886e741ee9fdabde +guid: 462177daf14104251875decc68effcd5 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_DDD/_Addressables/Environments/Prop/BarrelTestProp/Mat_BarrelTestProp.mat b/Assets/_DDD/_Addressables/Environments/Prop/BarrelTestProp/Mat_BarrelTestProp.mat new file mode 100644 index 000000000..d6edc236a --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/BarrelTestProp/Mat_BarrelTestProp.mat @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mat_BarrelTestProp + m_Shader: {fileID: -6465566751694194690, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHATEST_ON + - _METALLICSPECGLOSSMAP + - _NORMALMAP + - _OCCLUSIONMAP + - _PARALLAXMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: + - SHADOWCASTER + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 3be98eb8461344cf19e8d0698c18d9fe, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Emiss: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MOHS: + m_Texture: {fileID: 2800000, guid: c86e16527dc8841eabd95bd7d867e6d8, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal: + m_Texture: {fileID: 2800000, guid: 2187501ce91064de6bc2fb7df8864050, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OpacityMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 1 + - _AlphaToMask: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _BumpScale: 1 + - _CastShadows: 0 + - _Cull: 0 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EMISSION: 0 + - _EnvironmentReflections: 1 + - _METALLICSPECGLOSSMAP: 1 + - _Metallic: 0 + - _NORMALMAP: 1 + - _OCCLUSIONMAP: 1 + - _OcclusionStrength: 1 + - _PARALLAXMAP: 1 + - _Parallax: 0.05 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SrcBlend: 1 + - _Surface: 0 + - _UseOpacityMask: 0 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/BarrelTestProp.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/BarrelTestProp/Mat_BarrelTestProp.mat.meta similarity index 79% rename from Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/BarrelTestProp.mat.meta rename to Assets/_DDD/_Addressables/Environments/Prop/BarrelTestProp/Mat_BarrelTestProp.mat.meta index 3b46d3fff..f9a19c5cb 100644 --- a/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/BarrelTestProp.mat.meta +++ b/Assets/_DDD/_Addressables/Environments/Prop/BarrelTestProp/Mat_BarrelTestProp.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 700b1d73671ee424dadd18a1443e7b7b +guid: 43cd00eace8b4446a877ee3eb62f9e6f NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/_DDD/_Addressables/Environments/Prop/BarrelTestProp/Prop_BarrelTestProp.prefab b/Assets/_DDD/_Addressables/Environments/Prop/BarrelTestProp/Prop_BarrelTestProp.prefab new file mode 100644 index 000000000..1997381c5 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/BarrelTestProp/Prop_BarrelTestProp.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &8856656757241880321 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Name + value: Prop_BarrelTestProp + objectReference: {fileID: 0} + - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 43cd00eace8b4446a877ee3eb62f9e6f, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} diff --git a/Assets/_DDD/_Addressables/Environments/Foods/BarrelTestFood/FoodBarrelTestFood.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/BarrelTestProp/Prop_BarrelTestProp.prefab.meta similarity index 74% rename from Assets/_DDD/_Addressables/Environments/Foods/BarrelTestFood/FoodBarrelTestFood.prefab.meta rename to Assets/_DDD/_Addressables/Environments/Prop/BarrelTestProp/Prop_BarrelTestProp.prefab.meta index 465e85c70..70dbc234a 100644 --- a/Assets/_DDD/_Addressables/Environments/Foods/BarrelTestFood/FoodBarrelTestFood.prefab.meta +++ b/Assets/_DDD/_Addressables/Environments/Prop/BarrelTestProp/Prop_BarrelTestProp.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 46dd69de07b704843a8c376995da2eb5 +guid: a06e5aa07b13d421cbf72d11084395c9 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/_DDD/_Addressables/Environments/Props/BlockLine.meta b/Assets/_DDD/_Addressables/Environments/Prop/BlockLine.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/BlockLine.meta rename to Assets/_DDD/_Addressables/Environments/Prop/BlockLine.meta diff --git a/Assets/_DDD/_Addressables/Environments/Props/BlockLine/BlockLine.mat b/Assets/_DDD/_Addressables/Environments/Prop/BlockLine/BlockLine.mat similarity index 93% rename from Assets/_DDD/_Addressables/Environments/Props/BlockLine/BlockLine.mat rename to Assets/_DDD/_Addressables/Environments/Prop/BlockLine/BlockLine.mat index c8e4ad9ce..1107955fc 100644 --- a/Assets/_DDD/_Addressables/Environments/Props/BlockLine/BlockLine.mat +++ b/Assets/_DDD/_Addressables/Environments/Prop/BlockLine/BlockLine.mat @@ -30,18 +30,16 @@ Material: - _NORMALMAP - _OCCLUSIONMAP - _PARALLAXMAP - - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2450 stringTagMap: - RenderType: Transparent + RenderType: TransparentCutout disabledShaderPasses: - - DepthOnly - - SHADOWCASTER - MOTIONVECTORS + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -81,14 +79,14 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 1 - - _AlphaToMask: 0 + - _AlphaToMask: 1 - _Blend: 0 - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _CastShadows: 0 - _Cull: 0 - _Cutoff: 0.5 - - _DstBlend: 10 + - _DstBlend: 0 - _EMISSION: 0 - _EnvironmentReflections: 1 - _METALLICSPECGLOSSMAP: 1 @@ -102,12 +100,12 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 - - _SrcBlend: 5 - - _Surface: 1 + - _SrcBlend: 1 + - _Surface: 0 - _UseOpacityMask: 0 - _WorkflowMode: 1 - _ZTest: 4 - - _ZWrite: 0 + - _ZWrite: 1 - _ZWriteControl: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/_DDD/_Addressables/Environments/Props/BlockLine/BlockLine.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/BlockLine/BlockLine.mat.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/BlockLine/BlockLine.mat.meta rename to Assets/_DDD/_Addressables/Environments/Prop/BlockLine/BlockLine.mat.meta diff --git a/Assets/_DDD/_Addressables/Environments/Prop/BlockLine/Mat_BlockLine.mat b/Assets/_DDD/_Addressables/Environments/Prop/BlockLine/Mat_BlockLine.mat new file mode 100644 index 000000000..269577b94 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/BlockLine/Mat_BlockLine.mat @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mat_BlockLine + m_Shader: {fileID: -6465566751694194690, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHATEST_ON + - _METALLICSPECGLOSSMAP + - _NORMALMAP + - _OCCLUSIONMAP + - _PARALLAXMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: + - MOTIONVECTORS + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Emiss: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MOHS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OpacityMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 1 + - _AlphaToMask: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _BumpScale: 1 + - _CastShadows: 0 + - _Cull: 0 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EMISSION: 0 + - _EnvironmentReflections: 1 + - _METALLICSPECGLOSSMAP: 1 + - _Metallic: 0 + - _NORMALMAP: 1 + - _OCCLUSIONMAP: 1 + - _OcclusionStrength: 1 + - _PARALLAXMAP: 1 + - _Parallax: 0.05 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SrcBlend: 1 + - _Surface: 0 + - _UseOpacityMask: 0 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/_DDD/_Addressables/Environments/Prop/BlockLine/Mat_BlockLine.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/BlockLine/Mat_BlockLine.mat.meta new file mode 100644 index 000000000..3f302f81c --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/BlockLine/Mat_BlockLine.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 23f8fbb0c76aa4649bddbc564ff03f7e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/BlockLine/PropBlockLine.prefab b/Assets/_DDD/_Addressables/Environments/Prop/BlockLine/PropBlockLine.prefab similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/BlockLine/PropBlockLine.prefab rename to Assets/_DDD/_Addressables/Environments/Prop/BlockLine/PropBlockLine.prefab diff --git a/Assets/_DDD/_Addressables/Environments/Props/BlockLine/PropBlockLine.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/BlockLine/PropBlockLine.prefab.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/BlockLine/PropBlockLine.prefab.meta rename to Assets/_DDD/_Addressables/Environments/Prop/BlockLine/PropBlockLine.prefab.meta diff --git a/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/PropBarrelTestProp.prefab b/Assets/_DDD/_Addressables/Environments/Prop/BlockLine/Prop_BlockLine.prefab similarity index 94% rename from Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/PropBarrelTestProp.prefab rename to Assets/_DDD/_Addressables/Environments/Prop/BlockLine/Prop_BlockLine.prefab index 0b3a1418f..60275e540 100644 --- a/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/PropBarrelTestProp.prefab +++ b/Assets/_DDD/_Addressables/Environments/Prop/BlockLine/Prop_BlockLine.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &9036100666493318766 +--- !u!1001 &1528259456169359855 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -50,12 +50,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Name - value: PropBarrelTestProp + value: Prop_BlockLine objectReference: {fileID: 0} - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 2100000, guid: 700b1d73671ee424dadd18a1443e7b7b, type: 2} + objectReference: {fileID: 2100000, guid: 23f8fbb0c76aa4649bddbc564ff03f7e, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/_DDD/_Addressables/Environments/Prop/BlockLine/Prop_BlockLine.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/BlockLine/Prop_BlockLine.prefab.meta new file mode 100644 index 000000000..87ce8e976 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/BlockLine/Prop_BlockLine.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e517171718dd64f0b8cd1de304d71238 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/Box.meta b/Assets/_DDD/_Addressables/Environments/Prop/Box.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/Box.meta rename to Assets/_DDD/_Addressables/Environments/Prop/Box.meta diff --git a/Assets/_DDD/_Addressables/Environments/Props/Box/Box.mat b/Assets/_DDD/_Addressables/Environments/Prop/Box/Box.mat similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/Box/Box.mat rename to Assets/_DDD/_Addressables/Environments/Prop/Box/Box.mat diff --git a/Assets/_DDD/_Addressables/Environments/Props/Box/Box.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/Box/Box.mat.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/Box/Box.mat.meta rename to Assets/_DDD/_Addressables/Environments/Prop/Box/Box.mat.meta diff --git a/Assets/_DDD/_Addressables/Environments/Prop/Box/Mat_Box.mat b/Assets/_DDD/_Addressables/Environments/Prop/Box/Mat_Box.mat new file mode 100644 index 000000000..d0ac27d9b --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/Box/Mat_Box.mat @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mat_Box + m_Shader: {fileID: -6465566751694194690, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHATEST_ON + - _METALLICSPECGLOSSMAP + - _NORMALMAP + - _OCCLUSIONMAP + - _PARALLAXMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: + - MOTIONVECTORS + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 466c229bf197e7d48a39445bed818ae3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Emiss: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MOHS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OpacityMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 1 + - _AlphaToMask: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _BumpScale: 1 + - _CastShadows: 0 + - _Cull: 0 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EMISSION: 0 + - _EnvironmentReflections: 1 + - _METALLICSPECGLOSSMAP: 1 + - _Metallic: 0 + - _NORMALMAP: 1 + - _OCCLUSIONMAP: 1 + - _OcclusionStrength: 1 + - _PARALLAXMAP: 1 + - _Parallax: 0.05 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SrcBlend: 1 + - _Surface: 0 + - _UseOpacityMask: 0 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/_DDD/_Addressables/Environments/Prop/Box/Mat_Box.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/Box/Mat_Box.mat.meta new file mode 100644 index 000000000..6331e0d65 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/Box/Mat_Box.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70697a7c4d2a248979104e8bec85ec63 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/Box/PropBox.prefab b/Assets/_DDD/_Addressables/Environments/Prop/Box/PropBox.prefab similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/Box/PropBox.prefab rename to Assets/_DDD/_Addressables/Environments/Prop/Box/PropBox.prefab diff --git a/Assets/_DDD/_Addressables/Environments/Props/Box/PropBox.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/Box/PropBox.prefab.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/Box/PropBox.prefab.meta rename to Assets/_DDD/_Addressables/Environments/Prop/Box/PropBox.prefab.meta diff --git a/Assets/_DDD/_Addressables/Environments/Props/PropProps.prefab b/Assets/_DDD/_Addressables/Environments/Prop/Box/Prop_Box.prefab similarity index 94% rename from Assets/_DDD/_Addressables/Environments/Props/PropProps.prefab rename to Assets/_DDD/_Addressables/Environments/Prop/Box/Prop_Box.prefab index f5eb8c6ce..7a6662a0a 100644 --- a/Assets/_DDD/_Addressables/Environments/Props/PropProps.prefab +++ b/Assets/_DDD/_Addressables/Environments/Prop/Box/Prop_Box.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &4283215516959356173 +--- !u!1001 &2001965217870859992 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -50,12 +50,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Name - value: PropProps + value: Prop_Box objectReference: {fileID: 0} - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 2100000, guid: 6745359e19e667c418eea884946d5b13, type: 2} + objectReference: {fileID: 2100000, guid: 70697a7c4d2a248979104e8bec85ec63, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/_DDD/_Addressables/Environments/Prop/Box/Prop_Box.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/Box/Prop_Box.prefab.meta new file mode 100644 index 000000000..04096d214 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/Box/Prop_Box.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a30b3947e65da417f8e9523f6e258ebd +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPart1.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPart1.meta rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1.meta diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPart1/FrontWallPart1.mat b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/FrontWallPart1.mat similarity index 93% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPart1/FrontWallPart1.mat rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/FrontWallPart1.mat index 57553dc25..b83d54842 100644 --- a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPart1/FrontWallPart1.mat +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/FrontWallPart1.mat @@ -17,18 +17,16 @@ Material: - _NORMALMAP - _OCCLUSIONMAP - _PARALLAXMAP - - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2450 stringTagMap: - RenderType: Transparent + RenderType: TransparentCutout disabledShaderPasses: - - DepthOnly - - SHADOWCASTER - MOTIONVECTORS + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -68,14 +66,14 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 1 - - _AlphaToMask: 0 + - _AlphaToMask: 1 - _Blend: 0 - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _CastShadows: 0 - _Cull: 0 - _Cutoff: 0.5 - - _DstBlend: 10 + - _DstBlend: 0 - _EMISSION: 0 - _EnvironmentReflections: 1 - _METALLICSPECGLOSSMAP: 1 @@ -89,12 +87,12 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 - - _SrcBlend: 5 - - _Surface: 1 + - _SrcBlend: 1 + - _Surface: 0 - _UseOpacityMask: 0 - _WorkflowMode: 1 - _ZTest: 4 - - _ZWrite: 0 + - _ZWrite: 1 - _ZWriteControl: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPart1/FrontWallPart1.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/FrontWallPart1.mat.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPart1/FrontWallPart1.mat.meta rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/FrontWallPart1.mat.meta diff --git a/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/Mat_FrontWallPart1.mat b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/Mat_FrontWallPart1.mat new file mode 100644 index 000000000..f520cd00e --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/Mat_FrontWallPart1.mat @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mat_FrontWallPart1 + m_Shader: {fileID: -6465566751694194690, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHATEST_ON + - _METALLICSPECGLOSSMAP + - _NORMALMAP + - _OCCLUSIONMAP + - _PARALLAXMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: + - MOTIONVECTORS + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: db1263fa7c3044d478d0b88d23c9a23b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Emiss: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MOHS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OpacityMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 1 + - _AlphaToMask: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _BumpScale: 1 + - _CastShadows: 0 + - _Cull: 0 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EMISSION: 0 + - _EnvironmentReflections: 1 + - _METALLICSPECGLOSSMAP: 1 + - _Metallic: 0 + - _NORMALMAP: 1 + - _OCCLUSIONMAP: 1 + - _OcclusionStrength: 1 + - _PARALLAXMAP: 1 + - _Parallax: 0.05 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SrcBlend: 1 + - _Surface: 0 + - _UseOpacityMask: 0 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/Mat_FrontWallPart1.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/Mat_FrontWallPart1.mat.meta new file mode 100644 index 000000000..749aa393b --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/Mat_FrontWallPart1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f76b65eee79374cbba1d37350a718f1b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPart1/PropFrontWallPart1.prefab b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/PropFrontWallPart1.prefab similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPart1/PropFrontWallPart1.prefab rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/PropFrontWallPart1.prefab diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPart1/PropFrontWallPart1.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/PropFrontWallPart1.prefab.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPart1/PropFrontWallPart1.prefab.meta rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/PropFrontWallPart1.prefab.meta diff --git a/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/Prop_FrontWallPart1.prefab b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/Prop_FrontWallPart1.prefab new file mode 100644 index 000000000..095157bd2 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/Prop_FrontWallPart1.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4871014902625696572 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Name + value: Prop_FrontWallPart1 + objectReference: {fileID: 0} + - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: f76b65eee79374cbba1d37350a718f1b, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} diff --git a/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/Prop_FrontWallPart1.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/Prop_FrontWallPart1.prefab.meta new file mode 100644 index 000000000..1c3f49911 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart1/Prop_FrontWallPart1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 60fc92ea9cd3d4ba6b7960d20e4a1ae4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPart2.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPart2.meta rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2.meta diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPart2/FrontWallPart2.mat b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/FrontWallPart2.mat similarity index 93% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPart2/FrontWallPart2.mat rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/FrontWallPart2.mat index de859f851..68e05a495 100644 --- a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPart2/FrontWallPart2.mat +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/FrontWallPart2.mat @@ -17,18 +17,16 @@ Material: - _NORMALMAP - _OCCLUSIONMAP - _PARALLAXMAP - - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2450 stringTagMap: - RenderType: Transparent + RenderType: TransparentCutout disabledShaderPasses: - - DepthOnly - - SHADOWCASTER - MOTIONVECTORS + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -68,14 +66,14 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 1 - - _AlphaToMask: 0 + - _AlphaToMask: 1 - _Blend: 0 - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _CastShadows: 0 - _Cull: 0 - _Cutoff: 0.5 - - _DstBlend: 10 + - _DstBlend: 0 - _EMISSION: 0 - _EnvironmentReflections: 1 - _METALLICSPECGLOSSMAP: 1 @@ -89,12 +87,12 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 - - _SrcBlend: 5 - - _Surface: 1 + - _SrcBlend: 1 + - _Surface: 0 - _UseOpacityMask: 0 - _WorkflowMode: 1 - _ZTest: 4 - - _ZWrite: 0 + - _ZWrite: 1 - _ZWriteControl: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPart2/FrontWallPart2.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/FrontWallPart2.mat.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPart2/FrontWallPart2.mat.meta rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/FrontWallPart2.mat.meta diff --git a/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/Mat_FrontWallPart2.mat b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/Mat_FrontWallPart2.mat new file mode 100644 index 000000000..d6f263418 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/Mat_FrontWallPart2.mat @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mat_FrontWallPart2 + m_Shader: {fileID: -6465566751694194690, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHATEST_ON + - _METALLICSPECGLOSSMAP + - _NORMALMAP + - _OCCLUSIONMAP + - _PARALLAXMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: + - MOTIONVECTORS + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: c76284932c3abd144a8034f18b3e6c4b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Emiss: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MOHS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OpacityMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 1 + - _AlphaToMask: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _BumpScale: 1 + - _CastShadows: 0 + - _Cull: 0 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EMISSION: 0 + - _EnvironmentReflections: 1 + - _METALLICSPECGLOSSMAP: 1 + - _Metallic: 0 + - _NORMALMAP: 1 + - _OCCLUSIONMAP: 1 + - _OcclusionStrength: 1 + - _PARALLAXMAP: 1 + - _Parallax: 0.05 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SrcBlend: 1 + - _Surface: 0 + - _UseOpacityMask: 0 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/Mat_FrontWallPart2.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/Mat_FrontWallPart2.mat.meta new file mode 100644 index 000000000..3515d73d2 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/Mat_FrontWallPart2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2741d39d4eb6a43d5984f3cbb51171e5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPart2/PropFrontWallPart2.prefab b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/PropFrontWallPart2.prefab similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPart2/PropFrontWallPart2.prefab rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/PropFrontWallPart2.prefab diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPart2/PropFrontWallPart2.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/PropFrontWallPart2.prefab.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPart2/PropFrontWallPart2.prefab.meta rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/PropFrontWallPart2.prefab.meta diff --git a/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/Prop_FrontWallPart2.prefab b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/Prop_FrontWallPart2.prefab new file mode 100644 index 000000000..5d7258924 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/Prop_FrontWallPart2.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &1264295735317467206 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Name + value: Prop_FrontWallPart2 + objectReference: {fileID: 0} + - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 2741d39d4eb6a43d5984f3cbb51171e5, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} diff --git a/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/Prop_FrontWallPart2.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/Prop_FrontWallPart2.prefab.meta new file mode 100644 index 000000000..bace559cc --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart2/Prop_FrontWallPart2.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f14a097defc964125b2e6f29602782fb +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPart3.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPart3.meta rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3.meta diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPart3/FrontWallPart3.mat b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/FrontWallPart3.mat similarity index 93% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPart3/FrontWallPart3.mat rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/FrontWallPart3.mat index 23266aa7c..bd6a24da5 100644 --- a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPart3/FrontWallPart3.mat +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/FrontWallPart3.mat @@ -30,18 +30,16 @@ Material: - _NORMALMAP - _OCCLUSIONMAP - _PARALLAXMAP - - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2450 stringTagMap: - RenderType: Transparent + RenderType: TransparentCutout disabledShaderPasses: - - DepthOnly - - SHADOWCASTER - MOTIONVECTORS + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -81,14 +79,14 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 1 - - _AlphaToMask: 0 + - _AlphaToMask: 1 - _Blend: 0 - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _CastShadows: 0 - _Cull: 0 - _Cutoff: 0.5 - - _DstBlend: 10 + - _DstBlend: 0 - _EMISSION: 0 - _EnvironmentReflections: 1 - _METALLICSPECGLOSSMAP: 1 @@ -102,12 +100,12 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 - - _SrcBlend: 5 - - _Surface: 1 + - _SrcBlend: 1 + - _Surface: 0 - _UseOpacityMask: 0 - _WorkflowMode: 1 - _ZTest: 4 - - _ZWrite: 0 + - _ZWrite: 1 - _ZWriteControl: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPart3/FrontWallPart3.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/FrontWallPart3.mat.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPart3/FrontWallPart3.mat.meta rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/FrontWallPart3.mat.meta diff --git a/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/Mat_FrontWallPart3.mat b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/Mat_FrontWallPart3.mat new file mode 100644 index 000000000..35af69c7a --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/Mat_FrontWallPart3.mat @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mat_FrontWallPart3 + m_Shader: {fileID: -6465566751694194690, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHATEST_ON + - _METALLICSPECGLOSSMAP + - _NORMALMAP + - _OCCLUSIONMAP + - _PARALLAXMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: + - MOTIONVECTORS + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 0858cb2d56f738e4f876e153f4ef4b06, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Emiss: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MOHS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OpacityMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 1 + - _AlphaToMask: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _BumpScale: 1 + - _CastShadows: 0 + - _Cull: 0 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EMISSION: 0 + - _EnvironmentReflections: 1 + - _METALLICSPECGLOSSMAP: 1 + - _Metallic: 0 + - _NORMALMAP: 1 + - _OCCLUSIONMAP: 1 + - _OcclusionStrength: 1 + - _PARALLAXMAP: 1 + - _Parallax: 0.05 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SrcBlend: 1 + - _Surface: 0 + - _UseOpacityMask: 0 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/Mat_FrontWallPart3.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/Mat_FrontWallPart3.mat.meta new file mode 100644 index 000000000..e722b430c --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/Mat_FrontWallPart3.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 22bff7f0d5dff4d94879f30cff429011 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPart3/PropFrontWallPart3.prefab b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/PropFrontWallPart3.prefab similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPart3/PropFrontWallPart3.prefab rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/PropFrontWallPart3.prefab diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPart3/PropFrontWallPart3.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/PropFrontWallPart3.prefab.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPart3/PropFrontWallPart3.prefab.meta rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/PropFrontWallPart3.prefab.meta diff --git a/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/Prop_FrontWallPart3.prefab b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/Prop_FrontWallPart3.prefab new file mode 100644 index 000000000..98dd4a717 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/Prop_FrontWallPart3.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &5278663199447379265 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Name + value: Prop_FrontWallPart3 + objectReference: {fileID: 0} + - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 22bff7f0d5dff4d94879f30cff429011, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} diff --git a/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/Prop_FrontWallPart3.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/Prop_FrontWallPart3.prefab.meta new file mode 100644 index 000000000..710b7ca32 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPart3/Prop_FrontWallPart3.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f7ea022317d044760a4f82504b1a7876 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPartDoor.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPartDoor.meta rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor.meta diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPartDoor/FrontWallPartDoor.mat b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/FrontWallPartDoor.mat similarity index 93% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPartDoor/FrontWallPartDoor.mat rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/FrontWallPartDoor.mat index 234c68d84..0da273907 100644 --- a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPartDoor/FrontWallPartDoor.mat +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/FrontWallPartDoor.mat @@ -17,18 +17,16 @@ Material: - _NORMALMAP - _OCCLUSIONMAP - _PARALLAXMAP - - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2450 stringTagMap: - RenderType: Transparent + RenderType: TransparentCutout disabledShaderPasses: - - DepthOnly - - SHADOWCASTER - MOTIONVECTORS + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -68,14 +66,14 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 1 - - _AlphaToMask: 0 + - _AlphaToMask: 1 - _Blend: 0 - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _CastShadows: 0 - _Cull: 0 - _Cutoff: 0.5 - - _DstBlend: 10 + - _DstBlend: 0 - _EMISSION: 0 - _EnvironmentReflections: 1 - _METALLICSPECGLOSSMAP: 1 @@ -89,12 +87,12 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 - - _SrcBlend: 5 - - _Surface: 1 + - _SrcBlend: 1 + - _Surface: 0 - _UseOpacityMask: 0 - _WorkflowMode: 1 - _ZTest: 4 - - _ZWrite: 0 + - _ZWrite: 1 - _ZWriteControl: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPartDoor/FrontWallPartDoor.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/FrontWallPartDoor.mat.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPartDoor/FrontWallPartDoor.mat.meta rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/FrontWallPartDoor.mat.meta diff --git a/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/Mat_FrontWallPartDoor.mat b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/Mat_FrontWallPartDoor.mat new file mode 100644 index 000000000..ea6ac6402 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/Mat_FrontWallPartDoor.mat @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mat_FrontWallPartDoor + m_Shader: {fileID: -6465566751694194690, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHATEST_ON + - _METALLICSPECGLOSSMAP + - _NORMALMAP + - _OCCLUSIONMAP + - _PARALLAXMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: + - MOTIONVECTORS + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: d63a8017daee99546a808b887393dbca, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Emiss: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MOHS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OpacityMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 1 + - _AlphaToMask: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _BumpScale: 1 + - _CastShadows: 0 + - _Cull: 0 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EMISSION: 0 + - _EnvironmentReflections: 1 + - _METALLICSPECGLOSSMAP: 1 + - _Metallic: 0 + - _NORMALMAP: 1 + - _OCCLUSIONMAP: 1 + - _OcclusionStrength: 1 + - _PARALLAXMAP: 1 + - _Parallax: 0.05 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SrcBlend: 1 + - _Surface: 0 + - _UseOpacityMask: 0 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/Mat_FrontWallPartDoor.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/Mat_FrontWallPartDoor.mat.meta new file mode 100644 index 000000000..708e09a0a --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/Mat_FrontWallPartDoor.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8de14cc6b5fd347eb87e3acad32a385e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPartDoor/PropFrontWallPartDoor.prefab b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/PropFrontWallPartDoor.prefab similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPartDoor/PropFrontWallPartDoor.prefab rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/PropFrontWallPartDoor.prefab diff --git a/Assets/_DDD/_Addressables/Environments/Props/FrontWallPartDoor/PropFrontWallPartDoor.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/PropFrontWallPartDoor.prefab.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/FrontWallPartDoor/PropFrontWallPartDoor.prefab.meta rename to Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/PropFrontWallPartDoor.prefab.meta diff --git a/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/Prop_FrontWallPartDoor.prefab b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/Prop_FrontWallPartDoor.prefab new file mode 100644 index 000000000..b2f765d79 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/Prop_FrontWallPartDoor.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &2280276875220455565 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Name + value: Prop_FrontWallPartDoor + objectReference: {fileID: 0} + - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 8de14cc6b5fd347eb87e3acad32a385e, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} diff --git a/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/Prop_FrontWallPartDoor.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/Prop_FrontWallPartDoor.prefab.meta new file mode 100644 index 000000000..90fa3a700 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/FrontWallPartDoor/Prop_FrontWallPartDoor.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c635256bbb7c3439db1a92b820076f52 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/Lantern.meta b/Assets/_DDD/_Addressables/Environments/Prop/Lantern.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/Lantern.meta rename to Assets/_DDD/_Addressables/Environments/Prop/Lantern.meta diff --git a/Assets/_DDD/_Addressables/Environments/Props/Lantern/Lantern.mat b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/Lantern.mat similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/Lantern/Lantern.mat rename to Assets/_DDD/_Addressables/Environments/Prop/Lantern/Lantern.mat diff --git a/Assets/_DDD/_Addressables/Environments/Props/Lantern/Lantern.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/Lantern.mat.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/Lantern/Lantern.mat.meta rename to Assets/_DDD/_Addressables/Environments/Prop/Lantern/Lantern.mat.meta diff --git a/Assets/_DDD/_Addressables/Environments/Prop/Lantern/Mat_Lantern.mat b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/Mat_Lantern.mat new file mode 100644 index 000000000..170b95e31 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/Mat_Lantern.mat @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mat_Lantern + m_Shader: {fileID: -6465566751694194690, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHATEST_ON + - _METALLICSPECGLOSSMAP + - _NORMALMAP + - _OCCLUSIONMAP + - _PARALLAXMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: + - MOTIONVECTORS + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 66072f72edd744aa584b7121a96e92d6, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Emiss: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MOHS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OpacityMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 1 + - _AlphaToMask: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _BumpScale: 1 + - _CastShadows: 0 + - _Cull: 0 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EMISSION: 0 + - _EnvironmentReflections: 1 + - _METALLICSPECGLOSSMAP: 1 + - _Metallic: 0 + - _NORMALMAP: 1 + - _OCCLUSIONMAP: 1 + - _OcclusionStrength: 1 + - _PARALLAXMAP: 1 + - _Parallax: 0.05 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SrcBlend: 1 + - _Surface: 0 + - _UseOpacityMask: 0 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/_DDD/_Addressables/Environments/Prop/Lantern/Mat_Lantern.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/Mat_Lantern.mat.meta new file mode 100644 index 000000000..f9ff544c7 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/Mat_Lantern.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 513a99894d07548759063bc27a3382af +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/Lantern/PropLantern.prefab b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab similarity index 99% rename from Assets/_DDD/_Addressables/Environments/Props/Lantern/PropLantern.prefab rename to Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab index b7cdbc9da..72578bf64 100644 --- a/Assets/_DDD/_Addressables/Environments/Props/Lantern/PropLantern.prefab +++ b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab @@ -16,7 +16,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &8812663732067019518 Transform: diff --git a/Assets/_DDD/_Addressables/Environments/Props/Lantern/PropLantern.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/Lantern/PropLantern.prefab.meta rename to Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab.meta diff --git a/Assets/_DDD/_Addressables/Environments/Prop/Lantern/Prop_Lantern.prefab b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/Prop_Lantern.prefab new file mode 100644 index 000000000..af86bf10f --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/Prop_Lantern.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &5183707688924774967 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Name + value: Prop_Lantern + objectReference: {fileID: 0} + - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 513a99894d07548759063bc27a3382af, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} diff --git a/Assets/_DDD/_Addressables/Environments/Prop/Lantern/Prop_Lantern.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/Prop_Lantern.prefab.meta new file mode 100644 index 000000000..23c17b716 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/Prop_Lantern.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e85d09c0b5407478287398646be1cac7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/MenuBoard.meta b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/MenuBoard.meta rename to Assets/_DDD/_Addressables/Environments/Prop/MenuBoard.meta diff --git a/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/Mat_MenuBoard.mat b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/Mat_MenuBoard.mat new file mode 100644 index 000000000..d1e5b1adf --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/Mat_MenuBoard.mat @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mat_MenuBoard + m_Shader: {fileID: -6465566751694194690, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHATEST_ON + - _METALLICSPECGLOSSMAP + - _NORMALMAP + - _OCCLUSIONMAP + - _PARALLAXMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: + - MOTIONVECTORS + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 56925a82ada32f047b16f322c7cde6ef, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Emiss: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MOHS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OpacityMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 1 + - _AlphaToMask: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _BumpScale: 1 + - _CastShadows: 0 + - _Cull: 0 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EMISSION: 0 + - _EnvironmentReflections: 1 + - _METALLICSPECGLOSSMAP: 1 + - _Metallic: 0 + - _NORMALMAP: 1 + - _OCCLUSIONMAP: 1 + - _OcclusionStrength: 1 + - _PARALLAXMAP: 1 + - _Parallax: 0.05 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SrcBlend: 1 + - _Surface: 0 + - _UseOpacityMask: 0 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/Mat_MenuBoard.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/Mat_MenuBoard.mat.meta new file mode 100644 index 000000000..49a77c51b --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/Mat_MenuBoard.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 13ed1a63d53c3410598ac2979494de17 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/MenuBoard/MenuBoard.mat b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/MenuBoard.mat similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/MenuBoard/MenuBoard.mat rename to Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/MenuBoard.mat diff --git a/Assets/_DDD/_Addressables/Environments/Props/MenuBoard/MenuBoard.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/MenuBoard.mat.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/MenuBoard/MenuBoard.mat.meta rename to Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/MenuBoard.mat.meta diff --git a/Assets/_DDD/_Addressables/Environments/Props/MenuBoard/PropMenuBoard.prefab b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/PropMenuBoard.prefab similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/MenuBoard/PropMenuBoard.prefab rename to Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/PropMenuBoard.prefab diff --git a/Assets/_DDD/_Addressables/Environments/Props/MenuBoard/PropMenuBoard.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/PropMenuBoard.prefab.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/MenuBoard/PropMenuBoard.prefab.meta rename to Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/PropMenuBoard.prefab.meta diff --git a/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/Prop_MenuBoard.prefab b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/Prop_MenuBoard.prefab new file mode 100644 index 000000000..3e9c530cc --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/Prop_MenuBoard.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7465628058133067904 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Name + value: Prop_MenuBoard + objectReference: {fileID: 0} + - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 13ed1a63d53c3410598ac2979494de17, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} diff --git a/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/Prop_MenuBoard.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/Prop_MenuBoard.prefab.meta new file mode 100644 index 000000000..2f14454aa --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/Prop_MenuBoard.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2847027325c2f4cd4894796379fbe579 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/Sink.meta b/Assets/_DDD/_Addressables/Environments/Prop/Sink.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/Sink.meta rename to Assets/_DDD/_Addressables/Environments/Prop/Sink.meta diff --git a/Assets/_DDD/_Addressables/Environments/Props/Props.mat b/Assets/_DDD/_Addressables/Environments/Prop/Sink/Mat_Sink.mat similarity index 83% rename from Assets/_DDD/_Addressables/Environments/Props/Props.mat rename to Assets/_DDD/_Addressables/Environments/Prop/Sink/Mat_Sink.mat index 9f33420d3..565b7bd9d 100644 --- a/Assets/_DDD/_Addressables/Environments/Props/Props.mat +++ b/Assets/_DDD/_Addressables/Environments/Prop/Sink/Mat_Sink.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Props + m_Name: Mat_Sink m_Shader: {fileID: -6465566751694194690, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -18,14 +18,15 @@ Material: - _OCCLUSIONMAP - _PARALLAXMAP m_InvalidKeywords: [] - m_LightmapFlags: 2 + m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: - MOTIONVECTORS + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -46,6 +47,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _OpacityMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -65,8 +70,8 @@ Material: - _Blend: 0 - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - - _CastShadows: 1 - - _Cull: 2 + - _CastShadows: 0 + - _Cull: 0 - _Cutoff: 0.5 - _DstBlend: 0 - _EMISSION: 0 @@ -84,6 +89,7 @@ Material: - _Smoothness: 0.5 - _SrcBlend: 1 - _Surface: 0 + - _UseOpacityMask: 0 - _WorkflowMode: 1 - _ZTest: 4 - _ZWrite: 1 @@ -93,16 +99,3 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 ---- !u!114 &7821807774480364696 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 9 diff --git a/Assets/_DDD/_Addressables/Environments/Prop/Sink/Mat_Sink.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/Sink/Mat_Sink.mat.meta new file mode 100644 index 000000000..dfe6f1bf8 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/Sink/Mat_Sink.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c8c5d729401c847b5a99c211cf4d2f3f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/Sink/PropSink.prefab b/Assets/_DDD/_Addressables/Environments/Prop/Sink/PropSink.prefab similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/Sink/PropSink.prefab rename to Assets/_DDD/_Addressables/Environments/Prop/Sink/PropSink.prefab diff --git a/Assets/_DDD/_Addressables/Environments/Props/Sink/PropSink.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/Sink/PropSink.prefab.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/Sink/PropSink.prefab.meta rename to Assets/_DDD/_Addressables/Environments/Prop/Sink/PropSink.prefab.meta diff --git a/Assets/_DDD/_Addressables/Environments/Prop/Sink/Prop_Sink.prefab b/Assets/_DDD/_Addressables/Environments/Prop/Sink/Prop_Sink.prefab new file mode 100644 index 000000000..97ae32159 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/Sink/Prop_Sink.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &953163815500150668 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Name + value: Prop_Sink + objectReference: {fileID: 0} + - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: c8c5d729401c847b5a99c211cf4d2f3f, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} diff --git a/Assets/_DDD/_Addressables/Environments/Prop/Sink/Prop_Sink.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/Sink/Prop_Sink.prefab.meta new file mode 100644 index 000000000..61d46e440 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/Sink/Prop_Sink.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a50fc79993f3a4e0ba760eff97d89478 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/Sink/Sink.mat b/Assets/_DDD/_Addressables/Environments/Prop/Sink/Sink.mat similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/Sink/Sink.mat rename to Assets/_DDD/_Addressables/Environments/Prop/Sink/Sink.mat diff --git a/Assets/_DDD/_Addressables/Environments/Props/Sink/Sink.mat.meta b/Assets/_DDD/_Addressables/Environments/Prop/Sink/Sink.mat.meta similarity index 100% rename from Assets/_DDD/_Addressables/Environments/Props/Sink/Sink.mat.meta rename to Assets/_DDD/_Addressables/Environments/Prop/Sink/Sink.mat.meta diff --git a/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/TileBarrelTestTile.prefab b/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/TileBarrelTestTile.prefab deleted file mode 100644 index 5c4399f72..000000000 --- a/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/TileBarrelTestTile.prefab +++ /dev/null @@ -1,63 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &3395123436787420580 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 378051429955981309, guid: ed5ad369f886f42a39c99799bfd5bf7b, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 378051429955981309, guid: ed5ad369f886f42a39c99799bfd5bf7b, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 378051429955981309, guid: ed5ad369f886f42a39c99799bfd5bf7b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 378051429955981309, guid: ed5ad369f886f42a39c99799bfd5bf7b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 378051429955981309, guid: ed5ad369f886f42a39c99799bfd5bf7b, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 378051429955981309, guid: ed5ad369f886f42a39c99799bfd5bf7b, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 378051429955981309, guid: ed5ad369f886f42a39c99799bfd5bf7b, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 378051429955981309, guid: ed5ad369f886f42a39c99799bfd5bf7b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 378051429955981309, guid: ed5ad369f886f42a39c99799bfd5bf7b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 378051429955981309, guid: ed5ad369f886f42a39c99799bfd5bf7b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3017209206697470557, guid: ed5ad369f886f42a39c99799bfd5bf7b, type: 3} - propertyPath: 'm_Materials.Array.data[0]' - value: - objectReference: {fileID: 2100000, guid: 2986d47c2acd84257866fc5e3180f833, type: 2} - - target: {fileID: 5351451762625743449, guid: ed5ad369f886f42a39c99799bfd5bf7b, type: 3} - propertyPath: m_Name - value: TileBarrelTestTile - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ed5ad369f886f42a39c99799bfd5bf7b, type: 3} diff --git a/Assets/_DDD/_Raw/Environments/Env_Mesh_Ground.prefab b/Assets/_DDD/_Raw/Environments/Env_Mesh_Ground.prefab new file mode 100644 index 000000000..2a9cd7d41 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Env_Mesh_Ground.prefab @@ -0,0 +1,108 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &8949086991938714667 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 698460856121427746, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_StaticShadowCaster + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1063320636771556828, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1063320636771556828, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 1241020487330251412, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1241020487330251412, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 4732070946668798894, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_Name + value: Env_Mesh_Ground + objectReference: {fileID: 0} + - target: {fileID: 4732070946668798894, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4732070946668798894, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9180751142906097830, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 9180751142906097830, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 9180751142906097830, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9180751142906097830, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9180751142906097830, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 721650953543496402, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} diff --git a/Assets/_DDD/_Raw/Environments/Env_Mesh_Ground.prefab.meta b/Assets/_DDD/_Raw/Environments/Env_Mesh_Ground.prefab.meta new file mode 100644 index 000000000..3d9af8b80 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Env_Mesh_Ground.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 355e43181ac8c438b9736b7e15fa8d43 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Env_Unlit_Food.prefab b/Assets/_DDD/_Raw/Environments/Env_Unlit_Item.prefab similarity index 100% rename from Assets/_DDD/_Raw/Environments/Env_Unlit_Food.prefab rename to Assets/_DDD/_Raw/Environments/Env_Unlit_Item.prefab diff --git a/Assets/_DDD/_Raw/Environments/Env_Unlit_Food.prefab.meta b/Assets/_DDD/_Raw/Environments/Env_Unlit_Item.prefab.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Env_Unlit_Food.prefab.meta rename to Assets/_DDD/_Raw/Environments/Env_Unlit_Item.prefab.meta diff --git a/Assets/_DDD/_Raw/Environments/Geometries.meta b/Assets/_DDD/_Raw/Environments/Geometries.meta deleted file mode 100644 index bbf4173aa..000000000 --- a/Assets/_DDD/_Raw/Environments/Geometries.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 56e9e7f8bf44849788ca7f287589030c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Geometry.meta b/Assets/_DDD/_Raw/Environments/Geometry.meta new file mode 100644 index 000000000..0075571fa --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Geometry.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f4dfcaabe8c4140648b7cd3d8f489ceb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry.meta b/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry.meta new file mode 100644 index 000000000..9be296376 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7dedec4c3fc904cdc90d4e7423f844ea +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_Base.png b/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_Base.png new file mode 100644 index 000000000..25512e1c4 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3959e3a4b7fdf6f6e781cccabca07f28c1a0e08739260a5bea6a192dbede4b3b +size 272382 diff --git a/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_Base.png.meta b/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_Base.png.meta new file mode 100644 index 000000000..fb72eb16f --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_Base.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 4b4cf6e285d3d4fed9102c9a403e3c08 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_MOHS.png b/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_MOHS.png new file mode 100644 index 000000000..e75589d69 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_MOHS.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51030e29adb608b6ae93d1eaedba77c2c000ef081a1557ae7f5afda2a3bd6926 +size 4668622 diff --git a/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_MOHS.png.meta b/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_MOHS.png.meta new file mode 100644 index 000000000..a95f0162c --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_MOHS.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: ca484ae873a004754b62cc9d53b01ff8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_Normal.png b/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_Normal.png new file mode 100644 index 000000000..01eb24c73 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56d06da66e16572db090a9442f0aaf383cc82b0932b9bf8fef0125d26c342f29 +size 660173 diff --git a/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_Normal.png.meta b/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_Normal.png.meta new file mode 100644 index 000000000..a41ff298a --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Geometry/TestGeometry/TestGeometry_Normal.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 7fb18a759867142889b20a646a586bfe +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Ground.meta b/Assets/_DDD/_Raw/Environments/Ground.meta new file mode 100644 index 000000000..a1f4670e1 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Ground.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 287f5b6b668d04ddcafbc2a026f5dd16 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Ground/TestGround.meta b/Assets/_DDD/_Raw/Environments/Ground/TestGround.meta new file mode 100644 index 000000000..30843e1f4 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Ground/TestGround.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9d63b2c2ce2ef406d84397fe7446527d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_Base.png b/Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_Base.png new file mode 100644 index 000000000..25512e1c4 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3959e3a4b7fdf6f6e781cccabca07f28c1a0e08739260a5bea6a192dbede4b3b +size 272382 diff --git a/Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_Base.png.meta b/Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_Base.png.meta new file mode 100644 index 000000000..9c6452ff7 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_Base.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 8dfc4f571f0fa466f98c2b3d548020e4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_MOHS.png b/Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_MOHS.png new file mode 100644 index 000000000..e75589d69 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_MOHS.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51030e29adb608b6ae93d1eaedba77c2c000ef081a1557ae7f5afda2a3bd6926 +size 4668622 diff --git a/Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_MOHS.png.meta b/Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_MOHS.png.meta new file mode 100644 index 000000000..271c59a15 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_MOHS.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 7e1340a2091f246ab8cd71c4d0a3c70b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_Normal.png b/Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_Normal.png new file mode 100644 index 000000000..01eb24c73 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56d06da66e16572db090a9442f0aaf383cc82b0932b9bf8fef0125d26c342f29 +size 660173 diff --git a/Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_Normal.png.meta b/Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_Normal.png.meta new file mode 100644 index 000000000..893b8ab2a --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Ground/TestGround/TestGround_Normal.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: c13033eb142d049539400ecdd4040d6a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Foods.meta b/Assets/_DDD/_Raw/Environments/Item.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Foods.meta rename to Assets/_DDD/_Raw/Environments/Item.meta diff --git a/Assets/_DDD/_Raw/Environments/Foods/BarrelTestFood.meta b/Assets/_DDD/_Raw/Environments/Item/BarrelTestItem.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Foods/BarrelTestFood.meta rename to Assets/_DDD/_Raw/Environments/Item/BarrelTestItem.meta diff --git a/Assets/_DDD/_Raw/Environments/Foods/BarrelTestFood/Barrel_BaseColor.png b/Assets/_DDD/_Raw/Environments/Item/BarrelTestItem/Barrel_BaseColor.png similarity index 100% rename from Assets/_DDD/_Raw/Environments/Foods/BarrelTestFood/Barrel_BaseColor.png rename to Assets/_DDD/_Raw/Environments/Item/BarrelTestItem/Barrel_BaseColor.png diff --git a/Assets/_DDD/_Raw/Environments/Foods/BarrelTestFood/Barrel_BaseColor.png.meta b/Assets/_DDD/_Raw/Environments/Item/BarrelTestItem/Barrel_BaseColor.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Foods/BarrelTestFood/Barrel_BaseColor.png.meta rename to Assets/_DDD/_Raw/Environments/Item/BarrelTestItem/Barrel_BaseColor.png.meta diff --git a/Assets/_DDD/_Raw/Environments/Props.meta b/Assets/_DDD/_Raw/Environments/Prop.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props.meta rename to Assets/_DDD/_Raw/Environments/Prop.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp.meta b/Assets/_DDD/_Raw/Environments/Prop/BarrelTestProp.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/BarrelTestProp.meta rename to Assets/_DDD/_Raw/Environments/Prop/BarrelTestProp.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_BaseColor.png b/Assets/_DDD/_Raw/Environments/Prop/BarrelTestProp/Barrel_BaseColor.png similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_BaseColor.png rename to Assets/_DDD/_Raw/Environments/Prop/BarrelTestProp/Barrel_BaseColor.png diff --git a/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_BaseColor.png.meta b/Assets/_DDD/_Raw/Environments/Prop/BarrelTestProp/Barrel_BaseColor.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_BaseColor.png.meta rename to Assets/_DDD/_Raw/Environments/Prop/BarrelTestProp/Barrel_BaseColor.png.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_MOHS.png b/Assets/_DDD/_Raw/Environments/Prop/BarrelTestProp/Barrel_MOHS.png similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_MOHS.png rename to Assets/_DDD/_Raw/Environments/Prop/BarrelTestProp/Barrel_MOHS.png diff --git a/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_MOHS.png.meta b/Assets/_DDD/_Raw/Environments/Prop/BarrelTestProp/Barrel_MOHS.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_MOHS.png.meta rename to Assets/_DDD/_Raw/Environments/Prop/BarrelTestProp/Barrel_MOHS.png.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_Normal.png b/Assets/_DDD/_Raw/Environments/Prop/BarrelTestProp/Barrel_Normal.png similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_Normal.png rename to Assets/_DDD/_Raw/Environments/Prop/BarrelTestProp/Barrel_Normal.png diff --git a/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_Normal.png.meta b/Assets/_DDD/_Raw/Environments/Prop/BarrelTestProp/Barrel_Normal.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_Normal.png.meta rename to Assets/_DDD/_Raw/Environments/Prop/BarrelTestProp/Barrel_Normal.png.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/BlockLine.meta b/Assets/_DDD/_Raw/Environments/Prop/BlockLine.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/BlockLine.meta rename to Assets/_DDD/_Raw/Environments/Prop/BlockLine.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/BlockLine/BlockLine_basemap.png b/Assets/_DDD/_Raw/Environments/Prop/BlockLine/BlockLine_basemap.png similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/BlockLine/BlockLine_basemap.png rename to Assets/_DDD/_Raw/Environments/Prop/BlockLine/BlockLine_basemap.png diff --git a/Assets/_DDD/_Raw/Environments/Props/BlockLine/BlockLine_basemap.png.meta b/Assets/_DDD/_Raw/Environments/Prop/BlockLine/BlockLine_basemap.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/BlockLine/BlockLine_basemap.png.meta rename to Assets/_DDD/_Raw/Environments/Prop/BlockLine/BlockLine_basemap.png.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/Box.meta b/Assets/_DDD/_Raw/Environments/Prop/Box.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/Box.meta rename to Assets/_DDD/_Raw/Environments/Prop/Box.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/Box/Box_basemap.png b/Assets/_DDD/_Raw/Environments/Prop/Box/Box_basemap.png similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/Box/Box_basemap.png rename to Assets/_DDD/_Raw/Environments/Prop/Box/Box_basemap.png diff --git a/Assets/_DDD/_Raw/Environments/Props/Box/Box_basemap.png.meta b/Assets/_DDD/_Raw/Environments/Prop/Box/Box_basemap.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/Box/Box_basemap.png.meta rename to Assets/_DDD/_Raw/Environments/Prop/Box/Box_basemap.png.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/FrontWallPart1.meta b/Assets/_DDD/_Raw/Environments/Prop/FrontWallPart1.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/FrontWallPart1.meta rename to Assets/_DDD/_Raw/Environments/Prop/FrontWallPart1.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/FrontWallPart1/FrontWallPart1_basemap.png b/Assets/_DDD/_Raw/Environments/Prop/FrontWallPart1/FrontWallPart1_basemap.png similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/FrontWallPart1/FrontWallPart1_basemap.png rename to Assets/_DDD/_Raw/Environments/Prop/FrontWallPart1/FrontWallPart1_basemap.png diff --git a/Assets/_DDD/_Raw/Environments/Props/FrontWallPart1/FrontWallPart1_basemap.png.meta b/Assets/_DDD/_Raw/Environments/Prop/FrontWallPart1/FrontWallPart1_basemap.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/FrontWallPart1/FrontWallPart1_basemap.png.meta rename to Assets/_DDD/_Raw/Environments/Prop/FrontWallPart1/FrontWallPart1_basemap.png.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/FrontWallPart2.meta b/Assets/_DDD/_Raw/Environments/Prop/FrontWallPart2.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/FrontWallPart2.meta rename to Assets/_DDD/_Raw/Environments/Prop/FrontWallPart2.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/FrontWallPart2/FrontWallPart2_basemap.png b/Assets/_DDD/_Raw/Environments/Prop/FrontWallPart2/FrontWallPart2_basemap.png similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/FrontWallPart2/FrontWallPart2_basemap.png rename to Assets/_DDD/_Raw/Environments/Prop/FrontWallPart2/FrontWallPart2_basemap.png diff --git a/Assets/_DDD/_Raw/Environments/Props/FrontWallPart2/FrontWallPart2_basemap.png.meta b/Assets/_DDD/_Raw/Environments/Prop/FrontWallPart2/FrontWallPart2_basemap.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/FrontWallPart2/FrontWallPart2_basemap.png.meta rename to Assets/_DDD/_Raw/Environments/Prop/FrontWallPart2/FrontWallPart2_basemap.png.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/FrontWallPart3.meta b/Assets/_DDD/_Raw/Environments/Prop/FrontWallPart3.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/FrontWallPart3.meta rename to Assets/_DDD/_Raw/Environments/Prop/FrontWallPart3.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/FrontWallPart3/FrontWallPart3_basemap.png b/Assets/_DDD/_Raw/Environments/Prop/FrontWallPart3/FrontWallPart3_basemap.png similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/FrontWallPart3/FrontWallPart3_basemap.png rename to Assets/_DDD/_Raw/Environments/Prop/FrontWallPart3/FrontWallPart3_basemap.png diff --git a/Assets/_DDD/_Raw/Environments/Props/FrontWallPart3/FrontWallPart3_basemap.png.meta b/Assets/_DDD/_Raw/Environments/Prop/FrontWallPart3/FrontWallPart3_basemap.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/FrontWallPart3/FrontWallPart3_basemap.png.meta rename to Assets/_DDD/_Raw/Environments/Prop/FrontWallPart3/FrontWallPart3_basemap.png.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/FrontWallPartDoor.meta b/Assets/_DDD/_Raw/Environments/Prop/FrontWallPartDoor.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/FrontWallPartDoor.meta rename to Assets/_DDD/_Raw/Environments/Prop/FrontWallPartDoor.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/FrontWallPartDoor/FrontWallPartDoor_basemap.png b/Assets/_DDD/_Raw/Environments/Prop/FrontWallPartDoor/FrontWallPartDoor_basemap.png similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/FrontWallPartDoor/FrontWallPartDoor_basemap.png rename to Assets/_DDD/_Raw/Environments/Prop/FrontWallPartDoor/FrontWallPartDoor_basemap.png diff --git a/Assets/_DDD/_Raw/Environments/Props/FrontWallPartDoor/FrontWallPartDoor_basemap.png.meta b/Assets/_DDD/_Raw/Environments/Prop/FrontWallPartDoor/FrontWallPartDoor_basemap.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/FrontWallPartDoor/FrontWallPartDoor_basemap.png.meta rename to Assets/_DDD/_Raw/Environments/Prop/FrontWallPartDoor/FrontWallPartDoor_basemap.png.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/Lantern.meta b/Assets/_DDD/_Raw/Environments/Prop/Lantern.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/Lantern.meta rename to Assets/_DDD/_Raw/Environments/Prop/Lantern.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/Lantern/Lantern_BaseMap.png b/Assets/_DDD/_Raw/Environments/Prop/Lantern/Lantern_BaseMap.png similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/Lantern/Lantern_BaseMap.png rename to Assets/_DDD/_Raw/Environments/Prop/Lantern/Lantern_BaseMap.png diff --git a/Assets/_DDD/_Raw/Environments/Props/Lantern/Lantern_BaseMap.png.meta b/Assets/_DDD/_Raw/Environments/Prop/Lantern/Lantern_BaseMap.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/Lantern/Lantern_BaseMap.png.meta rename to Assets/_DDD/_Raw/Environments/Prop/Lantern/Lantern_BaseMap.png.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/MenuBoard.meta b/Assets/_DDD/_Raw/Environments/Prop/MenuBoard.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/MenuBoard.meta rename to Assets/_DDD/_Raw/Environments/Prop/MenuBoard.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/MenuBoard/MenuBoard_basemap.png b/Assets/_DDD/_Raw/Environments/Prop/MenuBoard/MenuBoard_basemap.png similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/MenuBoard/MenuBoard_basemap.png rename to Assets/_DDD/_Raw/Environments/Prop/MenuBoard/MenuBoard_basemap.png diff --git a/Assets/_DDD/_Raw/Environments/Props/MenuBoard/MenuBoard_basemap.png.meta b/Assets/_DDD/_Raw/Environments/Prop/MenuBoard/MenuBoard_basemap.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/MenuBoard/MenuBoard_basemap.png.meta rename to Assets/_DDD/_Raw/Environments/Prop/MenuBoard/MenuBoard_basemap.png.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/Sink.meta b/Assets/_DDD/_Raw/Environments/Prop/Sink.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/Sink.meta rename to Assets/_DDD/_Raw/Environments/Prop/Sink.meta diff --git a/Assets/_DDD/_Raw/Environments/Props/Sink/Sink_basemap.png b/Assets/_DDD/_Raw/Environments/Prop/Sink/Sink_basemap.png similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/Sink/Sink_basemap.png rename to Assets/_DDD/_Raw/Environments/Prop/Sink/Sink_basemap.png diff --git a/Assets/_DDD/_Raw/Environments/Props/Sink/Sink_basemap.png.meta b/Assets/_DDD/_Raw/Environments/Prop/Sink/Sink_basemap.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Props/Sink/Sink_basemap.png.meta rename to Assets/_DDD/_Raw/Environments/Prop/Sink/Sink_basemap.png.meta diff --git a/Assets/_DDD/_Raw/Environments/_old.meta b/Assets/_DDD/_Raw/Environments/_old.meta new file mode 100644 index 000000000..1e3a450eb --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/_old.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 03b78d4a28cdd47bf87ec86cbf189c80 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Env_Sprite_Background.prefab b/Assets/_DDD/_Raw/Environments/_old/Env_Sprite_Background.prefab similarity index 100% rename from Assets/_DDD/_Raw/Environments/Env_Sprite_Background.prefab rename to Assets/_DDD/_Raw/Environments/_old/Env_Sprite_Background.prefab diff --git a/Assets/_DDD/_Raw/Environments/Env_Sprite_Background.prefab.meta b/Assets/_DDD/_Raw/Environments/_old/Env_Sprite_Background.prefab.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Env_Sprite_Background.prefab.meta rename to Assets/_DDD/_Raw/Environments/_old/Env_Sprite_Background.prefab.meta diff --git a/Assets/_DDD/_Raw/Environments/Tiles.meta b/Assets/_DDD/_Raw/Environments/_old/Tiles.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Tiles.meta rename to Assets/_DDD/_Raw/Environments/_old/Tiles.meta diff --git a/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile.meta b/Assets/_DDD/_Raw/Environments/_old/Tiles/BarrelTestTile.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile.meta rename to Assets/_DDD/_Raw/Environments/_old/Tiles/BarrelTestTile.meta diff --git a/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_BaseColor.png b/Assets/_DDD/_Raw/Environments/_old/Tiles/BarrelTestTile/Barrel_BaseColor.png similarity index 100% rename from Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_BaseColor.png rename to Assets/_DDD/_Raw/Environments/_old/Tiles/BarrelTestTile/Barrel_BaseColor.png diff --git a/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_BaseColor.png.meta b/Assets/_DDD/_Raw/Environments/_old/Tiles/BarrelTestTile/Barrel_BaseColor.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_BaseColor.png.meta rename to Assets/_DDD/_Raw/Environments/_old/Tiles/BarrelTestTile/Barrel_BaseColor.png.meta diff --git a/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_MOHS.png b/Assets/_DDD/_Raw/Environments/_old/Tiles/BarrelTestTile/Barrel_MOHS.png similarity index 100% rename from Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_MOHS.png rename to Assets/_DDD/_Raw/Environments/_old/Tiles/BarrelTestTile/Barrel_MOHS.png diff --git a/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_MOHS.png.meta b/Assets/_DDD/_Raw/Environments/_old/Tiles/BarrelTestTile/Barrel_MOHS.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_MOHS.png.meta rename to Assets/_DDD/_Raw/Environments/_old/Tiles/BarrelTestTile/Barrel_MOHS.png.meta diff --git a/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_Normal.png b/Assets/_DDD/_Raw/Environments/_old/Tiles/BarrelTestTile/Barrel_Normal.png similarity index 100% rename from Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_Normal.png rename to Assets/_DDD/_Raw/Environments/_old/Tiles/BarrelTestTile/Barrel_Normal.png diff --git a/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_Normal.png.meta b/Assets/_DDD/_Raw/Environments/_old/Tiles/BarrelTestTile/Barrel_Normal.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_Normal.png.meta rename to Assets/_DDD/_Raw/Environments/_old/Tiles/BarrelTestTile/Barrel_Normal.png.meta diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json deleted file mode 100644 index b414217a2..000000000 --- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "m_Dictionary": { - "m_DictionaryValues": [ - { - "type": "UnityEngine.ProBuilder.LogLevel, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "log.level", - "value": "{\"m_Value\":3}" - }, - { - "type": "UnityEngine.ProBuilder.LogOutput, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "log.output", - "value": "{\"m_Value\":1}" - }, - { - "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "log.path", - "value": "{\"m_Value\":\"ProBuilderLog.txt\"}" - }, - { - "type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "about.identifier", - "value": "{\"m_Value\":{\"m_Major\":6,\"m_Minor\":0,\"m_Patch\":6,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}" - }, - { - "type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "preferences.version", - "value": "{\"m_Value\":{\"m_Major\":6,\"m_Minor\":0,\"m_Patch\":6,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}" - }, - { - "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "lightmapping.autoUnwrapLightmapUV", - "value": "{\"m_Value\":true}" - } - ] - } -} \ No newline at end of file From 25bc1ff025213c9b979cc01381648b63197d87df Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Tue, 12 Aug 2025 16:25:38 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EA=B8=80=EB=A1=9C=EB=B2=8C=20=EC=9D=BC?= =?UTF-8?q?=EB=A3=A8=EB=AF=B8=EB=84=A4=EC=9D=B4=EC=85=98=20=EC=85=8B?= =?UTF-8?q?=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Settings/PC_Renderer.asset | 2 +- .../Common/Shaders/LitEnvironment.shadergraph | 649 +++++++++++++++++- .../BackgroundWall/BackgroundWall.prefab | 24 + .../Environments/Props/Fish/Fish.mat | 19 +- .../Props/FloorDoor/FloorDoor.mat | 17 + .../Props/Prop_BartenderTable.prefab | 6 +- .../Environments/Props/Prop_FloorDoor.prefab | 6 +- .../Environments/Props/Prop_WallBar.prefab | 6 +- .../Props/Prop_WallColumn01.prefab | 84 +-- .../Environments/Props/Prop_Window.prefab | 4 +- .../Environments/Props/Window2/WindowBack.mat | 2 + .../Props/_old/Prefabs/Old/Coral02.prefab | 4 + .../Prop/Lantern/PropLantern.prefab | 20 +- .../_Addressables/Scenes/Restaurant.unity | 174 ++++- .../Scenes/Restaurant/LightingData.asset | 4 +- .../Scenes/Restaurant/Lightmap-0_comp_dir.png | 4 +- .../Restaurant/Lightmap-0_comp_light.exr | 4 +- .../Scenes/Restaurant/Lightmap-1_comp_dir.png | 4 +- .../Restaurant/Lightmap-1_comp_light.exr | 4 +- .../Scenes/Restaurant/Lightmap-2_comp_dir.png | 4 +- .../Restaurant/Lightmap-2_comp_light.exr | 4 +- .../Scenes/Restaurant/Lightmap-3_comp_dir.png | 4 +- .../Restaurant/Lightmap-3_comp_light.exr | 4 +- .../Scenes/Restaurant/Lightmap-4_comp_dir.png | 4 +- .../Restaurant/Lightmap-4_comp_light.exr | 4 +- ...staurant Baking Set-Default.CellData.bytes | 2 +- ... Baking Set-Default.CellOptionalData.bytes | 2 +- ...Restaurant Baking Set.CellBricksData.bytes | 4 +- ...Restaurant Baking Set.CellSharedData.bytes | 2 +- ...estaurant Baking Set.CellSupportData.bytes | 2 +- .../Restaurant/Restaurant Baking Set.asset | 4 +- .../Environments/Env_Mesh_Geometry.prefab | 6 +- 32 files changed, 905 insertions(+), 178 deletions(-) diff --git a/Assets/Settings/PC_Renderer.asset b/Assets/Settings/PC_Renderer.asset index cb8b6f764..2621c5cb3 100644 --- a/Assets/Settings/PC_Renderer.asset +++ b/Assets/Settings/PC_Renderer.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3d94f40456ea85cdaa3cf04c9ffdb7eee4aad4501ad610b0cada66a00fc208a +oid sha256:07414ade5c9ce30e2bd64aeaba279b959964c8d62448e72d06aa64c57490cc8f size 5224 diff --git a/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph b/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph index 021257ebf..509d22d0c 100644 --- a/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph +++ b/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph @@ -47,6 +47,12 @@ }, { "m_Id": "72f0899fbf5c470f8ef90d70cdb5784c" + }, + { + "m_Id": "8fbf6b35e6e24eb78351203a51a3677b" + }, + { + "m_Id": "98c441d6e85a44fea743d7f1404eaabc" } ], "m_Keywords": [ @@ -91,6 +97,9 @@ }, { "m_Id": "463ea6973807410dabf0e3fad02dc93a" + }, + { + "m_Id": "f60a04c5451b47a79ebfb6bfe470f0fe" } ], "m_Nodes": [ @@ -261,6 +270,18 @@ }, { "m_Id": "c2aac6b4cbdb4350a02fdebd568e2de7" + }, + { + "m_Id": "ac9b749414aa44ba841083b2139f70d5" + }, + { + "m_Id": "1e7190b1f3b7443aadc9ed0c552e6139" + }, + { + "m_Id": "fd650abb3b5040fd9ccdc4ec64fba141" + }, + { + "m_Id": "a6a41bd4b9b74520a86d1da1472cde76" } ], "m_GroupDatas": [ @@ -293,6 +314,9 @@ }, { "m_Id": "3923201a51e041c9a8a1c2dad2fbf086" + }, + { + "m_Id": "9432d5284a6b497a8096b7ae4723a7a3" } ], "m_StickyNoteDatas": [], @@ -423,6 +447,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "1e7190b1f3b7443aadc9ed0c552e6139" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ac9b749414aa44ba841083b2139f70d5" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -670,7 +708,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "c2aac6b4cbdb4350a02fdebd568e2de7" + "m_Id": "f913165a0168454a83d6f1ebe45f2604" }, "m_SlotId": 0 } @@ -768,7 +806,21 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "4d1430013dcb4815a91820d9d840532e" + "m_Id": "fd650abb3b5040fd9ccdc4ec64fba141" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a6a41bd4b9b74520a86d1da1472cde76" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "fd650abb3b5040fd9ccdc4ec64fba141" }, "m_SlotId": 1 } @@ -787,6 +839,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "ac9b749414aa44ba841083b2139f70d5" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "8bef4ad136d34d1699462cbf5d39c11d" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -838,9 +904,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "f913165a0168454a83d6f1ebe45f2604" + "m_Id": "ac9b749414aa44ba841083b2139f70d5" }, - "m_SlotId": 0 + "m_SlotId": 1 } }, { @@ -1011,6 +1077,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "fd650abb3b5040fd9ccdc4ec64fba141" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4d1430013dcb4815a91820d9d840532e" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1034,7 +1114,21 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "8bef4ad136d34d1699462cbf5d39c11d" + "m_Id": "ac9b749414aa44ba841083b2139f70d5" + }, + "m_SlotId": 2 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "fe14a7ba65b24516a6dc92571c6ecd71" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c2aac6b4cbdb4350a02fdebd568e2de7" }, "m_SlotId": 0 } @@ -1084,8 +1178,8 @@ ], "m_VertexContext": { "m_Position": { - "x": 1098.9998779296875, - "y": -543.9999389648438 + "x": 2079.0, + "y": -556.9999389648438 }, "m_Blocks": [ { @@ -1101,8 +1195,8 @@ }, "m_FragmentContext": { "m_Position": { - "x": 1098.9998779296875, - "y": -331.9999694824219 + "x": 2079.0, + "y": -344.99993896484377 }, "m_Blocks": [ { @@ -1877,6 +1971,20 @@ "m_MipSamplingMode": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "18953a18e84f41809a0485d7d3bc5e50", + "m_Id": 0, + "m_DisplayName": "Predicate", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Predicate", + "m_StageCapability": 3, + "m_Value": false, + "m_DefaultValue": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ParallaxMappingNode", @@ -2014,7 +2122,7 @@ "m_AlphaMode": 0, "m_RenderFace": 0, "m_AlphaClip": true, - "m_CastShadows": false, + "m_CastShadows": true, "m_ReceiveShadows": true, "m_DisableTint": false, "m_AdditionalMotionVectorMode": 0, @@ -2103,6 +2211,42 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "1e7190b1f3b7443aadc9ed0c552e6139", + "m_Group": { + "m_Id": "9432d5284a6b497a8096b7ae4723a7a3" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1989.0, + "y": -1061.0, + "width": 118.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "64ff16502e5f4a108a9bfea02d90615a" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "8fbf6b35e6e24eb78351203a51a3677b" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", @@ -3004,16 +3148,16 @@ "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", "m_ObjectId": "4d1430013dcb4815a91820d9d840532e", "m_Group": { - "m_Id": "" + "m_Id": "9432d5284a6b497a8096b7ae4723a7a3" }, "m_Name": "Multiply", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 383.0000305175781, - "y": 171.00003051757813, - "width": 207.99996948242188, + "x": 1422.0, + "y": -1084.0, + "width": 208.0, "height": 302.0 } }, @@ -3148,10 +3292,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 846.0, - "y": -252.99998474121095, - "width": 183.0, - "height": 34.0 + "x": 1825.9998779296875, + "y": -265.99993896484377, + "width": 183.0001220703125, + "height": 33.999969482421878 } }, "m_Slots": [ @@ -3172,6 +3316,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "54047b877a134a07abf761376e4b051b", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", @@ -3443,6 +3635,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "5fa6eb0c430c4a2fb4046c0296651a44", + "m_Id": 1, + "m_DisplayName": "True", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "True", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData", @@ -3588,6 +3804,20 @@ "m_Space": 3 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "64ff16502e5f4a108a9bfea02d90615a", + "m_Id": 0, + "m_DisplayName": "ApplyGI", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": false, + "m_DefaultValue": false +} + { "m_SGVersion": 2, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", @@ -3629,6 +3859,30 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "6812b5978ed345c99d1d498937833607", + "m_Id": 3, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", @@ -3795,6 +4049,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "6ede6feb75334e24ac10a3bf9ce1a684", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GroupData", @@ -4639,6 +4941,29 @@ "m_SerializedDescriptor": "SurfaceDescription.BaseColor" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.BooleanShaderProperty", + "m_ObjectId": "8fbf6b35e6e24eb78351203a51a3677b", + "m_Guid": { + "m_GuidSerialized": "7c5560c7-277d-4bd4-939c-efdb7595530c" + }, + "m_Name": "ApplyGI", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "ApplyGI", + "m_DefaultReferenceName": "_ApplyGI", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": true +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -4669,6 +4994,17 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GroupData", + "m_ObjectId": "9432d5284a6b497a8096b7ae4723a7a3", + "m_Title": "GI", + "m_Position": { + "x": 857.0, + "y": -1294.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Internal.BooleanShaderProperty", @@ -4734,6 +5070,34 @@ } } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "98c441d6e85a44fea743d7f1404eaabc", + "m_Guid": { + "m_GuidSerialized": "337bed26-e402-42b3-81b1-8a0c1e5652fc" + }, + "m_Name": "GlobalIlluminationIntensity", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "GlobalIlluminationIntensity", + "m_DefaultReferenceName": "_GlobalIlluminationIntensity", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 1.0, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + { "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", @@ -4764,6 +5128,21 @@ "m_ColorMode": 1 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "99ea492be1164bb180eb5ffb8ff271ed", + "m_Id": 0, + "m_DisplayName": "GlobalIlluminationIntensity", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", @@ -4902,17 +5281,17 @@ "m_Type": "UnityEditor.ShaderGraph.BakedGINode", "m_ObjectId": "9ea7841f7742473eac1d80cc97d2726c", "m_Group": { - "m_Id": "" + "m_Id": "9432d5284a6b497a8096b7ae4723a7a3" }, "m_Name": "Baked GI", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 237.0, - "y": 453.9999694824219, - "width": 183.0001220703125, - "height": 184.00003051757813 + "x": 882.0, + "y": -999.0, + "width": 183.0, + "height": 184.0 } }, "m_Slots": [ @@ -5013,6 +5392,42 @@ "m_IsEditable": true } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "a6a41bd4b9b74520a86d1da1472cde76", + "m_Group": { + "m_Id": "9432d5284a6b497a8096b7ae4723a7a3" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 895.0, + "y": -762.0, + "width": 212.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "99ea492be1164bb180eb5ffb8ff271ed" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "98c441d6e85a44fea743d7f1404eaabc" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.CategoryData", @@ -5190,6 +5605,52 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BranchNode", + "m_ObjectId": "ac9b749414aa44ba841083b2139f70d5", + "m_Group": { + "m_Id": "9432d5284a6b497a8096b7ae4723a7a3" + }, + "m_Name": "Branch", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1989.0, + "y": -1027.0, + "width": 208.0, + "height": 326.0 + } + }, + "m_Slots": [ + { + "m_Id": "18953a18e84f41809a0485d7d3bc5e50" + }, + { + "m_Id": "5fa6eb0c430c4a2fb4046c0296651a44" + }, + { + "m_Id": "e6c9e2a3f74c4a618a4e0e466ba835dd" + }, + { + "m_Id": "6812b5978ed345c99d1d498937833607" + } + ], + "synonyms": [ + "switch", + "if", + "else" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -5619,15 +6080,15 @@ "m_Type": "UnityEditor.ShaderGraph.AddNode", "m_ObjectId": "c2aac6b4cbdb4350a02fdebd568e2de7", "m_Group": { - "m_Id": "" + "m_Id": "9432d5284a6b497a8096b7ae4723a7a3" }, "m_Name": "Add", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 644.0, - "y": 171.00003051757813, + "x": 1686.0, + "y": -1235.0, "width": 208.0, "height": 302.0 } @@ -6019,6 +6480,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "cdb63927f0624cfb9d76cef04110f3a5", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -6572,6 +7081,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "e6c9e2a3f74c4a618a4e0e466ba835dd", + "m_Id": 2, + "m_DisplayName": "False", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "False", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -6875,6 +7408,21 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "f60a04c5451b47a79ebfb6bfe470f0fe", + "m_Name": "Global Illumination", + "m_ChildObjectList": [ + { + "m_Id": "8fbf6b35e6e24eb78351203a51a3677b" + }, + { + "m_Id": "98c441d6e85a44fea743d7f1404eaabc" + } + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -7012,6 +7560,49 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "fd650abb3b5040fd9ccdc4ec64fba141", + "m_Group": { + "m_Id": "9432d5284a6b497a8096b7ae4723a7a3" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1136.0, + "y": -901.0, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "6ede6feb75334e24ac10a3bf9ce1a684" + }, + { + "m_Id": "54047b877a134a07abf761376e4b051b" + }, + { + "m_Id": "cdb63927f0624cfb9d76cef04110f3a5" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -7039,10 +7630,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 944.9999389648438, - "y": -384.9999694824219, + "x": 366.0000305175781, + "y": -957.0, "width": 55.99993896484375, - "height": 23.999969482421876 + "height": 24.00006103515625 } }, "m_Slots": [ diff --git a/Assets/_DDD/Restaurant/Environments/Geometries/BackgroundWall/BackgroundWall.prefab b/Assets/_DDD/Restaurant/Environments/Geometries/BackgroundWall/BackgroundWall.prefab index 29c091f40..4d953ec07 100644 --- a/Assets/_DDD/Restaurant/Environments/Geometries/BackgroundWall/BackgroundWall.prefab +++ b/Assets/_DDD/Restaurant/Environments/Geometries/BackgroundWall/BackgroundWall.prefab @@ -60,6 +60,30 @@ PrefabInstance: propertyPath: m_Name value: BackgroundWall objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 7856941568993672895, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7856941568993672895, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 8282162905857597943, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8282162905857597943, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} - target: {fileID: 8467019391491472137, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: diff --git a/Assets/_DDD/Restaurant/Environments/Props/Fish/Fish.mat b/Assets/_DDD/Restaurant/Environments/Props/Fish/Fish.mat index 472523ae9..4ddeb0dfa 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Fish/Fish.mat +++ b/Assets/_DDD/Restaurant/Environments/Props/Fish/Fish.mat @@ -31,7 +31,7 @@ Material: - _OCCLUSIONMAP - _PARALLAXMAP m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 2450 @@ -63,10 +63,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Emiss: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MOHS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -75,10 +83,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Normal: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _OpacityMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _ParallaxMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -137,6 +153,7 @@ Material: - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _UseOpacityMask: 0 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZTest: 4 diff --git a/Assets/_DDD/Restaurant/Environments/Props/FloorDoor/FloorDoor.mat b/Assets/_DDD/Restaurant/Environments/Props/FloorDoor/FloorDoor.mat index 610c75257..541e49111 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/FloorDoor/FloorDoor.mat +++ b/Assets/_DDD/Restaurant/Environments/Props/FloorDoor/FloorDoor.mat @@ -50,10 +50,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Emiss: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MOHS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -62,10 +70,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Normal: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _OpacityMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _ParallaxMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -124,6 +140,7 @@ Material: - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _UseOpacityMask: 0 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZTest: 4 diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_BartenderTable.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_BartenderTable.prefab index e10b528e4..670c5f12e 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_BartenderTable.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_BartenderTable.prefab @@ -58,7 +58,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Layer @@ -66,7 +66,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Layer @@ -74,7 +74,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: 'm_Materials.Array.data[0]' diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_FloorDoor.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_FloorDoor.prefab index e5b143d83..0aeacbf34 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_FloorDoor.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_FloorDoor.prefab @@ -70,7 +70,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Layer @@ -78,7 +78,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Layer @@ -86,7 +86,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: 'm_Materials.Array.data[0]' diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_WallBar.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_WallBar.prefab index 829863e5e..568d93b5d 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_WallBar.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_WallBar.prefab @@ -58,7 +58,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Layer @@ -66,7 +66,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Layer @@ -74,7 +74,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: 'm_Materials.Array.data[0]' diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_WallColumn01.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_WallColumn01.prefab index 69d3689d7..3fe481047 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_WallColumn01.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_WallColumn01.prefab @@ -180,14 +180,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8881739536043914635} m_Modifications: - - target: {fileID: 469687031743160198, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 469687031743160198, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalScale.x value: 0.19592836 @@ -210,7 +202,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalPosition.z - value: 0.48826963 + value: 0.47600007 objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalRotation.w @@ -256,38 +248,6 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} - - target: {fileID: 5358278810492944094, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 5358278810492944094, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Lightmapping - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7122967726149048717, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_LocalPosition.z - value: -0.06 - objectReference: {fileID: 0} - - target: {fileID: 8000566592514339547, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 8000566592514339547, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8142201499108093331, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 8142201499108093331, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -432,14 +392,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8881739536043914635} m_Modifications: - - target: {fileID: 469687031743160198, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 469687031743160198, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalScale.x value: 0.19592836 @@ -462,7 +414,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalPosition.z - value: 0.48826963 + value: 0.476 objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalRotation.w @@ -508,38 +460,6 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} - - target: {fileID: 5358278810492944094, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 5358278810492944094, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Lightmapping - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7122967726149048717, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_LocalPosition.z - value: -0.06 - objectReference: {fileID: 0} - - target: {fileID: 8000566592514339547, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 8000566592514339547, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8142201499108093331, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 8142201499108093331, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_Window.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_Window.prefab index 098e1eba0..17af20956 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_Window.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_Window.prefab @@ -137,7 +137,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1651310607354768263 Transform: @@ -277,7 +277,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 0 + value: 2147483647 objectReference: {fileID: 0} - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Layer diff --git a/Assets/_DDD/Restaurant/Environments/Props/Window2/WindowBack.mat b/Assets/_DDD/Restaurant/Environments/Props/Window2/WindowBack.mat index 66be7fda2..96c7bbf25 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Window2/WindowBack.mat +++ b/Assets/_DDD/Restaurant/Environments/Props/Window2/WindowBack.mat @@ -104,6 +104,7 @@ Material: - _AddPrecomputedVelocity: 0 - _AlphaClip: 1 - _AlphaToMask: 1 + - _ApplyGI: 1 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 @@ -118,6 +119,7 @@ Material: - _DstBlendAlpha: 0 - _EMISSION: 0 - _EnvironmentReflections: 1 + - _GlobalIlluminationIntensity: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/Coral02.prefab b/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/Coral02.prefab index 03639ae26..d19b9804b 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/Coral02.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/Coral02.prefab @@ -8,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 833125971660403034, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_Sprite value: diff --git a/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab index 72578bf64..42ba72ba8 100644 --- a/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab +++ b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab @@ -16,7 +16,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &8812663732067019518 Transform: @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 469687031743160198} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: 0, y: 0, z: 0.01} + m_LocalPosition: {x: 0, y: 0, z: 0.001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -114,7 +114,7 @@ Transform: m_GameObject: {fileID: 5358278810492944094} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.557, z: -0.022} + m_LocalPosition: {x: 0, y: 0.6, z: 0.001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -173,7 +173,7 @@ Light: m_Lightmapping: 1 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 10 + m_BounceIntensity: 500 m_ColorTemperature: 6570 m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} @@ -260,6 +260,18 @@ PrefabInstance: propertyPath: m_Name value: PropLantern objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity index e6e275586..52fdb7f9e 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity @@ -1496,6 +1496,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 405711182} m_Modifications: + - target: {fileID: 3406375906160120237, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3511876579184512741, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3782685999912116715, guid: 15c73973805ba914cbcc9929659591d9, type: 3} propertyPath: m_Size.x value: 1.05 @@ -1572,6 +1580,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2130,6 +2142,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 589983953} m_Modifications: + - target: {fileID: 1924183298637050373, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -2182,6 +2198,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8283425785690863959, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9211739394093953175, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_Name value: Prop_WallColumn01_004 @@ -2376,7 +2396,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3406375906160120237, guid: e4b1fd7999823d1489c618510cb4b1a7, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3511876579184512741, guid: e4b1fd7999823d1489c618510cb4b1a7, type: 3} propertyPath: m_Layer @@ -2384,7 +2404,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3511876579184512741, guid: e4b1fd7999823d1489c618510cb4b1a7, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: e4b1fd7999823d1489c618510cb4b1a7, type: 3} propertyPath: m_LocalScale.x @@ -2448,7 +2468,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9211739394093953175, guid: e4b1fd7999823d1489c618510cb4b1a7, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -5602,6 +5622,14 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Type + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Strength + value: 0.6 + objectReference: {fileID: 0} - target: {fileID: 4689806172687901599, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.y value: 0 @@ -5796,6 +5824,10 @@ PrefabInstance: propertyPath: m_Lightmapping value: 1 objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_BounceIntensity value: 1 @@ -5827,6 +5859,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 969165171} m_Modifications: + - target: {fileID: 3392632814396210413, guid: ece30713fe5c65b4d9b7b3806e45408f, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3782685999912116715, guid: ece30713fe5c65b4d9b7b3806e45408f, type: 3} propertyPath: m_Enabled value: 1 @@ -6314,6 +6350,10 @@ PrefabInstance: propertyPath: m_Name value: Prop_FrontWall objectReference: {fileID: 0} + - target: {fileID: 3360314925300997339, guid: eb64f5e965ab06a4090e0dec428c911c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -6425,6 +6465,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 589983953} m_Modifications: + - target: {fileID: 1924183298637050373, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -6477,6 +6521,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8283425785690863959, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9211739394093953175, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_Name value: Prop_WallColumn01_005 @@ -7075,6 +7123,10 @@ PrefabInstance: propertyPath: m_Lightmapping value: 1 objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_BounceIntensity value: 1 @@ -7219,6 +7271,14 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Type + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Strength + value: 0.6 + objectReference: {fileID: 0} - target: {fileID: 4689806172687901599, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.y value: 0 @@ -7801,6 +7861,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 589983953} m_Modifications: + - target: {fileID: 1924183298637050373, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -7853,6 +7917,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8283425785690863959, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9211739394093953175, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_Name value: Prop_WallColumn01_003 @@ -8675,6 +8743,14 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Type + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Strength + value: 0.6 + objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.x value: -12.88694 @@ -9313,6 +9389,10 @@ PrefabInstance: propertyPath: m_Lightmapping value: 1 objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_BounceIntensity value: 1 @@ -9701,6 +9781,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 589983953} m_Modifications: + - target: {fileID: 1924183298637050373, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -9753,6 +9837,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8283425785690863959, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9211739394093953175, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_Name value: Prop_WallColumn01_002 @@ -10510,6 +10598,10 @@ PrefabInstance: propertyPath: m_Lightmapping value: 1 objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_BounceIntensity value: 1 @@ -10687,6 +10779,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 589983953} m_Modifications: + - target: {fileID: 1924183298637050373, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -10739,6 +10835,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8283425785690863959, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9211739394093953175, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_Name value: Prop_WallColumn01_001 @@ -12108,6 +12208,14 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Type + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Strength + value: 0.6 + objectReference: {fileID: 0} - target: {fileID: 4689806172687901599, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.y value: 0 @@ -12184,6 +12292,10 @@ PrefabInstance: propertyPath: m_Name value: Prop_Window2_003 objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -13013,7 +13125,7 @@ Light: m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 - m_Strength: 0.5 + m_Strength: 0.6 m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.1 @@ -14808,6 +14920,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 405711182} m_Modifications: + - target: {fileID: 3406375906160120237, guid: 39c2bad790435fc448f5b3222198ef3f, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3511876579184512741, guid: 39c2bad790435fc448f5b3222198ef3f, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3782685999912116715, guid: 39c2bad790435fc448f5b3222198ef3f, type: 3} propertyPath: m_Enabled value: 0 @@ -14912,6 +15032,14 @@ PrefabInstance: propertyPath: m_Name value: Prop_FloorDoor_001 objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: 39c2bad790435fc448f5b3222198ef3f, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: 39c2bad790435fc448f5b3222198ef3f, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -16251,6 +16379,14 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Type + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Strength + value: 0.6 + objectReference: {fileID: 0} - target: {fileID: 4689806172687901599, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.y value: 0 @@ -18023,18 +18159,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1428769370} m_Modifications: - - target: {fileID: 43200463158696774, guid: 80e8672c53bf68341b6948acf3a4e04c, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 502577561992037683, guid: 80e8672c53bf68341b6948acf3a4e04c, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 2698668723082114449, guid: 80e8672c53bf68341b6948acf3a4e04c, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - target: {fileID: 3782685999912116715, guid: 80e8672c53bf68341b6948acf3a4e04c, type: 3} propertyPath: m_Size.x value: 1.02 @@ -18061,7 +18185,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 80e8672c53bf68341b6948acf3a4e04c, type: 3} propertyPath: m_LocalPosition.x - value: 8.05 + value: 8.127 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 80e8672c53bf68341b6948acf3a4e04c, type: 3} propertyPath: m_LocalPosition.y @@ -19116,6 +19240,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 589983953} m_Modifications: + - target: {fileID: 1924183298637050373, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -19168,6 +19296,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8283425785690863959, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9211739394093953175, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_Name value: Prop_WallColumn01_006 @@ -19275,6 +19407,10 @@ PrefabInstance: propertyPath: m_Name value: Prop_SideWall_001 objectReference: {fileID: 0} + - target: {fileID: 3360314925300997339, guid: 16126e3678ee6df4f9b33c1ea1e8497d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -19737,6 +19873,10 @@ PrefabInstance: propertyPath: m_Name value: Prop_SideWall objectReference: {fileID: 0} + - target: {fileID: 3360314925300997339, guid: 16126e3678ee6df4f9b33c1ea1e8497d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/LightingData.asset b/Assets/_DDD/_Addressables/Scenes/Restaurant/LightingData.asset index b34445ae0..d3654b834 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/LightingData.asset +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/LightingData.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82dcc695096adb8d0bdb5ab22339e833ca714d91435a171c2d50a089c1891b88 -size 29857 +oid sha256:9ac8a6472c44a59e97d7642bc8e34a84aab8cec18abe5b1b4910c237ff285e2d +size 26769 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_dir.png b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_dir.png index fa945c118..a56c478c8 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_dir.png +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:022aa44cf18b62d8cb3574089047b87fd8d7cc9b52415242badd2540b331e0a7 -size 227354 +oid sha256:e2f79700d2ff3f812bb9e941e2cc71b153b02425996b260e6a1d223469088f5b +size 411792 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_light.exr b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_light.exr index 1e74b16a4..21e203b20 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_light.exr +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:644bd9c1f7341aef35daed7ab54b039b422ee64fa1eb9f32e68191b5b9d2b383 -size 4184975 +oid sha256:28c42bad91c266b645a2902ed22c68bb6cbed230a22e269efc55afab497804df +size 6153629 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_dir.png b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_dir.png index c7fff91e4..aeae60a3c 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_dir.png +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:215bb1e3c0e45aeaba8630be8e7858dfa762756c2ba9aab9c6612bfec604b48d -size 537295 +oid sha256:9dbafe0334cfcf101199aad128a84fe1c1e180af6ee76dd396a83a52ff6d8dd8 +size 628217 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_light.exr b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_light.exr index 735cd3e29..6bd8d882e 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_light.exr +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d5b567f6ab1d060a2b02651f9b18193191092b09027b05f4f2e4b0c7e0c6f70 -size 9574644 +oid sha256:177f941e83792d6591020eac497714ee6488ec37b7039105acc3975348d93729 +size 9057678 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_dir.png b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_dir.png index ff3ba74fb..bfa9cee76 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_dir.png +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f20d0c848b70887c25c6a38059d895170a9481d1a37e8fd76052374d7699f2f -size 745273 +oid sha256:15f879540b2e79f593c1b241cff7106db269f83e3ccbd96450391aa2bf2fb4b2 +size 850982 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_light.exr b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_light.exr index 0826857d0..6379385dd 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_light.exr +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55b51fa5c8cef1b4e14f50bab37e863f89ba33324e6f95f67ca36631fadeb67a -size 11803586 +oid sha256:54d9af136bcae3c19e4aaa63b33804b81a1d72205159ad283688f8236eaf5689 +size 11634515 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_dir.png b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_dir.png index 171a86018..109719347 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_dir.png +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c2f80b1a6df95a69d52089e3d37f6ad4962b3e38d80f9846423fdcf89306ec4 -size 487047 +oid sha256:a781954251c93c388d17a6e5f3d05c5d128a4b9e734cbe515f26e90abb6272ba +size 671278 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_light.exr b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_light.exr index 82f74434e..2ec3b3bd8 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_light.exr +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77e02c14664b51236582bd3b585c8b85729fd9b8cc34708565d09ff60a66c18b -size 7832853 +oid sha256:c2239352988528c43decd800fe01254f9da7ff4dea0ccabd69d8d22b1ad620fe +size 9180172 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_dir.png b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_dir.png index fa172aed1..b41632a6e 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_dir.png +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99297166f913f2282b4bffb1c9b5d9d72c3e263bc12cb8dc196242c0b15a1300 -size 50330 +oid sha256:4a0a2d7b2c52e8695b236b0d6f0c5627b1ad908a998a520def70c1ea7fd28612 +size 1117 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_light.exr b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_light.exr index 4fe1c88e3..2f9960cc2 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_light.exr +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3faee729ba7a09dcfcb261dfb12c7daa6488d807f193fdd1812f643ea0dbe8ce -size 737909 +oid sha256:5779e068473823158defb11033c46536f98b051f435485bddc950c1f7e8872df +size 5643 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellData.bytes b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellData.bytes index f27388fdf..dab2afad4 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellData.bytes +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellData.bytes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7bdfbe3af83cef7a1ffc468a404e87a25380bea232140d8debc177024938867 +oid sha256:d0f502596a47e25072955e0ee0e5c6c7d8cca9f911ff34977efdc14d6b92d7fb size 262144 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellOptionalData.bytes b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellOptionalData.bytes index 0ef4ca58c..b5e9315c0 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellOptionalData.bytes +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellOptionalData.bytes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4937e47affd56b29576e2070bc262abc3441c658bd7df9f3fa544297644e237a +oid sha256:49dbf9a5a16788d39caa039bf720a08bc4c59260f2e2bcba371cdf34e438d98d size 262144 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellBricksData.bytes b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellBricksData.bytes index 3bf7cc671..12bac61ac 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellBricksData.bytes +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellBricksData.bytes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd261e7861addcff9ead87ca048c0f07089a6b0f70017389feb83540b85f0237 -size 3520 +oid sha256:9078ca525e9954b8dd3488916cc0e3270f5076b3eef88bbccd31fe8f1ef45066 +size 3024 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSharedData.bytes b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSharedData.bytes index 704302dba..a615801b3 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSharedData.bytes +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSharedData.bytes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fad5915e7492e249bc036af7c3911a7ea29acf093a4c53310336cecf2daa7fd +oid sha256:58e947e9a4d04a03b8adb6c35ce11766c1dd0fd6fb8a2acf57a1d666386faf34 size 147456 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSupportData.bytes b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSupportData.bytes index 5e9af9a7a..7aacb86ab 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSupportData.bytes +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSupportData.bytes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:331b06b5c63e15d2a6b38fc8dca892bf5b1904e39b369ed69835d9e43faff262 +oid sha256:8c26ac4d13e976a2643c40faa0e06a6a62972f65275df5afc3d67a9d1c05ec9f size 524288 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.asset b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.asset index 0e9df0cb7..a465792f0 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.asset +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9f59bf317639095fc1758c8e4ef76796847e298e944f7dcbcfc8b381e0b6560 -size 331733 +oid sha256:897d51ae5962fbd5d7179c943d84365bac8cd8f5abc57ca775187e4a412c66f0 +size 17821 diff --git a/Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab b/Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab index 9b5bca0d0..cb542d1f4 100644 --- a/Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab +++ b/Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab @@ -18,7 +18,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1063320636771556828, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1241020487330251412, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_Layer @@ -26,7 +26,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1241020487330251412, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4732070946668798894, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_Name @@ -38,7 +38,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4732070946668798894, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_LocalPosition.x From 671d2d57b9aa2ea644e9eac5188444304093f8d6 Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Tue, 12 Aug 2025 19:01:40 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EB=A0=8C=EB=8D=94=20=ED=8C=8C=EC=9D=B4?= =?UTF-8?q?=ED=94=84=EB=9D=BC=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Settings/PC_Renderer.asset | 4 +- .../Common/Shaders/PlayerStencil.shadergraph | 231 ++++++++++++-- .../Spine/MainCharacter_Stencil_Material.mat | 1 + .../RestaurantGround/RestaurantGround.prefab | 2 +- .../Props/Prop_GrillMeat 1.prefab | 12 +- .../Props/Prop_GrillMeat 2.prefab | 8 +- .../Props/Prop_Refrigerator.prefab | 6 +- .../Props/_old/Prefabs/Old/Coral02.prefab | 10 +- .../Prop/Lantern/PropLantern.prefab | 2 +- .../Prefabs/RestaurantPlayer.prefab | 284 +++++++++--------- 10 files changed, 388 insertions(+), 172 deletions(-) diff --git a/Assets/Settings/PC_Renderer.asset b/Assets/Settings/PC_Renderer.asset index 2621c5cb3..92a61128a 100644 --- a/Assets/Settings/PC_Renderer.asset +++ b/Assets/Settings/PC_Renderer.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07414ade5c9ce30e2bd64aeaba279b959964c8d62448e72d06aa64c57490cc8f -size 5224 +oid sha256:b979c11e4f07bdd2a3dc74b1da80d9ebe48f35ad16665e62dfb8c0b440b88c6c +size 9212 diff --git a/Assets/_DDD/Common/Shaders/PlayerStencil.shadergraph b/Assets/_DDD/Common/Shaders/PlayerStencil.shadergraph index 637e58a7e..a3e14a37b 100644 --- a/Assets/_DDD/Common/Shaders/PlayerStencil.shadergraph +++ b/Assets/_DDD/Common/Shaders/PlayerStencil.shadergraph @@ -44,6 +44,15 @@ }, { "m_Id": "a3c80b347ef046c0bc1d3269273f6fea" + }, + { + "m_Id": "50de2268964d4fc4b3bd4f1dc0c002bb" + }, + { + "m_Id": "61fab68b2f3b4369a28caf60c643eae9" + }, + { + "m_Id": "2aa776757f104079b20228516f4622f8" } ], "m_GroupDatas": [], @@ -77,6 +86,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "2aa776757f104079b20228516f4622f8" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "3b485b1e5ced4f53b41de1bdc5151215" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -91,20 +114,6 @@ "m_SlotId": 1 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "d0ce7d094dec447ea6fcc3f96774f923" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "3b485b1e5ced4f53b41de1bdc5151215" - }, - "m_SlotId": 0 - } - }, { "m_OutputSlot": { "m_Node": { @@ -148,6 +157,9 @@ }, { "m_Id": "f7faf4f9d58c4df9b044e747a4d72a9a" + }, + { + "m_Id": "50de2268964d4fc4b3bd4f1dc0c002bb" } ] }, @@ -323,12 +335,12 @@ "m_Id": "0d29c53938814b749a04f0e8a61b89af" }, "m_AllowMaterialOverride": false, - "m_SurfaceType": 1, + "m_SurfaceType": 0, "m_ZTestMode": 4, "m_ZWriteControl": 2, "m_AlphaMode": 0, "m_RenderFace": 2, - "m_AlphaClip": false, + "m_AlphaClip": true, "m_CastShadows": true, "m_ReceiveShadows": true, "m_DisableTint": false, @@ -399,6 +411,42 @@ "m_MipSamplingMode": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "2aa776757f104079b20228516f4622f8", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 160.60818481445313, + "y": 507.3179931640625, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "6b0a7bb9e7de4867be29dabbfe3bc520" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "e85348c3d1dc479f8575b5791d30c9bc" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", @@ -566,6 +614,108 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "50de2268964d4fc4b3bd4f1dc0c002bb", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.AlphaClipThreshold", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "c0c87694f3bc4ea6a6b5a1c364ac3045" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1Node", + "m_ObjectId": "61fab68b2f3b4369a28caf60c643eae9", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Float", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -138.9999542236328, + "y": 805.0000610351563, + "width": 116.00003814697266, + "height": 34.00006103515625 + } + }, + "m_Slots": [ + { + "m_Id": "7c3303decfbd40d59761cb44dc0a3d31" + }, + { + "m_Id": "c6020c17b22846ba9235ab60da67e7c3" + } + ], + "synonyms": [ + "Vector 1", + "1", + "v1", + "vec1", + "scalar" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Value": 0.0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "6b0a7bb9e7de4867be29dabbfe3bc520", + "m_Id": 0, + "m_DisplayName": "BaseColor", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", @@ -590,6 +740,21 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "7c3303decfbd40d59761cb44dc0a3d31", + "m_Id": 1, + "m_DisplayName": "X", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "X", + "m_StageCapability": 3, + "m_Value": 0.5, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -654,8 +819,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 129.0, - "y": 108.0, + "x": 83.9999771118164, + "y": 90.99998474121094, "width": 208.0, "height": 302.0 } @@ -797,6 +962,21 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "c0c87694f3bc4ea6a6b5a1c364ac3045", + "m_Id": 0, + "m_DisplayName": "Alpha Clip Threshold", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "AlphaClipThreshold", + "m_StageCapability": 2, + "m_Value": 0.5, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -849,6 +1029,21 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "c6020c17b22846ba9235ab60da67e7c3", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", diff --git a/Assets/_DDD/Restaurant/Characters/Player/Spine/MainCharacter_Stencil_Material.mat b/Assets/_DDD/Restaurant/Characters/Player/Spine/MainCharacter_Stencil_Material.mat index e34b96000..feba544be 100644 --- a/Assets/_DDD/Restaurant/Characters/Player/Spine/MainCharacter_Stencil_Material.mat +++ b/Assets/_DDD/Restaurant/Characters/Player/Spine/MainCharacter_Stencil_Material.mat @@ -63,6 +63,7 @@ Material: - _Cutoff: 0.1 - _DoubleSidedLighting: 0 - _LightAffectsAdditive: 0 + - _Opacity: 0.5 - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 diff --git a/Assets/_DDD/Restaurant/Environments/Geometries/RestaurantGround/RestaurantGround.prefab b/Assets/_DDD/Restaurant/Environments/Geometries/RestaurantGround/RestaurantGround.prefab index 8132dea3e..f03f66814 100644 --- a/Assets/_DDD/Restaurant/Environments/Geometries/RestaurantGround/RestaurantGround.prefab +++ b/Assets/_DDD/Restaurant/Environments/Geometries/RestaurantGround/RestaurantGround.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 8835311167308124458} - component: {fileID: 241574284133009341} - component: {fileID: 15447880633616622} - m_Layer: 0 + m_Layer: 3 m_Name: Plane m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_GrillMeat 1.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_GrillMeat 1.prefab index 65b3fa6ef..92eaf0009 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_GrillMeat 1.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_GrillMeat 1.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 7857189672518433004} - component: {fileID: 2501614416472258473} - component: {fileID: 9017823610648423131} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook_004 m_TagString: Untagged m_Icon: {fileID: 0} @@ -97,7 +97,7 @@ GameObject: - component: {fileID: 6727915351210375460} - component: {fileID: 7518404612132152582} - component: {fileID: 4098434064772308400} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook_003 m_TagString: Untagged m_Icon: {fileID: 0} @@ -183,7 +183,7 @@ GameObject: - component: {fileID: 7205601819533780546} - component: {fileID: 1351338171002337622} - component: {fileID: 4532696157954143371} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook_005 m_TagString: Untagged m_Icon: {fileID: 0} @@ -269,7 +269,7 @@ GameObject: - component: {fileID: 8211332538887232571} - component: {fileID: 5693985379922020792} - component: {fileID: 2540024809278599235} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -355,7 +355,7 @@ GameObject: - component: {fileID: 8032813968137285366} - component: {fileID: 7775287767503856352} - component: {fileID: 4398746862490504318} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook_006 m_TagString: Untagged m_Icon: {fileID: 0} @@ -441,7 +441,7 @@ GameObject: - component: {fileID: 4754284760536505136} - component: {fileID: 6086511103358333044} - component: {fileID: 6389774304370644126} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook_002 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_GrillMeat 2.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_GrillMeat 2.prefab index bee8ecc5e..f44ebdbb6 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_GrillMeat 2.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_GrillMeat 2.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 8927441586151414980} - component: {fileID: 5512123271003375021} - component: {fileID: 5210367358241826992} - m_Layer: 0 + m_Layer: 8 m_Name: VisualLook_002 m_TagString: Untagged m_Icon: {fileID: 0} @@ -97,7 +97,7 @@ GameObject: - component: {fileID: 8211332538887232571} - component: {fileID: 5693985379922020792} - component: {fileID: 2540024809278599235} - m_Layer: 0 + m_Layer: 8 m_Name: VisualLook_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -334,6 +334,10 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} + - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags value: 0 diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_Refrigerator.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_Refrigerator.prefab index f2ce04cce..34d426923 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_Refrigerator.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_Refrigerator.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 5034705976361966992} - component: {fileID: 6814456922268065288} - component: {fileID: 8026521092434122185} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook_002 m_TagString: Untagged m_Icon: {fileID: 0} @@ -97,7 +97,7 @@ GameObject: - component: {fileID: 7159781468411195695} - component: {fileID: 8988209345456356862} - component: {fileID: 3757411897572263444} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -183,7 +183,7 @@ GameObject: - component: {fileID: 3703768966387483766} - component: {fileID: 6496825391945974316} - component: {fileID: 3907416760919235474} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook_003 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/Coral02.prefab b/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/Coral02.prefab index d19b9804b..d6da5cf75 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/Coral02.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/Coral02.prefab @@ -8,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 833125971660403034, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 833125971660403034, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_SortingOrder value: 0 @@ -30,7 +34,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_Layer - value: 16 + value: 7 objectReference: {fileID: 0} - target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -38,7 +42,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7835622629792856689, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_Layer - value: 16 + value: 7 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_LocalScale.x @@ -156,7 +160,7 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &1267130311855284124 MonoBehaviour: diff --git a/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab index 42ba72ba8..51c531400 100644 --- a/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab +++ b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 8812663732067019518} - component: {fileID: 3007032601211948582} - component: {fileID: 1974374480108892137} - m_Layer: 0 + m_Layer: 1 m_Name: VisualLook_Flame m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab index bafd45c81..013c5ef5f 100644 --- a/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4318885206818761415 +--- !u!1 &6964515026568296306 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,9 +8,130 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 92685501732061756} - - component: {fileID: 4837437381441246234} - - component: {fileID: 7189397998236803397} + - component: {fileID: 7476222657412110048} + - component: {fileID: 4277184008289255055} + - component: {fileID: 1989103694703995626} + m_Layer: 0 + m_Name: CharacterLight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7476222657412110048 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6964515026568296306} + serializedVersion: 2 + m_LocalRotation: {x: 0.42261827, y: -0, z: -0, w: 0.9063079} + m_LocalPosition: {x: 0, y: 1.5, z: -0.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7511707580127947132} + m_LocalEulerAnglesHint: {x: 50, y: 0, z: 0} +--- !u!108 &4277184008289255055 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6964515026568296306} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 2 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 5 + m_Range: 2.5 + m_SpotAngle: 120 + m_InnerSpotAngle: 90 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.1 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 64 + m_RenderingLayerMask: 2 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!114 &1989103694703995626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6964515026568296306} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 2 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!1 &7889117055561491011 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7902811446395955698} + - component: {fileID: 1021115348555494531} + - component: {fileID: 6813050995913811272} m_Layer: 0 m_Name: Point Light m_TagString: Untagged @@ -18,34 +139,34 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &92685501732061756 +--- !u!4 &7902811446395955698 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4318885206818761415} + m_GameObject: {fileID: 7889117055561491011} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalPosition: {x: 0, y: 1, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7511707580127947132} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!108 &4837437381441246234 +--- !u!108 &1021115348555494531 Light: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4318885206818761415} + m_GameObject: {fileID: 7889117055561491011} m_Enabled: 1 serializedVersion: 11 m_Type: 2 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 5 - m_Range: 4 + m_Range: 20 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 m_CookieSize: 10 @@ -81,7 +202,7 @@ Light: m_RenderMode: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 1 + m_Bits: 9 m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 @@ -98,134 +219,13 @@ Light: m_LightUnit: 1 m_LuxAtDistance: 1 m_EnableSpotReflector: 1 ---- !u!114 &7189397998236803397 +--- !u!114 &6813050995913811272 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4318885206818761415} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 ---- !u!1 &6964515026568296306 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7476222657412110048} - - component: {fileID: 4277184008289255055} - - component: {fileID: 1989103694703995626} - m_Layer: 0 - m_Name: Spot Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7476222657412110048 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6964515026568296306} - serializedVersion: 2 - m_LocalRotation: {x: 0.42261827, y: -0, z: -0, w: 0.9063079} - m_LocalPosition: {x: 0, y: 2.009, z: -0.507} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7511707580127947132} - m_LocalEulerAnglesHint: {x: 50, y: 0, z: 0} ---- !u!108 &4277184008289255055 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6964515026568296306} - m_Enabled: 1 - serializedVersion: 11 - m_Type: 0 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 10 - m_Range: 2.5 - m_SpotAngle: 120 - m_InnerSpotAngle: 90 - m_CookieSize: 10 - m_Shadows: - m_Type: 0 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 64 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ForceVisible: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 - m_LightUnit: 1 - m_LuxAtDistance: 1 - m_EnableSpotReflector: 1 ---- !u!114 &1989103694703995626 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6964515026568296306} + m_GameObject: {fileID: 7889117055561491011} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} @@ -318,6 +318,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2182479135931305606, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 3095965496140440094, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: _initialSkinName value: Basic @@ -330,6 +334,10 @@ PrefabInstance: propertyPath: m_Name value: RestaurantPlayer objectReference: {fileID: 0} + - target: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 6791841979869644848, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: m_Layer value: 6 @@ -354,6 +362,10 @@ PrefabInstance: propertyPath: m_LightProbeUsage value: 0 objectReference: {fileID: 0} + - target: {fileID: 8683566178618629536, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_RenderingLayerMask + value: 3 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 3365694194251356714, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} - {fileID: 127430239903465757, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} @@ -362,10 +374,10 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4993183601549197863, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} insertIndex: -1 - addedObject: {fileID: 92685501732061756} + addedObject: {fileID: 7476222657412110048} - targetCorrespondingSourceObject: {fileID: 4993183601549197863, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} insertIndex: -1 - addedObject: {fileID: 7476222657412110048} + addedObject: {fileID: 7902811446395955698} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} insertIndex: -1 From d6fa60df7f276628a31ca8798c2f8909ac9207f8 Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Tue, 12 Aug 2025 20:02:30 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EB=B0=98=ED=88=AC=EB=AA=85=20=EB=B0=8F=20?= =?UTF-8?q?=EC=8A=A4=ED=8C=8C=EC=9D=B8=20=EB=A0=8C=EB=8D=94=EB=9F=AC=20?= =?UTF-8?q?=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Settings/PC_Renderer.asset | 4 ++-- .../Props/_old/Prefabs/Old/BaseEnvironment.prefab | 15 +-------------- .../_Addressables/Prefabs/RestaurantPlayer.prefab | 12 ++++++++++-- Assets/_DDD/_Addressables/Scenes/Restaurant.unity | 2 +- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/Assets/Settings/PC_Renderer.asset b/Assets/Settings/PC_Renderer.asset index 92a61128a..c00a23ed4 100644 --- a/Assets/Settings/PC_Renderer.asset +++ b/Assets/Settings/PC_Renderer.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b979c11e4f07bdd2a3dc74b1da80d9ebe48f35ad16665e62dfb8c0b440b88c6c -size 9212 +oid sha256:c0384e7016e9f8795b79c76034b8c8334a143a2931d4a71826e4b242e236e73e +size 9172 diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/BaseEnvironment.prefab b/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/BaseEnvironment.prefab index fb3009906..08dd1af6a 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/BaseEnvironment.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/BaseEnvironment.prefab @@ -10,7 +10,6 @@ GameObject: m_Component: - component: {fileID: 7986070582027999988} - component: {fileID: 8465497525880288504} - - component: {fileID: 833125971660403034} m_Layer: 8 m_Name: BaseEnvironment m_TagString: Untagged @@ -55,18 +54,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 0.5} m_Center: {x: 0, y: 0.5, z: 0.25} ---- !u!210 &833125971660403034 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3764902268943045601} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_SortAtRoot: 0 --- !u!1 &7835622629792856689 GameObject: m_ObjectHideFlags: 0 @@ -143,7 +130,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 0 m_Sprite: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab index 013c5ef5f..a793438d1 100644 --- a/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab @@ -266,6 +266,14 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 1741467189652270979, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: zSpacing + value: -0.0005 + objectReference: {fileID: 0} + - target: {fileID: 1741467189652270979, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: addNormals + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1741467189652270979, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: initialFlipX value: 0 @@ -348,7 +356,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8683566178618629536, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8683566178618629536, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: m_SortingOrder @@ -356,7 +364,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8683566178618629536, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: m_SortingLayerID - value: 966875293 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8683566178618629536, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: m_LightProbeUsage diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity index 52fdb7f9e..04154f9e1 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity @@ -3785,7 +3785,7 @@ MonoBehaviour: initialFlipY: 0 updateWhenInvisible: 3 separatorSlotNames: [] - zSpacing: 0 + zSpacing: -0.0005 useClipping: 1 immutableTriangles: 0 pmaVertexColors: 1