diff --git a/Assets/GoogleMobileAds/Resources/GoogleMobileAdsSettings.asset b/Assets/GoogleMobileAds/Resources/GoogleMobileAdsSettings.asset index 8ac852f..7176e35 100644 --- a/Assets/GoogleMobileAds/Resources/GoogleMobileAdsSettings.asset +++ b/Assets/GoogleMobileAds/Resources/GoogleMobileAdsSettings.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a187246822bbb47529482707f3e0eff8, type: 3} m_Name: GoogleMobileAdsSettings m_EditorClassIdentifier: - adMobAndroidAppId: ca-app-pub-3966734202864173~2020769855 - adMobIOSAppId: ca-app-pub-3940256099942544~3347511713 + adMobAndroidAppId: ca-app-pub-3966734202864173~3172778738 + adMobIOSAppId: ca-app-pub-3966734202864173~3172778738 delayAppMeasurementInit: 0 optimizeInitialization: 0 optimizeAdLoading: 0 diff --git a/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib/AndroidManifest.xml b/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib/AndroidManifest.xml index 99f3406..eb66da0 100644 --- a/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib/AndroidManifest.xml +++ b/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib/AndroidManifest.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/Assets/Plugins/Android/androidx.annotation.annotation-1.2.0.jar.meta b/Assets/Plugins/Android/androidx.annotation.annotation-1.2.0.jar.meta index 53f2705..8daf808 100644 --- a/Assets/Plugins/Android/androidx.annotation.annotation-1.2.0.jar.meta +++ b/Assets/Plugins/Android/androidx.annotation.annotation-1.2.0.jar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 91eca8ae38d428e45a80e5b23be696bc +guid: 7cedabd625006c94f91444217df9c966 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.annotation.annotation-experimental-1.1.0.aar.meta b/Assets/Plugins/Android/androidx.annotation.annotation-experimental-1.1.0.aar.meta index 1b332d3..35eacb7 100644 --- a/Assets/Plugins/Android/androidx.annotation.annotation-experimental-1.1.0.aar.meta +++ b/Assets/Plugins/Android/androidx.annotation.annotation-experimental-1.1.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 68ec6a0203a5f3a45af69620b156fd0b +guid: 3ab81f162e287284ba0497440b9933db labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.arch.core.core-common-2.1.0.jar.meta b/Assets/Plugins/Android/androidx.arch.core.core-common-2.1.0.jar.meta index afdaaf3..4d8b280 100644 --- a/Assets/Plugins/Android/androidx.arch.core.core-common-2.1.0.jar.meta +++ b/Assets/Plugins/Android/androidx.arch.core.core-common-2.1.0.jar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 851b732d27c1c8c4ab7851bcb7b803eb +guid: 4d6bfb6403890294cad689703e30e9a5 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.1.0.aar.meta b/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.1.0.aar.meta index c57f69a..139b5db 100644 --- a/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.1.0.aar.meta +++ b/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.1.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2cbf9028781a20d49ac7e0c7057dc850 +guid: a88b83817de1e024c88dc0f41e93e242 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar.meta b/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar.meta index f849d60..6d2ee09 100644 --- a/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 56207080ccfbb2847a3953da912f4194 +guid: 97f8cf7684230f64cbf2a890c392edc9 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.browser.browser-1.4.0.aar.meta b/Assets/Plugins/Android/androidx.browser.browser-1.4.0.aar.meta index 14d9828..63307c8 100644 --- a/Assets/Plugins/Android/androidx.browser.browser-1.4.0.aar.meta +++ b/Assets/Plugins/Android/androidx.browser.browser-1.4.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7e15e4c2e341ed841899d658eb78ce90 +guid: 66713f2db54fa7c409442270a15b8ab3 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.collection.collection-1.1.0.jar.meta b/Assets/Plugins/Android/androidx.collection.collection-1.1.0.jar.meta index 8e9b21a..fc49e3e 100644 --- a/Assets/Plugins/Android/androidx.collection.collection-1.1.0.jar.meta +++ b/Assets/Plugins/Android/androidx.collection.collection-1.1.0.jar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 11472f4f4155a0c4ea24c3d40f563d8e +guid: 11c40648c614c874a9bdd26662bbac4d labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.concurrent.concurrent-futures-1.0.0.jar.meta b/Assets/Plugins/Android/androidx.concurrent.concurrent-futures-1.0.0.jar.meta index a4f4354..2549b47 100644 --- a/Assets/Plugins/Android/androidx.concurrent.concurrent-futures-1.0.0.jar.meta +++ b/Assets/Plugins/Android/androidx.concurrent.concurrent-futures-1.0.0.jar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dd129a4542c6deb419f39c450fb3ee03 +guid: 535188086b24a5b4f878d7f1b8fdec64 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar.meta b/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar.meta index 368c47e..6ea742b 100644 --- a/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 093cf7cd5a3c62a4ba95b636d1c7c70a +guid: e533532cf9074d14ca74d74c6a39f28b labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.core.core-1.6.0.aar.meta b/Assets/Plugins/Android/androidx.core.core-1.6.0.aar.meta index 61706b0..6ebafa9 100644 --- a/Assets/Plugins/Android/androidx.core.core-1.6.0.aar.meta +++ b/Assets/Plugins/Android/androidx.core.core-1.6.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fe576450ff6e12646bf6cf1cda697164 +guid: 3fcd45bb49d2f2841b5d8d380cf3ab6d labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar.meta b/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar.meta index 3d73a68..942eb14 100644 --- a/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7b1e8593ef6c445498de1ca8f63ed7f6 +guid: 02eff56ca256f964abfa9e77e19d1725 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar.meta b/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar.meta index a61124e..ce61941 100644 --- a/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5c88c6e7f908f074cb3c84e2423fb0c4 +guid: c636cea6bbce87349b45e8a539c9f7f9 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar.meta b/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar.meta index 0189d3c..6f7d1e2 100644 --- a/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6cc1c22518ee0cd4baa838386b839d0e +guid: e1d201d4672262342b9bd011637b65f3 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar.meta b/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar.meta index 63df961..072db63 100644 --- a/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c09070a4b02921a4db22fdc5bfc484ce +guid: f3c31bceaa5572544bc2fbe2d0b88f76 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar.meta b/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar.meta index 4d06e70..8236e09 100644 --- a/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6e439d61b4ac06d42b2512b6dfd7cc65 +guid: 0ed99a7a78e49da499eeffabff049016 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar.meta b/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar.meta index ffeaf49..d5b1d2f 100644 --- a/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8156bff443c070b4d81405fa5c92266c +guid: 07fc56704a71a044f8ff9a9caefe28aa labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar.meta b/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar.meta index 96ca14e..83582a7 100644 --- a/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 60473618b6477a14d9131d03b60ae259 +guid: 0d1c7db02db2b72448c3d11e89b5354f labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar.meta b/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar.meta index 1412347..c72d404 100644 --- a/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d615146296bb8b04fbf4cfc1ee95a368 +guid: 9e0194dcbdf826242bf131634a408da7 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.1.0.jar.meta b/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.1.0.jar.meta index f2f4fa5..91dd659 100644 --- a/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.1.0.jar.meta +++ b/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.1.0.jar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 93ae4fc7498158f47838025a148db9db +guid: 78728e7bb5b9d3249af65d42ee851170 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.1.0.aar.meta b/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.1.0.aar.meta index 55f872c..48220d7 100644 --- a/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.1.0.aar.meta +++ b/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.1.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fd39bfbdd1929a04796122dc7fc21816 +guid: a3dec7b0ceb1a4a4598693c2fff3115d labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.1.0.aar.meta b/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.1.0.aar.meta index 0b90055..891f19a 100644 --- a/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.1.0.aar.meta +++ b/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.1.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e9c0f378adc6e9146b7b11f255d5a7d7 +guid: 37cd201daef14514f9077e80c62c5070 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.1.0.aar.meta b/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.1.0.aar.meta index 7c82664..b63ca6a 100644 --- a/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.1.0.aar.meta +++ b/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.1.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 816ba9ff44cf111459b8d25d8b4b7d1b +guid: 3069d984d0ed54d4c8ed82b366cf1d90 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.lifecycle.lifecycle-service-2.1.0.aar.meta b/Assets/Plugins/Android/androidx.lifecycle.lifecycle-service-2.1.0.aar.meta index d1e2931..6a3ab7e 100644 --- a/Assets/Plugins/Android/androidx.lifecycle.lifecycle-service-2.1.0.aar.meta +++ b/Assets/Plugins/Android/androidx.lifecycle.lifecycle-service-2.1.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a29ed97aea8a88e41aba833a5dddc8bc +guid: 59c5b22f98781a74a8987819f21e3dbc labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar.meta b/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar.meta index c6576fe..12ab365 100644 --- a/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cdb536dc3858f0844bd25e652d339689 +guid: 3027b8d73ae3baa4cb8443a37d985281 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar.meta b/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar.meta index 9d78b70..28abbfd 100644 --- a/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 37a293d615fc32f488784f630363bf72 +guid: a7267ebe1e11b8e4d9d326c03bc62881 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar.meta b/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar.meta index b51894f..f1e1b6c 100644 --- a/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3ee11e31ba9b3b54ba78834301a8d9d9 +guid: 0ff1fb6f83ca5cf4dbaea162122d5244 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.print.print-1.0.0.aar.meta b/Assets/Plugins/Android/androidx.print.print-1.0.0.aar.meta index 45bc193..9c03083 100644 --- a/Assets/Plugins/Android/androidx.print.print-1.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.print.print-1.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9f95874020fa00045a5d8da58930a780 +guid: be1c997a9946c43479494b52e79d4512 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.room.room-common-2.2.5.jar.meta b/Assets/Plugins/Android/androidx.room.room-common-2.2.5.jar.meta index 910eba8..20f6337 100644 --- a/Assets/Plugins/Android/androidx.room.room-common-2.2.5.jar.meta +++ b/Assets/Plugins/Android/androidx.room.room-common-2.2.5.jar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2fadcc2a84ced864786404b62985ff81 +guid: 63872ea300a20e946994d1266a325116 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.room.room-runtime-2.2.5.aar.meta b/Assets/Plugins/Android/androidx.room.room-runtime-2.2.5.aar.meta index 19ccc97..e618f7c 100644 --- a/Assets/Plugins/Android/androidx.room.room-runtime-2.2.5.aar.meta +++ b/Assets/Plugins/Android/androidx.room.room-runtime-2.2.5.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1f0e92cef52a9d3438b61c717b2b6d6f +guid: c1f924b381c99f04d9600717d1964c85 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar.meta b/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar.meta index 009052f..57492f7 100644 --- a/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 49a09414d09a0dd4784fd8e084904e78 +guid: 63ed19d4d5a9c964ebbd1be591dcd080 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.sqlite.sqlite-2.1.0.aar.meta b/Assets/Plugins/Android/androidx.sqlite.sqlite-2.1.0.aar.meta index a6a7973..980bf83 100644 --- a/Assets/Plugins/Android/androidx.sqlite.sqlite-2.1.0.aar.meta +++ b/Assets/Plugins/Android/androidx.sqlite.sqlite-2.1.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c040a4832c60c5549921e0b03bf73eff +guid: a9f3b9442cd218f4188c14464621382c labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.sqlite.sqlite-framework-2.1.0.aar.meta b/Assets/Plugins/Android/androidx.sqlite.sqlite-framework-2.1.0.aar.meta index 10c7193..59d7f4a 100644 --- a/Assets/Plugins/Android/androidx.sqlite.sqlite-framework-2.1.0.aar.meta +++ b/Assets/Plugins/Android/androidx.sqlite.sqlite-framework-2.1.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cd9d161e65c91384389b0511bf110080 +guid: a439c39b2f2a44245b30fabf37a15add labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.startup.startup-runtime-1.0.0.aar b/Assets/Plugins/Android/androidx.startup.startup-runtime-1.0.0.aar index 84c96ac..3d415b0 100644 Binary files a/Assets/Plugins/Android/androidx.startup.startup-runtime-1.0.0.aar and b/Assets/Plugins/Android/androidx.startup.startup-runtime-1.0.0.aar differ diff --git a/Assets/Plugins/Android/androidx.startup.startup-runtime-1.0.0.aar.meta b/Assets/Plugins/Android/androidx.startup.startup-runtime-1.0.0.aar.meta index e3e1e1d..c816aca 100644 --- a/Assets/Plugins/Android/androidx.startup.startup-runtime-1.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.startup.startup-runtime-1.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 139b00eb129828345b07af19a0799c6e +guid: 7f9dd6d09b53e6d49819dbff031391c5 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar.meta b/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar.meta index 5733a7d..1b728be 100644 --- a/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d1c1502fb5c9ef445940455647e68fb4 +guid: c4130dd4d579e0a4bac4abe37cbddf10 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.tracing.tracing-1.0.0.aar.meta b/Assets/Plugins/Android/androidx.tracing.tracing-1.0.0.aar.meta index dadb4e6..e0b2e6a 100644 --- a/Assets/Plugins/Android/androidx.tracing.tracing-1.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.tracing.tracing-1.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5706bd3d032ee684b81c928b3d91a371 +guid: bd07c3fa51950cc419317b4e1c5d0701 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.1.aar.meta b/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.1.aar.meta index 4083872..33ec436 100644 --- a/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.1.aar.meta +++ b/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.1.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1bf0dc29034e9d04ca827b5f5426ef83 +guid: 6ed182ed97868314c88a89faf6876aac labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar.meta b/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar.meta index f1f15da..48efaf2 100644 --- a/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar.meta +++ b/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 44a3986ebb1668842bc220d9a9284717 +guid: e18c5623344ce5e4ca485d4dcfebd11e labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar b/Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar index 6138d3b..55634ad 100644 Binary files a/Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar and b/Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar differ diff --git a/Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar.meta b/Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar.meta index b08f895..6ed80dd 100644 --- a/Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar.meta +++ b/Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d8e8a22980a45914bb31561060e4ad91 +guid: c9eff852df1a06e459daed01ff3e0858 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-22.2.0.aar.meta b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-22.2.0.aar.meta index e99a26e..01cc284 100644 --- a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-22.2.0.aar.meta +++ b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-22.2.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b615948ac3c2ae84ba7e32c0eb5e368b +guid: 3d8b737ae4dab184e9f2289cb7ea2069 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-22.2.0.aar.meta b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-22.2.0.aar.meta index b5879cc..1b83e7f 100644 --- a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-22.2.0.aar.meta +++ b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-22.2.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 56f84dbe6f19ef042b68e0f9d4b94251 +guid: d88f5c7dd66cf5d4194dd02810415a90 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-18.0.0.aar.meta b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-18.0.0.aar.meta index b5ef74e..569799c 100644 --- a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-18.0.0.aar.meta +++ b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-18.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f627730d039b99c4180a39bacc84886b +guid: 7c619ddecea2e8e4780e8b775079e6e7 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-22.2.0.aar b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-22.2.0.aar index c9a3f8d..0455963 100644 Binary files a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-22.2.0.aar and b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-22.2.0.aar differ diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-22.2.0.aar.meta b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-22.2.0.aar.meta index e491b62..f8466c7 100644 --- a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-22.2.0.aar.meta +++ b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-22.2.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: eb77b7be2388a9343939418a3d3b958b +guid: efadb527439041d41aba514255ffe896 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.1.aar.meta b/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.1.aar.meta index eef294d..72db7dd 100644 --- a/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.1.aar.meta +++ b/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.1.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c16c59fd4640ba84988e8103372ba581 +guid: 84fca489a9f4bb34d83289296b54b299 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-auth-16.0.1.aar.meta b/Assets/Plugins/Android/com.google.android.gms.play-services-auth-16.0.1.aar.meta index 7535c67..48f38de 100644 --- a/Assets/Plugins/Android/com.google.android.gms.play-services-auth-16.0.1.aar.meta +++ b/Assets/Plugins/Android/com.google.android.gms.play-services-auth-16.0.1.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b6293ad7f4501544491ba02dd04453b2 +guid: 29101d46543da33489fd4b954a60d7df labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-auth-api-phone-16.0.0.aar.meta b/Assets/Plugins/Android/com.google.android.gms.play-services-auth-api-phone-16.0.0.aar.meta index 59dd527..45b6164 100644 --- a/Assets/Plugins/Android/com.google.android.gms.play-services-auth-api-phone-16.0.0.aar.meta +++ b/Assets/Plugins/Android/com.google.android.gms.play-services-auth-api-phone-16.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a3acb2a06de6ae04296d2b3aa850026e +guid: 5bd1ca89b70937246bbdec1a21ad339d labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-auth-base-16.0.0.aar.meta b/Assets/Plugins/Android/com.google.android.gms.play-services-auth-base-16.0.0.aar.meta index 7c3ed52..3875463 100644 --- a/Assets/Plugins/Android/com.google.android.gms.play-services-auth-base-16.0.0.aar.meta +++ b/Assets/Plugins/Android/com.google.android.gms.play-services-auth-base-16.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 35bb0ea04350b4c4a8c67e9c206efa8d +guid: 61709811ebfc7fc4d881119834c9ae6b labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.0.aar.meta b/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.0.aar.meta index 56c9640..0695631 100644 --- a/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.0.aar.meta +++ b/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 59b50e19afa6b0c4582459df58938386 +guid: e47d027b70be6cf4eac571f0a1c019d9 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar.meta b/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar.meta index b3dc044..9c59f3a 100644 --- a/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar.meta +++ b/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 15014946d8c9d664da9feb0a2d0038f5 +guid: 900df1315ffaa4042ab475b14b0bdee9 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-base-20.1.2.aar.meta b/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-base-20.1.2.aar.meta index ebadfbc..de38323 100644 --- a/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-base-20.1.2.aar.meta +++ b/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-base-20.1.2.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b84250e0f789c214cb965408a98d16e8 +guid: afb76ce087a371048968079fc98034c9 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-api-20.1.2.aar.meta b/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-api-20.1.2.aar.meta index 7334269..4188045 100644 --- a/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-api-20.1.2.aar.meta +++ b/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-api-20.1.2.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 23a0d8f070e1d3141bbf8305c00ea210 +guid: f340996e1661c2a4ab68dfc581e7f6e7 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar.meta b/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar.meta index 60a64cf..eef376a 100644 --- a/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar.meta +++ b/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5e1faf278f2645744816cd352dff2704 +guid: 7733e083fd8c3784cb3d8996fdbc0a19 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/com.google.android.ump.user-messaging-platform-2.0.0.aar.meta b/Assets/Plugins/Android/com.google.android.ump.user-messaging-platform-2.0.0.aar.meta index 608de0a..a4ff758 100644 --- a/Assets/Plugins/Android/com.google.android.ump.user-messaging-platform-2.0.0.aar.meta +++ b/Assets/Plugins/Android/com.google.android.ump.user-messaging-platform-2.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c61e1f2ff107f7043ad8e7c9e2bdee71 +guid: 949b7a5ad753ecd479efd6cb906fb9e9 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/com.google.guava.listenablefuture-1.0.jar.meta b/Assets/Plugins/Android/com.google.guava.listenablefuture-1.0.jar.meta index ba566b3..60b79a3 100644 --- a/Assets/Plugins/Android/com.google.guava.listenablefuture-1.0.jar.meta +++ b/Assets/Plugins/Android/com.google.guava.listenablefuture-1.0.jar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 932f093b36a175a469d70f512daf4340 +guid: 0e249d824620dff45bf6a5b40a72f782 labels: - gpsr PluginImporter: diff --git a/Assets/Plugins/Android/com.google.signin.google-signin-support-1.0.4.aar b/Assets/Plugins/Android/com.google.signin.google-signin-support-1.0.4.aar index 8472572..e1ac0ef 100644 Binary files a/Assets/Plugins/Android/com.google.signin.google-signin-support-1.0.4.aar and b/Assets/Plugins/Android/com.google.signin.google-signin-support-1.0.4.aar differ diff --git a/Assets/Plugins/Android/com.google.signin.google-signin-support-1.0.4.aar.meta b/Assets/Plugins/Android/com.google.signin.google-signin-support-1.0.4.aar.meta index 449ae05..0414b1f 100644 --- a/Assets/Plugins/Android/com.google.signin.google-signin-support-1.0.4.aar.meta +++ b/Assets/Plugins/Android/com.google.signin.google-signin-support-1.0.4.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5a09e6aa66c47a94c98ff5fdf26f7caf +guid: 48c06db517f8d5e4fb4aaf8093d318f1 labels: - gpsr PluginImporter: diff --git a/Assets/Scenes/Login.unity b/Assets/Scenes/Login.unity index a7409fb..acf805d 100644 --- a/Assets/Scenes/Login.unity +++ b/Assets/Scenes/Login.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -154,7 +154,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1460372373} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -227,13 +226,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 72577380} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 950.63477, y: 545.19165, z: -1.3904891} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &72577383 MonoBehaviour: @@ -287,7 +286,6 @@ RectTransform: m_Children: - {fileID: 530201950} m_Father: {fileID: 854720075} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -458,7 +456,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2016523076} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -579,7 +576,6 @@ RectTransform: - {fileID: 1840391355} - {fileID: 1460372373} m_Father: {fileID: 1660506358} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -672,7 +668,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1696886592} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -789,7 +784,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1696886592} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -19.325} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -865,7 +859,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 180936615} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -949,7 +942,6 @@ RectTransform: - {fileID: 850481589} - {fileID: 603375167} m_Father: {fileID: 854720075} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1115,7 +1107,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 200691246} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1195,7 +1186,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 581444913} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1275,7 +1265,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 968626100} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1357,7 +1346,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 854720075} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1478,7 +1466,6 @@ RectTransform: - {fileID: 831796138} - {fileID: 1799310642} m_Father: {fileID: 854720075} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1637,13 +1624,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 804316953} + 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: 2003006343} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &804316955 AudioSource: @@ -1774,7 +1761,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 854720075} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -1891,7 +1877,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 735234988} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1971,7 +1956,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 854720075} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2047,7 +2031,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 581444913} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2156,13 +2139,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 852246587} + 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: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &854720071 GameObject: @@ -2240,7 +2223,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -2266,7 +2251,6 @@ RectTransform: - {fileID: 180936615} - {fileID: 1696886592} m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2296,13 +2280,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 855220809} + 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: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &968626099 GameObject: @@ -2340,7 +2324,6 @@ RectTransform: - {fileID: 653822502} - {fileID: 1231595342} m_Father: {fileID: 854720075} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2510,7 +2493,6 @@ RectTransform: m_Children: - {fileID: 1637193759} m_Father: {fileID: 968626100} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2588,7 +2570,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1549363271} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2698,13 +2679,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1319665559} + 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: 2003006343} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &1319665561 AudioSource: @@ -2833,7 +2814,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1549363271} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2919,9 +2899,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -2955,13 +2943,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1449942452} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 20, y: 0, z: -10} m_LocalScale: {x: 1.8, y: 1.8, z: 1.5} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1449942457 MonoBehaviour: @@ -3092,7 +3080,6 @@ RectTransform: m_Children: - {fileID: 15356874} m_Father: {fileID: 200691246} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -3203,7 +3190,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 10 m_TargetDisplay: 0 @@ -3223,13 +3212,56 @@ RectTransform: - {fileID: 1284514893} - {fileID: 1874708325} m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1606887007 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1606887009} + - component: {fileID: 1606887008} + m_Layer: 0 + m_Name: AdsManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1606887008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1606887007} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 51ce029fa474b514fb11d81ac6802e28, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1606887009 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1606887007} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 979.7824, y: 492.10196, z: 17.034882} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1637193758 GameObject: m_ObjectHideFlags: 0 @@ -3261,7 +3293,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1231595342} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3399,7 +3430,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 11 m_TargetDisplay: 0 @@ -3418,7 +3451,6 @@ RectTransform: - {fileID: 2080452763} - {fileID: 200691246} m_Father: {fileID: 0} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3470,7 +3502,6 @@ RectTransform: - {fileID: 223821189} - {fileID: 260623676} m_Father: {fileID: 854720075} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3546,7 +3577,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 735234988} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3630,7 +3660,6 @@ RectTransform: m_Children: - {fileID: 2033423904} m_Father: {fileID: 854720075} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -3799,7 +3828,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 200691246} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -3882,7 +3910,6 @@ RectTransform: - {fileID: 2016523076} - {fileID: 2076903600} m_Father: {fileID: 1549363271} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3986,6 +4013,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2003006341} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 901.02673, y: 494.32477, z: 39.196747} m_LocalScale: {x: 1, y: 1, z: 1} @@ -3994,7 +4022,6 @@ Transform: - {fileID: 1319665560} - {fileID: 804316954} m_Father: {fileID: 0} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2016523075 GameObject: @@ -4029,7 +4056,6 @@ RectTransform: m_Children: - {fileID: 197305943} m_Father: {fileID: 1874708325} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4118,7 +4144,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1814844235} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4198,7 +4223,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1874708325} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -21.796} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -4274,7 +4298,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1660506358} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4319,3 +4342,16 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2080452762} m_CullTransparentMesh: 1 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 855220811} + - {fileID: 1449942455} + - {fileID: 852246590} + - {fileID: 854720075} + - {fileID: 1549363271} + - {fileID: 72577382} + - {fileID: 1660506358} + - {fileID: 2003006343} + - {fileID: 1606887009} diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index cfddf5e..14ac596 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -154,7 +154,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 213277236} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -237,11 +236,10 @@ RectTransform: m_Children: - {fileID: 1091632804} m_Father: {fileID: 593019634} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -42} + m_AnchoredPosition: {x: 0, y: -130.99} m_SizeDelta: {x: 700, y: 182.3441} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &46201523 @@ -377,13 +375,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 53498157} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 40, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1371508595} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &53498159 SpriteRenderer: @@ -471,6 +469,12 @@ MonoBehaviour: - {fileID: 1728859604} LinkPanel: {fileID: 304717449} FHIdInput: {fileID: 514819064} + sfxImage: {fileID: 190796293} + musicImage: {fileID: 463614637} + sprite_sfxOn: {fileID: 21300000, guid: f78abd1020f17fc4e897c65c20f7f3c2, type: 3} + sprite_sfxOff: {fileID: 21300000, guid: afbfe2a3374e7e6439d1fd6f24f14981, type: 3} + sprite_musicOn: {fileID: 21300000, guid: e771488162bd36841aeb2ec254f03b80, type: 3} + sprite_musicOff: {fileID: 21300000, guid: ff42fd7043329e04db3992bee20a0757, type: 3} --- !u!4 &72577382 Transform: m_ObjectHideFlags: 0 @@ -478,13 +482,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 72577380} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 950.63477, y: 545.19165, z: -1.3904891} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &88746874 GameObject: @@ -525,8 +529,6 @@ MonoBehaviour: rightTangent: {x: -0.5359726, y: 0.00048208237, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -535,8 +537,6 @@ MonoBehaviour: rightTangent: {x: 0.53783464, y: -0.00056660175, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -545,8 +545,6 @@ MonoBehaviour: rightTangent: {x: 2.0187497, y: 0.38778567, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -555,8 +553,6 @@ MonoBehaviour: rightTangent: {x: 0.27353573, y: 0.00046253204, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -565,8 +561,6 @@ MonoBehaviour: rightTangent: {x: -0.062002182, y: -0.57465553, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -575,8 +569,6 @@ MonoBehaviour: rightTangent: {x: -0.54391515, y: -0.00042247772, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -591,11 +583,68 @@ MonoBehaviour: m_ColliderDetail: 16 m_ColliderOffset: 0.5 m_UpdateCollider: 1 - m_OptimizeCollider: 1 - m_OptimizeGeometry: 1 m_EnableTangents: 0 m_GeometryCached: 0 m_UTess2D: 0 + m_Creator: {fileID: 0} + m_Modifiers: [] + m_ColliderSegment: + - {x: -7.3853846, y: -3.5118275} + - {x: -7.462919, y: -3.4734979} + - {x: -7.7344885, y: -3.1196246} + - {x: -7.6983, y: -2.8877048} + - {x: -7.6152744, y: -2.6433997} + - {x: -7.34101, y: -2.082646} + - {x: -7.1591177, y: -1.7775459} + - {x: -6.8772693, y: -1.3637687} + - {x: -6.4911947, y: -0.87343603} + - {x: -6.193196, y: -0.5635567} + - {x: -5.986504, y: -0.37765393} + - {x: -5.7233963, y: -0.19110987} + - {x: -5.449176, y: -0.061216116} + - {x: -5.1704173, y: -0.011142552} + - {x: -4.988349, y: -0.030188322} + - {x: -4.5722694, y: -0.14356822} + - {x: -3.6556292, y: -0.43513843} + - {x: -3.0240202, y: -0.6093232} + - {x: -2.6415687, y: -0.69588214} + - {x: -2.2283669, y: -0.770589} + - {x: -1.7444584, y: -0.82969236} + - {x: -1.2598088, y: -0.8565188} + - {x: -0.9647635, y: -0.8593359} + - {x: -0.5236485, y: -0.8309032} + - {x: -0.0797549, y: -0.76557326} + - {x: 0.3033234, y: -0.67227656} + - {x: 0.6894196, y: -0.5423232} + - {x: 1.0759759, y: -0.3813097} + - {x: 1.5053141, y: -0.17022783} + - {x: 1.9359852, y: 0.06882024} + - {x: 2.5511994, y: 0.44731832} + - {x: 3.7499123, y: 1.2618806} + - {x: 4.1940546, y: 1.5403798} + - {x: 4.3854246, y: 1.6301482} + - {x: 4.616488, y: 1.6679611} + - {x: 4.823597, y: 1.5714803} + - {x: 5.285446, y: 1.1509432} + - {x: 5.938713, y: 0.47277457} + - {x: 6.7030997, y: -0.3625012} + - {x: 7.564384, y: -1.3405285} + - {x: 8.216779, y: -2.1119733} + - {x: 8.6437235, y: -2.6496587} + - {x: 8.791569, y: -2.8636844} + - {x: 8.842677, y: -2.9748535} + - {x: 8.860329, y: -3.1396956} + - {x: 8.6039715, y: -3.4080763} + - {x: 8.192574, y: -3.5087175} + - {x: 7.679965, y: -3.563291} + - {x: 7.0409794, y: -3.596912} + - {x: 6.1628284, y: -3.6138554} + - {x: 5.155706, y: -3.6123476} + - {x: 3.6460013, y: -3.586553} + - {x: 1.6370275, y: -3.5224314} + - {x: -0.62444425, y: -3.4317436} + - {x: -6.918007, y: -3.5080879} + - {x: -7.3853846, y: -3.5118275} --- !u!1971053207 &88746876 SpriteShapeRenderer: m_ObjectHideFlags: 0 @@ -654,6 +703,7 @@ SpriteShapeRenderer: m_LocalAABB: m_Center: {x: 0.5629206, y: -0.9738171, z: 0} m_Extent: {x: 8.297409, y: 2.6417782, z: 0} + m_SpriteSortPoint: 0 --- !u!4 &88746877 Transform: m_ObjectHideFlags: 0 @@ -661,13 +711,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 88746874} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -143.57788, y: -1.7367756, z: 0.0729104} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 753870229} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &88746878 PolygonCollider2D: @@ -679,6 +729,25 @@ PolygonCollider2D: m_Enabled: 0 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -749,8 +818,8 @@ PolygonCollider2D: - {x: 1.6370275, y: -3.5224314} - {x: -0.62444425, y: -3.4317436} - {x: -6.918007, y: -3.5080879} - - {x: -7.210502, y: -3.51089} - {x: -7.3853846, y: -3.5118275} + m_UseDelaunayMesh: 0 --- !u!1 &155145304 GameObject: m_ObjectHideFlags: 0 @@ -783,7 +852,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1950278698} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -933,7 +1001,6 @@ RectTransform: - {fileID: 213277236} - {fileID: 397747028} m_Father: {fileID: 854720075} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1032,7 +1099,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 304717450} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1096,6 +1162,138 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 162714460} m_CullTransparentMesh: 1 +--- !u!1 &190796289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 190796290} + - component: {fileID: 190796292} + - component: {fileID: 190796293} + - component: {fileID: 190796291} + m_Layer: 5 + m_Name: sfx + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &190796290 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 190796289} + 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: 593019634} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -150, y: 152} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &190796291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 190796289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 190796293} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 72577381} + m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp + m_MethodName: ToggleSFX + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!222 &190796292 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 190796289} + m_CullTransparentMesh: 1 +--- !u!114 &190796293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 190796289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, 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: 21300000, guid: f78abd1020f17fc4e897c65c20f7f3c2, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &197305942 GameObject: m_ObjectHideFlags: 0 @@ -1129,7 +1327,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2016523076} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -1254,8 +1451,6 @@ MonoBehaviour: rightTangent: {x: -0.5359726, y: 0.00048208237, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -1264,8 +1459,6 @@ MonoBehaviour: rightTangent: {x: 0.53783464, y: -0.00056660175, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -1274,8 +1467,6 @@ MonoBehaviour: rightTangent: {x: 2.0187497, y: 0.38778567, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -1284,8 +1475,6 @@ MonoBehaviour: rightTangent: {x: 0.27353573, y: 0.00046253204, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -1294,8 +1483,6 @@ MonoBehaviour: rightTangent: {x: -0.062002182, y: -0.57465553, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -1304,8 +1491,6 @@ MonoBehaviour: rightTangent: {x: -0.54391515, y: -0.00042247772, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -1320,11 +1505,68 @@ MonoBehaviour: m_ColliderDetail: 16 m_ColliderOffset: 0.5 m_UpdateCollider: 1 - m_OptimizeCollider: 1 - m_OptimizeGeometry: 1 m_EnableTangents: 0 m_GeometryCached: 0 m_UTess2D: 0 + m_Creator: {fileID: 0} + m_Modifiers: [] + m_ColliderSegment: + - {x: -7.3853846, y: -3.5118275} + - {x: -7.462919, y: -3.4734979} + - {x: -7.7344885, y: -3.1196246} + - {x: -7.6983, y: -2.8877048} + - {x: -7.6152744, y: -2.6433997} + - {x: -7.34101, y: -2.082646} + - {x: -7.1591177, y: -1.7775459} + - {x: -6.8772693, y: -1.3637687} + - {x: -6.4911947, y: -0.87343603} + - {x: -6.193196, y: -0.5635567} + - {x: -5.986504, y: -0.37765393} + - {x: -5.7233963, y: -0.19110987} + - {x: -5.449176, y: -0.061216116} + - {x: -5.1704173, y: -0.011142552} + - {x: -4.988349, y: -0.030188322} + - {x: -4.5722694, y: -0.14356822} + - {x: -3.6556292, y: -0.43513843} + - {x: -3.0240202, y: -0.6093232} + - {x: -2.6415687, y: -0.69588214} + - {x: -2.2283669, y: -0.770589} + - {x: -1.7444584, y: -0.82969236} + - {x: -1.2598088, y: -0.8565188} + - {x: -0.9647635, y: -0.8593359} + - {x: -0.5236485, y: -0.8309032} + - {x: -0.0797549, y: -0.76557326} + - {x: 0.3033234, y: -0.67227656} + - {x: 0.6894196, y: -0.5423232} + - {x: 1.0759759, y: -0.3813097} + - {x: 1.5053141, y: -0.17022783} + - {x: 1.9359852, y: 0.06882024} + - {x: 2.5511994, y: 0.44731832} + - {x: 3.7499123, y: 1.2618806} + - {x: 4.1940546, y: 1.5403798} + - {x: 4.3854246, y: 1.6301482} + - {x: 4.616488, y: 1.6679611} + - {x: 4.823597, y: 1.5714803} + - {x: 5.285446, y: 1.1509432} + - {x: 5.938713, y: 0.47277457} + - {x: 6.7030997, y: -0.3625012} + - {x: 7.564384, y: -1.3405285} + - {x: 8.216779, y: -2.1119733} + - {x: 8.6437235, y: -2.6496587} + - {x: 8.791569, y: -2.8636844} + - {x: 8.842677, y: -2.9748535} + - {x: 8.860329, y: -3.1396956} + - {x: 8.6039715, y: -3.4080763} + - {x: 8.192574, y: -3.5087175} + - {x: 7.679965, y: -3.563291} + - {x: 7.0409794, y: -3.596912} + - {x: 6.1628284, y: -3.6138554} + - {x: 5.155706, y: -3.6123476} + - {x: 3.6460013, y: -3.586553} + - {x: 1.6370275, y: -3.5224314} + - {x: -0.62444425, y: -3.4317436} + - {x: -6.918007, y: -3.5080879} + - {x: -7.3853846, y: -3.5118275} --- !u!1971053207 &204007387 SpriteShapeRenderer: m_ObjectHideFlags: 0 @@ -1383,6 +1625,7 @@ SpriteShapeRenderer: m_LocalAABB: m_Center: {x: 0.5629206, y: -0.9738171, z: 0} m_Extent: {x: 8.297409, y: 2.6417782, z: 0} + m_SpriteSortPoint: 0 --- !u!4 &204007388 Transform: m_ObjectHideFlags: 0 @@ -1390,13 +1633,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 204007385} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -143.57788, y: -1.7367756, z: 0.0729104} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 753870229} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &204007389 PolygonCollider2D: @@ -1408,6 +1651,25 @@ PolygonCollider2D: m_Enabled: 0 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -1478,8 +1740,8 @@ PolygonCollider2D: - {x: 1.6370275, y: -3.5224314} - {x: -0.62444425, y: -3.4317436} - {x: -6.918007, y: -3.5080879} - - {x: -7.210502, y: -3.51089} - {x: -7.3853846, y: -3.5118275} + m_UseDelaunayMesh: 0 --- !u!1 &207153870 GameObject: m_ObjectHideFlags: 0 @@ -1512,7 +1774,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1950278698} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1613,7 +1874,6 @@ RectTransform: m_Children: - {fileID: 23123650} m_Father: {fileID: 157360000} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1795,7 +2055,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1950278698} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1942,6 +2201,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 239795865} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1950,7 +2210,6 @@ Transform: - {fileID: 449598764} - {fileID: 1219477791} m_Father: {fileID: 1449942455} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &294927377 GameObject: @@ -1981,6 +2240,25 @@ PolygonCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -2050,6 +2328,7 @@ PolygonCollider2D: - {x: 0.78, y: -1.22} - {x: 0.88, y: -1.13} - {x: 0.98999995, y: -1.0699999} + m_UseDelaunayMesh: 0 --- !u!50 &294927379 Rigidbody2D: serializedVersion: 4 @@ -2067,6 +2346,12 @@ Rigidbody2D: m_AngularDrag: 0.05 m_GravityScale: 0 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 @@ -2130,13 +2415,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 294927377} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0.10594707, w: 0.9943718} m_LocalPosition: {x: -155.2, y: 7.7, z: 0} m_LocalScale: {x: 1.4508, y: 1.4508, z: 1.4508} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -12.163} --- !u!1 &304717449 GameObject: @@ -2173,7 +2458,6 @@ RectTransform: - {fileID: 742881719} - {fileID: 1522777183} m_Father: {fileID: 593019634} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2249,7 +2533,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 514819063} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2333,7 +2616,6 @@ RectTransform: m_Children: - {fileID: 1447229821} m_Father: {fileID: 157360000} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -2502,7 +2784,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1626060475} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2575,13 +2856,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 449598763} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -40, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 239795867} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &449598765 SpriteRenderer: @@ -2635,6 +2916,138 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &463614636 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 463614640} + - component: {fileID: 463614639} + - component: {fileID: 463614637} + - component: {fileID: 463614638} + m_Layer: 5 + m_Name: music + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &463614637 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 463614636} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, 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: 21300000, guid: e771488162bd36841aeb2ec254f03b80, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &463614638 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 463614636} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 463614637} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 72577381} + m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp + m_MethodName: ToggleMusic + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!222 &463614639 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 463614636} + m_CullTransparentMesh: 1 +--- !u!224 &463614640 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 463614636} + 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: 593019634} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 150, y: 152} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &467946480 GameObject: m_ObjectHideFlags: 0 @@ -2711,13 +3124,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 467946480} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1449942455} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &513263553 GameObject: @@ -2758,8 +3171,6 @@ MonoBehaviour: rightTangent: {x: -0.5359726, y: 0.00048208237, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -2768,8 +3179,6 @@ MonoBehaviour: rightTangent: {x: 0.53783464, y: -0.00056660175, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -2778,8 +3187,6 @@ MonoBehaviour: rightTangent: {x: 2.0187497, y: 0.38778567, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -2788,8 +3195,6 @@ MonoBehaviour: rightTangent: {x: 0.27353573, y: 0.00046253204, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -2798,8 +3203,6 @@ MonoBehaviour: rightTangent: {x: -0.062002182, y: -0.57465553, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -2808,8 +3211,6 @@ MonoBehaviour: rightTangent: {x: -0.54391515, y: -0.00042247772, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -2824,11 +3225,68 @@ MonoBehaviour: m_ColliderDetail: 16 m_ColliderOffset: 0.5 m_UpdateCollider: 1 - m_OptimizeCollider: 1 - m_OptimizeGeometry: 1 m_EnableTangents: 0 m_GeometryCached: 0 m_UTess2D: 0 + m_Creator: {fileID: 0} + m_Modifiers: [] + m_ColliderSegment: + - {x: -7.3853846, y: -3.5118275} + - {x: -7.462919, y: -3.4734979} + - {x: -7.7344885, y: -3.1196246} + - {x: -7.6983, y: -2.8877048} + - {x: -7.6152744, y: -2.6433997} + - {x: -7.34101, y: -2.082646} + - {x: -7.1591177, y: -1.7775459} + - {x: -6.8772693, y: -1.3637687} + - {x: -6.4911947, y: -0.87343603} + - {x: -6.193196, y: -0.5635567} + - {x: -5.986504, y: -0.37765393} + - {x: -5.7233963, y: -0.19110987} + - {x: -5.449176, y: -0.061216116} + - {x: -5.1704173, y: -0.011142552} + - {x: -4.988349, y: -0.030188322} + - {x: -4.5722694, y: -0.14356822} + - {x: -3.6556292, y: -0.43513843} + - {x: -3.0240202, y: -0.6093232} + - {x: -2.6415687, y: -0.69588214} + - {x: -2.2283669, y: -0.770589} + - {x: -1.7444584, y: -0.82969236} + - {x: -1.2598088, y: -0.8565188} + - {x: -0.9647635, y: -0.8593359} + - {x: -0.5236485, y: -0.8309032} + - {x: -0.0797549, y: -0.76557326} + - {x: 0.3033234, y: -0.67227656} + - {x: 0.6894196, y: -0.5423232} + - {x: 1.0759759, y: -0.3813097} + - {x: 1.5053141, y: -0.17022783} + - {x: 1.9359852, y: 0.06882024} + - {x: 2.5511994, y: 0.44731832} + - {x: 3.7499123, y: 1.2618806} + - {x: 4.1940546, y: 1.5403798} + - {x: 4.3854246, y: 1.6301482} + - {x: 4.616488, y: 1.6679611} + - {x: 4.823597, y: 1.5714803} + - {x: 5.285446, y: 1.1509432} + - {x: 5.938713, y: 0.47277457} + - {x: 6.7030997, y: -0.3625012} + - {x: 7.564384, y: -1.3405285} + - {x: 8.216779, y: -2.1119733} + - {x: 8.6437235, y: -2.6496587} + - {x: 8.791569, y: -2.8636844} + - {x: 8.842677, y: -2.9748535} + - {x: 8.860329, y: -3.1396956} + - {x: 8.6039715, y: -3.4080763} + - {x: 8.192574, y: -3.5087175} + - {x: 7.679965, y: -3.563291} + - {x: 7.0409794, y: -3.596912} + - {x: 6.1628284, y: -3.6138554} + - {x: 5.155706, y: -3.6123476} + - {x: 3.6460013, y: -3.586553} + - {x: 1.6370275, y: -3.5224314} + - {x: -0.62444425, y: -3.4317436} + - {x: -6.918007, y: -3.5080879} + - {x: -7.3853846, y: -3.5118275} --- !u!1971053207 &513263555 SpriteShapeRenderer: m_ObjectHideFlags: 0 @@ -2887,6 +3345,7 @@ SpriteShapeRenderer: m_LocalAABB: m_Center: {x: 0.5629206, y: -0.9738171, z: 0} m_Extent: {x: 8.297409, y: 2.6417782, z: 0} + m_SpriteSortPoint: 0 --- !u!4 &513263556 Transform: m_ObjectHideFlags: 0 @@ -2894,13 +3353,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 513263553} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -143.57788, y: -1.7367756, z: 0.0729104} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 753870229} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &513263557 PolygonCollider2D: @@ -2912,6 +3371,25 @@ PolygonCollider2D: m_Enabled: 0 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -2982,8 +3460,8 @@ PolygonCollider2D: - {x: 1.6370275, y: -3.5224314} - {x: -0.62444425, y: -3.4317436} - {x: -6.918007, y: -3.5080879} - - {x: -7.210502, y: -3.51089} - {x: -7.3853846, y: -3.5118275} + m_UseDelaunayMesh: 0 --- !u!1 &514819062 GameObject: m_ObjectHideFlags: 0 @@ -3018,7 +3496,6 @@ RectTransform: - {fileID: 1372052474} - {fileID: 371307568} m_Father: {fileID: 304717450} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3162,7 +3639,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 742881719} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3250,8 +3726,6 @@ MonoBehaviour: rightTangent: {x: -0.5359726, y: 0.00048208237, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -3260,8 +3734,6 @@ MonoBehaviour: rightTangent: {x: 0.53783464, y: -0.00056660175, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -3270,8 +3742,6 @@ MonoBehaviour: rightTangent: {x: 2.0187497, y: 0.38778567, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -3280,8 +3750,6 @@ MonoBehaviour: rightTangent: {x: 0.27353573, y: 0.00046253204, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -3290,8 +3758,6 @@ MonoBehaviour: rightTangent: {x: -0.062002182, y: -0.57465553, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -3300,8 +3766,6 @@ MonoBehaviour: rightTangent: {x: -0.54391515, y: -0.00042247772, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -3316,11 +3780,68 @@ MonoBehaviour: m_ColliderDetail: 16 m_ColliderOffset: 0.5 m_UpdateCollider: 1 - m_OptimizeCollider: 1 - m_OptimizeGeometry: 1 m_EnableTangents: 0 m_GeometryCached: 0 m_UTess2D: 0 + m_Creator: {fileID: 0} + m_Modifiers: [] + m_ColliderSegment: + - {x: -7.3853846, y: -3.5118275} + - {x: -7.462919, y: -3.4734979} + - {x: -7.7344885, y: -3.1196246} + - {x: -7.6983, y: -2.8877048} + - {x: -7.6152744, y: -2.6433997} + - {x: -7.34101, y: -2.082646} + - {x: -7.1591177, y: -1.7775459} + - {x: -6.8772693, y: -1.3637687} + - {x: -6.4911947, y: -0.87343603} + - {x: -6.193196, y: -0.5635567} + - {x: -5.986504, y: -0.37765393} + - {x: -5.7233963, y: -0.19110987} + - {x: -5.449176, y: -0.061216116} + - {x: -5.1704173, y: -0.011142552} + - {x: -4.988349, y: -0.030188322} + - {x: -4.5722694, y: -0.14356822} + - {x: -3.6556292, y: -0.43513843} + - {x: -3.0240202, y: -0.6093232} + - {x: -2.6415687, y: -0.69588214} + - {x: -2.2283669, y: -0.770589} + - {x: -1.7444584, y: -0.82969236} + - {x: -1.2598088, y: -0.8565188} + - {x: -0.9647635, y: -0.8593359} + - {x: -0.5236485, y: -0.8309032} + - {x: -0.0797549, y: -0.76557326} + - {x: 0.3033234, y: -0.67227656} + - {x: 0.6894196, y: -0.5423232} + - {x: 1.0759759, y: -0.3813097} + - {x: 1.5053141, y: -0.17022783} + - {x: 1.9359852, y: 0.06882024} + - {x: 2.5511994, y: 0.44731832} + - {x: 3.7499123, y: 1.2618806} + - {x: 4.1940546, y: 1.5403798} + - {x: 4.3854246, y: 1.6301482} + - {x: 4.616488, y: 1.6679611} + - {x: 4.823597, y: 1.5714803} + - {x: 5.285446, y: 1.1509432} + - {x: 5.938713, y: 0.47277457} + - {x: 6.7030997, y: -0.3625012} + - {x: 7.564384, y: -1.3405285} + - {x: 8.216779, y: -2.1119733} + - {x: 8.6437235, y: -2.6496587} + - {x: 8.791569, y: -2.8636844} + - {x: 8.842677, y: -2.9748535} + - {x: 8.860329, y: -3.1396956} + - {x: 8.6039715, y: -3.4080763} + - {x: 8.192574, y: -3.5087175} + - {x: 7.679965, y: -3.563291} + - {x: 7.0409794, y: -3.596912} + - {x: 6.1628284, y: -3.6138554} + - {x: 5.155706, y: -3.6123476} + - {x: 3.6460013, y: -3.586553} + - {x: 1.6370275, y: -3.5224314} + - {x: -0.62444425, y: -3.4317436} + - {x: -6.918007, y: -3.5080879} + - {x: -7.3853846, y: -3.5118275} --- !u!1971053207 &581857053 SpriteShapeRenderer: m_ObjectHideFlags: 0 @@ -3379,6 +3900,7 @@ SpriteShapeRenderer: m_LocalAABB: m_Center: {x: 0.5629206, y: -0.9738171, z: 0} m_Extent: {x: 8.297409, y: 2.6417782, z: 0} + m_SpriteSortPoint: 0 --- !u!4 &581857054 Transform: m_ObjectHideFlags: 0 @@ -3386,13 +3908,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 581857051} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -143.57788, y: -1.7367756, z: 0.0729104} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 753870229} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &581857057 PolygonCollider2D: @@ -3404,6 +3926,25 @@ PolygonCollider2D: m_Enabled: 0 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -3474,8 +4015,8 @@ PolygonCollider2D: - {x: 1.6370275, y: -3.5224314} - {x: -0.62444425, y: -3.4317436} - {x: -6.918007, y: -3.5080879} - - {x: -7.210502, y: -3.51089} - {x: -7.3853846, y: -3.5118275} + m_UseDelaunayMesh: 0 --- !u!1 &593019633 GameObject: m_ObjectHideFlags: 0 @@ -3508,16 +4049,17 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 650684899} + - {fileID: 190796290} + - {fileID: 463614640} - {fileID: 1626060475} - {fileID: 46201521} - {fileID: 1240345107} - {fileID: 304717450} m_Father: {fileID: 854720075} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -3223, y: 0} + m_AnchoredPosition: {x: -3235, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &593019635 @@ -3619,8 +4161,6 @@ MonoBehaviour: rightTangent: {x: -0.5359726, y: 0.00048208237, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -3629,8 +4169,6 @@ MonoBehaviour: rightTangent: {x: 0.53783464, y: -0.00056660175, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -3639,8 +4177,6 @@ MonoBehaviour: rightTangent: {x: 2.0187497, y: 0.38778567, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -3649,8 +4185,6 @@ MonoBehaviour: rightTangent: {x: 0.27353573, y: 0.00046253204, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -3659,8 +4193,6 @@ MonoBehaviour: rightTangent: {x: -0.062002182, y: -0.57465553, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -3669,8 +4201,6 @@ MonoBehaviour: rightTangent: {x: -0.54391515, y: -0.00042247772, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -3685,11 +4215,68 @@ MonoBehaviour: m_ColliderDetail: 16 m_ColliderOffset: 0.5 m_UpdateCollider: 1 - m_OptimizeCollider: 1 - m_OptimizeGeometry: 1 m_EnableTangents: 0 m_GeometryCached: 0 m_UTess2D: 0 + m_Creator: {fileID: 0} + m_Modifiers: [] + m_ColliderSegment: + - {x: -7.3853846, y: -3.5118275} + - {x: -7.462919, y: -3.4734979} + - {x: -7.7344885, y: -3.1196246} + - {x: -7.6983, y: -2.8877048} + - {x: -7.6152744, y: -2.6433997} + - {x: -7.34101, y: -2.082646} + - {x: -7.1591177, y: -1.7775459} + - {x: -6.8772693, y: -1.3637687} + - {x: -6.4911947, y: -0.87343603} + - {x: -6.193196, y: -0.5635567} + - {x: -5.986504, y: -0.37765393} + - {x: -5.7233963, y: -0.19110987} + - {x: -5.449176, y: -0.061216116} + - {x: -5.1704173, y: -0.011142552} + - {x: -4.988349, y: -0.030188322} + - {x: -4.5722694, y: -0.14356822} + - {x: -3.6556292, y: -0.43513843} + - {x: -3.0240202, y: -0.6093232} + - {x: -2.6415687, y: -0.69588214} + - {x: -2.2283669, y: -0.770589} + - {x: -1.7444584, y: -0.82969236} + - {x: -1.2598088, y: -0.8565188} + - {x: -0.9647635, y: -0.8593359} + - {x: -0.5236485, y: -0.8309032} + - {x: -0.0797549, y: -0.76557326} + - {x: 0.3033234, y: -0.67227656} + - {x: 0.6894196, y: -0.5423232} + - {x: 1.0759759, y: -0.3813097} + - {x: 1.5053141, y: -0.17022783} + - {x: 1.9359852, y: 0.06882024} + - {x: 2.5511994, y: 0.44731832} + - {x: 3.7499123, y: 1.2618806} + - {x: 4.1940546, y: 1.5403798} + - {x: 4.3854246, y: 1.6301482} + - {x: 4.616488, y: 1.6679611} + - {x: 4.823597, y: 1.5714803} + - {x: 5.285446, y: 1.1509432} + - {x: 5.938713, y: 0.47277457} + - {x: 6.7030997, y: -0.3625012} + - {x: 7.564384, y: -1.3405285} + - {x: 8.216779, y: -2.1119733} + - {x: 8.6437235, y: -2.6496587} + - {x: 8.791569, y: -2.8636844} + - {x: 8.842677, y: -2.9748535} + - {x: 8.860329, y: -3.1396956} + - {x: 8.6039715, y: -3.4080763} + - {x: 8.192574, y: -3.5087175} + - {x: 7.679965, y: -3.563291} + - {x: 7.0409794, y: -3.596912} + - {x: 6.1628284, y: -3.6138554} + - {x: 5.155706, y: -3.6123476} + - {x: 3.6460013, y: -3.586553} + - {x: 1.6370275, y: -3.5224314} + - {x: -0.62444425, y: -3.4317436} + - {x: -6.918007, y: -3.5080879} + - {x: -7.3853846, y: -3.5118275} --- !u!1971053207 &597624423 SpriteShapeRenderer: m_ObjectHideFlags: 0 @@ -3748,6 +4335,7 @@ SpriteShapeRenderer: m_LocalAABB: m_Center: {x: 0.5629206, y: -0.9738171, z: 0} m_Extent: {x: 8.297409, y: 2.6417782, z: 0} + m_SpriteSortPoint: 0 --- !u!4 &597624424 Transform: m_ObjectHideFlags: 0 @@ -3755,13 +4343,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 597624421} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -143.57788, y: -1.7367756, z: 0.0729104} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 753870229} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &597624425 PolygonCollider2D: @@ -3773,6 +4361,25 @@ PolygonCollider2D: m_Enabled: 0 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -3843,8 +4450,8 @@ PolygonCollider2D: - {x: 1.6370275, y: -3.5224314} - {x: -0.62444425, y: -3.4317436} - {x: -6.918007, y: -3.5080879} - - {x: -7.210502, y: -3.51089} - {x: -7.3853846, y: -3.5118275} + m_UseDelaunayMesh: 0 --- !u!1 &635958794 GameObject: m_ObjectHideFlags: 0 @@ -3921,6 +4528,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 635958794} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} @@ -3929,7 +4537,6 @@ Transform: - {fileID: 1931640969} - {fileID: 1615807479} m_Father: {fileID: 1449942455} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &650684898 GameObject: @@ -3963,7 +4570,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 593019634} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -4060,7 +4666,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 157360000} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -4180,7 +4785,6 @@ RectTransform: m_Children: - {fileID: 546174291} m_Father: {fileID: 304717450} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -4378,6 +4982,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 753870227} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 15.477869, y: 0.8067756, z: -0.0729104} m_LocalScale: {x: 1, y: 1, z: 1} @@ -4392,7 +4997,6 @@ Transform: - {fileID: 204007388} - {fileID: 1483817712} m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &753870230 MonoBehaviour: @@ -4438,7 +5042,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1950278698} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -4562,13 +5165,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 852246587} + 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: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &854720071 GameObject: @@ -4646,7 +5249,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -4667,7 +5272,6 @@ RectTransform: - {fileID: 1950278698} - {fileID: 1082824190} m_Father: {fileID: 0} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4698,13 +5302,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 855220809} + 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: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &855220812 MonoBehaviour: @@ -4756,13 +5360,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 918429316} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 40, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2120181088} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &918429318 SpriteRenderer: @@ -4855,8 +5459,6 @@ MonoBehaviour: rightTangent: {x: -0.5359726, y: 0.00048208237, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -4865,8 +5467,6 @@ MonoBehaviour: rightTangent: {x: 0.53783464, y: -0.00056660175, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -4875,8 +5475,6 @@ MonoBehaviour: rightTangent: {x: 2.0187497, y: 0.38778567, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -4885,8 +5483,6 @@ MonoBehaviour: rightTangent: {x: 0.27353573, y: 0.00046253204, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -4895,8 +5491,6 @@ MonoBehaviour: rightTangent: {x: -0.062002182, y: -0.57465553, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -4905,8 +5499,6 @@ MonoBehaviour: rightTangent: {x: -0.54391515, y: -0.00042247772, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -4921,11 +5513,68 @@ MonoBehaviour: m_ColliderDetail: 16 m_ColliderOffset: 0.5 m_UpdateCollider: 1 - m_OptimizeCollider: 1 - m_OptimizeGeometry: 1 m_EnableTangents: 0 m_GeometryCached: 0 m_UTess2D: 0 + m_Creator: {fileID: 0} + m_Modifiers: [] + m_ColliderSegment: + - {x: -7.3853846, y: -3.5118275} + - {x: -7.462919, y: -3.4734979} + - {x: -7.7344885, y: -3.1196246} + - {x: -7.6983, y: -2.8877048} + - {x: -7.6152744, y: -2.6433997} + - {x: -7.34101, y: -2.082646} + - {x: -7.1591177, y: -1.7775459} + - {x: -6.8772693, y: -1.3637687} + - {x: -6.4911947, y: -0.87343603} + - {x: -6.193196, y: -0.5635567} + - {x: -5.986504, y: -0.37765393} + - {x: -5.7233963, y: -0.19110987} + - {x: -5.449176, y: -0.061216116} + - {x: -5.1704173, y: -0.011142552} + - {x: -4.988349, y: -0.030188322} + - {x: -4.5722694, y: -0.14356822} + - {x: -3.6556292, y: -0.43513843} + - {x: -3.0240202, y: -0.6093232} + - {x: -2.6415687, y: -0.69588214} + - {x: -2.2283669, y: -0.770589} + - {x: -1.7444584, y: -0.82969236} + - {x: -1.2598088, y: -0.8565188} + - {x: -0.9647635, y: -0.8593359} + - {x: -0.5236485, y: -0.8309032} + - {x: -0.0797549, y: -0.76557326} + - {x: 0.3033234, y: -0.67227656} + - {x: 0.6894196, y: -0.5423232} + - {x: 1.0759759, y: -0.3813097} + - {x: 1.5053141, y: -0.17022783} + - {x: 1.9359852, y: 0.06882024} + - {x: 2.5511994, y: 0.44731832} + - {x: 3.7499123, y: 1.2618806} + - {x: 4.1940546, y: 1.5403798} + - {x: 4.3854246, y: 1.6301482} + - {x: 4.616488, y: 1.6679611} + - {x: 4.823597, y: 1.5714803} + - {x: 5.285446, y: 1.1509432} + - {x: 5.938713, y: 0.47277457} + - {x: 6.7030997, y: -0.3625012} + - {x: 7.564384, y: -1.3405285} + - {x: 8.216779, y: -2.1119733} + - {x: 8.6437235, y: -2.6496587} + - {x: 8.791569, y: -2.8636844} + - {x: 8.842677, y: -2.9748535} + - {x: 8.860329, y: -3.1396956} + - {x: 8.6039715, y: -3.4080763} + - {x: 8.192574, y: -3.5087175} + - {x: 7.679965, y: -3.563291} + - {x: 7.0409794, y: -3.596912} + - {x: 6.1628284, y: -3.6138554} + - {x: 5.155706, y: -3.6123476} + - {x: 3.6460013, y: -3.586553} + - {x: 1.6370275, y: -3.5224314} + - {x: -0.62444425, y: -3.4317436} + - {x: -6.918007, y: -3.5080879} + - {x: -7.3853846, y: -3.5118275} --- !u!1971053207 &1012466600 SpriteShapeRenderer: m_ObjectHideFlags: 0 @@ -4984,6 +5633,7 @@ SpriteShapeRenderer: m_LocalAABB: m_Center: {x: 0.5629206, y: -0.9738171, z: 0} m_Extent: {x: 8.297409, y: 2.6417782, z: 0} + m_SpriteSortPoint: 0 --- !u!4 &1012466601 Transform: m_ObjectHideFlags: 0 @@ -4991,13 +5641,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1012466598} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -143.57788, y: -1.7367756, z: 0.0729104} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 753870229} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1012466602 PolygonCollider2D: @@ -5009,6 +5659,25 @@ PolygonCollider2D: m_Enabled: 0 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -5079,8 +5748,8 @@ PolygonCollider2D: - {x: 1.6370275, y: -3.5224314} - {x: -0.62444425, y: -3.4317436} - {x: -6.918007, y: -3.5080879} - - {x: -7.210502, y: -3.51089} - {x: -7.3853846, y: -3.5118275} + m_UseDelaunayMesh: 0 --- !u!1 &1082824189 GameObject: m_ObjectHideFlags: 0 @@ -5113,7 +5782,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 854720075} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5211,7 +5879,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 46201521} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5284,13 +5951,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1212605697} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -40, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2120181088} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1212605699 SpriteRenderer: @@ -5368,13 +6035,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1219477790} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 40, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 239795867} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1219477792 SpriteRenderer: @@ -5460,7 +6127,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 593019634} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5606,7 +6272,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1549363271} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -5770,13 +6435,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1305185923} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0.10594707, w: 0.9943718} m_LocalPosition: {x: -157.6, y: 2.1385326, z: 0} m_LocalScale: {x: 1.4508, y: 1.4508, z: 1.4508} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -12.163} --- !u!50 &1305185926 Rigidbody2D: @@ -5795,6 +6460,12 @@ Rigidbody2D: m_AngularDrag: 0.05 m_GravityScale: 0 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 @@ -5809,6 +6480,25 @@ PolygonCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 6200000, guid: 974ddea486cdf95f7aedbce5e6db4edc, type: 2} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -5888,6 +6578,7 @@ PolygonCollider2D: - {x: -0.55, y: -1.5} - {x: -0.37, y: -1.49} - {x: -0.29999998, y: -1.52} + m_UseDelaunayMesh: 0 --- !u!1 &1368371776 GameObject: m_ObjectHideFlags: 0 @@ -5907,6 +6598,7 @@ GameObject: m_IsActive: 0 --- !u!120 &1368371777 LineRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -5994,16 +6686,20 @@ LineRenderer: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 numCornerVertices: 0 numCapVertices: 0 alignment: 0 textureMode: 0 + textureScale: {x: 1, y: 1} shadowBias: 0.5 generateLightingData: 0 + m_MaskInteraction: 0 m_UseWorldSpace: 0 m_Loop: 0 + m_ApplyActiveColorSpace: 0 --- !u!4 &1368371778 Transform: m_ObjectHideFlags: 0 @@ -6011,13 +6707,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1368371776} + 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: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1371508593 GameObject: @@ -6095,6 +6791,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1371508593} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} @@ -6103,7 +6800,6 @@ Transform: - {fileID: 1516280136} - {fileID: 53498158} m_Father: {fileID: 1449942455} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1372052473 GameObject: @@ -6136,7 +6832,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 514819063} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6216,7 +6911,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1549363271} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6292,7 +6986,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 397747028} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6382,9 +7075,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -6418,6 +7119,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1449942452} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 20, y: 0, z: -10} m_LocalScale: {x: 1.8, y: 1.8, z: 1.5} @@ -6429,7 +7131,6 @@ Transform: - {fileID: 1371508595} - {fileID: 239795867} m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1449942457 MonoBehaviour: @@ -6484,8 +7185,6 @@ MonoBehaviour: rightTangent: {x: -0.5359726, y: 0.00048208237, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -6494,8 +7193,6 @@ MonoBehaviour: rightTangent: {x: 0.53783464, y: -0.00056660175, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -6504,8 +7201,6 @@ MonoBehaviour: rightTangent: {x: 2.0187497, y: 0.38778567, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -6514,8 +7209,6 @@ MonoBehaviour: rightTangent: {x: 0.27353573, y: 0.00046253204, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -6524,8 +7217,6 @@ MonoBehaviour: rightTangent: {x: -0.062002182, y: -0.57465553, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -6534,8 +7225,6 @@ MonoBehaviour: rightTangent: {x: -0.54391515, y: -0.00042247772, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -6550,11 +7239,68 @@ MonoBehaviour: m_ColliderDetail: 16 m_ColliderOffset: 0.5 m_UpdateCollider: 1 - m_OptimizeCollider: 1 - m_OptimizeGeometry: 1 m_EnableTangents: 0 m_GeometryCached: 0 m_UTess2D: 0 + m_Creator: {fileID: 0} + m_Modifiers: [] + m_ColliderSegment: + - {x: -7.3853846, y: -3.5118275} + - {x: -7.462919, y: -3.4734979} + - {x: -7.7344885, y: -3.1196246} + - {x: -7.6983, y: -2.8877048} + - {x: -7.6152744, y: -2.6433997} + - {x: -7.34101, y: -2.082646} + - {x: -7.1591177, y: -1.7775459} + - {x: -6.8772693, y: -1.3637687} + - {x: -6.4911947, y: -0.87343603} + - {x: -6.193196, y: -0.5635567} + - {x: -5.986504, y: -0.37765393} + - {x: -5.7233963, y: -0.19110987} + - {x: -5.449176, y: -0.061216116} + - {x: -5.1704173, y: -0.011142552} + - {x: -4.988349, y: -0.030188322} + - {x: -4.5722694, y: -0.14356822} + - {x: -3.6556292, y: -0.43513843} + - {x: -3.0240202, y: -0.6093232} + - {x: -2.6415687, y: -0.69588214} + - {x: -2.2283669, y: -0.770589} + - {x: -1.7444584, y: -0.82969236} + - {x: -1.2598088, y: -0.8565188} + - {x: -0.9647635, y: -0.8593359} + - {x: -0.5236485, y: -0.8309032} + - {x: -0.0797549, y: -0.76557326} + - {x: 0.3033234, y: -0.67227656} + - {x: 0.6894196, y: -0.5423232} + - {x: 1.0759759, y: -0.3813097} + - {x: 1.5053141, y: -0.17022783} + - {x: 1.9359852, y: 0.06882024} + - {x: 2.5511994, y: 0.44731832} + - {x: 3.7499123, y: 1.2618806} + - {x: 4.1940546, y: 1.5403798} + - {x: 4.3854246, y: 1.6301482} + - {x: 4.616488, y: 1.6679611} + - {x: 4.823597, y: 1.5714803} + - {x: 5.285446, y: 1.1509432} + - {x: 5.938713, y: 0.47277457} + - {x: 6.7030997, y: -0.3625012} + - {x: 7.564384, y: -1.3405285} + - {x: 8.216779, y: -2.1119733} + - {x: 8.6437235, y: -2.6496587} + - {x: 8.791569, y: -2.8636844} + - {x: 8.842677, y: -2.9748535} + - {x: 8.860329, y: -3.1396956} + - {x: 8.6039715, y: -3.4080763} + - {x: 8.192574, y: -3.5087175} + - {x: 7.679965, y: -3.563291} + - {x: 7.0409794, y: -3.596912} + - {x: 6.1628284, y: -3.6138554} + - {x: 5.155706, y: -3.6123476} + - {x: 3.6460013, y: -3.586553} + - {x: 1.6370275, y: -3.5224314} + - {x: -0.62444425, y: -3.4317436} + - {x: -6.918007, y: -3.5080879} + - {x: -7.3853846, y: -3.5118275} --- !u!1971053207 &1483817711 SpriteShapeRenderer: m_ObjectHideFlags: 0 @@ -6613,6 +7359,7 @@ SpriteShapeRenderer: m_LocalAABB: m_Center: {x: 0.5629206, y: -0.9738171, z: 0} m_Extent: {x: 8.297409, y: 2.6417782, z: 0} + m_SpriteSortPoint: 0 --- !u!4 &1483817712 Transform: m_ObjectHideFlags: 0 @@ -6620,13 +7367,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1483817709} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -143.57788, y: -1.7367756, z: 0.0729104} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 753870229} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1483817713 PolygonCollider2D: @@ -6638,6 +7385,25 @@ PolygonCollider2D: m_Enabled: 0 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -6708,8 +7474,8 @@ PolygonCollider2D: - {x: 1.6370275, y: -3.5224314} - {x: -0.62444425, y: -3.4317436} - {x: -6.918007, y: -3.5080879} - - {x: -7.210502, y: -3.51089} - {x: -7.3853846, y: -3.5118275} + m_UseDelaunayMesh: 0 --- !u!1 &1516280135 GameObject: m_ObjectHideFlags: 0 @@ -6734,13 +7500,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1516280135} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -40, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1371508595} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1516280137 SpriteRenderer: @@ -6828,7 +7594,6 @@ RectTransform: m_Children: - {fileID: 1606200342} m_Father: {fileID: 304717450} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -7048,7 +7813,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 10 m_TargetDisplay: 0 @@ -7068,7 +7835,6 @@ RectTransform: - {fileID: 1284514893} - {fileID: 1874708325} m_Father: {fileID: 0} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -7113,8 +7879,6 @@ MonoBehaviour: rightTangent: {x: -0.53597355, y: 0.00048208237, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -7123,8 +7887,6 @@ MonoBehaviour: rightTangent: {x: 1.0023332, y: -0.0010559559, z: -0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -7133,8 +7895,6 @@ MonoBehaviour: rightTangent: {x: 0.48696995, y: 0.0008234978, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -7143,8 +7903,6 @@ MonoBehaviour: rightTangent: {x: 0.5425911, y: -1.1006677, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -7153,8 +7911,6 @@ MonoBehaviour: rightTangent: {x: 0.6362877, y: 0.15030003, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -7163,8 +7919,6 @@ MonoBehaviour: rightTangent: {x: -0.54390717, y: -0.00042247772, z: 0} mode: 2 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -7179,11 +7933,12 @@ MonoBehaviour: m_ColliderDetail: 16 m_ColliderOffset: 0.5 m_UpdateCollider: 1 - m_OptimizeCollider: 1 - m_OptimizeGeometry: 1 m_EnableTangents: 0 m_GeometryCached: 0 m_UTess2D: 0 + m_Creator: {fileID: 0} + m_Modifiers: [] + m_ColliderSegment: [] --- !u!1971053207 &1554778517 SpriteShapeRenderer: m_ObjectHideFlags: 0 @@ -7242,6 +7997,7 @@ SpriteShapeRenderer: m_LocalAABB: m_Center: {x: 7.6981974, y: -0.010440826, z: 0} m_Extent: {x: 17.980568, y: 3.981062, z: 0} + m_SpriteSortPoint: 0 --- !u!4 &1554778518 Transform: m_ObjectHideFlags: 0 @@ -7249,13 +8005,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1554778515} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.35714984, y: -3.2322228, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1584378045 GameObject: @@ -7289,7 +8045,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1950278698} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -7386,7 +8141,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1522777183} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7459,13 +8213,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1615807478} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 40, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 635958796} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1615807480 SpriteRenderer: @@ -7553,7 +8307,6 @@ RectTransform: m_Children: - {fileID: 406638477} m_Father: {fileID: 593019634} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -7701,7 +8454,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1950278698} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -7806,7 +8558,6 @@ RectTransform: m_Children: - {fileID: 2033423904} m_Father: {fileID: 157360000} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7990,7 +8741,6 @@ RectTransform: - {fileID: 2016523076} - {fileID: 2076903600} m_Father: {fileID: 1549363271} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8089,8 +8839,6 @@ MonoBehaviour: rightTangent: {x: -0.5359726, y: 0.00048208237, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -8099,8 +8847,6 @@ MonoBehaviour: rightTangent: {x: 0.53783464, y: -0.00056660175, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -8109,8 +8855,6 @@ MonoBehaviour: rightTangent: {x: 2.0187497, y: 0.38778567, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -8119,8 +8863,6 @@ MonoBehaviour: rightTangent: {x: 0.27353573, y: 0.00046253204, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -8129,8 +8871,6 @@ MonoBehaviour: rightTangent: {x: -0.062002182, y: -0.57465553, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -8139,8 +8879,6 @@ MonoBehaviour: rightTangent: {x: -0.54391515, y: -0.00042247772, z: 0} mode: 1 height: 1 - bevelCutoff: 0 - bevelSize: 0 spriteIndex: 0 corner: 1 m_CornerMode: 1 @@ -8155,11 +8893,68 @@ MonoBehaviour: m_ColliderDetail: 16 m_ColliderOffset: 0.5 m_UpdateCollider: 1 - m_OptimizeCollider: 1 - m_OptimizeGeometry: 1 m_EnableTangents: 0 m_GeometryCached: 0 m_UTess2D: 0 + m_Creator: {fileID: 0} + m_Modifiers: [] + m_ColliderSegment: + - {x: -7.3853846, y: -3.5118275} + - {x: -7.462919, y: -3.4734979} + - {x: -7.7344885, y: -3.1196246} + - {x: -7.6983, y: -2.8877048} + - {x: -7.6152744, y: -2.6433997} + - {x: -7.34101, y: -2.082646} + - {x: -7.1591177, y: -1.7775459} + - {x: -6.8772693, y: -1.3637687} + - {x: -6.4911947, y: -0.87343603} + - {x: -6.193196, y: -0.5635567} + - {x: -5.986504, y: -0.37765393} + - {x: -5.7233963, y: -0.19110987} + - {x: -5.449176, y: -0.061216116} + - {x: -5.1704173, y: -0.011142552} + - {x: -4.988349, y: -0.030188322} + - {x: -4.5722694, y: -0.14356822} + - {x: -3.6556292, y: -0.43513843} + - {x: -3.0240202, y: -0.6093232} + - {x: -2.6415687, y: -0.69588214} + - {x: -2.2283669, y: -0.770589} + - {x: -1.7444584, y: -0.82969236} + - {x: -1.2598088, y: -0.8565188} + - {x: -0.9647635, y: -0.8593359} + - {x: -0.5236485, y: -0.8309032} + - {x: -0.0797549, y: -0.76557326} + - {x: 0.3033234, y: -0.67227656} + - {x: 0.6894196, y: -0.5423232} + - {x: 1.0759759, y: -0.3813097} + - {x: 1.5053141, y: -0.17022783} + - {x: 1.9359852, y: 0.06882024} + - {x: 2.5511994, y: 0.44731832} + - {x: 3.7499123, y: 1.2618806} + - {x: 4.1940546, y: 1.5403798} + - {x: 4.3854246, y: 1.6301482} + - {x: 4.616488, y: 1.6679611} + - {x: 4.823597, y: 1.5714803} + - {x: 5.285446, y: 1.1509432} + - {x: 5.938713, y: 0.47277457} + - {x: 6.7030997, y: -0.3625012} + - {x: 7.564384, y: -1.3405285} + - {x: 8.216779, y: -2.1119733} + - {x: 8.6437235, y: -2.6496587} + - {x: 8.791569, y: -2.8636844} + - {x: 8.842677, y: -2.9748535} + - {x: 8.860329, y: -3.1396956} + - {x: 8.6039715, y: -3.4080763} + - {x: 8.192574, y: -3.5087175} + - {x: 7.679965, y: -3.563291} + - {x: 7.0409794, y: -3.596912} + - {x: 6.1628284, y: -3.6138554} + - {x: 5.155706, y: -3.6123476} + - {x: 3.6460013, y: -3.586553} + - {x: 1.6370275, y: -3.5224314} + - {x: -0.62444425, y: -3.4317436} + - {x: -6.918007, y: -3.5080879} + - {x: -7.3853846, y: -3.5118275} --- !u!1971053207 &1917319959 SpriteShapeRenderer: m_ObjectHideFlags: 0 @@ -8218,6 +9013,7 @@ SpriteShapeRenderer: m_LocalAABB: m_Center: {x: 0.5629206, y: -0.9738171, z: 0} m_Extent: {x: 8.297409, y: 2.6417782, z: 0} + m_SpriteSortPoint: 0 --- !u!4 &1917319960 Transform: m_ObjectHideFlags: 0 @@ -8225,13 +9021,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1917319957} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -143.57788, y: -1.7367756, z: 0.0729104} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 753870229} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1917319961 PolygonCollider2D: @@ -8243,6 +9039,25 @@ PolygonCollider2D: m_Enabled: 0 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -8313,8 +9128,8 @@ PolygonCollider2D: - {x: 1.6370275, y: -3.5224314} - {x: -0.62444425, y: -3.4317436} - {x: -6.918007, y: -3.5080879} - - {x: -7.210502, y: -3.51089} - {x: -7.3853846, y: -3.5118275} + m_UseDelaunayMesh: 0 --- !u!1 &1918098644 GameObject: m_ObjectHideFlags: 0 @@ -8346,7 +9161,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2087417816} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8424,6 +9238,25 @@ PolygonCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -8482,6 +9315,7 @@ PolygonCollider2D: - {x: -0.45999998, y: -0.98999995} - {x: -0.24, y: -0.81} - {x: -0.11, y: -0.62} + m_UseDelaunayMesh: 0 --- !u!50 &1923920629 Rigidbody2D: serializedVersion: 4 @@ -8499,6 +9333,12 @@ Rigidbody2D: m_AngularDrag: 0.05 m_GravityScale: 0 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 @@ -8562,13 +9402,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1923920627} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0.10594707, w: 0.9943718} m_LocalPosition: {x: -151.7, y: 2.1385326, z: 0} m_LocalScale: {x: 1.4508, y: 1.4508, z: 1.4508} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -12.163} --- !u!1 &1931640968 GameObject: @@ -8594,13 +9434,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1931640968} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -40, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 635958796} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1931640970 SpriteRenderer: @@ -8692,7 +9532,6 @@ RectTransform: - {fileID: 1728859601} - {fileID: 155145305} m_Father: {fileID: 854720075} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8792,7 +9631,6 @@ RectTransform: m_Children: - {fileID: 197305943} m_Father: {fileID: 1874708325} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8881,7 +9719,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1814844235} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8961,7 +9798,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1874708325} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -21.796} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -9041,7 +9877,6 @@ RectTransform: m_Children: - {fileID: 1918098645} m_Father: {fileID: 157360000} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9255,6 +10090,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2120181086} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} @@ -9263,5 +10099,20 @@ Transform: - {fileID: 1212605698} - {fileID: 918429317} m_Father: {fileID: 1449942455} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 855220811} + - {fileID: 1449942455} + - {fileID: 852246590} + - {fileID: 1554778518} + - {fileID: 753870229} + - {fileID: 1368371778} + - {fileID: 1305185925} + - {fileID: 294927381} + - {fileID: 1923920631} + - {fileID: 854720075} + - {fileID: 1549363271} + - {fileID: 72577382} diff --git a/Assets/Scripts/AdsManager.cs b/Assets/Scripts/AdsManager.cs new file mode 100644 index 0000000..26c5302 --- /dev/null +++ b/Assets/Scripts/AdsManager.cs @@ -0,0 +1,158 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using GoogleMobileAds.Api; +using UnityEngine; + +public class AdsManager : MonoBehaviour +{ + // Start is called before the first frame update + + public static AdsManager instance; + void Awake(){ + if(instance!= null){Destroy(gameObject);} + instance = this; + } + + const string intAdId = "ca-app-pub-3966734202864173/9071918772"; + const string rewardedAdId = "ca-app-pub-3966734202864173/7802288880"; + void Start() + { + DontDestroyOnLoad(gameObject); + // Initialize the Google Mobile Ads SDK. + MobileAds.Initialize(initStatus => { Debug.Log("admob Init status : " + initStatus.ToString());}); + + StartCoroutine(ReloadAds(true)); + } + + private InterstitialAd interstitialAd; + + /// + /// Loads the interstitial ad. + /// + public void LoadInterstitialAd() + { + // Clean up the old ad before loading a new one. + if (interstitialAd != null) + { + interstitialAd.Destroy(); + interstitialAd = null; + } + + Debug.Log("Loading the interstitial ad."); + + // create our request used to load the ad. + var adRequest = new AdRequest.Builder() + .AddKeyword("unity-admob-sample") + .Build(); + + // send the request to load the ad. + InterstitialAd.Load(intAdId, adRequest, + (InterstitialAd ad, LoadAdError error) => + { + // if error is not null, the load request failed. + if (error != null || ad == null) + { + Debug.LogError("interstitial ad failed to load an ad " + + "with error : " + error); + return; + } + + Debug.Log("Interstitial ad loaded with response : " + + ad.GetResponseInfo()); + + interstitialAd = ad; + }); + + + } + + public void ShowIntAd() + { + if (interstitialAd != null && interstitialAd.CanShowAd()) + { + Debug.Log("Showing interstitial ad."); + interstitialAd.Show(); + } + else + { + Debug.LogError("Interstitial ad is not ready yet."); + } + StartCoroutine(ReloadAds(false)); + + } + + + private RewardedAd rewardedAd; + + /// + /// Loads the rewarded ad. + /// + public void LoadRewardedAd() + { + // Clean up the old ad before loading a new one. + if (rewardedAd != null) + { + rewardedAd.Destroy(); + rewardedAd = null; + } + + Debug.Log("Loading the rewarded ad."); + + // create our request used to load the ad. + var adRequest = new AdRequest.Builder().Build(); + + // send the request to load the ad. + RewardedAd.Load(rewardedAdId, adRequest, + (RewardedAd ad, LoadAdError error) => + { + // if error is not null, the load request failed. + if (error != null || ad == null) + { + Debug.LogError("Rewarded ad failed to load an ad " + + "with error : " + error); + return; + } + + Debug.Log("Rewarded ad loaded with response : " + + ad.GetResponseInfo()); + + rewardedAd = ad; + + rewardedAd.OnAdPaid += OnRewardSuccess; + }); + } + + private void OnRewardSuccess(AdValue obj) + { + // GameManager.AdWatched(); + } + + public void ShowRewardedAd() + { + const string rewardMsg = + "Rewarded ad rewarded the user. Type: {0}, amount: {1}."; + + if (rewardedAd != null && rewardedAd.CanShowAd()) + { + rewardedAd.Show((Reward reward) => + { + // TODO: Reward the user. + Debug.Log(String.Format(rewardMsg, reward.Type, reward.Amount)); + }); + } + + StartCoroutine(ReloadAds(true)); + } + + + IEnumerator ReloadAds(bool rewarded){ + yield return new WaitForSeconds(2); + LoadInterstitialAd(); + if(rewarded){ + LoadRewardedAd(); + } + } + + +} diff --git a/Assets/Scripts/AdsManager.cs.meta b/Assets/Scripts/AdsManager.cs.meta new file mode 100644 index 0000000..3c91250 --- /dev/null +++ b/Assets/Scripts/AdsManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 51ce029fa474b514fb11d81ac6802e28 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AudioManager.cs b/Assets/Scripts/AudioManager.cs index aed4755..dbffadf 100644 --- a/Assets/Scripts/AudioManager.cs +++ b/Assets/Scripts/AudioManager.cs @@ -11,14 +11,14 @@ public class AudioManager : MonoBehaviour [SerializeField]public LevelAudioCombo[] levels; public static bool isMuteMusic {get{ if(PlayerPrefs.HasKey("music")){ - return PlayerPrefs.GetInt("music") == 1; + return PlayerPrefs.GetInt("music") == 0; }else{ return false; } }} public static bool isMuteSFX {get{ if(PlayerPrefs.HasKey("sfx")){ - return PlayerPrefs.GetInt("sfx") == 1; + return PlayerPrefs.GetInt("sfx") == 0; }else{ return false; } @@ -26,21 +26,30 @@ public class AudioManager : MonoBehaviour public static void ToggleMusic(){ if(isMuteMusic){ PlayerPrefs.SetInt("music",1); + instance.SourceMusic.volume = instance.defVol; }else{ PlayerPrefs.SetInt("music",0); + instance.SourceMusic.volume = 0; } + PlayerPrefs.Save(); + } + + float defVol; public static void ToggleSFX(){ - if(isMuteMusic){ + if(isMuteSFX){ PlayerPrefs.SetInt("sfx",1); }else{ PlayerPrefs.SetInt("sfx",0); } + PlayerPrefs.Save(); + } void Awake(){ instance= this; DontDestroyOnLoad(this); + defVol = SourceMusic.volume; } public static void ChangeMusicToScene(string scene){ diff --git a/Assets/Scripts/DataManager.cs b/Assets/Scripts/DataManager.cs index f6bbe6d..7d26aa2 100644 --- a/Assets/Scripts/DataManager.cs +++ b/Assets/Scripts/DataManager.cs @@ -8,7 +8,7 @@ using UnityEngine; using UnityEngine.Networking; public static class DataManager{ - public const string API_ENDPOINT = "http://vps.playpoolstudios.com/faucet/ufo/api/"; + public const string API_ENDPOINT = "https://vps.playpoolstudios.com/faucet/ufo/api/"; public const string key = "#2CuV1Bit^S!sW1ZcgRv8BhrO"; public static UserData userData{get; private set;} public static List Leaderboard{get; private set;} diff --git a/Assets/Scripts/MainMenu.cs b/Assets/Scripts/MainMenu.cs index 64c3887..5c7d704 100644 --- a/Assets/Scripts/MainMenu.cs +++ b/Assets/Scripts/MainMenu.cs @@ -7,6 +7,9 @@ public class MainMenu : MonoBehaviour public Text[] txtStats; public GameObject LinkPanel; public InputField FHIdInput; + public Image sfxImage,musicImage; + + public Sprite sprite_sfxOn,sprite_sfxOff,sprite_musicOn,sprite_musicOff; public void OnPlay(){ LoadingScreen.LoadLevel("Game"); } @@ -22,6 +25,7 @@ public class MainMenu : MonoBehaviour foreach(Text txtStat in txtStats){ txtStat.text = txtStat.text.Replace("{score}",DataManager.userData.score).Replace("{top_score}",DataManager.userData.top_score).Replace("{play_time}",Helpers.SecondsToTime(int.Parse(DataManager.userData.play_time),showSeconds:false)).Replace("{asteroids}",DataManager.userData.asteroids).Replace("{near_miss}",DataManager.userData.near_miss).Replace("{total_games}",DataManager.userData.total_games); } + UpdateAudioImages(); } @@ -59,4 +63,19 @@ public class MainMenu : MonoBehaviour LoadingScreen.LoadLevel("Login"); } + + public void ToggleMusic(){ + AudioManager.ToggleMusic(); + UpdateAudioImages(); + } + + public void ToggleSFX(){ + AudioManager.ToggleSFX(); + UpdateAudioImages(); + } + + void UpdateAudioImages(){ + sfxImage.sprite = (AudioManager.isMuteSFX) ? sprite_sfxOff : sprite_sfxOn; + musicImage.sprite = (AudioManager.isMuteMusic) ? sprite_musicOff : sprite_musicOn; + } } diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 4cd3812..44484e8 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -110,7 +110,7 @@ public class PlayerController : MonoBehaviour public void ActivatePowerup(){ powerupTimer = PowerupLife; } - + public static int AdCounter=0; public async void GameOver(){ // Application.LoadLevel(0); TalkWithServer(); @@ -124,6 +124,12 @@ public class PlayerController : MonoBehaviour GameOverUI.Activate(); + AdCounter++; + if(AdCounter > 1){ + AdCounter =0; + + AdsManager.instance.ShowIntAd(); + } } public void SpawnExplosionFX(Vector3 pos){ diff --git a/Assets/Sprites/music_off.png b/Assets/Sprites/music_off.png new file mode 100644 index 0000000..5159a0e Binary files /dev/null and b/Assets/Sprites/music_off.png differ diff --git a/Assets/Sprites/music_off.png.meta b/Assets/Sprites/music_off.png.meta new file mode 100644 index 0000000..5b88a94 --- /dev/null +++ b/Assets/Sprites/music_off.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: ff42fd7043329e04db3992bee20a0757 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + 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: 3 + 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: 3 + buildTarget: iPhone + 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: 3 + 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: 3 + buildTarget: Server + 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: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/music_on.png b/Assets/Sprites/music_on.png new file mode 100644 index 0000000..5e1fb32 Binary files /dev/null and b/Assets/Sprites/music_on.png differ diff --git a/Assets/Sprites/music_on.png.meta b/Assets/Sprites/music_on.png.meta new file mode 100644 index 0000000..3510671 --- /dev/null +++ b/Assets/Sprites/music_on.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: e771488162bd36841aeb2ec254f03b80 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + 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: 3 + 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: 3 + buildTarget: iPhone + 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: 3 + 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: 3 + buildTarget: Server + 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: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/sfx_off.png b/Assets/Sprites/sfx_off.png new file mode 100644 index 0000000..2ab845e Binary files /dev/null and b/Assets/Sprites/sfx_off.png differ diff --git a/Assets/Sprites/sfx_off.png.meta b/Assets/Sprites/sfx_off.png.meta new file mode 100644 index 0000000..423e134 --- /dev/null +++ b/Assets/Sprites/sfx_off.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: afbfe2a3374e7e6439d1fd6f24f14981 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + 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: 3 + 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: 3 + buildTarget: iPhone + 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: 3 + 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: 3 + buildTarget: Server + 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: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/sfx_on.png b/Assets/Sprites/sfx_on.png new file mode 100644 index 0000000..776dd55 Binary files /dev/null and b/Assets/Sprites/sfx_on.png differ diff --git a/Assets/Sprites/sfx_on.png.meta b/Assets/Sprites/sfx_on.png.meta new file mode 100644 index 0000000..92a63c8 --- /dev/null +++ b/Assets/Sprites/sfx_on.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: f78abd1020f17fc4e897c65c20f7f3c2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + 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: 3 + 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: 3 + buildTarget: iPhone + 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: 3 + 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: 3 + buildTarget: Server + 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: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 5e93e4b..9097d17 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,13 +1,14 @@ { "dependencies": { - "com.unity.collab-proxy": "2.0.0", - "com.unity.feature.2d": "1.0.0", - "com.unity.ide.rider": "3.0.18", - "com.unity.ide.visualstudio": "2.0.17", + "com.unity.ai.navigation": "1.1.4", + "com.unity.collab-proxy": "2.0.5", + "com.unity.feature.2d": "2.0.0", + "com.unity.ide.rider": "3.0.24", + "com.unity.ide.visualstudio": "2.0.18", "com.unity.ide.vscode": "1.2.5", - "com.unity.test-framework": "1.1.31", + "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.4", + "com.unity.timeline": "1.7.5", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.8.0", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index b2b16bf..1ce74ae 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,36 +1,43 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "7.0.9", + "version": "9.0.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "6.0.6", + "com.unity.2d.common": "8.0.1", "com.unity.2d.sprite": "1.0.0", + "com.unity.collections": "1.1.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.uielements": "1.0.0" }, "url": "https://packages.unity.com" }, + "com.unity.2d.aseprite": { + "version": "1.0.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.common": "6.0.6", + "com.unity.mathematics": "1.2.6", + "com.unity.modules.animation": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.2d.common": { - "version": "6.0.6", + "version": "8.0.1", "depth": 2, "source": "registry", "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.mathematics": "1.1.0", "com.unity.modules.uielements": "1.0.0", - "com.unity.burst": "1.5.1" + "com.unity.modules.animation": "1.0.0", + "com.unity.burst": "1.7.3" }, "url": "https://packages.unity.com" }, - "com.unity.2d.path": { - "version": "5.0.2", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.2d.pixel-perfect": { "version": "5.0.3", "depth": 1, @@ -39,12 +46,12 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "6.0.7", + "version": "8.0.2", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.animation": "7.0.9", - "com.unity.2d.common": "6.0.6", + "com.unity.2d.animation": "9.0.1", + "com.unity.2d.common": "8.0.1", "com.unity.2d.sprite": "1.0.0" }, "url": "https://packages.unity.com" @@ -56,13 +63,12 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "7.0.6", + "version": "9.0.2", "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.2d.common": "6.0.4", - "com.unity.2d.path": "5.0.2", + "com.unity.2d.common": "8.0.1", "com.unity.modules.physics2d": "1.0.0" }, "url": "https://packages.unity.com" @@ -71,10 +77,13 @@ "version": "1.0.0", "depth": 1, "source": "builtin", - "dependencies": {} + "dependencies": { + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.uielements": "1.0.0" + } }, "com.unity.2d.tilemap.extras": { - "version": "2.2.4", + "version": "3.1.1", "depth": 1, "source": "registry", "dependencies": { @@ -85,8 +94,17 @@ }, "url": "https://packages.unity.com" }, + "com.unity.ai.navigation": { + "version": "1.1.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { - "version": "1.6.6", + "version": "1.8.7", "depth": 3, "source": "registry", "dependencies": { @@ -95,12 +113,22 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.0.0", + "version": "2.0.5", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.collections": { + "version": "1.2.4", + "depth": 2, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.6.6", + "com.unity.test-framework": "1.1.31" + }, + "url": "https://packages.unity.com" + }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 1, @@ -109,21 +137,22 @@ "url": "https://packages.unity.com" }, "com.unity.feature.2d": { - "version": "1.0.0", + "version": "2.0.0", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "7.0.9", + "com.unity.2d.animation": "9.0.3", "com.unity.2d.pixel-perfect": "5.0.3", - "com.unity.2d.psdimporter": "6.0.7", + "com.unity.2d.psdimporter": "8.0.2", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "7.0.6", + "com.unity.2d.spriteshape": "9.0.2", "com.unity.2d.tilemap": "1.0.0", - "com.unity.2d.tilemap.extras": "2.2.4" + "com.unity.2d.tilemap.extras": "3.1.1", + "com.unity.2d.aseprite": "1.0.0" } }, "com.unity.ide.rider": { - "version": "3.0.18", + "version": "3.0.24", "depth": 0, "source": "registry", "dependencies": { @@ -132,7 +161,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.17", + "version": "2.0.18", "depth": 0, "source": "registry", "dependencies": { @@ -155,7 +184,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.31", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { @@ -175,7 +204,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.4", + "version": "1.7.5", "depth": 0, "source": "registry", "dependencies": { @@ -337,17 +366,6 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml index dd5b5f4..733ecd9 100644 --- a/ProjectSettings/AndroidResolverDependencies.xml +++ b/ProjectSettings/AndroidResolverDependencies.xml @@ -62,7 +62,7 @@ Assets/Plugins/Android/com.google.signin.google-signin-support-1.0.4.aar - + diff --git a/ProjectSettings/GvhProjectSettings.xml b/ProjectSettings/GvhProjectSettings.xml index 42602f6..0a41df4 100644 --- a/ProjectSettings/GvhProjectSettings.xml +++ b/ProjectSettings/GvhProjectSettings.xml @@ -1,8 +1,24 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 2297620..1cf9673 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 23 + serializedVersion: 26 productGUID: ef0914c0b3a0b7c10ac4f954ee5a61dc AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,14 +48,15 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 0 allowedAutorotateToPortraitUpsideDown: 0 allowedAutorotateToLandscapeRight: 1 @@ -119,8 +120,11 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -128,13 +132,8 @@ PlayerSettings: vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 - bundleVersion: 1.1 + loadStoreDebugModeEnabled: 0 + bundleVersion: 1.14 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -147,7 +146,7 @@ PlayerSettings: enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -159,10 +158,11 @@ PlayerSettings: Standalone: com.DefaultCompany.2DProject buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 1 - AndroidBundleVersionCode: 2 + AndroidBundleVersionCode: 4 AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 @@ -176,12 +176,15 @@ PlayerSettings: APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -229,8 +232,10 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -245,13 +250,15 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 - AndroidTargetArchitectures: 1 + AndroidTargetArchitectures: 3 AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: H:/keys/xperience.keystore AndroidKeyaliasName: xperience + AndroidEnableArmv9SecurityFeatures: 1 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -265,7 +272,6 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 @@ -349,8 +355,8 @@ PlayerSettings: m_Kind: 0 m_SubKind: - m_Textures: - - {fileID: 2800000, guid: 81a35b2ee95fa934dafe00e8941de700, type: 3} - {fileID: 2800000, guid: 15e00ceb828d2de4c9a03a790a9266bb, type: 3} + - {fileID: 2800000, guid: 81a35b2ee95fa934dafe00e8941de700, type: 3} m_Width: 432 m_Height: 432 m_Kind: 2 @@ -380,6 +386,103 @@ PlayerSettings: m_Height: 81 m_Kind: 2 m_SubKind: + - m_BuildTarget: iPhone + m_Icons: + - m_Textures: [] + m_Width: 180 + m_Height: 180 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 167 + m_Height: 167 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 152 + m_Height: 152 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 76 + m_Height: 76 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 87 + m_Height: 87 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 60 + m_Height: 60 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 20 + m_Height: 20 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 1024 + m_Height: 1024 + m_Kind: 4 + m_SubKind: App Store m_BuildTargetBatching: [] m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: @@ -429,7 +532,9 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] m_BuildTargetDefaultTextureCompressionFormat: - m_BuildTarget: Android @@ -444,6 +549,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -455,6 +561,7 @@ PlayerSettings: switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -528,7 +635,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -570,6 +676,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -670,6 +777,7 @@ PlayerSettings: webGLMemorySize: 32 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -682,6 +790,12 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: {} additionalCompilerArguments: {} @@ -689,17 +803,30 @@ PlayerSettings: scriptingBackend: Android: 1 il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + il2cppCodeGeneration: {} + managedStrippingLevel: + Android: 1 + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + QNX: 1 + Stadia: 1 + VisionOS: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 - selectedPlatform: 2 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -771,6 +898,11 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: apiCompatibilityLevel: 3 activeInputHandler: 0 windowsGamepadBackendHint: 0 @@ -781,6 +913,7 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 - playerDataPath: - forceSRGBBlit: 1 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 8e3af85..0a60761 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.19f1 -m_EditorVersionWithRevision: 2021.3.19f1 (c9714fde33b6) +m_EditorVersion: 2022.3.5f1 +m_EditorVersionWithRevision: 2022.3.5f1 (9674261d40ee) diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config deleted file mode 100644 index e69de29..0000000