diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 40352d76b..32d23c4fa 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -804,7 +804,7 @@ Transform: m_GameObject: {fileID: 211259724} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 3.57, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 1 m_Children: @@ -1077,7 +1077,7 @@ Transform: m_GameObject: {fileID: 545850347} serializedVersion: 2 m_LocalRotation: {x: 0.17364816, y: 0, z: 0, w: 0.9848078} - m_LocalPosition: {x: 0, y: 10.260604, z: -28.190779} + m_LocalPosition: {x: 3.57, y: 10.260604, z: -28.190779} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1438,7 +1438,7 @@ Transform: m_GameObject: {fileID: 873223985} serializedVersion: 2 m_LocalRotation: {x: 0.17364816, y: 0, z: 0, w: 0.9848078} - m_LocalPosition: {x: 0, y: 10.260604, z: -28.190779} + m_LocalPosition: {x: 3.57, y: 10.260604, z: -28.190779} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1517,6 +1517,38 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15c02fef22ba8d0488bd2517167c117c, type: 3} +--- !u!1 &923706277 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 923706278} + m_Layer: 0 + m_Name: Props + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &923706278 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 923706277} + 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: 1028035736} + m_Father: {fileID: 1253205195} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &988649515 GameObject: m_ObjectHideFlags: 0 @@ -1647,6 +1679,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 988649515} m_Mesh: {fileID: 0} +--- !u!1 &1028035735 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1028035736} + m_Layer: 0 + m_Name: Furnitrues + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1028035736 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1028035735} + 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: [] + m_Father: {fileID: 923706278} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1049919588 GameObject: m_ObjectHideFlags: 0 @@ -1777,7 +1840,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 50, y: 50, z: 50} + m_LocalScale: {x: 20, y: 20, z: 10} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 461791772} @@ -1805,7 +1868,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: d3c87e7ec1e83654cb2bff3178900c99, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1826,12 +1889,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 92ec0c30f0488744d8bb594477258f40, type: 3} + m_Sprite: {fileID: 21300000, guid: c19baa66304058f47b77065b3bd04588, 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_DrawMode: 2 + m_Size: {x: 2, y: 2} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1856,7 +1919,7 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1, y: 0.85, z: 0.20000005} + m_Size: {x: 2, y: 2, z: 0.20000005} m_Center: {x: 0, y: 0, z: 0.1} --- !u!1 &1222632320 GameObject: @@ -2008,6 +2071,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 461791772} + - {fileID: 923706278} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1395162455 diff --git a/Assets/01.Scenes/02.Combat.unity b/Assets/01.Scenes/02.Combat.unity index ce421cc9d..813d9e7b8 100644 --- a/Assets/01.Scenes/02.Combat.unity +++ b/Assets/01.Scenes/02.Combat.unity @@ -1653,6 +1653,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 179524db1ad20f44a8374fb83bb46495, type: 3} m_Name: m_EditorClassIdentifier: + SwitchMapsOpened: 4 + SwitchMapsClosed: 3 --- !u!1 &473280139 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/02.Scripts/Ui/ClearPopupUi.cs b/Assets/02.Scripts/Ui/ClearPopupUi.cs index 2cc2e8fba..4ec7126ed 100644 --- a/Assets/02.Scripts/Ui/ClearPopupUi.cs +++ b/Assets/02.Scripts/Ui/ClearPopupUi.cs @@ -18,7 +18,7 @@ namespace BlueWater.Uis public override void Open() { - Time.timeScale = 0f; + VisualFeedbackManager.Instance.SetBaseTimeScale(1f); PlayerInputKeyManager.Instance.DisableCurrentPlayerInput(); _moveNextStageButton.interactable = (int)DataManager.Instance.CurrentSaveStage < Enum.GetValues(typeof(SaveStage)).Length - 1; @@ -27,8 +27,8 @@ namespace BlueWater.Uis public override void Close() { - Time.timeScale = 1f; PlayerInputKeyManager.Instance.EnableCurrentPlayerInput(); + VisualFeedbackManager.Instance.SetBaseTimeScale(1f); base.Close(); } } diff --git a/Assets/02.Scripts/Ui/GameOverPopupUi.cs b/Assets/02.Scripts/Ui/GameOverPopupUi.cs index 92976ad2b..6cf5bf8ce 100644 --- a/Assets/02.Scripts/Ui/GameOverPopupUi.cs +++ b/Assets/02.Scripts/Ui/GameOverPopupUi.cs @@ -6,15 +6,15 @@ namespace BlueWater.Uis { public override void Open() { - Time.timeScale = 0f; + VisualFeedbackManager.Instance.SetBaseTimeScale(0f); PlayerInputKeyManager.Instance.DisableCurrentPlayerInput(); base.Open(); } public override void Close() { - Time.timeScale = 1f; PlayerInputKeyManager.Instance.EnableCurrentPlayerInput(); + VisualFeedbackManager.Instance.SetBaseTimeScale(1f); base.Close(); } } diff --git a/Assets/02.Scripts/Ui/MenuPopupUi.cs b/Assets/02.Scripts/Ui/MenuPopupUi.cs index 3503e93ee..0e55f5188 100644 --- a/Assets/02.Scripts/Ui/MenuPopupUi.cs +++ b/Assets/02.Scripts/Ui/MenuPopupUi.cs @@ -1,17 +1,25 @@ +using UnityEngine; + namespace BlueWater.Uis { public class MenuPopupUi : PopupUi { + [SerializeField] + protected InputActionMaps SwitchMapsOpened; + + [SerializeField] + protected InputActionMaps SwitchMapsClosed; + public override void Open() { - PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.CombatUi); VisualFeedbackManager.Instance.SetBaseTimeScale(0f); + PlayerInputKeyManager.Instance.SwitchCurrentActionMap(SwitchMapsOpened); base.Open(); } public override void Close() { - PlayerInputKeyManager.Instance.SwitchPreviousActionMap(); + PlayerInputKeyManager.Instance.SwitchCurrentActionMap(SwitchMapsClosed); VisualFeedbackManager.Instance.SetBaseTimeScale(1f); base.Close(); } diff --git a/Assets/03.Images/Maps/Tycoon.meta b/Assets/03.Images/Maps/Tycoon.meta new file mode 100644 index 000000000..fa817bf13 --- /dev/null +++ b/Assets/03.Images/Maps/Tycoon.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fde7b2499ffef824e94a33c67972556c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Maps/Tycoon/RestaurantTile.png b/Assets/03.Images/Maps/Tycoon/RestaurantTile.png new file mode 100644 index 000000000..fe8e6fa61 Binary files /dev/null and b/Assets/03.Images/Maps/Tycoon/RestaurantTile.png differ diff --git a/Assets/03.Images/Maps/Tycoon/RestaurantTile.png.meta b/Assets/03.Images/Maps/Tycoon/RestaurantTile.png.meta new file mode 100644 index 000000000..b3af0cab6 --- /dev/null +++ b/Assets/03.Images/Maps/Tycoon/RestaurantTile.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: c19baa66304058f47b77065b3bd04588 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 2048 + 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 + - serializedVersion: 4 + buildTarget: Android + 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: WindowsStoreApps + 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: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Props/Environment.meta b/Assets/03.Images/Props/Environment.meta new file mode 100644 index 000000000..efe9ad260 --- /dev/null +++ b/Assets/03.Images/Props/Environment.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e557fef296bc73d45b82e6bfa813158b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Props/Bush01.png b/Assets/03.Images/Props/Environment/Bush01.png similarity index 100% rename from Assets/03.Images/Props/Bush01.png rename to Assets/03.Images/Props/Environment/Bush01.png diff --git a/Assets/03.Images/Props/Bush01.png.meta b/Assets/03.Images/Props/Environment/Bush01.png.meta similarity index 100% rename from Assets/03.Images/Props/Bush01.png.meta rename to Assets/03.Images/Props/Environment/Bush01.png.meta diff --git a/Assets/03.Images/Props/Bush02.png b/Assets/03.Images/Props/Environment/Bush02.png similarity index 100% rename from Assets/03.Images/Props/Bush02.png rename to Assets/03.Images/Props/Environment/Bush02.png diff --git a/Assets/03.Images/Props/Bush02.png.meta b/Assets/03.Images/Props/Environment/Bush02.png.meta similarity index 100% rename from Assets/03.Images/Props/Bush02.png.meta rename to Assets/03.Images/Props/Environment/Bush02.png.meta diff --git a/Assets/03.Images/Props/DeathTree01.png b/Assets/03.Images/Props/Environment/DeathTree01.png similarity index 100% rename from Assets/03.Images/Props/DeathTree01.png rename to Assets/03.Images/Props/Environment/DeathTree01.png diff --git a/Assets/03.Images/Props/DeathTree01.png.meta b/Assets/03.Images/Props/Environment/DeathTree01.png.meta similarity index 100% rename from Assets/03.Images/Props/DeathTree01.png.meta rename to Assets/03.Images/Props/Environment/DeathTree01.png.meta diff --git a/Assets/03.Images/Props/DeathTree02.png b/Assets/03.Images/Props/Environment/DeathTree02.png similarity index 100% rename from Assets/03.Images/Props/DeathTree02.png rename to Assets/03.Images/Props/Environment/DeathTree02.png diff --git a/Assets/03.Images/Props/DeathTree02.png.meta b/Assets/03.Images/Props/Environment/DeathTree02.png.meta similarity index 100% rename from Assets/03.Images/Props/DeathTree02.png.meta rename to Assets/03.Images/Props/Environment/DeathTree02.png.meta diff --git a/Assets/03.Images/Props/FallTree01.png b/Assets/03.Images/Props/Environment/FallTree01.png similarity index 100% rename from Assets/03.Images/Props/FallTree01.png rename to Assets/03.Images/Props/Environment/FallTree01.png diff --git a/Assets/03.Images/Props/FallTree01.png.meta b/Assets/03.Images/Props/Environment/FallTree01.png.meta similarity index 100% rename from Assets/03.Images/Props/FallTree01.png.meta rename to Assets/03.Images/Props/Environment/FallTree01.png.meta diff --git a/Assets/03.Images/Props/FallTree02.png b/Assets/03.Images/Props/Environment/FallTree02.png similarity index 100% rename from Assets/03.Images/Props/FallTree02.png rename to Assets/03.Images/Props/Environment/FallTree02.png diff --git a/Assets/03.Images/Props/FallTree02.png.meta b/Assets/03.Images/Props/Environment/FallTree02.png.meta similarity index 100% rename from Assets/03.Images/Props/FallTree02.png.meta rename to Assets/03.Images/Props/Environment/FallTree02.png.meta diff --git a/Assets/03.Images/Props/Fallbush01.png b/Assets/03.Images/Props/Environment/Fallbush01.png similarity index 100% rename from Assets/03.Images/Props/Fallbush01.png rename to Assets/03.Images/Props/Environment/Fallbush01.png diff --git a/Assets/03.Images/Props/Fallbush01.png.meta b/Assets/03.Images/Props/Environment/Fallbush01.png.meta similarity index 100% rename from Assets/03.Images/Props/Fallbush01.png.meta rename to Assets/03.Images/Props/Environment/Fallbush01.png.meta diff --git a/Assets/03.Images/Props/Grass01.png b/Assets/03.Images/Props/Environment/Grass01.png similarity index 100% rename from Assets/03.Images/Props/Grass01.png rename to Assets/03.Images/Props/Environment/Grass01.png diff --git a/Assets/03.Images/Props/Grass01.png.meta b/Assets/03.Images/Props/Environment/Grass01.png.meta similarity index 100% rename from Assets/03.Images/Props/Grass01.png.meta rename to Assets/03.Images/Props/Environment/Grass01.png.meta diff --git a/Assets/03.Images/Props/Grass02.png b/Assets/03.Images/Props/Environment/Grass02.png similarity index 100% rename from Assets/03.Images/Props/Grass02.png rename to Assets/03.Images/Props/Environment/Grass02.png diff --git a/Assets/03.Images/Props/Grass02.png.meta b/Assets/03.Images/Props/Environment/Grass02.png.meta similarity index 100% rename from Assets/03.Images/Props/Grass02.png.meta rename to Assets/03.Images/Props/Environment/Grass02.png.meta diff --git a/Assets/03.Images/Props/Grass03.png b/Assets/03.Images/Props/Environment/Grass03.png similarity index 100% rename from Assets/03.Images/Props/Grass03.png rename to Assets/03.Images/Props/Environment/Grass03.png diff --git a/Assets/03.Images/Props/Grass03.png.meta b/Assets/03.Images/Props/Environment/Grass03.png.meta similarity index 100% rename from Assets/03.Images/Props/Grass03.png.meta rename to Assets/03.Images/Props/Environment/Grass03.png.meta diff --git a/Assets/03.Images/Props/Grass04.png b/Assets/03.Images/Props/Environment/Grass04.png similarity index 100% rename from Assets/03.Images/Props/Grass04.png rename to Assets/03.Images/Props/Environment/Grass04.png diff --git a/Assets/03.Images/Props/Grass04.png.meta b/Assets/03.Images/Props/Environment/Grass04.png.meta similarity index 100% rename from Assets/03.Images/Props/Grass04.png.meta rename to Assets/03.Images/Props/Environment/Grass04.png.meta diff --git a/Assets/03.Images/Props/Rock01.png b/Assets/03.Images/Props/Environment/Rock01.png similarity index 100% rename from Assets/03.Images/Props/Rock01.png rename to Assets/03.Images/Props/Environment/Rock01.png diff --git a/Assets/03.Images/Props/Rock01.png.meta b/Assets/03.Images/Props/Environment/Rock01.png.meta similarity index 100% rename from Assets/03.Images/Props/Rock01.png.meta rename to Assets/03.Images/Props/Environment/Rock01.png.meta diff --git a/Assets/03.Images/Props/SmallGrass01.png b/Assets/03.Images/Props/Environment/SmallGrass01.png similarity index 100% rename from Assets/03.Images/Props/SmallGrass01.png rename to Assets/03.Images/Props/Environment/SmallGrass01.png diff --git a/Assets/03.Images/Props/SmallGrass01.png.meta b/Assets/03.Images/Props/Environment/SmallGrass01.png.meta similarity index 100% rename from Assets/03.Images/Props/SmallGrass01.png.meta rename to Assets/03.Images/Props/Environment/SmallGrass01.png.meta diff --git a/Assets/03.Images/Props/SnowRock01.png b/Assets/03.Images/Props/Environment/SnowRock01.png similarity index 100% rename from Assets/03.Images/Props/SnowRock01.png rename to Assets/03.Images/Props/Environment/SnowRock01.png diff --git a/Assets/03.Images/Props/SnowRock01.png.meta b/Assets/03.Images/Props/Environment/SnowRock01.png.meta similarity index 100% rename from Assets/03.Images/Props/SnowRock01.png.meta rename to Assets/03.Images/Props/Environment/SnowRock01.png.meta diff --git a/Assets/03.Images/Props/SnowTree01.png b/Assets/03.Images/Props/Environment/SnowTree01.png similarity index 100% rename from Assets/03.Images/Props/SnowTree01.png rename to Assets/03.Images/Props/Environment/SnowTree01.png diff --git a/Assets/03.Images/Props/SnowTree01.png.meta b/Assets/03.Images/Props/Environment/SnowTree01.png.meta similarity index 100% rename from Assets/03.Images/Props/SnowTree01.png.meta rename to Assets/03.Images/Props/Environment/SnowTree01.png.meta diff --git a/Assets/03.Images/Props/SnowTree02.png b/Assets/03.Images/Props/Environment/SnowTree02.png similarity index 100% rename from Assets/03.Images/Props/SnowTree02.png rename to Assets/03.Images/Props/Environment/SnowTree02.png diff --git a/Assets/03.Images/Props/SnowTree02.png.meta b/Assets/03.Images/Props/Environment/SnowTree02.png.meta similarity index 100% rename from Assets/03.Images/Props/SnowTree02.png.meta rename to Assets/03.Images/Props/Environment/SnowTree02.png.meta diff --git a/Assets/03.Images/Props/SnowTree03.png b/Assets/03.Images/Props/Environment/SnowTree03.png similarity index 100% rename from Assets/03.Images/Props/SnowTree03.png rename to Assets/03.Images/Props/Environment/SnowTree03.png diff --git a/Assets/03.Images/Props/SnowTree03.png.meta b/Assets/03.Images/Props/Environment/SnowTree03.png.meta similarity index 100% rename from Assets/03.Images/Props/SnowTree03.png.meta rename to Assets/03.Images/Props/Environment/SnowTree03.png.meta diff --git a/Assets/03.Images/Props/Tree01.png b/Assets/03.Images/Props/Environment/Tree01.png similarity index 100% rename from Assets/03.Images/Props/Tree01.png rename to Assets/03.Images/Props/Environment/Tree01.png diff --git a/Assets/03.Images/Props/Tree01.png.meta b/Assets/03.Images/Props/Environment/Tree01.png.meta similarity index 100% rename from Assets/03.Images/Props/Tree01.png.meta rename to Assets/03.Images/Props/Environment/Tree01.png.meta diff --git a/Assets/03.Images/Props/Furniture.meta b/Assets/03.Images/Props/Furniture.meta new file mode 100644 index 000000000..9e52d463d --- /dev/null +++ b/Assets/03.Images/Props/Furniture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7b2993e5ccfec63469019a33158febe4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Props/Furniture/TableLeg.png b/Assets/03.Images/Props/Furniture/TableLeg.png new file mode 100644 index 000000000..34437fec9 Binary files /dev/null and b/Assets/03.Images/Props/Furniture/TableLeg.png differ diff --git a/Assets/03.Images/Props/Furniture/TableLeg.png.meta b/Assets/03.Images/Props/Furniture/TableLeg.png.meta new file mode 100644 index 000000000..dc203150b --- /dev/null +++ b/Assets/03.Images/Props/Furniture/TableLeg.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: 3715781c43768284da9143d381ef9ca5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 2048 + 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 + - serializedVersion: 4 + buildTarget: Android + 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: WindowsStoreApps + 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: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Props/Furniture/TableTop.png b/Assets/03.Images/Props/Furniture/TableTop.png new file mode 100644 index 000000000..416a6f809 Binary files /dev/null and b/Assets/03.Images/Props/Furniture/TableTop.png differ diff --git a/Assets/03.Images/Props/Furniture/TableTop.png.meta b/Assets/03.Images/Props/Furniture/TableTop.png.meta new file mode 100644 index 000000000..052335b86 --- /dev/null +++ b/Assets/03.Images/Props/Furniture/TableTop.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: 28d46d5b3a19fd848a0e80590ea20266 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 2048 + 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 + - serializedVersion: 4 + buildTarget: Android + 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: WindowsStoreApps + 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: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Ui/QuestBox.png b/Assets/03.Images/Ui/QuestBox.png new file mode 100644 index 000000000..54b98dbff Binary files /dev/null and b/Assets/03.Images/Ui/QuestBox.png differ diff --git a/Assets/03.Images/Ui/QuestBox.png.meta b/Assets/03.Images/Ui/QuestBox.png.meta new file mode 100644 index 000000000..fca89b6d0 --- /dev/null +++ b/Assets/03.Images/Ui/QuestBox.png.meta @@ -0,0 +1,164 @@ +fileFormatVersion: 2 +guid: 0a1818f6cfb80244183c6206428bf094 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 1024 + 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 + - serializedVersion: 4 + buildTarget: Android + 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: WindowsStoreApps + 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: + - serializedVersion: 2 + name: QuestBox_0 + rect: + serializedVersion: 2 + x: 39 + y: 326 + width: 946 + height: 367 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4b9fdb0437d51174f8700df0a32d99b6 + internalID: 612642094 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + QuestBox_0: 612642094 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04.Materials/OpaqueLit.mat b/Assets/04.Materials/OpaqueLit.mat index 7c7580de9..7ebd100fd 100644 --- a/Assets/04.Materials/OpaqueLit.mat +++ b/Assets/04.Materials/OpaqueLit.mat @@ -136,8 +136,8 @@ Material: - _WorkflowMode: 0 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 0.59607846} + - _Color: {r: 1, g: 1, b: 1, a: 0.59607846} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/05.Prefabs/Props/Environment.meta b/Assets/05.Prefabs/Props/Environment.meta new file mode 100644 index 000000000..876774f5d --- /dev/null +++ b/Assets/05.Prefabs/Props/Environment.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7c94a647bf18c9544992c9dc2cbac50a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Bush02.prefab b/Assets/05.Prefabs/Props/Environment/Bush02.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Bush02.prefab rename to Assets/05.Prefabs/Props/Environment/Bush02.prefab diff --git a/Assets/05.Prefabs/Props/Bush02.prefab.meta b/Assets/05.Prefabs/Props/Environment/Bush02.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Bush02.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Bush02.prefab.meta diff --git a/Assets/05.Prefabs/Props/DeathTree01.prefab b/Assets/05.Prefabs/Props/Environment/DeathTree01.prefab similarity index 100% rename from Assets/05.Prefabs/Props/DeathTree01.prefab rename to Assets/05.Prefabs/Props/Environment/DeathTree01.prefab diff --git a/Assets/05.Prefabs/Props/DeathTree01.prefab.meta b/Assets/05.Prefabs/Props/Environment/DeathTree01.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/DeathTree01.prefab.meta rename to Assets/05.Prefabs/Props/Environment/DeathTree01.prefab.meta diff --git a/Assets/05.Prefabs/Props/DeathTree02.prefab b/Assets/05.Prefabs/Props/Environment/DeathTree02.prefab similarity index 100% rename from Assets/05.Prefabs/Props/DeathTree02.prefab rename to Assets/05.Prefabs/Props/Environment/DeathTree02.prefab diff --git a/Assets/05.Prefabs/Props/DeathTree02.prefab.meta b/Assets/05.Prefabs/Props/Environment/DeathTree02.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/DeathTree02.prefab.meta rename to Assets/05.Prefabs/Props/Environment/DeathTree02.prefab.meta diff --git a/Assets/05.Prefabs/Props/FallBush01.prefab b/Assets/05.Prefabs/Props/Environment/FallBush01.prefab similarity index 100% rename from Assets/05.Prefabs/Props/FallBush01.prefab rename to Assets/05.Prefabs/Props/Environment/FallBush01.prefab diff --git a/Assets/05.Prefabs/Props/FallBush01.prefab.meta b/Assets/05.Prefabs/Props/Environment/FallBush01.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/FallBush01.prefab.meta rename to Assets/05.Prefabs/Props/Environment/FallBush01.prefab.meta diff --git a/Assets/05.Prefabs/Props/FallTree01.prefab b/Assets/05.Prefabs/Props/Environment/FallTree01.prefab similarity index 100% rename from Assets/05.Prefabs/Props/FallTree01.prefab rename to Assets/05.Prefabs/Props/Environment/FallTree01.prefab diff --git a/Assets/05.Prefabs/Props/FallTree01.prefab.meta b/Assets/05.Prefabs/Props/Environment/FallTree01.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/FallTree01.prefab.meta rename to Assets/05.Prefabs/Props/Environment/FallTree01.prefab.meta diff --git a/Assets/05.Prefabs/Props/FallTree02.prefab b/Assets/05.Prefabs/Props/Environment/FallTree02.prefab similarity index 100% rename from Assets/05.Prefabs/Props/FallTree02.prefab rename to Assets/05.Prefabs/Props/Environment/FallTree02.prefab diff --git a/Assets/05.Prefabs/Props/FallTree02.prefab.meta b/Assets/05.Prefabs/Props/Environment/FallTree02.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/FallTree02.prefab.meta rename to Assets/05.Prefabs/Props/Environment/FallTree02.prefab.meta diff --git a/Assets/05.Prefabs/Props/SmallGrass01.prefab b/Assets/05.Prefabs/Props/Environment/SmallGrass01.prefab similarity index 100% rename from Assets/05.Prefabs/Props/SmallGrass01.prefab rename to Assets/05.Prefabs/Props/Environment/SmallGrass01.prefab diff --git a/Assets/05.Prefabs/Props/SmallGrass01.prefab.meta b/Assets/05.Prefabs/Props/Environment/SmallGrass01.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/SmallGrass01.prefab.meta rename to Assets/05.Prefabs/Props/Environment/SmallGrass01.prefab.meta diff --git a/Assets/05.Prefabs/Props/SmallGrass01Group.prefab b/Assets/05.Prefabs/Props/Environment/SmallGrass01Group.prefab similarity index 100% rename from Assets/05.Prefabs/Props/SmallGrass01Group.prefab rename to Assets/05.Prefabs/Props/Environment/SmallGrass01Group.prefab diff --git a/Assets/05.Prefabs/Props/SmallGrass01Group.prefab.meta b/Assets/05.Prefabs/Props/Environment/SmallGrass01Group.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/SmallGrass01Group.prefab.meta rename to Assets/05.Prefabs/Props/Environment/SmallGrass01Group.prefab.meta diff --git a/Assets/05.Prefabs/Props/Furniture.meta b/Assets/05.Prefabs/Props/Furniture.meta new file mode 100644 index 000000000..f6cc577d6 --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1fdc0803ca9ff874b91d9e1bf80a19d4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Furniture/BaseFurnitrueOpaqueLit.prefab b/Assets/05.Prefabs/Props/Furniture/BaseFurnitrueOpaqueLit.prefab new file mode 100644 index 000000000..71f1d2e48 --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/BaseFurnitrueOpaqueLit.prefab @@ -0,0 +1,111 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3764902268943045601 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7986070582027999988} + - component: {fileID: 2953167904248670954} + - component: {fileID: 4147700776997737566} + m_Layer: 8 + m_Name: BaseFurnitrueOpaqueLit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7986070582027999988 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3764902268943045601} + 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: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2953167904248670954 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3764902268943045601} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + 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: 2100000, guid: d3c87e7ec1e83654cb2bff3178900c99, type: 2} + 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: 0} + 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: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!65 &4147700776997737566 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3764902268943045601} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 0.5, z: 0.2} + m_Center: {x: 0, y: 0.25, z: 0} diff --git a/Assets/05.Prefabs/Props/Furniture/BaseFurnitrueOpaqueLit.prefab.meta b/Assets/05.Prefabs/Props/Furniture/BaseFurnitrueOpaqueLit.prefab.meta new file mode 100644 index 000000000..0b8ec793e --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/BaseFurnitrueOpaqueLit.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 06b1e69255a5cf549a66772b84f05858 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Furniture/Table.prefab b/Assets/05.Prefabs/Props/Furniture/Table.prefab new file mode 100644 index 000000000..cdea2c53f --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Table.prefab @@ -0,0 +1,527 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1980361952201753745 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3811134852192710656} + - component: {fileID: 8536195421963874577} + - component: {fileID: 6469022790447902844} + m_Layer: 8 + m_Name: TableTop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3811134852192710656 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1980361952201753745} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0.6, z: 0} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 8329145905272216057} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!212 &8536195421963874577 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1980361952201753745} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + 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: 2100000, guid: d3c87e7ec1e83654cb2bff3178900c99, type: 2} + 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: 21300000, guid: 28d46d5b3a19fd848a0e80590ea20266, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 12.32, y: 9.83} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!65 &6469022790447902844 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1980361952201753745} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 0.5, z: 0.21364339} + m_Center: {x: 0, y: 4.8067108e-17, z: 0.106601186} +--- !u!1 &2504212820380879328 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1677436774590684166} + - component: {fileID: 5675049590271136953} + m_Layer: 8 + m_Name: TableLeg (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1677436774590684166 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2504212820380879328} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1, y: 0.286, z: 0.5} + m_LocalScale: {x: 2, y: 2.2, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 449509999300027421} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5675049590271136953 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2504212820380879328} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + 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: 2100000, guid: d3c87e7ec1e83654cb2bff3178900c99, type: 2} + 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: 21300000, guid: 3715781c43768284da9143d381ef9ca5, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 12.32, y: 9.83} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &5318497876702386529 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 471017782293580717} + - component: {fileID: 6715788019154208649} + m_Layer: 8 + m_Name: TableLeg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &471017782293580717 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5318497876702386529} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1, y: 0.286, z: -0.5} + m_LocalScale: {x: 2, y: 2.2, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 449509999300027421} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6715788019154208649 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5318497876702386529} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + 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: 2100000, guid: d3c87e7ec1e83654cb2bff3178900c99, type: 2} + 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: 21300000, guid: 3715781c43768284da9143d381ef9ca5, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 12.32, y: 9.83} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &5732043876207189762 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8329145905272216057} + m_Layer: 8 + m_Name: Table + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8329145905272216057 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5732043876207189762} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.979, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3811134852192710656} + - {fileID: 449509999300027421} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6916466727269743424 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 449509999300027421} + m_Layer: 8 + m_Name: TableLegs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &449509999300027421 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6916466727269743424} + 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: 471017782293580717} + - {fileID: 4651152174175227733} + - {fileID: 1677436774590684166} + - {fileID: 7218991410042696144} + m_Father: {fileID: 8329145905272216057} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7595152786930832538 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4651152174175227733} + - component: {fileID: 2309493982735878229} + m_Layer: 8 + m_Name: TableLeg (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4651152174175227733 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7595152786930832538} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1, y: 0.286, z: -0.5} + m_LocalScale: {x: 2, y: 2.2, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 449509999300027421} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2309493982735878229 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7595152786930832538} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + 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: 2100000, guid: d3c87e7ec1e83654cb2bff3178900c99, type: 2} + 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: 21300000, guid: 3715781c43768284da9143d381ef9ca5, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 12.32, y: 9.83} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &8260513296096090349 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7218991410042696144} + - component: {fileID: 7138221218382436191} + m_Layer: 8 + m_Name: TableLeg (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7218991410042696144 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8260513296096090349} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1, y: 0.286, z: 0.5} + m_LocalScale: {x: 2, y: 2.2, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 449509999300027421} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7138221218382436191 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8260513296096090349} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + 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: 2100000, guid: d3c87e7ec1e83654cb2bff3178900c99, type: 2} + 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: 21300000, guid: 3715781c43768284da9143d381ef9ca5, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 12.32, y: 9.83} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/05.Prefabs/Props/Furniture/Table.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Table.prefab.meta new file mode 100644 index 000000000..39ee305ff --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Table.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dc2c95fd8209ed543ba0e92fd6de6e62 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Uis/ItemLootInfoUi.prefab b/Assets/05.Prefabs/Uis/ItemLootInfoUi.prefab index 3685c8db0..71119e7fd 100644 --- a/Assets/05.Prefabs/Uis/ItemLootInfoUi.prefab +++ b/Assets/05.Prefabs/Uis/ItemLootInfoUi.prefab @@ -198,14 +198,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.36078432, g: 0.34509805, b: 0.34117648, a: 0.39215687} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 612642094, guid: 0a1818f6cfb80244183c6206428bf094, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -230,6 +230,8 @@ MonoBehaviour: _itemImage: {fileID: 521307256957815083} _itemNameText: {fileID: 2566633392395074932} _totalItemCountText: {fileID: 3485473602148659666} + _moveDuration: 0.5 + _showDuration: 2 --- !u!1 &7705100688492996814 GameObject: m_ObjectHideFlags: 0