diff --git a/Assets/AddressableAssetsData/AssetGroups/Group.asset b/Assets/AddressableAssetsData/AssetGroups/Group.asset index 0b104ed75..9fe6744b0 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Group.asset @@ -134,6 +134,12 @@ MonoBehaviour: m_SerializedLabels: - Scene FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: bdaaf61c74a901948adb2ec33a16f303 + m_Address: TEst + m_ReadOnly: 0 + m_SerializedLabels: + - Atlas + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: c6d19267dabc844449cc778f2f03fb34 m_Address: SummerGrass01_SkeletonData m_ReadOnly: 0 diff --git a/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph b/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph index 4e5acbda3..a167b2cfa 100644 --- a/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph +++ b/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph @@ -1327,7 +1327,7 @@ "m_ObjectId": "0a13e827cdfd469e87dda752ac9ed76a", "m_Title": "NormalMap", "m_Position": { - "x": -731.9998779296875, + "x": -731.999755859375, "y": -1098.0 } } @@ -2282,8 +2282,8 @@ "m_ObjectId": "30eb404d377b4ee995f488277ff0881a", "m_Title": "Emission", "m_Position": { - "x": -306.9999694824219, - "y": 118.9998779296875 + "x": -307.0, + "y": 119.00021362304688 } } @@ -2375,8 +2375,8 @@ "m_ObjectId": "3923201a51e041c9a8a1c2dad2fbf086", "m_Title": "Maps", "m_Position": { - "x": -1006.9998779296875, - "y": -682.0 + "x": -1006.999755859375, + "y": -682.0000610351563 } } @@ -3053,7 +3053,7 @@ "m_ObjectId": "5e93511e3b064f71b54a63214c2b625c", "m_Title": "Main UVs", "m_Position": { - "x": -2343.999755859375, + "x": -2344.0, "y": -617.0 } } @@ -3123,7 +3123,7 @@ "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", "m_ObjectId": "634699490c584c1fbc36531946fd235e", "m_Id": 0, - "m_DisplayName": "Map_MetallicOcclusionHeightSmoothness", + "m_DisplayName": "MaskMap_MOHS", "m_SlotType": 1, "m_Hidden": false, "m_ShaderOutputName": "Out", @@ -3401,8 +3401,8 @@ "m_ObjectId": "7062b1d5057b4266b6f536a6c9279cea", "m_Title": "Smoothness", "m_Position": { - "x": -141.9998779296875, - "y": -121.00004577636719 + "x": -142.0, + "y": -121.0 } } @@ -3534,7 +3534,7 @@ "m_DefaultRefNameVersion": 1, "m_RefNameGeneratedByDisplayName": "Normal Map", "m_DefaultReferenceName": "Normal_Map", - "m_OverrideReferenceName": "_BumpMap", + "m_OverrideReferenceName": "_Normal", "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", @@ -3989,8 +3989,8 @@ "m_ObjectId": "840e4948a2894ca1bd6c9e7e0d9bf623", "m_Title": "Metallic", "m_Position": { - "x": -145.00001525878907, - "y": -657.0000610351563 + "x": -145.0, + "y": -657.0001220703125 } } @@ -4463,11 +4463,11 @@ "m_Guid": { "m_GuidSerialized": "33adf08c-516a-4b29-9b2f-d658d6023fea" }, - "m_Name": "Map_MetallicOcclusionHeightSmoothness", + "m_Name": "MaskMap_MOHS", "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "Map_MetallicOcclusionHeightSmoothness", - "m_DefaultReferenceName": "_Map_MetallicOcclusionHeightSmoothness", - "m_OverrideReferenceName": "_MetallicGlossMap", + "m_RefNameGeneratedByDisplayName": "MaskMap_MOHS", + "m_DefaultReferenceName": "_MaskMap_MOHS", + "m_OverrideReferenceName": "_MOHS", "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", @@ -4687,7 +4687,7 @@ "m_ObjectId": "a79adeb299a4447aa2aa6b76e1e220d0", "m_Title": "BaseColor", "m_Position": { - "x": -589.0, + "x": -588.999755859375, "y": -1434.0 } } @@ -4697,7 +4697,7 @@ "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", "m_ObjectId": "a81405bb4642429b8c04bb7dd70316e1", "m_Id": 0, - "m_DisplayName": "Map_MetallicOcclusionHeightSmoothness", + "m_DisplayName": "MaskMap_MOHS", "m_SlotType": 1, "m_Hidden": false, "m_ShaderOutputName": "Out", @@ -4936,8 +4936,8 @@ "m_ObjectId": "b4ab1432e21d4fdcadb52c542f96596b", "m_Title": "Occlusion", "m_Position": { - "x": -149.99986267089845, - "y": -425.0 + "x": -149.99978637695313, + "y": -425.0001220703125 } } @@ -5019,7 +5019,7 @@ "m_DefaultRefNameVersion": 1, "m_RefNameGeneratedByDisplayName": "Emission Map", "m_DefaultReferenceName": "_Emission_Map", - "m_OverrideReferenceName": "_EmissionMap", + "m_OverrideReferenceName": "_Emiss", "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", @@ -5334,8 +5334,8 @@ "m_ObjectId": "c5fa6721aa814cd3b24fca69c6e5c5fa", "m_Title": "UV", "m_Position": { - "x": -1659.999755859375, - "y": -817.0 + "x": -1660.0, + "y": -817.0000610351563 } } diff --git a/Assets/_DDD/Restaurant/Environments/Env_Unlit.prefab b/Assets/_DDD/Restaurant/Environments/Env_Unlit.prefab new file mode 100644 index 000000000..6e5ab97c9 --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Env_Unlit.prefab @@ -0,0 +1,121 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2657423305549939101 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6187678082237817855} + - component: {fileID: 3463077198689503016} + m_Layer: 0 + m_Name: VisualLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6187678082237817855 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2657423305549939101} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2084900895006646920} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &3463077198689503016 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2657423305549939101} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &6022500804847150892 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2084900895006646920} + m_Layer: 0 + m_Name: Env_Unlit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2084900895006646920 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6022500804847150892} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6187678082237817855} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/_DDD/Restaurant/Environments/Env_Unlit.prefab.meta b/Assets/_DDD/Restaurant/Environments/Env_Unlit.prefab.meta new file mode 100644 index 000000000..f1d422491 --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Env_Unlit.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 536180d2161f3479e8f24b85cda06fd2 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments.meta b/Assets/_DDD/_Addressables/Environments.meta new file mode 100644 index 000000000..74a9e23fe --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b91bc39ff9c7c4ef58f61a5f335ca2af +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Foods.meta b/Assets/_DDD/_Addressables/Environments/Foods.meta new file mode 100644 index 000000000..1083c8a31 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Foods.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9b35ab787d8b0437098e77d47aed46c3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Foods/BarrelTestFood.meta b/Assets/_DDD/_Addressables/Environments/Foods/BarrelTestFood.meta new file mode 100644 index 000000000..37a8bfc66 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Foods/BarrelTestFood.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3140e5f62496848a9abb823d2016cd77 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Foods/BarrelTestFood/FoodBarrelTestFood.prefab b/Assets/_DDD/_Addressables/Environments/Foods/BarrelTestFood/FoodBarrelTestFood.prefab new file mode 100644 index 000000000..458621cee --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Foods/BarrelTestFood/FoodBarrelTestFood.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &8152534763188943799 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3849439458660134528, guid: 8108ecb638808448dbf086652864796a, type: 3} + propertyPath: m_Name + value: FoodBarrelTestFood + objectReference: {fileID: 0} + - target: {fileID: 6264680826521292420, guid: 8108ecb638808448dbf086652864796a, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 15a478c10efef4068bb8e8a93048a40a, type: 3} + - target: {fileID: 8795743417363065636, guid: 8108ecb638808448dbf086652864796a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8795743417363065636, guid: 8108ecb638808448dbf086652864796a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8795743417363065636, guid: 8108ecb638808448dbf086652864796a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8795743417363065636, guid: 8108ecb638808448dbf086652864796a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8795743417363065636, guid: 8108ecb638808448dbf086652864796a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8795743417363065636, guid: 8108ecb638808448dbf086652864796a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8795743417363065636, guid: 8108ecb638808448dbf086652864796a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8795743417363065636, guid: 8108ecb638808448dbf086652864796a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8795743417363065636, guid: 8108ecb638808448dbf086652864796a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8795743417363065636, guid: 8108ecb638808448dbf086652864796a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8108ecb638808448dbf086652864796a, type: 3} diff --git a/Assets/_DDD/_Addressables/Environments/Foods/BarrelTestFood/FoodBarrelTestFood.prefab.meta b/Assets/_DDD/_Addressables/Environments/Foods/BarrelTestFood/FoodBarrelTestFood.prefab.meta new file mode 100644 index 000000000..465e85c70 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Foods/BarrelTestFood/FoodBarrelTestFood.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 46dd69de07b704843a8c376995da2eb5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props.meta b/Assets/_DDD/_Addressables/Environments/Props.meta new file mode 100644 index 000000000..4b929d77c --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Props.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e72ae77fb824b4ec8bebcdcdac5bbfd0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp.meta b/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp.meta new file mode 100644 index 000000000..69ac6475a --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 11ee7a37b72e54ce886e741ee9fdabde +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/BarrelTestProp.mat b/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/BarrelTestProp.mat new file mode 100644 index 000000000..a7b291b53 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/BarrelTestProp.mat @@ -0,0 +1,108 @@ +%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: 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: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: + - 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} + - _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} + - 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: 1 + - _Cull: 2 + - _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 + - _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 +--- !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/Props/BarrelTestProp/BarrelTestProp.mat.meta b/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/BarrelTestProp.mat.meta new file mode 100644 index 000000000..3b46d3fff --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/BarrelTestProp.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 700b1d73671ee424dadd18a1443e7b7b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/PropBarrelTestProp.prefab b/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/PropBarrelTestProp.prefab new file mode 100644 index 000000000..0b3a1418f --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/PropBarrelTestProp.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &9036100666493318766 +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: PropBarrelTestProp + objectReference: {fileID: 0} + - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 700b1d73671ee424dadd18a1443e7b7b, 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/Props/BarrelTestProp/PropBarrelTestProp.prefab.meta b/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/PropBarrelTestProp.prefab.meta new file mode 100644 index 000000000..1e8c2b340 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Props/BarrelTestProp/PropBarrelTestProp.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7a110f482049d4062b4545dc94852fea +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Tiles.meta b/Assets/_DDD/_Addressables/Environments/Tiles.meta new file mode 100644 index 000000000..39fc3c018 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Tiles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 304ca71daceb442e9a2d77d0ae9b9d1a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile.meta b/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile.meta new file mode 100644 index 000000000..029802477 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e89c0aea2d3ff4247b6974c9c257bcfe +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/BarrelTestTile.mat b/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/BarrelTestTile.mat new file mode 100644 index 000000000..d131219b4 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/BarrelTestTile.mat @@ -0,0 +1,108 @@ +%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 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BarrelTestTile + 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: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Base: + m_Texture: {fileID: 2800000, guid: 9e3e41f5375f0477ea843b5f6aff3e9c, 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: efc0a8a7da4244e4ca3716534343b9e7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal: + m_Texture: {fileID: 2800000, guid: 5065b680750834465b52cebe19f5b46e, type: 3} + 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: 1 + - _Cull: 2 + - _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 + - _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/Tiles/BarrelTestTile/BarrelTestTile.mat.meta b/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/BarrelTestTile.mat.meta new file mode 100644 index 000000000..31a88dea1 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/BarrelTestTile.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2986d47c2acd84257866fc5e3180f833 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/TileBarrelTestTile.prefab b/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/TileBarrelTestTile.prefab new file mode 100644 index 000000000..5c4399f72 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/TileBarrelTestTile.prefab @@ -0,0 +1,63 @@ +%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/_Addressables/Environments/Tiles/BarrelTestTile/TileBarrelTestTile.prefab.meta b/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/TileBarrelTestTile.prefab.meta new file mode 100644 index 000000000..129e70375 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Tiles/BarrelTestTile/TileBarrelTestTile.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cd49da51493584ecf98e21cd4eeb3e2b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments.meta b/Assets/_DDD/_Raw/Environments.meta new file mode 100644 index 000000000..267cff357 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4e0dbc016d2c12f4c99558ee241527c2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/Restaurant/Environments/Env_Mesh_Prop.prefab b/Assets/_DDD/_Raw/Environments/Env_Mesh_Prop.prefab similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Env_Mesh_Prop.prefab rename to Assets/_DDD/_Raw/Environments/Env_Mesh_Prop.prefab diff --git a/Assets/_DDD/Restaurant/Environments/Env_Mesh_Prop.prefab.meta b/Assets/_DDD/_Raw/Environments/Env_Mesh_Prop.prefab.meta similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Env_Mesh_Prop.prefab.meta rename to Assets/_DDD/_Raw/Environments/Env_Mesh_Prop.prefab.meta diff --git a/Assets/_DDD/Restaurant/Environments/Env_Sprite_Background.prefab b/Assets/_DDD/_Raw/Environments/Env_Sprite_Background.prefab similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Env_Sprite_Background.prefab rename to Assets/_DDD/_Raw/Environments/Env_Sprite_Background.prefab diff --git a/Assets/_DDD/Restaurant/Environments/Env_Sprite_Background.prefab.meta b/Assets/_DDD/_Raw/Environments/Env_Sprite_Background.prefab.meta similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Env_Sprite_Background.prefab.meta rename to Assets/_DDD/_Raw/Environments/Env_Sprite_Background.prefab.meta diff --git a/Assets/_DDD/_Raw/Environments/Env_Unlit_Food.prefab b/Assets/_DDD/_Raw/Environments/Env_Unlit_Food.prefab new file mode 100644 index 000000000..995e24a44 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Env_Unlit_Food.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7421875389555018156 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2084900895006646920, guid: 536180d2161f3479e8f24b85cda06fd2, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2084900895006646920, guid: 536180d2161f3479e8f24b85cda06fd2, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2084900895006646920, guid: 536180d2161f3479e8f24b85cda06fd2, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2084900895006646920, guid: 536180d2161f3479e8f24b85cda06fd2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2084900895006646920, guid: 536180d2161f3479e8f24b85cda06fd2, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2084900895006646920, guid: 536180d2161f3479e8f24b85cda06fd2, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2084900895006646920, guid: 536180d2161f3479e8f24b85cda06fd2, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2084900895006646920, guid: 536180d2161f3479e8f24b85cda06fd2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2084900895006646920, guid: 536180d2161f3479e8f24b85cda06fd2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2084900895006646920, guid: 536180d2161f3479e8f24b85cda06fd2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3463077198689503016, guid: 536180d2161f3479e8f24b85cda06fd2, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 70aebc98d60422b4fa30aa5da1fe3623, type: 2} + - target: {fileID: 6022500804847150892, guid: 536180d2161f3479e8f24b85cda06fd2, type: 3} + propertyPath: m_Name + value: Env_Unlit_Food + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 536180d2161f3479e8f24b85cda06fd2, type: 3} diff --git a/Assets/_DDD/_Raw/Environments/Env_Unlit_Food.prefab.meta b/Assets/_DDD/_Raw/Environments/Env_Unlit_Food.prefab.meta new file mode 100644 index 000000000..d20ad0804 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Env_Unlit_Food.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8108ecb638808448dbf086652864796a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Foods.meta b/Assets/_DDD/_Raw/Environments/Foods.meta new file mode 100644 index 000000000..74d55c6c5 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Foods.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 11fc7cf31212747faa8f0ea9eca376ea +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Foods/BarrelTestFood.meta b/Assets/_DDD/_Raw/Environments/Foods/BarrelTestFood.meta new file mode 100644 index 000000000..0fe9c1eb0 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Foods/BarrelTestFood.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 18c1dfd6cd16b40b7ad0cfe2831fcc74 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Foods/BarrelTestFood/Barrel_BaseColor.png b/Assets/_DDD/_Raw/Environments/Foods/BarrelTestFood/Barrel_BaseColor.png new file mode 100644 index 000000000..5b48e3d9a --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Foods/BarrelTestFood/Barrel_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04d68b3aa51e352f04c7514e896e750fe4f68676443b51b705440d3634b6e3ab +size 180154 diff --git a/Assets/_DDD/_Raw/Environments/Foods/BarrelTestFood/Barrel_BaseColor.png.meta b/Assets/_DDD/_Raw/Environments/Foods/BarrelTestFood/Barrel_BaseColor.png.meta new file mode 100644 index 000000000..0c10340f9 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Foods/BarrelTestFood/Barrel_BaseColor.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 15a478c10efef4068bb8e8a93048a40a +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/Props.meta b/Assets/_DDD/_Raw/Environments/Props.meta new file mode 100644 index 000000000..8acdf8e17 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Props.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d58c8943d350249438b6899760c896c8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp.meta b/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp.meta new file mode 100644 index 000000000..aea25f548 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f7b3163e5eb4d4a5c977195f01d5e746 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_BaseColor.png b/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_BaseColor.png new file mode 100644 index 000000000..5b48e3d9a --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04d68b3aa51e352f04c7514e896e750fe4f68676443b51b705440d3634b6e3ab +size 180154 diff --git a/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_BaseColor.png.meta b/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_BaseColor.png.meta new file mode 100644 index 000000000..0da6afc99 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_BaseColor.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 3be98eb8461344cf19e8d0698c18d9fe +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/Props/BarrelTestProp/Barrel_MOHS.png b/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_MOHS.png new file mode 100644 index 000000000..99c5f1411 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_MOHS.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3788ed993ee6256d715ed62d4e73bd672aa152509df18f78cb056caec9fc3038 +size 391516 diff --git a/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_MOHS.png.meta b/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_MOHS.png.meta new file mode 100644 index 000000000..bd3c0d031 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_MOHS.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: c86e16527dc8841eabd95bd7d867e6d8 +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/Props/BarrelTestProp/Barrel_Normal.png b/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_Normal.png new file mode 100644 index 000000000..116e64b21 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d8cdab7ce406afabc98ac47e88cb3f9c76c87f44246d898f383147e92f994e9 +size 174518 diff --git a/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_Normal.png.meta b/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_Normal.png.meta new file mode 100644 index 000000000..4261b873b --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Props/BarrelTestProp/Barrel_Normal.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 2187501ce91064de6bc2fb7df8864050 +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/Tiles.meta b/Assets/_DDD/_Raw/Environments/Tiles.meta new file mode 100644 index 000000000..122c0df1b --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Tiles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ba12ebeb9c43e44ffa3a74fcc884069d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile.meta b/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile.meta new file mode 100644 index 000000000..728d36999 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b74f19f2e16294f5c93f63a1058b7d7d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_BaseColor.png b/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_BaseColor.png new file mode 100644 index 000000000..5b48e3d9a --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04d68b3aa51e352f04c7514e896e750fe4f68676443b51b705440d3634b6e3ab +size 180154 diff --git a/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_BaseColor.png.meta b/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_BaseColor.png.meta new file mode 100644 index 000000000..7cba6b8f1 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_BaseColor.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 9e3e41f5375f0477ea843b5f6aff3e9c +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/Tiles/BarrelTestTile/Barrel_MOHS.png b/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_MOHS.png new file mode 100644 index 000000000..99c5f1411 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_MOHS.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3788ed993ee6256d715ed62d4e73bd672aa152509df18f78cb056caec9fc3038 +size 391516 diff --git a/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_MOHS.png.meta b/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_MOHS.png.meta new file mode 100644 index 000000000..313060a90 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_MOHS.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: efc0a8a7da4244e4ca3716534343b9e7 +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/Tiles/BarrelTestTile/Barrel_Normal.png b/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_Normal.png new file mode 100644 index 000000000..116e64b21 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d8cdab7ce406afabc98ac47e88cb3f9c76c87f44246d898f383147e92f994e9 +size 174518 diff --git a/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_Normal.png.meta b/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_Normal.png.meta new file mode 100644 index 000000000..0f90d5b66 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Tiles/BarrelTestTile/Barrel_Normal.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 5065b680750834465b52cebe19f5b46e +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/_Scripts/AssetPostprocessors/AssetPostProcessors.cs b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostProcessors.cs index 10841c498..c5fca9a11 100644 --- a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostProcessors.cs +++ b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostProcessors.cs @@ -1,7 +1,6 @@ #if UNITY_EDITOR using UnityEngine; using UnityEditor; -using UnityEngine.Networking; namespace DDD { @@ -28,6 +27,10 @@ private void OnPreprocessTexture() AssetPostprocessorSprite.OnPreprocessTexture(importer); } } + else if (upperPath.Contains(PathConstants.RawEnvironmentsPathUpper)) + { + AssetPostprocessorEnvironment.OnPreprocessTexture(importer); + } } public static void OnPostprocessAllAssets(string[] importedAssets, string[] deleteAssets, string[] movedAssets, @@ -75,7 +78,7 @@ public static void OnPostprocessAllAssets(string[] importedAssets, string[] dele } AssetPostprocessorSprite.BuildTarget(); - AssetPostprocessorSprite.BuildTarget(); + AssetPostprocessorEnvironment.BuildTarget(); } private static void PostRemove(string path, string movePath = "") @@ -83,6 +86,7 @@ private static void PostRemove(string path, string movePath = "") try { AssetPostprocessorSprite.OnRemove(path, movePath); + AssetPostprocessorEnvironment.OnRemove(path); } catch (System.Exception e) { @@ -95,6 +99,7 @@ private static void PostAdd(string path) try { AssetPostprocessorSprite.OnAdd(path); + AssetPostprocessorEnvironment.OnAdd(path); } catch (System.Exception e) { diff --git a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorEnvironment.cs b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorEnvironment.cs new file mode 100644 index 000000000..2a9c9f18f --- /dev/null +++ b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorEnvironment.cs @@ -0,0 +1,278 @@ +#if UNITY_EDITOR +using System.Collections.Generic; +using System.IO; +using UnityEditor; +using UnityEditor.AddressableAssets; +using UnityEditor.AddressableAssets.Settings; +using UnityEngine; + +namespace DDD +{ + public static class AssetPostprocessorEnvironment + { + private static readonly HashSet TileTargetPaths = new(); + private static readonly HashSet PropTargetPaths = new(); + private static readonly HashSet FoodTargetPaths = new(); + + private const string BasePrefabPath_Prop = "Assets/_DDD/_Raw/Environments/Env_Mesh_Prop.prefab"; + private const string BasePrefabPath_Tile = "Assets/_DDD/_Raw/Environments/Env_Sprite_Background.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 + { + Tile, + Prop, + Food + } + + public static void OnPreprocessTexture(TextureImporter importer) + { + var path = importer.assetPath; + string fileNameUpper = Utils.FileName(path).ToUpper(); + + if (fileNameUpper.Contains(NormalUpper)) + { + importer.textureType = TextureImporterType.NormalMap; + } + else if (fileNameUpper.Contains(BaseUpper)) + { + importer.textureType = TextureImporterType.Sprite; + importer.spriteImportMode = SpriteImportMode.Single; + } + else + { + importer.textureType = TextureImporterType.Default; + importer.sRGBTexture = true; + } + + importer.mipmapEnabled = true; + } + + public static void OnAdd(string path) + { + AddTargetPath(path); + } + + public static void OnRemove(string path, string movePath = "") + { + AddTargetPath(path); + + } + + private static void AddTargetPath(string path) + { + string upperPath = path.ToUpper(); + + if (upperPath.Contains(PathConstants.RawEnvPathUpper_Tile) && + upperPath.Contains(ExtenstionConstants.PngExtensionUpper)) + { + TileTargetPaths.Add(path); + } + else 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); + } + } + + public static void BuildMaterialAndPrefab(string path, EnvPrefabType prefabType) + { + var di = new DirectoryInfo(path); + if (!di.Exists) return; + + string folderName = di.Name; + string rawRoot = PathConstants.RawFolderPath; // "/_Raw" + 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}"; + + Utils.MakeFolderFromFilePath(materialPath); + + bool bShouldCreateMaterial = false; + bShouldCreateMaterial = prefabType != EnvPrefabType.Food; // Add conditions if needed. + if (bShouldCreateMaterial) + { + // 머티리얼 생성 또는 로드 + var mat = CreateOrLoadMaterial(path, materialPath, out var files, out var shader); + MatchTexturesToShaderProperties(shader, files, mat); + AssetDatabase.ImportAsset(materialPath, ImportAssetOptions.ForceUpdate); + AssetDatabase.SaveAssets(); + CreateMaterialPrefabVariantIfNotExist(folderName, mat, prefabPath, prefabType); + } + else // Set sprite to renderer + { + var files = Directory.GetFiles(path, $"*{ExtenstionConstants.PngExtensionLower}", + SearchOption.TopDirectoryOnly); + foreach (var file in files) + { + string texName = Path.GetFileNameWithoutExtension(file).ToUpper(); + Sprite tex = AssetDatabase.LoadAssetAtPath(file); + if (tex == null) continue; + // 셰이더 프로퍼티명과 텍스처 파일명의 접미사 매칭 + if (IsTextureMatchingPropertyBySuffix(texName, BaseUpper)) + CreateSpritePrefabVariantIfNotExist(folderName, tex, prefabPath, prefabType); + } + } + } + + private static Material CreateOrLoadMaterial(string path, string materialPath, out string[] files, out Shader shader) + { + Material mat = AssetDatabase.LoadAssetAtPath(materialPath); + if (mat == null) + { + mat = new Material(Shader.Find(ShaderName)); + AssetDatabase.CreateAsset(mat, materialPath); + } + + // PNG 텍스처 매핑 - 셰이더 프로퍼티와 텍스처 접미사 매칭 + files = Directory.GetFiles(path, $"*{ExtenstionConstants.PngExtensionLower}", SearchOption.TopDirectoryOnly); + shader = mat.shader; + return mat; + } + + private static void MatchTexturesToShaderProperties(Shader shader, string[] files, Material mat) + { + for (int i = 0; i < ShaderUtil.GetPropertyCount(shader); i++) + { + if (ShaderUtil.GetPropertyType(shader, i) != ShaderUtil.ShaderPropertyType.TexEnv) + continue; + + string propertyName = ShaderUtil.GetPropertyName(shader, i); + + foreach (var file in files) + { + string texName = Path.GetFileNameWithoutExtension(file).ToUpper(); + var tex = AssetDatabase.LoadAssetAtPath(file); + if (tex == null) continue; + + // 셰이더 프로퍼티명과 텍스처 파일명의 접미사 매칭 + if (IsTextureMatchingPropertyBySuffix(texName, propertyName)) + { + mat.SetTexture(propertyName, tex); + break; // 매칭되면 다음 프로퍼티로 + } + } + } + } + + private static bool IsTextureMatchingPropertyBySuffix(string textureName, string propertyName) + { + // 셰이더 프로퍼티명에서 접미사 추출 (예: _BaseMap -> BASEMAP) + string propertySuffix = propertyName.TrimStart('_').ToUpper(); + + // 텍스처 파일명이 해당 접미사로 끝나는지 확인 + return textureName.Contains($"_{propertySuffix}"); + } + + private static void CreateMaterialPrefabVariantIfNotExist(string folderName, Material mat, string prefabPath, EnvPrefabType prefabType) + { + if (AssetDatabase.LoadAssetAtPath(prefabPath) != null) return; + + if (InstantiatePrefabByType(folderName, prefabPath, prefabType, out var instancePrefab)) return; + + if (mat != null) + { + var renderer = instancePrefab.GetComponentInChildren(); + if (renderer != null) renderer.sharedMaterial = mat; + } + + SavePrefabInstance(prefabPath, instancePrefab); + } + + private static void CreateSpritePrefabVariantIfNotExist(string folderName, Sprite sprite, string prefabPath, + EnvPrefabType prefabType) + { + if (AssetDatabase.LoadAssetAtPath(prefabPath) != null) return; + + if (InstantiatePrefabByType(folderName, prefabPath, prefabType, out var instancePrefab)) return; + + if (sprite != null) + { + var renderer = instancePrefab.GetComponentInChildren(); + if (renderer != null) renderer.sprite = sprite; + } + + SavePrefabInstance(prefabPath, instancePrefab); + } + + private static void SavePrefabInstance(string prefabPath, GameObject instancePrefab) + { + Utils.MakeFolderFromFilePath(prefabPath); + PrefabUtility.SaveAsPrefabAssetAndConnect(instancePrefab, prefabPath, InteractionMode.AutomatedAction); + Object.DestroyImmediate(instancePrefab); + + AssetDatabase.ImportAsset(prefabPath, ImportAssetOptions.ForceUpdate); + AssetDatabase.SaveAssets(); + AssetDatabase.Refresh(); + } + + private static bool InstantiatePrefabByType(string folderName, string prefabPath, EnvPrefabType prefabType, + out GameObject instancePrefab) + { + // EnvPrefabType에 따라 베이스 프리팹 결정 + string basePrefabPath = GetBasePrefabPath(prefabType); + + var basePrefab = AssetDatabase.LoadAssetAtPath(basePrefabPath); + if (basePrefab == null) + { + Debug.LogWarning($"Base prefab not found: {basePrefabPath}"); + instancePrefab = null; + return true; + } + + instancePrefab = AssetDatabase.LoadAssetAtPath(prefabPath); + if (instancePrefab == null) + { + instancePrefab = (GameObject)PrefabUtility.InstantiatePrefab(basePrefab); + instancePrefab.name = $"{Prop}{folderName}"; + } + + return false; + } + + private static string GetBasePrefabPath(EnvPrefabType prefabType) + { + return prefabType switch + { + EnvPrefabType.Prop => BasePrefabPath_Prop, + EnvPrefabType.Tile => BasePrefabPath_Tile, + EnvPrefabType.Food => BasePrefabPath_Food, + _ => BasePrefabPath_Prop + }; + } + + public static void BuildTarget() + { + foreach (var path in TileTargetPaths) + { + BuildMaterialAndPrefab(Utils.FolderPath(path), EnvPrefabType.Tile); + } + + foreach (var path in PropTargetPaths) + { + BuildMaterialAndPrefab(Utils.FolderPath(path), EnvPrefabType.Prop); + } + + foreach (var path in FoodTargetPaths) + { + BuildMaterialAndPrefab(Utils.FolderPath(path), EnvPrefabType.Food); + } + + TileTargetPaths.Clear(); + PropTargetPaths.Clear(); + FoodTargetPaths.Clear(); + } + } +} +#endif \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorEnvironment.cs.meta b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorEnvironment.cs.meta new file mode 100644 index 000000000..bef92d840 --- /dev/null +++ b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorEnvironment.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 423ca2e84db846d08980f4821dd69f25 +timeCreated: 1754028565 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Utilities/Constants.cs b/Assets/_DDD/_Scripts/Utilities/Constants.cs index c6dd55aae..4e03e996e 100644 --- a/Assets/_DDD/_Scripts/Utilities/Constants.cs +++ b/Assets/_DDD/_Scripts/Utilities/Constants.cs @@ -42,6 +42,10 @@ public static class PathConstants public const string RawOnlyAtlasPathUpper = "ASSETS/_DDD/_RAW/SPRITES/ONLYATLAS/"; 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 static class ExtenstionConstants @@ -49,6 +53,8 @@ public static class ExtenstionConstants public const string PngExtensionUpper = ".PNG"; public const string PngExtensionLower = ".png"; public const string SpriteAtlasExtenstionLower = ".spriteatlasv2"; + public const string MaterialExtenstionLower = ".mat"; + public const string PrefabExtenstionLower = ".prefab"; } public static class SpriteConstants