diff --git a/Assets/1-arab desert/2.6.unity b/Assets/1-arab desert/2.6.unity index a0427ed..a988ac3 100644 --- a/Assets/1-arab desert/2.6.unity +++ b/Assets/1-arab desert/2.6.unity @@ -24124,238 +24124,238 @@ PrefabInstance: type: 3} propertyPath: DynamicMaterials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: f1215359928007e47b9f2abb8b75b776, type: 2} - - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, - type: 3} - propertyPath: DynamicMaterials.Array.data[1] - value: objectReference: {fileID: 9185737683893222716, guid: 09ddb1d715442654287c84a1e70ff8bb, type: 3} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[2] + propertyPath: DynamicMaterials.Array.data[1] value: objectReference: {fileID: 2100000, guid: 6d03d88399e65d7478ad3fab30e208fd, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[3] + propertyPath: DynamicMaterials.Array.data[2] value: objectReference: {fileID: 2100000, guid: a5aa59419d28d5e4aa61125d8d187d73, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[4] + propertyPath: DynamicMaterials.Array.data[3] value: objectReference: {fileID: 2100000, guid: 471fc4c83c0b20241956beab53b54fc2, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[5] + propertyPath: DynamicMaterials.Array.data[4] value: - objectReference: {fileID: 2100000, guid: e394f09dbc0871f418c6659369898a8a, type: 2} + objectReference: {fileID: 2100000, guid: f1215359928007e47b9f2abb8b75b776, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[6] + propertyPath: DynamicMaterials.Array.data[5] value: objectReference: {fileID: 2100000, guid: 9e9715fa64f836143b6797b042ef1e7c, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[7] - value: - objectReference: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, - type: 3} - propertyPath: DynamicMaterials.Array.data[8] - value: - objectReference: {fileID: 2100000, guid: a77af8adbb4f64a47a45c619b7f2c0cd, type: 2} - - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, - type: 3} - propertyPath: DynamicMaterials.Array.data[9] - value: - objectReference: {fileID: 2100000, guid: b8b331f3ce0cb7d4b86e851364730c05, type: 2} - - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, - type: 3} - propertyPath: DynamicMaterials.Array.data[10] - value: - objectReference: {fileID: 2100000, guid: af38e92b592b77d4cb4322f6f446ea90, type: 2} - - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, - type: 3} - propertyPath: DynamicMaterials.Array.data[11] - value: - objectReference: {fileID: 2100000, guid: bdfcb15a1be7a3d45b4ff1108446d3ea, type: 2} - - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, - type: 3} - propertyPath: DynamicMaterials.Array.data[12] + propertyPath: DynamicMaterials.Array.data[6] value: objectReference: {fileID: 2100000, guid: 419ae9fed5372564c995339c60fd7ebf, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[13] + propertyPath: DynamicMaterials.Array.data[7] value: objectReference: {fileID: 2100000, guid: e86e7281176dae945bd655f34805ed55, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[14] + propertyPath: DynamicMaterials.Array.data[8] value: objectReference: {fileID: 2100000, guid: 3f13a5d1eb038764b804d1aabffed55f, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[15] + propertyPath: DynamicMaterials.Array.data[9] value: objectReference: {fileID: 2100000, guid: 48f32ce8d7140f045a2c568df3a8d9bd, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[16] + propertyPath: DynamicMaterials.Array.data[10] value: objectReference: {fileID: 2100000, guid: 43d0ae848fdfe6d4495a87f8e80e386b, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[17] + propertyPath: DynamicMaterials.Array.data[11] value: objectReference: {fileID: 2100000, guid: c2af845bdfb561149b08ba13167ff040, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[18] + propertyPath: DynamicMaterials.Array.data[12] value: objectReference: {fileID: 2100000, guid: 885a01c79ffd5024489a1fb31f3fffb5, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[19] + propertyPath: DynamicMaterials.Array.data[13] value: objectReference: {fileID: 2100000, guid: b24ed807dd7dc224baf5390f46738647, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[20] + propertyPath: DynamicMaterials.Array.data[14] value: objectReference: {fileID: 2100000, guid: 9db9f48f3ee803d448488d4368a140f9, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[21] + propertyPath: DynamicMaterials.Array.data[15] value: objectReference: {fileID: 2100000, guid: b3889ddf2a4bd9346a4843eb47e0acb1, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[22] + propertyPath: DynamicMaterials.Array.data[16] value: objectReference: {fileID: 2100000, guid: 51d72acecdb1ba249957953415f8e29b, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[23] + propertyPath: DynamicMaterials.Array.data[17] value: objectReference: {fileID: 2100000, guid: a393dafb2990e2c4fa0628ace4444efa, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[24] + propertyPath: DynamicMaterials.Array.data[18] value: objectReference: {fileID: 2100000, guid: 88aa935393607b6409baa45499f5156b, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[25] + propertyPath: DynamicMaterials.Array.data[19] value: objectReference: {fileID: 2100000, guid: 5b91c5c74862dba4d9fc2e8ae3e07b70, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[26] + propertyPath: DynamicMaterials.Array.data[20] value: objectReference: {fileID: 2100000, guid: 87529c80faca0ef4a881efba652815f3, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[27] + propertyPath: DynamicMaterials.Array.data[21] value: objectReference: {fileID: 2100000, guid: 56778de2f4060f14fb06bc8cba7e30b7, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[28] + propertyPath: DynamicMaterials.Array.data[22] value: objectReference: {fileID: 2100000, guid: e01134920adbcf549ac7f52ceeb583a2, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[29] + propertyPath: DynamicMaterials.Array.data[23] value: objectReference: {fileID: 2100000, guid: 254a177cd9c57e84683d0fd3bd1be46d, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[30] + propertyPath: DynamicMaterials.Array.data[24] value: objectReference: {fileID: 2100000, guid: dd75a5d3bd47a0c489c0fd71aff39ede, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[31] + propertyPath: DynamicMaterials.Array.data[25] value: objectReference: {fileID: 2100000, guid: 49c7ed6d767622b4fadcf200017fd44f, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[32] + propertyPath: DynamicMaterials.Array.data[26] + value: + objectReference: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, + type: 3} + propertyPath: DynamicMaterials.Array.data[27] + value: + objectReference: {fileID: 2100000, guid: a77af8adbb4f64a47a45c619b7f2c0cd, type: 2} + - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, + type: 3} + propertyPath: DynamicMaterials.Array.data[28] + value: + objectReference: {fileID: 2100000, guid: b8b331f3ce0cb7d4b86e851364730c05, type: 2} + - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, + type: 3} + propertyPath: DynamicMaterials.Array.data[29] + value: + objectReference: {fileID: 2100000, guid: af38e92b592b77d4cb4322f6f446ea90, type: 2} + - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, + type: 3} + propertyPath: DynamicMaterials.Array.data[30] + value: + objectReference: {fileID: 2100000, guid: bdfcb15a1be7a3d45b4ff1108446d3ea, type: 2} + - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, + type: 3} + propertyPath: DynamicMaterials.Array.data[31] value: objectReference: {fileID: 2100000, guid: 2ba0cc9df10229148ba45ca99764d762, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[33] + propertyPath: DynamicMaterials.Array.data[32] value: objectReference: {fileID: 2100000, guid: 2f33cec77e6be55488e6a614c288fce1, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[34] + propertyPath: DynamicMaterials.Array.data[33] value: objectReference: {fileID: 2100000, guid: a20d4cbf460866441adc19feb467abc9, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[35] + propertyPath: DynamicMaterials.Array.data[34] value: objectReference: {fileID: 2100000, guid: 6be31ec5303b1a44b92374eed50d4e48, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[36] + propertyPath: DynamicMaterials.Array.data[35] value: objectReference: {fileID: 2100000, guid: 61dcb852d7161f74c8a5e8dcc64de8e9, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[37] + propertyPath: DynamicMaterials.Array.data[36] value: objectReference: {fileID: 2100000, guid: feb1219745a919e4f8b190c48a579b75, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[38] + propertyPath: DynamicMaterials.Array.data[37] value: objectReference: {fileID: 2100000, guid: 08449cb337aa5154eb9776a96efd80e4, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[39] + propertyPath: DynamicMaterials.Array.data[38] value: objectReference: {fileID: 2100000, guid: c124011a1754a804780db881a598a17e, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[40] + propertyPath: DynamicMaterials.Array.data[39] value: objectReference: {fileID: 2100000, guid: f1a07ab15fecaa84eab2e47b3bfaaff9, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[41] + propertyPath: DynamicMaterials.Array.data[40] value: objectReference: {fileID: 2100000, guid: 786128f13534cfe488a3ef6dce80e5ef, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[42] + propertyPath: DynamicMaterials.Array.data[41] value: objectReference: {fileID: 2100000, guid: 397c2fcfe58ef54439ec7bed699754a9, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[43] + propertyPath: DynamicMaterials.Array.data[42] value: objectReference: {fileID: 2100000, guid: 6a2dd6f6c7ee9fa4ea19fd3f7547cc3a, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[44] + propertyPath: DynamicMaterials.Array.data[43] value: objectReference: {fileID: 2100000, guid: bf223c28f40d06c45abf56baaefaffa6, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[45] + propertyPath: DynamicMaterials.Array.data[44] value: objectReference: {fileID: 2100000, guid: 28231051462747445b616dc8ecdd10f0, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} - propertyPath: DynamicMaterials.Array.data[46] + propertyPath: DynamicMaterials.Array.data[45] value: objectReference: {fileID: 2100000, guid: a6f828c93cc83274f99b7dfed5e5d3c3, type: 2} + - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, + type: 3} + propertyPath: DynamicMaterials.Array.data[46] + value: + objectReference: {fileID: 2100000, guid: e394f09dbc0871f418c6659369898a8a, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} propertyPath: DynamicMaterials.Array.data[47] diff --git a/Assets/Bakery/shader/Bakery_ShaderGraphHDRP.unitypackage.meta b/Assets/Bakery/shader/Bakery_ShaderGraphHDRP.unitypackage.meta deleted file mode 100644 index b0506f8..0000000 --- a/Assets/Bakery/shader/Bakery_ShaderGraphHDRP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b1b95168f2f925246bf670cb2bc2bf79 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bakery/shader/Bakery_ShaderGraphURP.unitypackage.meta b/Assets/Bakery/shader/Bakery_ShaderGraphURP.unitypackage.meta deleted file mode 100644 index 103b6af..0000000 --- a/Assets/Bakery/shader/Bakery_ShaderGraphURP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ec3754b09ac1517429546e96e7b25708 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index 8a3b466..b946757 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 406ec28216dbc3a4a93aac8428a9c881, + serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index 5a7d7c6..b35639e 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 06b4106abab0c9a4bbab391f2ea84232, + serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index cdddf4b..1def3de 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 6f534dbd52095b647b6d5843d5b26f5f, + serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index a61a571..8101274 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 27ae5ea2cc30c7643ae4a2039da38091, + serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index fd93e18..901d05e 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: eabf7d6e8f73a9649a4eb62cef5a409c, + serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index 02a50bd..da92932 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 0fb97fb6ab5bb264d99e3d24a475af6e, + serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index f8d6a21..ee4621f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: a326e83c801ff8349955d1e96b92a241, + serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, type: 2} udonAssembly: assemblyError: diff --git a/Assets/XR/XRGeneralSettings.asset b/Assets/XR/XRGeneralSettings.asset index 1eb1882..a121868 100644 --- a/Assets/XR/XRGeneralSettings.asset +++ b/Assets/XR/XRGeneralSettings.asset @@ -1,5 +1,22 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5814813666652663106 +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: f4c3631f5e58749a59194e0cf6baf6d5, type: 3} + m_Name: Android Providers + m_EditorClassIdentifier: + m_RequiresSettingsUpdate: 0 + m_AutomaticLoading: 0 + m_AutomaticRunning: 0 + m_Loaders: + - {fileID: 11400000, guid: 1f414dda34c43dc4e8de9a440e18fd5b, type: 2} --- !u!114 &-869646144760387049 MonoBehaviour: m_ObjectHideFlags: 0 @@ -74,5 +91,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3} m_Name: Android Settings m_EditorClassIdentifier: - m_LoaderManagerInstance: {fileID: 0} + m_LoaderManagerInstance: {fileID: -5814813666652663106} m_InitManagerOnStart: 0 diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index ba6209e..d925021 100644 --- a/ProjectSettings/AudioManager.asset +++ b/ProjectSettings/AudioManager.asset @@ -10,8 +10,8 @@ AudioManager: Default Speaker Mode: 2 m_SampleRate: 48000 m_DSPBufferSize: 1024 - m_VirtualVoiceCount: 64 - m_RealVoiceCount: 32 + m_VirtualVoiceCount: 32 + m_RealVoiceCount: 24 m_EnableOutputSuspension: 1 m_SpatializerPlugin: OculusSpatializer m_AmbisonicDecoderPlugin: OculusSpatializer diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 36ee04c..fdf4940 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -161,15 +161,15 @@ PlayerSettings: tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 22 - AndroidTargetSdkVersion: 0 + AndroidMinSdkVersion: 25 + AndroidTargetSdkVersion: 33 AndroidPreferredInstallLocation: 1 aotOptions: stripEngineCode: 1 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 ForceInternetPermission: 0 - ForceSDCardPermission: 0 + ForceSDCardPermission: 1 CreateWallpaper: 0 APKExpansionFiles: 0 keepLoadedShadersAlive: 0 @@ -250,7 +250,7 @@ PlayerSettings: useCustomGradlePropertiesTemplate: 0 useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 - AndroidTargetArchitectures: 1 + AndroidTargetArchitectures: 2 AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -724,7 +724,7 @@ PlayerSettings: webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: - Android: UNITY_POST_PROCESSING_STACK_V2;BAKERY_INCLUDED + Android: UNITY_POST_PROCESSING_STACK_V2;BAKERY_INCLUDED;UDONSHARP;UDON;VRC_SDK_VRCSDK3 EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2 GameCoreXboxOne: UNITY_POST_PROCESSING_STACK_V2 LinuxHeadlessSimulation: UNITY_POST_PROCESSING_STACK_V2 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 0c8e050..4d21b3e 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -4,9 +4,9 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 2 + m_CurrentQuality: 3 m_QualitySettings: - - serializedVersion: 2 + - serializedVersion: 3 name: VRC Low pixelLightCount: 4 shadows: 2 @@ -19,16 +19,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 skinWeights: 4 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 2 antiAliasing: 0 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 vSyncCount: 0 + realtimeGICPUUsage: 25 lodBias: 1 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -41,9 +45,18 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: - Android - - serializedVersion: 2 + - serializedVersion: 3 name: VRC Medium pixelLightCount: 4 shadows: 2 @@ -56,16 +69,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 skinWeights: 4 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 2 antiAliasing: 2 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 vSyncCount: 0 + realtimeGICPUUsage: 25 lodBias: 1.5 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -78,9 +95,18 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: - Android - - serializedVersion: 2 + - serializedVersion: 3 name: VRC High pixelLightCount: 8 shadows: 2 @@ -93,16 +119,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 skinWeights: 4 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 2 antiAliasing: 4 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 vSyncCount: 0 + realtimeGICPUUsage: 25 lodBias: 2 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -115,9 +145,18 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: - Android - - serializedVersion: 2 + - serializedVersion: 3 name: VRC Mobile pixelLightCount: 4 shadows: 0 @@ -130,16 +169,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 skinWeights: 4 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 2 antiAliasing: 2 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 vSyncCount: 0 + realtimeGICPUUsage: 50 lodBias: 2 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -152,6 +195,16 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: - Standalone + m_TextureMipmapLimitGroupNames: [] m_PerPlatformDefaultQuality: {}