diff --git a/Assets/AddressableAssetsData/AssetGroups/Group.asset b/Assets/AddressableAssetsData/AssetGroups/Group.asset index f95f579da..3303aeae9 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Group.asset @@ -1,245 +1,3 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Group - m_EditorClassIdentifier: - m_GroupName: Group - m_GUID: 30e7f67fe9aaa7849a34c9b6e2bc53ae - m_SerializeEntries: - - m_GUID: 01b8de2498ebb6a49843147da99a3c8d - m_Address: RestaurantManagementUi - m_ReadOnly: 0 - m_SerializedLabels: - - Atlas - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 034ac52b4c3fe854193b7c9c2d353be5 - m_Address: Foods - m_ReadOnly: 0 - m_SerializedLabels: - - Atlas - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 077fbb30d2367574db4211e2945acda0 - m_Address: TodayMenuSlotUi - m_ReadOnly: 0 - m_SerializedLabels: - - AnimatorController - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 0912c3de85fd61848a41575faa2794ed - m_Address: CreateEnvironmentSo - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 0e912dc7ded8c2449bc4d0e2bbf1d2bf - m_Address: BaseRestaurantEnvironment - m_ReadOnly: 0 - m_SerializedLabels: - - Prefab - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 2007acba03804024a801aee30991e439 - m_Address: Ingredients - m_ReadOnly: 0 - m_SerializedLabels: - - Atlas - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 2986d47c2acd84257866fc5e3180f833 - m_Address: BarrelTestTile - m_ReadOnly: 0 - m_SerializedLabels: - - Material - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 29d0dee3b70fbc44d992ea47012bc366 - m_Address: InventoryTestDataSo - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 29dcda970aef9584d9b157e766b8a278 - m_Address: RestaurantPlayer - m_ReadOnly: 0 - m_SerializedLabels: - - Prefab - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 2eb88deceda8c443db7ec557aaef30af - m_Address: Entry - m_ReadOnly: 0 - m_SerializedLabels: - - Scene - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 3d9cd4966de6ad949b6c2f3289f681ce - m_Address: CustomerNpc - m_ReadOnly: 0 - m_SerializedLabels: - - Prefab - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 422e501a9731145439708c6759c8c546 - m_Address: Coral_SkeletonData - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 43d183a6e5f0da746b6dbe4b447caa9e - m_Address: RestaurantProps - m_ReadOnly: 0 - m_SerializedLabels: - - Atlas - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 46dd69de07b704843a8c376995da2eb5 - m_Address: FoodBarrelTestFood - m_ReadOnly: 0 - m_SerializedLabels: - - Prefab - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 47e757b9a170ab649af14c4d7b80ac41 - m_Address: CreateRestaurantPlayerSo - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 700b1d73671ee424dadd18a1443e7b7b - m_Address: BarrelTestProp - m_ReadOnly: 0 - m_SerializedLabels: - - Material - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 79f90744c9c7ada498ba1ee8c60272d3 - m_Address: Common - m_ReadOnly: 0 - m_SerializedLabels: - - Atlas - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 7a110f482049d4062b4545dc94852fea - m_Address: PropBarrelTestProp - m_ReadOnly: 0 - m_SerializedLabels: - - Prefab - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 7d5defa51c3d6764ca544d54592fdb47 - m_Address: RestaurantManagementUi_OnlyAtlas - m_ReadOnly: 0 - m_SerializedLabels: - - Atlas - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 8073fcaf56fc7c34e996d0d47044f146 - m_Address: RestaurantManagementUi_RestaurantUiActions_InputBindingSo - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 83afdd7c8e0232443a83b09a90d0d3b1 - m_Address: InventorySlotUi - m_ReadOnly: 0 - m_SerializedLabels: - - AnimatorController - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 8c4fcb278b09f944cbfa342ace27fcd4 - m_Address: RestaurantManagementSo - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 91f41ed6ea0600f4abed98cf0bf53bc5 - m_Address: Drinks - m_ReadOnly: 0 - m_SerializedLabels: - - Atlas - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 99d3d87bd43df65488e757c43a308f36 - m_Address: ConfirmUi_RestaurantUiActions_InputBindingSo - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: a60e7a432b7eb65419f3942f4f422fb4 - m_Address: Voyage - m_ReadOnly: 0 - m_SerializedLabels: - - Scene - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: be3e2271305612d4ab3277c241ffe629 - m_Address: Restaurant2 - m_ReadOnly: 0 - m_SerializedLabels: - - Scene - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: c6d19267dabc844449cc778f2f03fb34 - m_Address: SummerGrass01_SkeletonData - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: cd49da51493584ecf98e21cd4eeb3e2b - m_Address: TileBarrelTestTile - m_ReadOnly: 0 - m_SerializedLabels: - - Prefab - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: ceeea618d8ee23642a0e56b3f963448c - m_Address: RestaurantNpc - m_ReadOnly: 0 - m_SerializedLabels: - - Prefab - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: d11d5cf80be02d7469f07db925af284a - m_Address: TabButtonUi - m_ReadOnly: 0 - m_SerializedLabels: - - Prefab - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: d530c37d61295a6498a34f20e4a70bee - m_Address: Cookwares - m_ReadOnly: 0 - m_SerializedLabels: - - Atlas - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: ddb0db863be8f254bb8a8f07d39a960e - m_Address: RestaurantPlayerDataSo - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: de073d0136201ac4cbb36dbeb4b76fb2 - m_Address: Restaurant - m_ReadOnly: 0 - m_SerializedLabels: - - Scene - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: e349efbef7b74ce47af461f7985bfdc2 - m_Address: ItemSlotUi - m_ReadOnly: 0 - m_SerializedLabels: - - Prefab - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: efc890589b4c46948885cd750384bc6f - m_Address: BasePropSpriteMaterial - m_ReadOnly: 0 - m_SerializedLabels: - - Material - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: f28a226717a80c9408dc27c756ce6e2f - m_Address: KeySlot - m_ReadOnly: 0 - m_SerializedLabels: - - Prefab - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: f9bb25b96d102c34ea2088901e9815df - m_Address: TasteHashTagSlotUi - m_ReadOnly: 0 - m_SerializedLabels: - - Prefab - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: ff07d58cdb81fca4f80b04a12d40d7d9 - m_Address: CheckListSlot - m_ReadOnly: 0 - m_SerializedLabels: - - Prefab - FlaggedDuringContentUpdateRestriction: 0 - m_ReadOnly: 0 - m_Settings: {fileID: 11400000, guid: d12ffbb6f886d48418efb0b6d15ccb88, type: 2} - m_SchemaSet: - m_Schemas: - - {fileID: 11400000, guid: 7e7c84ad73aefe14a8fe3acef1a1ef70, type: 2} - - {fileID: 11400000, guid: 446e71e39fbb9cc41bd76f6e78ea5347, type: 2} version https://git-lfs.github.com/spec/v1 -oid sha256:cd29c0cce014cb55723256f66659694982df2c6df9db2e3d31c876b405d138f7 -size 9353 +oid sha256:b6d7524997f79e40d78974a8b5692fe5db69a445e4684e09e7923120b8c7e78e +size 10724 diff --git a/Assets/Samples/Shader Graph/17.1.0/Feature Examples/Scenes/HDRPFeatureExampleScene/HDRPFeatureExampleScene Baking Set.asset b/Assets/Samples/Shader Graph/17.1.0/Feature Examples/Scenes/HDRPFeatureExampleScene/HDRPFeatureExampleScene Baking Set.asset index d00c47fb4..3fb3384ba 100644 --- a/Assets/Samples/Shader Graph/17.1.0/Feature Examples/Scenes/HDRPFeatureExampleScene/HDRPFeatureExampleScene Baking Set.asset +++ b/Assets/Samples/Shader Graph/17.1.0/Feature Examples/Scenes/HDRPFeatureExampleScene/HDRPFeatureExampleScene Baking Set.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0168813a0506d91d3dc52b55a46fbcfd2d87c956e76ba531790bf78cdde4abf8 -size 3355 +oid sha256:74e54df23c6c178b5186c5134a9accc9e2b4a4afa5fdd61cbc95bb4cb860062d +size 4870 diff --git a/Assets/Samples/Shader Graph/17.1.0/Production Ready Shaders/Scenes/HDRPProductionReadyShaders/HDRPProductionReadyShaders Baking Set.asset b/Assets/Samples/Shader Graph/17.1.0/Production Ready Shaders/Scenes/HDRPProductionReadyShaders/HDRPProductionReadyShaders Baking Set.asset index 9a755c3d8..3aec37421 100644 --- a/Assets/Samples/Shader Graph/17.1.0/Production Ready Shaders/Scenes/HDRPProductionReadyShaders/HDRPProductionReadyShaders Baking Set.asset +++ b/Assets/Samples/Shader Graph/17.1.0/Production Ready Shaders/Scenes/HDRPProductionReadyShaders/HDRPProductionReadyShaders Baking Set.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfc4f141abe7db8b05407ac2768dc9569417b955b850d39eabb7d7f10071978d -size 3061 +oid sha256:fd7a2a6680f7cc24c68d4c4bfd2cfd8da21bd3cd0392e64e6d62d453e5a9debb +size 3271 diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/Trashcan/Trashcan_Atlas.asset b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/Trashcan/Trashcan_Atlas.asset index 079efc1d6..a07c0e7d9 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/Trashcan/Trashcan_Atlas.asset +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/Trashcan/Trashcan_Atlas.asset @@ -1,19 +1,3 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: Trashcan_Atlas - m_EditorClassIdentifier: - textureLoadingMode: 0 - onDemandTextureLoader: {fileID: 0} - atlasFile: {fileID: 4900000, guid: 929d6c10894c2a448b35cc2a244da32d, type: 3} - materials: - - {fileID: 2100000, guid: 77610c722f3effb469ae2e4310b971f7, type: 2} +version https://git-lfs.github.com/spec/v1 +oid sha256:9b4c10de9a7d030d0ae09382b81c099c6f6b552c16a17fa6713c113ef0bcdaca +size 628 diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Common/EmptyWorker.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Common/EmptyWorker.png.meta index 49119b0d3..7b6ac0006 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Common/EmptyWorker.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Common/EmptyWorker.png.meta @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Cookwares/item_environment_cookware_001_icon.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Cookwares/item_environment_cookware_001_icon.png.meta index 8c38d2931..d62a0f247 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Cookwares/item_environment_cookware_001_icon.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Cookwares/item_environment_cookware_001_icon.png.meta @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Cookwares/item_environment_cookware_002_icon.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Cookwares/item_environment_cookware_002_icon.png.meta index 16f809689..c4c8dcb54 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Cookwares/item_environment_cookware_002_icon.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Cookwares/item_environment_cookware_002_icon.png.meta @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Cookwares/item_environment_cookware_003_icon.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Cookwares/item_environment_cookware_003_icon.png.meta index f92dbbefb..0c3b282da 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Cookwares/item_environment_cookware_003_icon.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Cookwares/item_environment_cookware_003_icon.png.meta @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/RestaurantStatePanel.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/RestaurantStatePanel.png.meta index 0d5cc3421..2ca9de98e 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/RestaurantStatePanel.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/RestaurantStatePanel.png.meta @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json index 9ee59ba50..b414217a2 100644 --- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -19,12 +19,12 @@ { "type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "about.identifier", - "value": "{\"m_Value\":{\"m_Major\":6,\"m_Minor\":0,\"m_Patch\":5,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}" + "value": "{\"m_Value\":{\"m_Major\":6,\"m_Minor\":0,\"m_Patch\":6,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}" }, { "type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "preferences.version", - "value": "{\"m_Value\":{\"m_Major\":6,\"m_Minor\":0,\"m_Patch\":5,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}" + "value": "{\"m_Value\":{\"m_Major\":6,\"m_Minor\":0,\"m_Patch\":6,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}" }, { "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",