diff --git a/Assets/000_assets/material/M_SquareFrame 1.mat b/Assets/000_assets/material/M_SquareFrame 1.mat index d875b26e..bb148dd5 100644 --- a/Assets/000_assets/material/M_SquareFrame 1.mat +++ b/Assets/000_assets/material/M_SquareFrame 1.mat @@ -213,7 +213,7 @@ Material: - _Dst: 10 - _DstBlend: 0 - _DstBlendAlpha: 0 - - _EdgeValue: 0.11854072 + - _EdgeValue: 0.9624716 - _EnvironmentReflections: 1 - _FNLfanxiangkaiguan: 0 - _Face: 1 @@ -258,7 +258,7 @@ Material: - _Mask_scale: 1 - _Metallic: 0 - _OcclusionStrength: 1 - - _Opacity: 0.8814593 + - _Opacity: 0.037528396 - _Parallax: 0.005 - _Pass: 0 - _QueueOffset: 0 diff --git a/Assets/AddressableAssetsData/Android/addressables_content_state.bin b/Assets/AddressableAssetsData/Android/addressables_content_state.bin index 52d4533a..606ad5c4 100644 Binary files a/Assets/AddressableAssetsData/Android/addressables_content_state.bin and b/Assets/AddressableAssetsData/Android/addressables_content_state.bin differ diff --git a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin index 094170ed..306956d4 100644 Binary files a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin and b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin differ diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml new file mode 100644 index 00000000..cb10945d --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/AddressableAssetsData/link.xml.meta b/Assets/AddressableAssetsData/link.xml.meta new file mode 100644 index 00000000..47526a9b --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7c82452eec95d2140ac081f8c18042f3 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/Built-In Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Built-In Samples.unitypackage.meta new file mode 100644 index 00000000..d97f4fc6 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/Built-In Samples.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e00e6f90ab8233e46a41c5e33917c642 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 10x.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/HDRP Samples 10x.unitypackage.meta new file mode 100644 index 00000000..d4db3873 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/HDRP Samples 10x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9da5530d5ebfab24c8ecad68795e720f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 12x.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/HDRP Samples 12x.unitypackage.meta new file mode 100644 index 00000000..c3c98f27 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/HDRP Samples 12x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: aa102d640b98b5d4781710a3a3dd6983 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 14x.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/HDRP Samples 14x.unitypackage.meta new file mode 100644 index 00000000..ba827d29 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/HDRP Samples 14x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7a0bb33169d95ec499136d59cb25918b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 15x.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/HDRP Samples 15x.unitypackage.meta new file mode 100644 index 00000000..3c5ca728 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/HDRP Samples 15x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 641c955d37d2fac4f87e00ac5c9d9bd8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 16x.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/HDRP Samples 16x.unitypackage.meta new file mode 100644 index 00000000..249f4ab1 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/HDRP Samples 16x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2690f45490c175045bbdc63395bf6278 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 17.0.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/HDRP Samples 17.0.unitypackage.meta new file mode 100644 index 00000000..3ee0254d --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/HDRP Samples 17.0.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fbd1fd9b3a70fad429d1eaaa5799c2a5 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 17.1.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/HDRP Samples 17.1.unitypackage.meta new file mode 100644 index 00000000..4557a1b4 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/HDRP Samples 17.1.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3579d9cf4b75c564faa8fffc58a9f3f6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 17.2.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/HDRP Samples 17.2.unitypackage.meta new file mode 100644 index 00000000..677da0f0 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/HDRP Samples 17.2.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0023a0858ba124646a55dfcb7231ed46 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/HDRP Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/HDRP Samples.unitypackage.meta new file mode 100644 index 00000000..872a1e1a --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/HDRP Samples.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d1c0b77896049554fa4b635531caf741 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/Sample Resources.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Sample Resources.unitypackage.meta new file mode 100644 index 00000000..9d944382 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/Sample Resources.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c0a0a980c9ba86345bc15411db88d34f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/URP Samples 10x.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/URP Samples 10x.unitypackage.meta new file mode 100644 index 00000000..819d3c7d --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/URP Samples 10x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2edbf4a9b9544774bbef617e92429664 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/URP Samples 12x.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/URP Samples 12x.unitypackage.meta new file mode 100644 index 00000000..9c0d665d --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/URP Samples 12x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 13ab599a7bda4e54fba3e92a13c9580a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/URP Samples 14x.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/URP Samples 14x.unitypackage.meta new file mode 100644 index 00000000..624d8621 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/URP Samples 14x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f6f268949ccf3f34fa4d18e92501ed82 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/URP Samples 15x.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/URP Samples 15x.unitypackage.meta new file mode 100644 index 00000000..7e2a8a41 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/URP Samples 15x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 69bc3229216b1504ea3e28b5820bbb0d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/URP Samples 16x.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/URP Samples 16x.unitypackage.meta new file mode 100644 index 00000000..9d2cb068 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/URP Samples 16x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4f665a06c5a2aa5499fa1c79ac058999 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/URP Samples 17.0.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/URP Samples 17.0.unitypackage.meta new file mode 100644 index 00000000..aa70a0f5 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/URP Samples 17.0.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8a87ed432fe2d97498c0de5fae312e35 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/URP Samples 17.1.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/URP Samples 17.1.unitypackage.meta new file mode 100644 index 00000000..013c35c6 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/URP Samples 17.1.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7c3bfbbeb9427b94099254e2e2768ad4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/URP Samples 17.2.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/URP Samples 17.2.unitypackage.meta new file mode 100644 index 00000000..42051740 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/URP Samples 17.2.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c5303861611f41c438a30be552da5de4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/URP Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/URP Samples.unitypackage.meta new file mode 100644 index 00000000..da8ce241 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/URP Samples.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a9d68dd8913f05d4d9ce75e7b40c6044 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Previews/IndirectSpecularPreview.exr.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Previews/IndirectSpecularPreview.exr.meta index c75ac69b..788f02fb 100644 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Previews/IndirectSpecularPreview.exr.meta +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Previews/IndirectSpecularPreview.exr.meta @@ -75,7 +75,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 10x.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 10x.unitypackage.meta new file mode 100644 index 00000000..602bd09a --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 10x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2243c8b4e1ab6914995699133f67ab5a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 12x.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 12x.unitypackage.meta new file mode 100644 index 00000000..e51ee6d4 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 12x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9a5e61a8b3421b944863d0946e32da0a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 14x.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 14x.unitypackage.meta new file mode 100644 index 00000000..82a2ab0e --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 14x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 89f0b84148d149d4d96b838d7ef60e92 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 15x.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 15x.unitypackage.meta new file mode 100644 index 00000000..54836f2b --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 15x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 19939ee2cdb76e0489b1b8cd4bed7f3d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 16x.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 16x.unitypackage.meta new file mode 100644 index 00000000..65b98bd3 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 16x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 70777e8ce9f3c8d4a8182ca2f965cdb2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 17.0.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 17.0.unitypackage.meta new file mode 100644 index 00000000..c32e9f8f --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 17.0.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ba281a1a00c8ac54c914e0763299f637 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 17.1.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 17.1.unitypackage.meta new file mode 100644 index 00000000..0a18ad9c --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 17.1.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e6fc8948257acee42b666d0bfe1d782c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 17.2.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 17.2.unitypackage.meta new file mode 100644 index 00000000..314aa79b --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 17.2.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4b5cb8698f2d9c14fadf8e2383441d37 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 10x.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 10x.unitypackage.meta new file mode 100644 index 00000000..34f23836 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 10x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b460b52e6c1feae45b70b7ddc2c45bd6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 12x.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 12x.unitypackage.meta new file mode 100644 index 00000000..04c4f886 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 12x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 57fcea0ed8b5eb347923c4c21fa31b57 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 14x.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 14x.unitypackage.meta new file mode 100644 index 00000000..d5cd3087 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 14x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2e9da72e7e3196146bf7d27450013734 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 15x.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 15x.unitypackage.meta new file mode 100644 index 00000000..0b6cd6d0 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 15x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0904cdf24ddcd5042b024326476220d5 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 16x.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 16x.unitypackage.meta new file mode 100644 index 00000000..2b33d7ab --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 16x.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 929783250050f8a448821b6ca1f2c578 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 17.0.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 17.0.unitypackage.meta new file mode 100644 index 00000000..e0b5ad87 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 17.0.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fcc4d2eb0af82e546ae75506872cf092 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 17.1.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 17.1.unitypackage.meta new file mode 100644 index 00000000..6338d388 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 17.1.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cd0a0171c5157b748afe763b89f71211 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 17.2.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 17.2.unitypackage.meta new file mode 100644 index 00000000..47f972a0 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 17.2.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f4990f6ace6142c4bbbf41cdd80b0bd3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Built-in Pipeline.unitypackage.meta b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Built-in Pipeline.unitypackage.meta new file mode 100644 index 00000000..d4c3ffb4 --- /dev/null +++ b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Built-in Pipeline.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1782b72cd0e99a54fac09382c482e3db +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 2022.3+.unitypackage.meta b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 2022.3+.unitypackage.meta new file mode 100644 index 00000000..378f3f8d --- /dev/null +++ b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 2022.3+.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 49d5bcbbd4cbd754b98cf3200197b0f1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 6000.0+.unitypackage.meta b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 6000.0+.unitypackage.meta new file mode 100644 index 00000000..2d5423a9 --- /dev/null +++ b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 6000.0+.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: eefe45a405f061045be947217e30ed10 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 6000.1+.unitypackage.meta b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 6000.1+.unitypackage.meta new file mode 100644 index 00000000..ccb4a903 --- /dev/null +++ b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 6000.1+.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2e995dfe11e22d34d92432383d15c067 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 6000.2+.unitypackage.meta b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 6000.2+.unitypackage.meta new file mode 100644 index 00000000..03ead5d2 --- /dev/null +++ b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 6000.2+.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ec984c51d4ae2504184eeb292734c672 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 6000.3+.unitypackage.meta b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 6000.3+.unitypackage.meta new file mode 100644 index 00000000..767ec46b --- /dev/null +++ b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 6000.3+.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e447b3d7d913d694ca35f74e30581840 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 2022.3+.unitypackage.meta b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 2022.3+.unitypackage.meta new file mode 100644 index 00000000..3502d9ed --- /dev/null +++ b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 2022.3+.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6584a66582083a1459dcf5e4e87f6d62 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 6000.0+.unitypackage.meta b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 6000.0+.unitypackage.meta new file mode 100644 index 00000000..615e9057 --- /dev/null +++ b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 6000.0+.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0190b8bde50f12943926613d9a63c89a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 6000.1+.unitypackage.meta b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 6000.1+.unitypackage.meta new file mode 100644 index 00000000..9835f913 --- /dev/null +++ b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 6000.1+.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ae2ce8ad295486349839288636aed1ed +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 6000.2+.unitypackage.meta b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 6000.2+.unitypackage.meta new file mode 100644 index 00000000..1002df1c --- /dev/null +++ b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 6000.2+.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d69745226619e3241a8e04ce86aee6a6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 6000.3+.unitypackage.meta b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 6000.3+.unitypackage.meta new file mode 100644 index 00000000..98204661 --- /dev/null +++ b/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 6000.3+.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 37e6a9374416bc946a55779c58d0d984 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FR2_Cache.asset b/Assets/FR2_Cache.asset index cd3cc63b..7204f8a9 100644 --- a/Assets/FR2_Cache.asset +++ b/Assets/FR2_Cache.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0560d77ba47d1bd7183ea50b7d7eee2e398b88118bfd7e2b101e3e4358be4bce -size 8732636 +oid sha256:fe0dfbab5808f71e29a2d0677b06dc7f88a0ee7de546f2c477b654d9d84293fd +size 8762633 diff --git a/Assets/Le Tai's Asset/TranslucentImage/URP support.unitypackage.meta b/Assets/Le Tai's Asset/TranslucentImage/URP support.unitypackage.meta new file mode 100644 index 00000000..9e552100 --- /dev/null +++ b/Assets/Le Tai's Asset/TranslucentImage/URP support.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e45363610a59a4543a9793b3bf2be4aa +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Localization/UI/UI Shared Data.asset b/Assets/Localization/UI/UI Shared Data.asset index 30f5819e..a8c2afe7 100644 --- a/Assets/Localization/UI/UI Shared Data.asset +++ b/Assets/Localization/UI/UI Shared Data.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d21b1206a2526b28964ebac3b40deb2193688d04dd2edd3d51b1c1767949da76 +oid sha256:4edd99a2ac964915482d47c74ae44b4c2e1be09a28bf34bd6568960aa6d8f728 size 13200 diff --git a/Assets/Localization/UI/UI.csv b/Assets/Localization/UI/UI.csv index 254ba17e..b36d9509 100644 --- a/Assets/Localization/UI/UI.csv +++ b/Assets/Localization/UI/UI.csv @@ -42,6 +42,8 @@ ui_settings_bloom_quality_title,Bloom 质量,Bloom Quality,Bloom 品質,ブル ui_settings_bloom_quality_description,设置 Bloom 质量；仅在启用后处理时生效。,Sets Bloom quality. Only takes effect while post-processing is enabled.,設定 Bloom 品質；僅在啟用後處理時生效。,ブルーム品質を設定します。ポストプロセス有効時のみ反映されます。,블룸 품질을 설정합니다. 후처리가 켜져 있을 때만 적용됩니다。,Đặt chất lượng Bloom. Chỉ có hiệu lực khi hậu xử lý được bật.,ตั้งค่าคุณภาพ Bloom มีผลเมื่อเปิดโพสต์โปรเซสเท่านั้น ui_settings_vfx_quality_title,VFX 质量,VFX Quality,VFX 品質,VFX品質,VFX 품질,Chất lượng VFX,คุณภาพ VFX ui_settings_vfx_quality_description,设置音符和演出特效的质量等级。,Sets quality levels for Notes and performance effects.,設定音符和演出特效的品質等級。,ノーツと演出エフェクトの品質を設定します。,노트와 연출 효과의 품질 단계를 설정합니다。,Đặt mức chất lượng cho Note và hiệu ứng trình diễn.,ตั้งระดับคุณภาพของโน้ตและเอฟเฟกต์การแสดง +ui_settings_ui_effects_title,UI 效果,UI Effects,UI 效果,UIエフェクト,UI 효과,Hiệu ứng UI,เอฟเฟ็กต์ UI +ui_settings_ui_effects_description,启用动态等高线等 UI 视觉效果。关闭可降低选曲和设置界面的 GPU 开销。,Enables dynamic UI visuals such as expanding contours. Disable to reduce GPU load on the song selection and settings screens.,啟用動態等高線等 UI 視覺效果。關閉可降低選曲與設定畫面的 GPU 負載。,拡張する等高線などの動的なUI表現を有効にします。オフにすると選曲・設定画面のGPU負荷を抑えられます。,확장 윤곽선 등 동적 UI 효과를 활성화합니다. 끄면 선곡 및 설정 화면의 GPU 부하를 줄일 수 있습니다.,Bật các hiệu ứng UI động như đường đồng mức lan rộng. Tắt để giảm tải GPU ở màn hình chọn bài và cài đặt.,เปิดใช้เอฟเฟ็กต์ UI แบบไดนามิก เช่น เส้นคอนทัวร์ที่ขยายออก ปิดเพื่อช่วยลดภาระ GPU ในหน้าจอเลือกเพลงและการตั้งค่า ui_settings_vsync_title,垂直同步,VSync,垂直同步,垂直同期,수직 동기화,Đồng bộ dọc,ซิงก์แนวตั้ง ui_settings_vsync_description,使帧输出与显示器刷新率同步；仅 PC 生效。,Synchronizes frame output with the display refresh rate. PC only.,使幀輸出與螢幕更新率同步；僅 PC 生效。,フレーム出力をディスプレイのリフレッシュレートに同期します。PCのみ。,프레임 출력을 디스플레이 주사율과 동기화합니다. PC 전용입니다。,Đồng bộ khung hình với tần số quét màn hình. Chỉ trên PC.,ซิงก์การแสดงผลเฟรมกับอัตรารีเฟรชของจอ ใช้ได้บน PC เท่านั้น ui_settings_display_mode_title,显示模式,Display Mode,顯示模式,表示モード,표시 모드,Chế độ hiển thị,โหมดการแสดงผล diff --git a/Assets/Localization/UI/UI_en.asset b/Assets/Localization/UI/UI_en.asset index a3df664e..4e964311 100644 --- a/Assets/Localization/UI/UI_en.asset +++ b/Assets/Localization/UI/UI_en.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b3f8625f7c0963cf9d7d65afd2dd57b9e8d0256dce3c3a46f55c393a2e77ee5 -size 13264 +oid sha256:74ac96f0c7c867d89bb98fe596e9685774a83011f644953bc46ab4db341ee61c +size 13346 diff --git a/Assets/Localization/UI/UI_ja.asset b/Assets/Localization/UI/UI_ja.asset index 25c156c5..c817b71c 100644 --- a/Assets/Localization/UI/UI_ja.asset +++ b/Assets/Localization/UI/UI_ja.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:021219a8bc09873f99bf9fa1bb0e483d19a91e55e2ca404050a8118a92f3e8f2 -size 18584 +oid sha256:62236c639f8c72156c4db88c6f6b594e76838dc1136d2141b82bec0068d11c45 +size 18767 diff --git a/Assets/Localization/UI/UI_ko.asset b/Assets/Localization/UI/UI_ko.asset index 6eef4520..e8c3f68b 100644 --- a/Assets/Localization/UI/UI_ko.asset +++ b/Assets/Localization/UI/UI_ko.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce5b465c88571dad68097efe0872bb2128d51b7a57a1f0a1f827e20564033c6c -size 17675 +oid sha256:efe7f55fa27fa99dc509d79db697a5ffdebeeb3452c5f74c8ac21b0328575283 +size 17811 diff --git a/Assets/Localization/UI/UI_th.asset b/Assets/Localization/UI/UI_th.asset index 9e13f690..174a72eb 100644 --- a/Assets/Localization/UI/UI_th.asset +++ b/Assets/Localization/UI/UI_th.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:533089c3985add8051c767f73fd558a0d52762d8eabcb1fc40ba893b399b9a7d -size 25575 +oid sha256:9960fc1e1becf0f6d1b4d3346d0a2db9956b2d3b063d07f69521eb6a94745251 +size 26050 diff --git a/Assets/Localization/UI/UI_vi-VN.asset b/Assets/Localization/UI/UI_vi-VN.asset index 31d2d44c..d2a9e51d 100644 --- a/Assets/Localization/UI/UI_vi-VN.asset +++ b/Assets/Localization/UI/UI_vi-VN.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fce0ea4caf67bdd0d5e2b30478dd49d882f7aa1cc7fc4a9dbd0d33b0e2be17d4 -size 16916 +oid sha256:f90761425ce8d969fa3bf6710dc4c4a14cc8c268e41e0f657e0345d528b1b4bd +size 17070 diff --git a/Assets/Localization/UI/UI_zh-CN.asset b/Assets/Localization/UI/UI_zh-CN.asset index d69c7b86..7caec611 100644 --- a/Assets/Localization/UI/UI_zh-CN.asset +++ b/Assets/Localization/UI/UI_zh-CN.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f975f2c3f54e40045c7f28493ab97388c761f2be15dbcbfdbb6d3a726d9b8a1 -size 15671 +oid sha256:e1ae99d89223c2aeff9b3f31c29bb1808fcb80bfacaf315d2797377023cba9e0 +size 15787 diff --git a/Assets/Localization/UI/UI_zh-TW.asset b/Assets/Localization/UI/UI_zh-TW.asset index 3b4c4b15..65227f8a 100644 --- a/Assets/Localization/UI/UI_zh-TW.asset +++ b/Assets/Localization/UI/UI_zh-TW.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3155ca195247cea1c25fbbd5801505af46a7be08325301976e90aa9c1d8eb8e2 -size 15719 +oid sha256:0a035f79644367f93afdf14718c4d4c00010765d24e1ad2a821c2193c695d9b3 +size 15835 diff --git a/Assets/Plugins/Easy Save 3/Editor/ES3Asmdefs.unitypackage.meta b/Assets/Plugins/Easy Save 3/Editor/ES3Asmdefs.unitypackage.meta new file mode 100644 index 00000000..550f254c --- /dev/null +++ b/Assets/Plugins/Easy Save 3/Editor/ES3Asmdefs.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: de41a70ead12af544a4e99a925b269d2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta new file mode 100644 index 00000000..1eadf09a --- /dev/null +++ b/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f597f19f656ba56eae4f6a3a7cc528f4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta new file mode 100644 index 00000000..f073d2ab --- /dev/null +++ b/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 48e08dc33330d11e9d4a1b246c52e4f6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta new file mode 100644 index 00000000..130722af --- /dev/null +++ b/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ed09910c0094cb27be8f3ca264680da3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta new file mode 100644 index 00000000..f9b8ed82 --- /dev/null +++ b/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cc355dd4cf1e6173beaeb22c2858cbe1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Menu/UI Elements/KeyRebindButton.prefab b/Assets/Prefabs/Menu/UI Elements/KeyRebindButton.prefab index 946fc32f..15b9ff65 100644 --- a/Assets/Prefabs/Menu/UI Elements/KeyRebindButton.prefab +++ b/Assets/Prefabs/Menu/UI Elements/KeyRebindButton.prefab @@ -36,7 +36,7 @@ RectTransform: 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: -200, y: -5} + m_AnchoredPosition: {x: -150, y: -5} m_SizeDelta: {x: 400, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4342668321050494381 @@ -891,7 +891,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 500, y: -350} - m_SizeDelta: {x: 7, y: 200} + m_SizeDelta: {x: 700, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2689290717058890741 MonoBehaviour: diff --git a/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/Beatmap.bytes index 564d2a04..fb74503b 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/Beatmap.bytes and b/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/Beatmap.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/CommandScripts.bytes index b1de77ad..89af2c70 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/CommandScripts.bytes and b/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/CommandScripts.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/ProjectInfo.bytes index 296520e9..33810030 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/ProjectInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/ProjectInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/SongInfo.bytes index b30ed9e4..add94616 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/SongInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/SongInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/Beatmap.bytes index 27894f44..bc3df8ca 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/Beatmap.bytes and b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/Beatmap.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/CommandScripts.bytes index 21d2ea4a..c2698cf0 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/CommandScripts.bytes and b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/CommandScripts.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/ProjectInfo.bytes index 04834980..beeb9b33 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/ProjectInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/ProjectInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/SongInfo.bytes index 381d2a40..a813e4be 100644 --- a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/SongInfo.bytes +++ b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/SongInfo.bytes @@ -1,2 +1,3 @@ -d`;mU Xv纙_9/SĈV;YC~4$CK.&qbyZ=?LĢ^$gQ!6(\$^a0)|=el eP V4)^ɒ=moĊ%ǟf֖ӹ*?U$8H z rw ޟ`w,15O}8"/!M%\9gQU86W҇ -ރ.{Kjwd \ No newline at end of file +$(ƾ4+E37n )36uC1n,} d 9|C:i]jDO5*: + Qr,ZꊟtZ/R\I}K~7sBn⿉⻟W)J酳d`mU?b:Mu2ߓoJ8`^Ɯ['.s}SkHQlAS)2Aދ+Eݫ{؝6@;@:؆zC%%P۵, 'm~d-]8lLw>l/S3*+:"jL9YHVY Ff \ No newline at end of file +虎hDA a{PgP@wY2hHU^Dmw roVr'U'(hB4-hRa'rY*E1X\qiBy4?±FUy'KlVGRPkeOִ"xIT~v v_H$:2MH'ә#pp@ \ No newline at end of file diff --git a/Assets/Resources/Beatmaps/Chapter0/Chapter 0 Tutorial/Easy/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Chapter 0 Tutorial/Easy/ProjectInfo.bytes index 5cc71877..bd5bcaa3 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Chapter 0 Tutorial/Easy/ProjectInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Chapter 0 Tutorial/Easy/ProjectInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Chapter 0 Tutorial/Easy/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Chapter 0 Tutorial/Easy/SongInfo.bytes index 19bca317..4d170c21 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Chapter 0 Tutorial/Easy/SongInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Chapter 0 Tutorial/Easy/SongInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Easy/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Easy/Beatmap.bytes index a21c35a3..04a0af76 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Easy/Beatmap.bytes and b/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Easy/Beatmap.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Easy/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Easy/CommandScripts.bytes index f6c7e7c8..042130f2 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Easy/CommandScripts.bytes and b/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Easy/CommandScripts.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Easy/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Easy/ProjectInfo.bytes index 1ac53e4e..496d581f 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Easy/ProjectInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Easy/ProjectInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Easy/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Easy/SongInfo.bytes index 13613aeb..2dd1659e 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Easy/SongInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Easy/SongInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Register/Easy/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Register/Easy/Beatmap.bytes index 91a15730..f625a7db 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Register/Easy/Beatmap.bytes and b/Assets/Resources/Beatmaps/Chapter0/Register/Easy/Beatmap.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Register/Easy/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Register/Easy/CommandScripts.bytes index 184ec6ce..490723c7 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Register/Easy/CommandScripts.bytes and b/Assets/Resources/Beatmaps/Chapter0/Register/Easy/CommandScripts.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Register/Easy/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Register/Easy/ProjectInfo.bytes index 061a8c4f..e3433f9b 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Register/Easy/ProjectInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Register/Easy/ProjectInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Register/Easy/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Register/Easy/SongInfo.bytes index ebec49a2..89cad8e5 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Register/Easy/SongInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Register/Easy/SongInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Observatory/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Observatory/Beatmap.bytes index 1ffd39d0..0e873955 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Observatory/Beatmap.bytes and b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Observatory/Beatmap.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Observatory/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Observatory/CommandScripts.bytes index 448ef8d4..4105b08e 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Observatory/CommandScripts.bytes and b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Observatory/CommandScripts.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Observatory/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Observatory/ProjectInfo.bytes index e41f0a1b..1c6419b8 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Observatory/ProjectInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Observatory/ProjectInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Observatory/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Observatory/SongInfo.bytes index a1bf0594..eb4be409 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Observatory/SongInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Observatory/SongInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/World for White Lies/Calendar/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/World for White Lies/Calendar/Beatmap.bytes index 15d86dd5..e5bde56a 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/World for White Lies/Calendar/Beatmap.bytes and b/Assets/Resources/Beatmaps/Chapter0/World for White Lies/Calendar/Beatmap.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/World for White Lies/Calendar/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/World for White Lies/Calendar/CommandScripts.bytes index 58ae84f1..c39862ae 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/World for White Lies/Calendar/CommandScripts.bytes and b/Assets/Resources/Beatmaps/Chapter0/World for White Lies/Calendar/CommandScripts.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/World for White Lies/Calendar/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/World for White Lies/Calendar/ProjectInfo.bytes index c026c402..626f3fe4 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/World for White Lies/Calendar/ProjectInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/World for White Lies/Calendar/ProjectInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/World for White Lies/Calendar/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/World for White Lies/Calendar/SongInfo.bytes index 062a95b7..eac9c8f3 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/World for White Lies/Calendar/SongInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/World for White Lies/Calendar/SongInfo.bytes differ diff --git a/Assets/Resources/Chapter0.asset b/Assets/Resources/Chapter0.asset index 8871508a..c9fdc6b2 100644 --- a/Assets/Resources/Chapter0.asset +++ b/Assets/Resources/Chapter0.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5607719226874590adfd9798e47ff887e006f5df34e7b47ff9315ec0b419fbd0 -size 18450 +oid sha256:42bdc03de85e3424cbe4cd22d4e9338f224a7a8d7ac33e11c4a1ab5092eb8c96 +size 18498 diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 130d21cf..f5213dcf 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -2426,6 +2426,8 @@ MonoBehaviour: characterImage: {fileID: 1998907881} characterNameText: {fileID: 747555051} sentenceText: {fileID: 608699491} + characterNameLocalizedText: {fileID: 0} + sentenceLocalizedText: {fileID: 0} difficultyText: {fileID: 792268001} levelText: {fileID: 2070194342} illustratorText: {fileID: 1491819405} @@ -4765,7 +4767,7 @@ MonoBehaviour: m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 - m_ActiveFontFeatures: 00000000 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 @@ -12223,7 +12225,7 @@ MonoBehaviour: m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 - m_ActiveFontFeatures: 00000000 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 @@ -14570,7 +14572,7 @@ MonoBehaviour: m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 - m_ActiveFontFeatures: 00000000 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 @@ -16504,7 +16506,7 @@ MonoBehaviour: m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 - m_ActiveFontFeatures: 00000000 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index 2fd2ce1b..b957c344 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -6522,6 +6522,8 @@ MonoBehaviour: enablePostProcessing: 1 bloomQuality: 2 vfxQuality: 2 + enableUiEffects: 1 + uiEffectsSettingInitialized: 0 vSyncEnabled: 0 displayMode: 1 displayResolutionWidth: 0 @@ -6543,6 +6545,7 @@ GameObject: - component: {fileID: 390213793} - component: {fileID: 390213795} - component: {fileID: 390213794} + - component: {fileID: 390213796} m_Layer: 5 m_Name: Background (1) m_TagString: Untagged @@ -6583,7 +6586,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 2f196e016e1f9de4092a5f24f02342ae, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -6607,6 +6610,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 390213792} m_CullTransparentMesh: 1 +--- !u!114 &390213796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 390213792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47bc8701d1c446184bf62bffaf104f2, type: 3} + m_Name: + m_EditorClassIdentifier: + targetGraphic: {fileID: 390213794} --- !u!1 &403017936 GameObject: m_ObjectHideFlags: 0 @@ -8567,7 +8583,7 @@ PrefabInstance: type: 3} propertyPath: rebindingWindow value: - objectReference: {fileID: 0} + objectReference: {fileID: 683565164} - target: {fileID: 2961029731193376656, guid: 14c67a04f94221942b124721a7dfa6fa, type: 3} propertyPath: targetText @@ -9447,7 +9463,7 @@ PrefabInstance: type: 3} propertyPath: rebindingWindow value: - objectReference: {fileID: 0} + objectReference: {fileID: 683565164} - target: {fileID: 2961029731193376656, guid: 14c67a04f94221942b124721a7dfa6fa, type: 3} propertyPath: stringReference.m_TableEntryReference.m_KeyId @@ -9915,6 +9931,173 @@ MonoBehaviour: references: version: 2 RefIds: [] +--- !u!1001 &586649206 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1790691941} + m_Modifications: + - target: {fileID: 684422186442178476, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: stringReference.m_TableEntryReference.m_KeyId + value: 17002036422762496 + objectReference: {fileID: 0} + - target: {fileID: 684422186442178476, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: stringReference.m_TableReference.m_TableCollectionName + value: GUID:971ba9d57d145154daf7371bd0e6b12f + objectReference: {fileID: 0} + - target: {fileID: 1436411705962800859, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_text + value: "UI \u6548\u679C" + objectReference: {fileID: 0} + - target: {fileID: 1890038081481639440, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_text + value: "\u542F\u7528\u52A8\u6001\u7B49\u9AD8\u7EBF\u7B49 UI \u89C6\u89C9\u6548\u679C\u3002\u5173\u95ED\u53EF\u964D\u4F4E\u9009\u66F2\u548C\u8BBE\u7F6E\u754C\u9762\u7684 + GPU \u5F00\u9500\u3002" + objectReference: {fileID: 0} + - target: {fileID: 2162142985987821472, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: stringReference.m_TableEntryReference.m_KeyId + value: 17002036540203008 + objectReference: {fileID: 0} + - target: {fileID: 2162142985987821472, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: stringReference.m_TableReference.m_TableCollectionName + value: GUID:971ba9d57d145154daf7371bd0e6b12f + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1500 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -900 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9161412252175312324, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + propertyPath: m_Name + value: UIEffects + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, type: 3} +--- !u!224 &586649207 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6957248862450417298, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + m_PrefabInstance: {fileID: 586649206} + m_PrefabAsset: {fileID: 0} +--- !u!114 &586649208 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5598452497064675529, guid: 02b942a4ac1a0e047bcc7cf6fc2664e0, + type: 3} + m_PrefabInstance: {fileID: 586649206} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 33444f8904d91374fb31960969da96ed, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &600935696 GameObject: m_ObjectHideFlags: 0 @@ -13766,7 +13949,7 @@ PrefabInstance: type: 3} propertyPath: rebindingWindow value: - objectReference: {fileID: 0} + objectReference: {fileID: 683565164} - target: {fileID: 2961029731193376656, guid: 14c67a04f94221942b124721a7dfa6fa, type: 3} propertyPath: m_Enabled @@ -15747,6 +15930,7 @@ MonoBehaviour: releaseSmoothing: 4 flickThreshold: 50 SnapThreshold: 5 + snapVelocityProjectionTime: 0.12 selectedTab: {fileID: 0} songItems: [] topBound: 0 @@ -21753,6 +21937,7 @@ GameObject: - component: {fileID: 1371824330} - component: {fileID: 1371824332} - component: {fileID: 1371824331} + - component: {fileID: 1371824333} m_Layer: 5 m_Name: Background (1) m_TagString: Untagged @@ -21793,7 +21978,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 2f196e016e1f9de4092a5f24f02342ae, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -21817,6 +22002,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1371824329} m_CullTransparentMesh: 1 +--- !u!114 &1371824333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1371824329} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47bc8701d1c446184bf62bffaf104f2, type: 3} + m_Name: + m_EditorClassIdentifier: + targetGraphic: {fileID: 1371824331} --- !u!1 &1385276030 GameObject: m_ObjectHideFlags: 0 @@ -22160,7 +22358,7 @@ PrefabInstance: - target: {fileID: 3829299537931940282, guid: cc732506675db1f4b9bf9bf0c997748c, type: 3} propertyPath: stringReference.m_TableEntryReference.m_KeyId - value: 16861133011935272 + value: 16866525339181063 objectReference: {fileID: 0} - target: {fileID: 3829299537931940282, guid: cc732506675db1f4b9bf9bf0c997748c, type: 3} @@ -22290,7 +22488,7 @@ PrefabInstance: - target: {fileID: 7103016005250617451, guid: cc732506675db1f4b9bf9bf0c997748c, type: 3} propertyPath: stringReference.m_TableEntryReference.m_KeyId - value: 16861133011935271 + value: 16866525339181062 objectReference: {fileID: 0} - target: {fileID: 7103016005250617451, guid: cc732506675db1f4b9bf9bf0c997748c, type: 3} @@ -25196,7 +25394,7 @@ PrefabInstance: type: 3} propertyPath: rebindingWindow value: - objectReference: {fileID: 0} + objectReference: {fileID: 683565164} - target: {fileID: 2961029731193376656, guid: 14c67a04f94221942b124721a7dfa6fa, type: 3} propertyPath: stringReference.m_TableEntryReference.m_KeyId @@ -27592,6 +27790,7 @@ RectTransform: - {fileID: 327999208} - {fileID: 1241064211} - {fileID: 441536413} + - {fileID: 586649207} - {fileID: 1138134107} - {fileID: 716068129} - {fileID: 777756904} @@ -27653,6 +27852,7 @@ MonoBehaviour: postProcessingSwitch: {fileID: 327999209} bloomQualityDropdown: {fileID: 1241064212} vfxQualityDropdown: {fileID: 441536414} + uiEffectsSwitch: {fileID: 586649208} vSyncSwitch: {fileID: 1138134108} displayModeDropdown: {fileID: 716068130} displayResolutionDropdown: {fileID: 777756905} @@ -36480,7 +36680,7 @@ PrefabInstance: type: 3} propertyPath: rebindingWindow value: - objectReference: {fileID: 0} + objectReference: {fileID: 683565164} - target: {fileID: 2961029731193376656, guid: 14c67a04f94221942b124721a7dfa6fa, type: 3} propertyPath: targetText diff --git a/Assets/Scripts/Game/GameElements/GeneralEffects/MusicEffects/HighPassFilterEffect.cs b/Assets/Scripts/Game/GameElements/GeneralEffects/MusicEffects/HighPassFilterEffect.cs index 223fdf9a..acb71300 100644 --- a/Assets/Scripts/Game/GameElements/GeneralEffects/MusicEffects/HighPassFilterEffect.cs +++ b/Assets/Scripts/Game/GameElements/GeneralEffects/MusicEffects/HighPassFilterEffect.cs @@ -32,7 +32,7 @@ namespace Ichni.RhythmGame // 1.0 = 纯线性（效果太弱） // 0.5 = 接近对数（效果太强） // 0.65 = 推荐起点，可根据实际测试微调（向 1.0 调弱，向 0.5 调强） - private const float PowerExponent = 0.25f; + private const float PowerExponent = 0.35f; #endregion #region [初始化] Initialization diff --git a/Assets/Scripts/Game/GameElements/GeneralEffects/MusicEffects/LowPassFilterEffect.cs b/Assets/Scripts/Game/GameElements/GeneralEffects/MusicEffects/LowPassFilterEffect.cs index 08221b62..162dca5d 100644 --- a/Assets/Scripts/Game/GameElements/GeneralEffects/MusicEffects/LowPassFilterEffect.cs +++ b/Assets/Scripts/Game/GameElements/GeneralEffects/MusicEffects/LowPassFilterEffect.cs @@ -30,7 +30,7 @@ namespace Ichni.RhythmGame // 1.0 = 纯线性（效果太弱） // 0.5 = 接近对数（效果太强） // 0.65 = 推荐起点，可根据实际测试微调（向 1.0 调弱，向 0.5 调强） - private const float PowerExponent = 0.25f; + private const float PowerExponent = 0.35f; #endregion #region [初始化] Initialization diff --git a/Assets/Scripts/Settings/SettingsManager.cs b/Assets/Scripts/Settings/SettingsManager.cs index 99f1abd8..b79bb41c 100644 --- a/Assets/Scripts/Settings/SettingsManager.cs +++ b/Assets/Scripts/Settings/SettingsManager.cs @@ -1,4 +1,5 @@ using Ichni.Menu; +using Ichni.UI; using System.Collections; using System.Collections.Generic; using Sirenix.OdinInspector; @@ -112,6 +113,7 @@ namespace Ichni { string savePath = Application.persistentDataPath + "/GameData/" + SettingsSaveFileName; bool migratedLegacyLanguageIndex = false; + bool migratedUiEffectsSetting = false; if (ES3.FileExists(savePath)) { // 保留原有 ES3 Key，确保本次数据模型重命名不会让已有本地设置失效。 @@ -123,12 +125,13 @@ namespace Ichni } migratedLegacyLanguageIndex = MigrateLanguageCodeIfNeeded(); + migratedUiEffectsSetting = MigrateUiEffectsSettingIfNeeded(); ApplyAudioSettings(); ApplyGraphicSettings(); ApplyLanguageSettings(); // 旧语言索引只应参与一次迁移；立刻写回稳定 Code，避免每次启动都重复依赖旧字段。 - if (migratedLegacyLanguageIndex) + if (migratedLegacyLanguageIndex || migratedUiEffectsSetting) { SaveGameSettings(); } @@ -176,6 +179,7 @@ namespace Ichni currentUrpAsset.renderScale = 0.5f + 0.1f * settingsSaveData.renderScaleLevel; ApplyDisplaySettings(); ApplyPostProcessingSettings(); + ApplyUiEffectsSettings(); } /// @@ -206,6 +210,33 @@ namespace Ichni } } + /// + /// 应用 UI 特效总开关。 + /// + /// 仅处理显式挂载 的装饰性 UI Image，而不修改共享材质本身。 + /// 这样关闭特效时会移除对应 Shader 的绘制开销，同时保留页面布局和其它 UI 元素。 + /// + /// + /// 使用 Include 是为了让当前处于隐藏状态的 SongSelectionPage、SettingsPage 也同步保存目标状态； + /// 它们下次显示时无需再经过一帧特效可见的过渡。 + /// + /// + public void ApplyUiEffectsSettings() + { + if (settingsSaveData == null) + { + return; + } + + UiExpandingContoursEffect[] effectTargets = + FindObjectsByType(FindObjectsInactive.Include, FindObjectsSortMode.None); + + foreach (UiExpandingContoursEffect effectTarget in effectTargets) + { + effectTarget.ApplyEnabledState(settingsSaveData.enableUiEffects); + } + } + /// /// 处理场景切换后新加载的相机与 Global Volume。SettingsManager 会跨场景保留， /// 因此不能只在首次读取存档时应用一次图形设置。 @@ -215,6 +246,7 @@ namespace Ichni if (settingsSaveData != null) { ApplyPostProcessingSettings(); + ApplyUiEffectsSettings(); } } @@ -266,6 +298,7 @@ namespace Ichni private SettingsSaveData CreateDefaultSettingsSaveData() { SettingsSaveData defaultSettings = new SettingsSaveData(); + defaultSettings.uiEffectsSettingInitialized = true; defaultSettings.languageCode = DefaultLocaleCode; defaultSettings.languageIndex = GetLanguageDropdownIndex(DefaultLocaleCode); defaultSettings.graphicsQualityPreset = GetGraphicsQualityPreset(QualitySettings.GetQualityLevel()); @@ -277,6 +310,25 @@ namespace Ichni return defaultSettings; } + /// + /// 将旧版 SettingsSave 中不存在的 UI 特效开关迁移为默认开启。 + /// + /// 不提升 Schema Version：项目尚未发布，且本字段只补齐一个布尔默认值。迁移标记会随即写回 ES3， + /// 之后玩家主动关闭 UI 效果时不会被再次覆盖。 + /// + /// + private bool MigrateUiEffectsSettingIfNeeded() + { + if (settingsSaveData.uiEffectsSettingInitialized) + { + return false; + } + + settingsSaveData.enableUiEffects = true; + settingsSaveData.uiEffectsSettingInitialized = true; + return true; + } + private FullScreenMode GetFullScreenMode(GraphicsDisplayMode displayMode) { return displayMode switch diff --git a/Assets/Scripts/Settings/SettingsSaveData.cs b/Assets/Scripts/Settings/SettingsSaveData.cs index 3e52ce7b..73e84935 100644 --- a/Assets/Scripts/Settings/SettingsSaveData.cs +++ b/Assets/Scripts/Settings/SettingsSaveData.cs @@ -109,6 +109,19 @@ namespace Ichni /// public VfxQuality vfxQuality = VfxQuality.High; + /// + /// UI 特效总开关。当前控制使用 UI_ExpandingContours Shader 的装饰性 Image； + /// 关闭后会停止这些 Image 的绘制，以降低选曲与设置页面在移动设备上的 GPU 开销。 + /// + public bool enableUiEffects = true; + + /// + /// UI 特效开关的迁移标记。 + /// 早于该字段的 ES3 存档没有此标记；SettingsManager 读取到 false 时会将 UI 特效安全地初始化为开启， + /// 从而保证新增设置不会在旧存档中意外以关闭状态首次出现。 + /// + public bool uiEffectsSettingInitialized; + // Desktop display settings. These values are saved on every platform but only applied on PC and in the Unity Editor. public bool vSyncEnabled = false; public GraphicsDisplayMode displayMode = GraphicsDisplayMode.BorderlessFullscreen; diff --git a/Assets/Scripts/UI/Base/UiExpandingContoursEffect.cs b/Assets/Scripts/UI/Base/UiExpandingContoursEffect.cs new file mode 100644 index 00000000..37c1d6d0 --- /dev/null +++ b/Assets/Scripts/UI/Base/UiExpandingContoursEffect.cs @@ -0,0 +1,56 @@ +using UnityEngine; +using UnityEngine.UI; + +namespace Ichni.UI +{ + /// + /// 将装饰性 UI Image 纳入「UI 效果」图形设置。 + /// + /// 此组件应只挂在使用 UI_ExpandingContours 等可选视觉 Shader 的 Image 上。 + /// 关闭设置时仅禁用目标 Image 的绘制，不会停用 GameObject，因此布局与子物体状态不受影响。 + /// 目标应为不承载输入的装饰性 Image。 + /// + /// + /// 新增同类 UI 特效时，只需在对应 Image 上添加本组件；无需再在 SettingsManager 中硬编码页面或物体名称。 + /// + /// + [DisallowMultipleComponent] + [RequireComponent(typeof(Graphic))] + public sealed class UiExpandingContoursEffect : MonoBehaviour + { + [SerializeField] private Graphic targetGraphic; + + private void Reset() + { + targetGraphic = GetComponent(); + } + + private void Awake() + { + if (targetGraphic == null) + { + targetGraphic = GetComponent(); + } + } + + private void OnEnable() + { + // 页面首次显示或从隐藏状态恢复时，重新读取已经加载的玩家设置。 + bool enableUiEffects = SettingsManager.instance?.settingsSaveData?.enableUiEffects ?? true; + ApplyEnabledState(enableUiEffects); + } + + /// + /// 设置目标 Image 是否参与绘制。由 SettingsManager 在载入存档、场景切换和玩家切换开关时调用。 + /// + public void ApplyEnabledState(bool enableUiEffects) + { + if (targetGraphic == null) + { + targetGraphic = GetComponent(); + } + + targetGraphic.enabled = enableUiEffects; + } + } +} diff --git a/Assets/Scripts/UI/Base/UiExpandingContoursEffect.cs.meta b/Assets/Scripts/UI/Base/UiExpandingContoursEffect.cs.meta new file mode 100644 index 00000000..41baa341 --- /dev/null +++ b/Assets/Scripts/UI/Base/UiExpandingContoursEffect.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e47bc8701d1c446184bf62bffaf104f2 diff --git a/Assets/Scripts/UI/Settings/GraphicsSettingsWindow.cs b/Assets/Scripts/UI/Settings/GraphicsSettingsWindow.cs index 500cd99e..9675c18d 100644 --- a/Assets/Scripts/UI/Settings/GraphicsSettingsWindow.cs +++ b/Assets/Scripts/UI/Settings/GraphicsSettingsWindow.cs @@ -48,6 +48,7 @@ namespace Ichni.Menu public Switch postProcessingSwitch; public Dropdown bloomQualityDropdown; public Dropdown vfxQualityDropdown; + public Switch uiEffectsSwitch; public Switch vSyncSwitch; public Dropdown displayModeDropdown; public Dropdown displayResolutionDropdown; @@ -78,6 +79,7 @@ namespace Ichni.Menu }; InitializePostProcessingSettings(); + InitializeUiEffectsSettings(); #if UNITY_STANDALONE || UNITY_EDITOR InitializeDesktopDisplaySettings(); @@ -101,6 +103,11 @@ namespace Ichni.Menu vfxQualityDropdown.SetValue((int)gameSettings.vfxQuality); } + if (uiEffectsSwitch != null) + { + uiEffectsSwitch.SetValue(gameSettings.enableUiEffects); + } + #if UNITY_STANDALONE || UNITY_EDITOR vSyncSwitch.SetValue(gameSettings.vSyncEnabled); displayModeDropdown.SetValue((int)gameSettings.displayMode); @@ -141,6 +148,27 @@ namespace Ichni.Menu }; } + /// + /// 初始化 UI 特效开关。 + /// 它独立于后处理和 VFX 质量：关闭后只停止标记为 UiExpandingContoursEffect 的 UI Image 绘制， + /// 不会影响游戏内 Note 特效、相机后处理或普通 UI。 + /// + private void InitializeUiEffectsSettings() + { + // 兼容尚未补齐新控件的旧 Settings Prefab；完成界面布置后必须在 Inspector 绑定该引用。 + if (uiEffectsSwitch == null) + { + return; + } + + uiEffectsSwitch.SetUp(gameSettings.enableUiEffects); + uiEffectsSwitch.updateValueAction = () => + { + gameSettings.enableUiEffects = uiEffectsSwitch.GetValue(); + SettingsManager.instance.ApplyUiEffectsSettings(); + }; + } + #if UNITY_STANDALONE || UNITY_EDITOR private void InitializeDesktopDisplaySettings() { diff --git a/Assets/Settings/URP-HighFidelity.asset b/Assets/Settings/URP-HighFidelity.asset index 36af699e..dfc1e51b 100644 --- a/Assets/Settings/URP-HighFidelity.asset +++ b/Assets/Settings/URP-HighFidelity.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bfb5dcd0662706c878767c59db6d31214cd374f5d2cb1c3b0eff4c96171212e7 -size 4596 +oid sha256:4d4398514f6e7f3df219d1ebd195c58e9c9288085289292c45f5488a669ac130 +size 4594 diff --git a/Assets/Sprites/UITextures/SongSelection/music_select_bg.png b/Assets/Sprites/UITextures/SongSelection/music_select_bg.png index d7cab4e5..2804ec70 100644 --- a/Assets/Sprites/UITextures/SongSelection/music_select_bg.png +++ b/Assets/Sprites/UITextures/SongSelection/music_select_bg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a476d626189cdb96e5efedb7258431356e13c0382489b5eb6d5e0d3da61cdb8 -size 1594840 +oid sha256:566dea9df93d2afb24d649c576e0a28aaa39f5e0a50abc730a7cb1df50aba8e4 +size 1589203 diff --git a/Assets/StreamingAssets/ThemeBundles/Android/Android b/Assets/StreamingAssets/ThemeBundles/Android/Android index a2f9cd87..5c786b32 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Android/Android and b/Assets/StreamingAssets/ThemeBundles/Android/Android differ diff --git a/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest b/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest index 220a0273..2a973585 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest @@ -1,21 +1,21 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 1212460786 +CRC: 112380145 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: Info_0: - Name: shapes + Name: unifiedraytracing Dependencies: {} Info_1: Name: basic Dependencies: {} Info_2: - Name: metropolis_on_orbit - Dependencies: {} - Info_3: Name: departure_to_multiverse Dependencies: {} - Info_4: - Name: unifiedraytracing + Info_3: + Name: metropolis_on_orbit + Dependencies: {} + Info_4: + Name: shapes Dependencies: {} diff --git a/Assets/StreamingAssets/ThemeBundles/Android/basic b/Assets/StreamingAssets/ThemeBundles/Android/basic index 6dc588d1..db3a6616 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Android/basic and b/Assets/StreamingAssets/ThemeBundles/Android/basic differ diff --git a/Assets/StreamingAssets/ThemeBundles/Android/basic.manifest b/Assets/StreamingAssets/ThemeBundles/Android/basic.manifest index e3fe1620..121cd866 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/basic.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/basic.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 4187162310 +CRC: 3948698453 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 041639c891c497f5cda773d76795250a + Hash: af7857bf316830adc26e256fe67e7e6e TypeTreeHash: serializedVersion: 2 Hash: dfed41e3b38758e5f34df30221d719dc IncrementalBuildHash: serializedVersion: 2 - Hash: cc55a4d6a0abd71c4bc122644494bf52 + Hash: 3808ec220bbc7f0a81ac1b76e5dfc9cf HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse index 7d73eb98..4965a5d4 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse +++ b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee34964900f07e3853f5b0fc28cfa81dbca697d08d6ddb7f7e741d984ca6c6b7 -size 1502797 +oid sha256:4b786314cb5bad5741079f6d3bb81be876de3d8202fb4f065f846eebfb9cab1b +size 1504123 diff --git a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest index 71d31d9a..36113961 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 1325295300 +CRC: 3534727336 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 5451f82a726dcc14425b20ee9bc64122 + Hash: 51cebaae174d01d837ffac32a2fa6871 TypeTreeHash: serializedVersion: 2 Hash: 6d9f9b8bc1074349261a0dbbf7f0f9f8 IncrementalBuildHash: serializedVersion: 2 - Hash: c797ddcac88cdba8fd37b53fd8ff9401 + Hash: b230bc36e21371470e09e12a9e719661 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ThemeBundles/Android/metropolis_on_orbit.manifest b/Assets/StreamingAssets/ThemeBundles/Android/metropolis_on_orbit.manifest index c8e51fa8..8ef44fe2 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/metropolis_on_orbit.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/metropolis_on_orbit.manifest @@ -10,7 +10,7 @@ Hashes: Hash: 8ab77e54d824a64c30bc20496c5f5926 IncrementalBuildHash: serializedVersion: 2 - Hash: 64fbabfc34523bda91b8bcf2df98fea2 + Hash: 839fe28321d6bb7ee758d0377b2aba67 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ThemeBundles/Android/shapes.manifest b/Assets/StreamingAssets/ThemeBundles/Android/shapes.manifest index de602b31..100171a4 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/shapes.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/shapes.manifest @@ -10,7 +10,7 @@ Hashes: Hash: bc9f87c7e64ff656997db0f2b2a91703 IncrementalBuildHash: serializedVersion: 2 - Hash: 612a23b0b40c16e3e1e3cbbf90636bd0 + Hash: 98313c8eb74f89178044a9a994c30a81 HashAppended: 0 ClassTypes: - Class: 28 diff --git a/Assets/Suggo Creations/RETROWAVE SKIES/_Demo Scenes/Demo Scenes/Scene Assets/ReflectionProbe-0.exr.meta b/Assets/Suggo Creations/RETROWAVE SKIES/_Demo Scenes/Demo Scenes/Scene Assets/ReflectionProbe-0.exr.meta index ebeac1a2..5ab8fc81 100644 --- a/Assets/Suggo Creations/RETROWAVE SKIES/_Demo Scenes/Demo Scenes/Scene Assets/ReflectionProbe-0.exr.meta +++ b/Assets/Suggo Creations/RETROWAVE SKIES/_Demo Scenes/Demo Scenes/Scene Assets/ReflectionProbe-0.exr.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86/Profile/AkUnitySoundEngine.dll.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/Profile/AkUnitySoundEngine.dll.meta index b722297d..21e19158 100644 --- a/Assets/Wwise/API/Runtime/Plugins/Windows/x86/Profile/AkUnitySoundEngine.dll.meta +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/Profile/AkUnitySoundEngine.dll.meta @@ -16,7 +16,7 @@ PluginImporter: settings: Exclude Editor: 1 Editor: - enabled: 0 + enabled: 1 settings: CPU: x86 DefaultValueInitialized: true diff --git a/ProjectSettings/Packages/dev.yarnspinner/Assembly-CSharp-generated.ysls.json b/ProjectSettings/Packages/dev.yarnspinner/Assembly-CSharp-generated.ysls.json index d5d3303e..72377535 100644 --- a/ProjectSettings/Packages/dev.yarnspinner/Assembly-CSharp-generated.ysls.json +++ b/ProjectSettings/Packages/dev.yarnspinner/Assembly-CSharp-generated.ysls.json @@ -1 +1 @@ -{"version":2,"commands":[{"yarnName":"log","definitionName":"global::Ichni.Story.YarnFunctions.GeneralFunctions.Log","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/GeneralFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":7,"character":8},"end":{"line":25,"character":9}},"parameters":[{"name":"message","isParamsArray":false,"type":"string"},{"name":"logType","defaultValue":"info","isParamsArray":false,"type":"string"}]},{"yarnName":"move_portrait","definitionName":"global::Ichni.Story.YarnFunctions.PortraitAnimationCommands.MovePortrait","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/PortraitAnimationCommands.cs","documentation":"\u5e73\u6ed1\u79fb\u52a8\u89d2\u8272\u7acb\u7ed8\u5230\u76ee\u6807\u4f4d\u7f6e\u3002 \u683c\u5f0f: <<move_portrait characterId x y duration>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":21,"character":8},"end":{"line":26,"character":9}},"parameters":[{"name":"characterId","documentation":"\u89d2\u8272\u6807\u8bc6 ID","isParamsArray":false,"type":"string"},{"name":"x","documentation":"\u76ee\u6807 X \u5750\u6807 [-100, 100]","isParamsArray":false,"type":"number"},{"name":"y","documentation":"\u76ee\u6807 Y \u5750\u6807 [-100, 100]","isParamsArray":false,"type":"number"},{"name":"duration","documentation":"\u52a8\u753b\u6301\u7eed\u65f6\u95f4\uff08\u79d2\uff09","isParamsArray":false,"type":"number"}]},{"yarnName":"jump_portrait","definitionName":"global::Ichni.Story.YarnFunctions.PortraitAnimationCommands.JumpPortrait","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/PortraitAnimationCommands.cs","documentation":"\u8ba9\u89d2\u8272\u7acb\u7ed8\u539f\u5730\u8df3\u8dc3\u3002 \u683c\u5f0f: <<jump_portrait characterId power numJumps duration>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":36,"character":8},"end":{"line":41,"character":9}},"parameters":[{"name":"characterId","documentation":"\u89d2\u8272\u6807\u8bc6 ID","isParamsArray":false,"type":"string"},{"name":"power","documentation":"\u8df3\u8dc3\u9ad8\u5ea6\uff08\u4f7f\u7528\u4e0e\u5750\u6807\u57df\u76f8\u540c\u7684\u5f52\u4e00\u5316\u5c3a\u5ea6\uff0c\u5982 10 \u8868\u793a 10% \u9ad8\u5ea6\uff09","isParamsArray":false,"type":"number"},{"name":"numJumps","documentation":"\u8df3\u8dc3\u6b21\u6570","isParamsArray":false,"type":"number"},{"name":"duration","documentation":"\u52a8\u753b\u603b\u6301\u7eed\u65f6\u95f4\uff08\u79d2\uff09","isParamsArray":false,"type":"number"}]},{"yarnName":"shake_portrait","definitionName":"global::Ichni.Story.YarnFunctions.PortraitAnimationCommands.ShakePortrait","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/PortraitAnimationCommands.cs","documentation":"\u8ba9\u89d2\u8272\u7acb\u7ed8\u4ea7\u751f\u5de6\u53f3\u9707\u52a8\u6548\u679c\u3002 \u683c\u5f0f: <<shake_portrait characterId duration strength vibrato>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":51,"character":8},"end":{"line":56,"character":9}},"parameters":[{"name":"characterId","documentation":"\u89d2\u8272\u6807\u8bc6 ID","isParamsArray":false,"type":"string"},{"name":"duration","documentation":"\u9707\u52a8\u6301\u7eed\u65f6\u95f4\uff08\u79d2\uff09","isParamsArray":false,"type":"number"},{"name":"strength","documentation":"\u9707\u52a8\u5e45\u5ea6\uff08\u4f7f\u7528\u4e0e\u5750\u6807\u57df\u76f8\u540c\u7684\u5f52\u4e00\u5316\u5c3a\u5ea6\uff09","isParamsArray":false,"type":"number"},{"name":"vibrato","documentation":"\u9707\u52a8\u9891\u7387","isParamsArray":false,"type":"number"}]},{"yarnName":"set_portrait","definitionName":"global::Ichni.Story.YarnFunctions.PortraitCommands.SetPortrait","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/PortraitCommands.cs","documentation":"\u6700\u57fa\u7840\u3001\u6700\u5168\u9762\u7684\u7acb\u7ed8\u6307\u4ee4\uff1a\u8bbe\u7f6e\u6307\u5b9a\u89d2\u8272\u7684\u5750\u6807\u548c\u8868\u60c5\u3002 \u82e5\u89d2\u8272\u4e0d\u5728\u53f0\u4e0a\uff0c\u4f1a\u81ea\u52a8\u4ee5\u6307\u5b9a\u7684\u8868\u60c5\u548c\u4f4d\u7f6e\u5b9e\u4f8b\u5316\u3002 \u683c\u5f0f: <<set_portrait characterId x y [emotion]>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":25,"character":8},"end":{"line":33,"character":9}},"parameters":[{"name":"characterId","documentation":"\u89d2\u8272\u6807\u8bc6 ID\u3002","isParamsArray":false,"type":"string"},{"name":"x","documentation":"\u5f52\u4e00\u5316 X \u5750\u6807 [-100, 100]","isParamsArray":false,"type":"number"},{"name":"y","documentation":"\u5f52\u4e00\u5316 Y \u5750\u6807 [-100, 100]","isParamsArray":false,"type":"number"},{"name":"emotion","documentation":"\u8868\u60c5\u540d\u79f0\u3002\u5982\u679c\u4e0d\u586b\uff0c\u9ed8\u8ba4\u4fdd\u6301\u4e0d\u53d8\u6216\u521d\u59cb\u5316\u4e3a \"normal\"","isParamsArray":false,"type":"string"}]},{"yarnName":"set_portrait_current","definitionName":"global::Ichni.Story.YarnFunctions.PortraitCommands.SetPortraitCurrent","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/PortraitCommands.cs","documentation":"\u8bbe\u7f6e\u5f53\u524d\u8bf4\u8bdd\u89d2\u8272\u7684\u5750\u6807\u548c\u8868\u60c5\u3002 \u683c\u5f0f: <<set_portrait_current x y [emotion]>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":39,"character":8},"end":{"line":52,"character":9}},"parameters":[{"name":"x","isParamsArray":false,"type":"number"},{"name":"y","isParamsArray":false,"type":"number"},{"name":"emotion","isParamsArray":false,"type":"string"}]},{"yarnName":"set_portrait_position","definitionName":"global::Ichni.Story.YarnFunctions.PortraitCommands.SetPortraitPosition","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/PortraitCommands.cs","documentation":"\u4ec5\u8bbe\u7f6e\u6216\u79fb\u52a8\u6307\u5b9a\u89d2\u8272\u7684\u5750\u6807\uff08\u4e0d\u6539\u53d8\u5f53\u524d\u8868\u60c5\uff09\u3002 \u683c\u5f0f: <<set_portrait_position characterId x y>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":58,"character":8},"end":{"line":63,"character":9}},"parameters":[{"name":"characterId","isParamsArray":false,"type":"string"},{"name":"x","isParamsArray":false,"type":"number"},{"name":"y","isParamsArray":false,"type":"number"}]},{"yarnName":"set_portrait_emotion","definitionName":"global::Ichni.Story.YarnFunctions.PortraitCommands.SetPortraitEmotion","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/PortraitCommands.cs","documentation":"\u4ec5\u6539\u53d8\u6307\u5b9a\u89d2\u8272\u7684\u8868\u60c5\uff08\u89d2\u8272\u5fc5\u987b\u5df2\u7ecf\u4e0a\u53f0\uff09\u3002 \u683c\u5f0f: <<set_portrait_emotion characterId emotion>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":69,"character":8},"end":{"line":75,"character":9}},"parameters":[{"name":"characterId","isParamsArray":false,"type":"string"},{"name":"emotion","isParamsArray":false,"type":"string"}]},{"yarnName":"hide_portrait","definitionName":"global::Ichni.Story.YarnFunctions.PortraitCommands.HidePortrait","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/PortraitCommands.cs","documentation":"\u9690\u85cf\u6307\u5b9a\u89d2\u8272\u7684\u7acb\u7ed8\u3002 \u683c\u5f0f: <<hide_portrait characterId>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":81,"character":8},"end":{"line":87,"character":9}},"parameters":[{"name":"characterId","isParamsArray":false,"type":"string"}]},{"yarnName":"hide_all_portraits","definitionName":"global::Ichni.Story.YarnFunctions.PortraitCommands.HideAllPortraits","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/PortraitCommands.cs","documentation":"\u9690\u85cf\u5f53\u524d\u6240\u6709\u5728\u53f0\u4e0a\u7684\u7acb\u7ed8\u3002 \u683c\u5f0f: <<hide_all_portraits>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":93,"character":8},"end":{"line":99,"character":9}},"parameters":[]},{"yarnName":"unlock_song","definitionName":"global::Ichni.Story.YarnFunctions.StoryTreeCommands.UnlockSong","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/StoryTreeCommands.cs","documentation":"\u6388\u4e88\u6b4c\u66f2\u76f8\u5173\u7684\u89e3\u9501 Key\uff0c\u5e76\u5728\u5f53\u524d\u5bf9\u8bdd\u7ed3\u675f\u540e\u5f39\u51fa\u63d0\u793a\u3002 \u683c\u5f0f: <<unlock_song unlock_key \"song_id\">> Key \u5fc5\u987b\u4f7f\u7528\u5c0f\u5199\u5b57\u6bcd\u3001\u6570\u5b57\u548c\u4e0b\u5212\u7ebf\uff0c\u4f8b\u5982 story_ch0_prologue_completed\u3002song_id \u5fc5\u987b\u662f \u7684\u7a33\u5b9a\u6807\u8bc6\uff0c\u800c\u4e0d\u662f\u663e\u793a\u540d\u79f0\u6216\u672c\u5730\u5316\u6587\u672c\u3002 \u8be5\u53c2\u6570\u7528\u4e8e\u89e3\u6790\u73a9\u5bb6\u53ef\u89c1\u7684\u6b4c\u66f2\u540d\u79f0\uff0c\u7edd\u4e0d\u80fd\u5c06\u6280\u672f Unlock Key \u663e\u793a\u7ed9\u73a9\u5bb6\u3002 \u65b0\u5185\u5bb9\u82e5\u4e0d\u9700\u8981\u6b4c\u66f2\u63d0\u793a\uff0c\u4f18\u5148\u4f7f\u7528 \u3002","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":26,"character":8},"end":{"line":45,"character":9}},"parameters":[{"name":"songUnlockKey","documentation":"\u8981\u6388\u4e88\u7684\u7a33\u5b9a\u89e3\u9501 Key\uff0c\u800c\u4e0d\u662f\u6b4c\u66f2\u663e\u793a\u540d\u79f0\u3002","isParamsArray":false,"type":"string"},{"name":"songId","documentation":"\u5bf9\u5e94 \u7684\u7a33\u5b9a\u6b4c\u66f2 ID\u3002","isParamsArray":false,"type":"string"}]},{"yarnName":"grant_unlock","definitionName":"global::Ichni.Story.YarnFunctions.StoryTreeCommands.GrantUnlock","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/StoryTreeCommands.cs","documentation":"\u901a\u7528\u5185\u5bb9\u89e3\u9501\u547d\u4ee4\uff0c\u53ef\u7528\u4e8e\u7ae0\u8282\u3001\u6b4c\u66f2\u3001\u6559\u7a0b\u53ca\u672a\u6765\u5185\u5bb9\u3002 \u683c\u5f0f: <<grant_unlock unlock_key>>\u3002 \u672c\u547d\u4ee4\u53ea\u6388\u4e88\u5e76\u4fdd\u5b58 Key\uff0c\u4e0d\u7ed1\u5b9a\u4efb\u4f55 UI \u63d0\u793a\uff1b\u9700\u8981\u63d0\u793a\u65f6\u5e94\u7531 Yarn \u989d\u5916\u8c03\u7528 show_message\u3002","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":53,"character":8},"end":{"line":59,"character":9}},"parameters":[{"name":"unlockKey","documentation":"\u7b26\u5408 \u7684\u7a33\u5b9a\u89e3\u9501 Key\u3002","isParamsArray":false,"type":"string"}]},{"yarnName":"show_message","definitionName":"global::Ichni.Story.YarnFunctions.StoryTreeCommands.ShowMessage","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/StoryTreeCommands.cs","documentation":"\u5728\u5bf9\u8bdd\u7ed3\u675f\u540e\uff0c\u5f39\u51fa\u4e00\u4e2a\u81ea\u5b9a\u4e49 MessageBox \u63d0\u793a\u3002 \u6587\u672c Key \u4f1a\u4ea4\u7ed9 MessageUIPage \u7684 FIFO \u961f\u5217\uff0c\u5e76\u5728\u8be5\u5f39\u7a97\u771f\u6b63\u663e\u793a\u524d\u624d\u6309\u5f53\u524d Locale \u89e3\u6790\u3002 \u683c\u5f0f: <<show_message titleKey contentKey [tableName]>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":69,"character":8},"end":{"line":82,"character":9}},"parameters":[{"name":"titleKey","documentation":"\u6807\u9898\u6587\u672c\u6216\u672c\u5730\u5316\u952e","isParamsArray":false,"type":"string"},{"name":"contentKey","documentation":"\u6b63\u6587\u6587\u672c\u6216\u672c\u5730\u5316\u952e","isParamsArray":false,"type":"string"},{"name":"tableName","documentation":"Unity Localization \u4e2d\u7684 String Table \u540d\u79f0","defaultValue":"Message","isParamsArray":false,"type":"string"}]},{"yarnName":"set_bool","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.SetBool","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":14,"character":8},"end":{"line":15,"character":106}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"value","isParamsArray":false,"type":"bool"}]},{"yarnName":"set_int","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.SetInt","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":20,"character":8},"end":{"line":21,"character":103}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"value","isParamsArray":false,"type":"number"}]},{"yarnName":"add_int","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.AddInt","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":23,"character":8},"end":{"line":24,"character":103}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"delta","isParamsArray":false,"type":"number"}]},{"yarnName":"set_float","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.SetFloat","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":29,"character":8},"end":{"line":30,"character":109}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"value","isParamsArray":false,"type":"number"}]},{"yarnName":"add_float","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.AddFloat","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":32,"character":8},"end":{"line":33,"character":109}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"delta","isParamsArray":false,"type":"number"}]},{"yarnName":"set_string","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.SetString","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":38,"character":8},"end":{"line":39,"character":112}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"value","isParamsArray":false,"type":"string"}]},{"yarnName":"remove_variable","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.RemoveVariable","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":44,"character":8},"end":{"line":45,"character":101}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"}]}],"functions":[{"yarnName":"get_bool","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.GetBool","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":17,"character":8},"end":{"line":18,"character":78}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"}],"return":{"type":"bool"}},{"yarnName":"get_int","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.GetInt","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":26,"character":8},"end":{"line":27,"character":75}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"}],"return":{"type":"number"}},{"yarnName":"get_float","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.GetFloat","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":35,"character":8},"end":{"line":36,"character":81}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"}],"return":{"type":"number"}},{"yarnName":"get_string","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.GetString","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":41,"character":8},"end":{"line":42,"character":84}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"}],"return":{"type":"string"}},{"yarnName":"has_variable","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.HasVariable","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":47,"character":8},"end":{"line":48,"character":86}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"}],"return":{"type":"bool"}}]} \ No newline at end of file +{"version":2,"commands":[{"yarnName":"log","definitionName":"global::Ichni.Story.YarnFunctions.GeneralFunctions.Log","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/GeneralFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":7,"character":8},"end":{"line":25,"character":9}},"parameters":[{"name":"message","isParamsArray":false,"type":"string"},{"name":"logType","defaultValue":"info","isParamsArray":false,"type":"string"}]},{"yarnName":"move_portrait","definitionName":"global::Ichni.Story.YarnFunctions.PortraitAnimationCommands.MovePortrait","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/PortraitAnimationCommands.cs","documentation":"\u5e73\u6ed1\u79fb\u52a8\u89d2\u8272\u7acb\u7ed8\u5230\u76ee\u6807\u4f4d\u7f6e\u3002 \u683c\u5f0f: <<move_portrait characterId x y duration>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":21,"character":8},"end":{"line":26,"character":9}},"parameters":[{"name":"characterId","documentation":"\u89d2\u8272\u6807\u8bc6 ID","isParamsArray":false,"type":"string"},{"name":"x","documentation":"\u76ee\u6807 X \u5750\u6807 [-100, 100]","isParamsArray":false,"type":"number"},{"name":"y","documentation":"\u76ee\u6807 Y \u5750\u6807 [-100, 100]","isParamsArray":false,"type":"number"},{"name":"duration","documentation":"\u52a8\u753b\u6301\u7eed\u65f6\u95f4\uff08\u79d2\uff09","isParamsArray":false,"type":"number"}]},{"yarnName":"jump_portrait","definitionName":"global::Ichni.Story.YarnFunctions.PortraitAnimationCommands.JumpPortrait","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/PortraitAnimationCommands.cs","documentation":"\u8ba9\u89d2\u8272\u7acb\u7ed8\u539f\u5730\u8df3\u8dc3\u3002 \u683c\u5f0f: <<jump_portrait characterId power numJumps duration>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":36,"character":8},"end":{"line":41,"character":9}},"parameters":[{"name":"characterId","documentation":"\u89d2\u8272\u6807\u8bc6 ID","isParamsArray":false,"type":"string"},{"name":"power","documentation":"\u8df3\u8dc3\u9ad8\u5ea6\uff08\u4f7f\u7528\u4e0e\u5750\u6807\u57df\u76f8\u540c\u7684\u5f52\u4e00\u5316\u5c3a\u5ea6\uff0c\u5982 10 \u8868\u793a 10% \u9ad8\u5ea6\uff09","isParamsArray":false,"type":"number"},{"name":"numJumps","documentation":"\u8df3\u8dc3\u6b21\u6570","isParamsArray":false,"type":"number"},{"name":"duration","documentation":"\u52a8\u753b\u603b\u6301\u7eed\u65f6\u95f4\uff08\u79d2\uff09","isParamsArray":false,"type":"number"}]},{"yarnName":"shake_portrait","definitionName":"global::Ichni.Story.YarnFunctions.PortraitAnimationCommands.ShakePortrait","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/PortraitAnimationCommands.cs","documentation":"\u8ba9\u89d2\u8272\u7acb\u7ed8\u4ea7\u751f\u5de6\u53f3\u9707\u52a8\u6548\u679c\u3002 \u683c\u5f0f: <<shake_portrait characterId duration strength vibrato>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":51,"character":8},"end":{"line":56,"character":9}},"parameters":[{"name":"characterId","documentation":"\u89d2\u8272\u6807\u8bc6 ID","isParamsArray":false,"type":"string"},{"name":"duration","documentation":"\u9707\u52a8\u6301\u7eed\u65f6\u95f4\uff08\u79d2\uff09","isParamsArray":false,"type":"number"},{"name":"strength","documentation":"\u9707\u52a8\u5e45\u5ea6\uff08\u4f7f\u7528\u4e0e\u5750\u6807\u57df\u76f8\u540c\u7684\u5f52\u4e00\u5316\u5c3a\u5ea6\uff09","isParamsArray":false,"type":"number"},{"name":"vibrato","documentation":"\u9707\u52a8\u9891\u7387","isParamsArray":false,"type":"number"}]},{"yarnName":"set_portrait","definitionName":"global::Ichni.Story.YarnFunctions.PortraitCommands.SetPortrait","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/PortraitCommands.cs","documentation":"\u6700\u57fa\u7840\u3001\u6700\u5168\u9762\u7684\u7acb\u7ed8\u6307\u4ee4\uff1a\u8bbe\u7f6e\u6307\u5b9a\u89d2\u8272\u7684\u5750\u6807\u548c\u8868\u60c5\u3002 \u82e5\u89d2\u8272\u4e0d\u5728\u53f0\u4e0a\uff0c\u4f1a\u81ea\u52a8\u4ee5\u6307\u5b9a\u7684\u8868\u60c5\u548c\u4f4d\u7f6e\u5b9e\u4f8b\u5316\u3002 \u683c\u5f0f: <<set_portrait characterId x y [emotion]>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":25,"character":8},"end":{"line":33,"character":9}},"parameters":[{"name":"characterId","documentation":"\u89d2\u8272\u6807\u8bc6 ID\u3002","isParamsArray":false,"type":"string"},{"name":"x","documentation":"\u5f52\u4e00\u5316 X \u5750\u6807 [-100, 100]","isParamsArray":false,"type":"number"},{"name":"y","documentation":"\u5f52\u4e00\u5316 Y \u5750\u6807 [-100, 100]","isParamsArray":false,"type":"number"},{"name":"emotion","documentation":"\u8868\u60c5\u540d\u79f0\u3002\u5982\u679c\u4e0d\u586b\uff0c\u9ed8\u8ba4\u4fdd\u6301\u4e0d\u53d8\u6216\u521d\u59cb\u5316\u4e3a \"normal\"","isParamsArray":false,"type":"string"}]},{"yarnName":"set_portrait_current","definitionName":"global::Ichni.Story.YarnFunctions.PortraitCommands.SetPortraitCurrent","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/PortraitCommands.cs","documentation":"\u8bbe\u7f6e\u5f53\u524d\u8bf4\u8bdd\u89d2\u8272\u7684\u5750\u6807\u548c\u8868\u60c5\u3002 \u683c\u5f0f: <<set_portrait_current x y [emotion]>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":39,"character":8},"end":{"line":52,"character":9}},"parameters":[{"name":"x","isParamsArray":false,"type":"number"},{"name":"y","isParamsArray":false,"type":"number"},{"name":"emotion","isParamsArray":false,"type":"string"}]},{"yarnName":"set_portrait_position","definitionName":"global::Ichni.Story.YarnFunctions.PortraitCommands.SetPortraitPosition","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/PortraitCommands.cs","documentation":"\u4ec5\u8bbe\u7f6e\u6216\u79fb\u52a8\u6307\u5b9a\u89d2\u8272\u7684\u5750\u6807\uff08\u4e0d\u6539\u53d8\u5f53\u524d\u8868\u60c5\uff09\u3002 \u683c\u5f0f: <<set_portrait_position characterId x y>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":58,"character":8},"end":{"line":63,"character":9}},"parameters":[{"name":"characterId","isParamsArray":false,"type":"string"},{"name":"x","isParamsArray":false,"type":"number"},{"name":"y","isParamsArray":false,"type":"number"}]},{"yarnName":"set_portrait_emotion","definitionName":"global::Ichni.Story.YarnFunctions.PortraitCommands.SetPortraitEmotion","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/PortraitCommands.cs","documentation":"\u4ec5\u6539\u53d8\u6307\u5b9a\u89d2\u8272\u7684\u8868\u60c5\uff08\u89d2\u8272\u5fc5\u987b\u5df2\u7ecf\u4e0a\u53f0\uff09\u3002 \u683c\u5f0f: <<set_portrait_emotion characterId emotion>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":69,"character":8},"end":{"line":75,"character":9}},"parameters":[{"name":"characterId","isParamsArray":false,"type":"string"},{"name":"emotion","isParamsArray":false,"type":"string"}]},{"yarnName":"hide_portrait","definitionName":"global::Ichni.Story.YarnFunctions.PortraitCommands.HidePortrait","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/PortraitCommands.cs","documentation":"\u9690\u85cf\u6307\u5b9a\u89d2\u8272\u7684\u7acb\u7ed8\u3002 \u683c\u5f0f: <<hide_portrait characterId>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":81,"character":8},"end":{"line":87,"character":9}},"parameters":[{"name":"characterId","isParamsArray":false,"type":"string"}]},{"yarnName":"hide_all_portraits","definitionName":"global::Ichni.Story.YarnFunctions.PortraitCommands.HideAllPortraits","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/PortraitCommands.cs","documentation":"\u9690\u85cf\u5f53\u524d\u6240\u6709\u5728\u53f0\u4e0a\u7684\u7acb\u7ed8\u3002 \u683c\u5f0f: <<hide_all_portraits>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":93,"character":8},"end":{"line":99,"character":9}},"parameters":[]},{"yarnName":"unlock_song","definitionName":"global::Ichni.Story.YarnFunctions.StoryTreeCommands.UnlockSong","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/StoryTreeCommands.cs","documentation":"\u6388\u4e88\u6b4c\u66f2\u76f8\u5173\u7684\u89e3\u9501 Key\uff0c\u5e76\u5728\u5f53\u524d\u5bf9\u8bdd\u7ed3\u675f\u540e\u5f39\u51fa\u63d0\u793a\u3002 \u683c\u5f0f: <<unlock_song unlock_key \"song_id\">> Key \u5fc5\u987b\u4f7f\u7528\u5c0f\u5199\u5b57\u6bcd\u3001\u6570\u5b57\u548c\u4e0b\u5212\u7ebf\uff0c\u4f8b\u5982 story_ch0_prologue_completed\u3002song_id \u5fc5\u987b\u662f \u7684\u7a33\u5b9a\u6807\u8bc6\uff0c\u800c\u4e0d\u662f\u663e\u793a\u540d\u79f0\u6216\u672c\u5730\u5316\u6587\u672c\u3002 \u8be5\u53c2\u6570\u7528\u4e8e\u89e3\u6790\u73a9\u5bb6\u53ef\u89c1\u7684\u6b4c\u66f2\u540d\u79f0\uff0c\u7edd\u4e0d\u80fd\u5c06\u6280\u672f Unlock Key \u663e\u793a\u7ed9\u73a9\u5bb6\u3002 \u65b0\u5185\u5bb9\u82e5\u4e0d\u9700\u8981\u6b4c\u66f2\u63d0\u793a\uff0c\u4f18\u5148\u4f7f\u7528 \u3002","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":26,"character":8},"end":{"line":45,"character":9}},"parameters":[{"name":"songUnlockKey","documentation":"\u8981\u6388\u4e88\u7684\u7a33\u5b9a\u89e3\u9501 Key\uff0c\u800c\u4e0d\u662f\u6b4c\u66f2\u663e\u793a\u540d\u79f0\u3002","isParamsArray":false,"type":"string"},{"name":"songId","documentation":"\u5bf9\u5e94 \u7684\u7a33\u5b9a\u6b4c\u66f2 ID\u3002","isParamsArray":false,"type":"string"}]},{"yarnName":"grant_unlock","definitionName":"global::Ichni.Story.YarnFunctions.StoryTreeCommands.GrantUnlock","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/StoryTreeCommands.cs","documentation":"\u901a\u7528\u5185\u5bb9\u89e3\u9501\u547d\u4ee4\uff0c\u53ef\u7528\u4e8e\u7ae0\u8282\u3001\u6b4c\u66f2\u3001\u6559\u7a0b\u53ca\u672a\u6765\u5185\u5bb9\u3002 \u683c\u5f0f: <<grant_unlock unlock_key>>\u3002 \u672c\u547d\u4ee4\u53ea\u6388\u4e88\u5e76\u4fdd\u5b58 Key\uff0c\u4e0d\u7ed1\u5b9a\u4efb\u4f55 UI \u63d0\u793a\uff1b\u9700\u8981\u63d0\u793a\u65f6\u5e94\u7531 Yarn \u989d\u5916\u8c03\u7528 show_message\u3002","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":53,"character":8},"end":{"line":59,"character":9}},"parameters":[{"name":"unlockKey","documentation":"\u7b26\u5408 \u7684\u7a33\u5b9a\u89e3\u9501 Key\u3002","isParamsArray":false,"type":"string"}]},{"yarnName":"show_message","definitionName":"global::Ichni.Story.YarnFunctions.StoryTreeCommands.ShowMessage","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/StoryTreeCommands.cs","documentation":"\u5728\u5bf9\u8bdd\u7ed3\u675f\u540e\uff0c\u5f39\u51fa\u4e00\u4e2a\u81ea\u5b9a\u4e49 MessageBox \u63d0\u793a\u3002 \u6587\u672c Key \u4f1a\u4ea4\u7ed9 MessageUIPage \u7684 FIFO \u961f\u5217\uff0c\u5e76\u5728\u8be5\u5f39\u7a97\u771f\u6b63\u663e\u793a\u524d\u624d\u6309\u5f53\u524d Locale \u89e3\u6790\u3002 \u683c\u5f0f: <<show_message titleKey contentKey [tableName]>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":69,"character":8},"end":{"line":82,"character":9}},"parameters":[{"name":"titleKey","documentation":"\u6807\u9898\u6587\u672c\u6216\u672c\u5730\u5316\u952e","isParamsArray":false,"type":"string"},{"name":"contentKey","documentation":"\u6b63\u6587\u6587\u672c\u6216\u672c\u5730\u5316\u952e","isParamsArray":false,"type":"string"},{"name":"tableName","documentation":"Unity Localization \u4e2d\u7684 String Table \u540d\u79f0","defaultValue":"Message","isParamsArray":false,"type":"string"}]},{"yarnName":"set_bool","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.SetBool","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":14,"character":8},"end":{"line":15,"character":106}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"value","isParamsArray":false,"type":"bool"}]},{"yarnName":"set_int","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.SetInt","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":20,"character":8},"end":{"line":21,"character":103}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"value","isParamsArray":false,"type":"number"}]},{"yarnName":"add_int","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.AddInt","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":23,"character":8},"end":{"line":24,"character":103}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"delta","isParamsArray":false,"type":"number"}]},{"yarnName":"set_float","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.SetFloat","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":29,"character":8},"end":{"line":30,"character":109}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"value","isParamsArray":false,"type":"number"}]},{"yarnName":"add_float","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.AddFloat","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":32,"character":8},"end":{"line":33,"character":109}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"delta","isParamsArray":false,"type":"number"}]},{"yarnName":"set_string","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.SetString","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":38,"character":8},"end":{"line":39,"character":112}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"value","isParamsArray":false,"type":"string"}]},{"yarnName":"remove_variable","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.RemoveVariable","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":44,"character":8},"end":{"line":45,"character":101}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"}]}],"functions":[{"yarnName":"get_bool","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.GetBool","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":17,"character":8},"end":{"line":18,"character":78}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"}],"return":{"type":"bool"}},{"yarnName":"get_int","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.GetInt","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":26,"character":8},"end":{"line":27,"character":75}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"}],"return":{"type":"number"}},{"yarnName":"get_float","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.GetFloat","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":35,"character":8},"end":{"line":36,"character":81}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"}],"return":{"type":"number"}},{"yarnName":"get_string","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.GetString","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":41,"character":8},"end":{"line":42,"character":84}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"}],"return":{"type":"string"}},{"yarnName":"has_variable","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.HasVariable","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":47,"character":8},"end":{"line":48,"character":86}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"}],"return":{"type":"bool"}}]} \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3054298b..e2a09481 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d35a71c3032b670a17f4186006405da3c88cc0eef17511e8b740109d818fac09 -size 29428 +oid sha256:8af2cbf0acc2c143947d2dcbabdcecff1379d216acbb5f0825876452701913b8 +size 29426 diff --git a/UserSettings/Layouts/default-6000.dwlt b/UserSettings/Layouts/default-6000.dwlt index 381c1cb7..ed3bbd15 100644 --- a/UserSettings/Layouts/default-6000.dwlt +++ b/UserSettings/Layouts/default-6000.dwlt @@ -14,10 +14,10 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 63 - y: 43 - width: 1377 - height: 857 + x: 0 + y: 42.666668 + width: 1706.6667 + height: 869.3334 m_ShowMode: 4 m_Title: Hierarchy m_RootView: {fileID: 2} @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1377 - height: 857 + width: 1706.6666 + height: 869.3333 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1377 + width: 1706.6666 height: 36 m_MinSize: {x: 50, y: 50} m_MaxSize: {x: 4000, y: 4000} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 837 - width: 1377 + y: 849.3333 + width: 1706.6666 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -113,12 +113,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 36 - width: 1377 - height: 801 + width: 1706.6666 + height: 813.3333 m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 97 + controlID: 71 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1377 - height: 801 + width: 1706.6666 + height: 813.3333 m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 98 + controlID: 72 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -165,12 +165,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 913 - height: 801 + width: 1131.3334 + height: 813.3333 m_MinSize: {x: 200, y: 112} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 132 + controlID: 73 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -191,12 +191,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 913 - height: 563 + width: 1131.3334 + height: 571.3333 m_MinSize: {x: 200, y: 56} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 23 + controlID: 26 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -215,8 +215,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 217 - height: 563 + width: 268.66666 + height: 571.3333 m_MinSize: {x: 201, y: 226} m_MaxSize: {x: 4001, y: 4026} m_ActualView: {fileID: 16} @@ -234,25 +234,25 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 217 + x: 268.66666 y: 0 - width: 696 - height: 563 - m_MinSize: {x: 202, y: 226} - m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 15} + width: 862.66675 + height: 571.3333 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} - {fileID: 15} - {fileID: 18} - {fileID: 13} - m_Selected: 1 - m_LastSelected: 3 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -269,9 +269,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 563 - width: 913 - height: 238 + y: 571.3333 + width: 1131.3334 + height: 242 m_MinSize: {x: 231, y: 276} m_MaxSize: {x: 10001, y: 10026} m_ActualView: {fileID: 19} @@ -297,12 +297,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 913 + x: 1131.3334 y: 0 - width: 464 - height: 801 - m_MinSize: {x: 276, y: 76} - m_MaxSize: {x: 4001, y: 4026} + width: 575.33325 + height: 813.3333 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 24} m_Panes: - {fileID: 23} @@ -498,8 +498,8 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 0 - width: 1377 + y: 42.666668 + width: 1706.6666 height: 36 m_SerializedDataModeController: m_DataMode: 0 @@ -557,10 +557,10 @@ MonoBehaviour: displayed: 1 id: Package Management/Package Manager index: 3 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":250.66665649414063,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 250.66666, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 @@ -582,7 +582,7 @@ MonoBehaviour: sizeOverridden: 0 - dockPosition: 0 containerId: overlay-toolbar__top - displayed: 0 + displayed: 1 id: Services/AI index: 5 contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' @@ -624,8 +624,8 @@ MonoBehaviour: sizeOverridden: 0 - dockPosition: 1 containerId: overlay-toolbar__top - displayed: 1 - id: Editor Controls/Layout + displayed: 0 + id: Editor Utility/Quality index: 1 contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 @@ -638,8 +638,8 @@ MonoBehaviour: sizeOverridden: 0 - dockPosition: 1 containerId: overlay-toolbar__top - displayed: 0 - id: Editor Utility/Quality + displayed: 1 + id: Editor Controls/Layout index: 2 contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 @@ -725,15 +725,57 @@ MonoBehaviour: displayed: 1 id: Play Mode Controls index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-644.0,"y":-36.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":3,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-781.3333129882813,"y":-36.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":3,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: -644, y: -36} + snapOffset: {x: -781.3333, y: -36} snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 layout: 4 size: {x: 0, y: 0} sizeOverridden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__top + displayed: 0 + id: Asset Inventory/Add To Scene + index: 7 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__top + displayed: 0 + id: Asset Inventory/Open Asset Inventory + index: 8 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + displayed: 0 + id: Services/Environment + index: 8 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 m_ContainerData: - containerId: overlay-toolbar__top scrollOffset: 0 @@ -757,17 +799,17 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: "\u6E38\u620F" - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, + m_Text: Game + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "\u6E38\u620F\u200B" + m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: 218 - y: 24 - width: 694 - height: 537 + x: 268.6667 + y: 78.66667 + width: 860.66675 + height: 545.3333 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -789,7 +831,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1920, y: 1080} + m_TargetSize: {x: 3840, y: 2160} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -804,10 +846,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -960 - m_HBaseRangeMax: 960 - m_VBaseRangeMin: -540 - m_VBaseRangeMax: 540 + m_HBaseRangeMin: -1280 + m_HBaseRangeMax: 1280 + m_VBaseRangeMin: -720 + m_VBaseRangeMax: 720 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -816,7 +858,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -825,23 +867,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 860 + width: 860.66675 height: 524.3333 - m_Scale: {x: 0.44791666, y: 0.44791666} - m_Translation: {x: 430, y: 262.16666} + m_Scale: {x: 0.33619794, y: 0.33619794} + m_Translation: {x: 430.33337, y: 262.16666} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -960 - y: -585.3023 - width: 1920 - height: 1170.6046 + x: -1280 + y: -779.7985 + width: 2560 + height: 1559.597 m_MinimalGUI: 1 - m_defaultScale: 0.44791666 - m_LastWindowPixelSize: {x: 860, y: 545.3333} + m_defaultScale: 0.33619794 + m_LastWindowPixelSize: {x: 1291.0001, y: 818} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -863,17 +905,17 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: "\u5C42\u7EA7" - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, + m_Text: Hierarchy + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "\u5C42\u7EA7\u200B" + m_TextWithWhitespace: "Hierarchy\u200B" m_Pos: serializedVersion: 2 x: 0 - y: 24 - width: 216 - height: 537 + y: 78.66667 + width: 267.66666 + height: 545.3333 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -894,95 +936,24 @@ MonoBehaviour: m_LastClickedID: m_Data: 0 m_ExpandedIDs: - - m_Data: -491778 - - m_Data: -491452 - - m_Data: -489128 - - m_Data: -485244 - - m_Data: -472540 - - m_Data: -472218 - - m_Data: -469898 - - m_Data: -466014 - - m_Data: -424492 - - m_Data: -389910 - - m_Data: -385618 - - m_Data: -385068 - - m_Data: -337008 - - m_Data: -274146 - - m_Data: -218216 - - m_Data: -112474 - - m_Data: -111800 - - m_Data: -111714 - - m_Data: -111712 - - m_Data: -111022 - - m_Data: -109088 - - m_Data: -4950 - - m_Data: -4948 - - m_Data: -4780 - - m_Data: -4634 - - m_Data: -4488 - - m_Data: -4320 - - m_Data: -4152 - - m_Data: -4150 - - m_Data: -4006 - - m_Data: -3866 - - m_Data: -3808 - - m_Data: -3806 - - m_Data: -3292 - - m_Data: -3290 - - m_Data: -3206 - - m_Data: -3118 - - m_Data: -3030 - - m_Data: -2884 - - m_Data: -2742 - - m_Data: -2630 - - m_Data: -2602 - - m_Data: -2278 - - m_Data: -1632 - - m_Data: -1630 - - m_Data: -1574 - - m_Data: -1572 - - m_Data: -1484 - - m_Data: -1396 - - m_Data: -1338 - - m_Data: -1336 - - m_Data: -1334 - - m_Data: 79016 - - m_Data: 79054 - - m_Data: 79846 - - m_Data: 79974 - - m_Data: 80244 - - m_Data: 80450 - - m_Data: 80506 - - m_Data: 80684 - - m_Data: 80954 - - m_Data: 80970 - - m_Data: 81266 - - m_Data: 159596 - - m_Data: 159950 - - m_Data: 160146 - - m_Data: 160348 - - m_Data: 160610 - - m_Data: 161056 - - m_Data: 161074 - - m_Data: 161368 - - m_Data: 161512 - - m_Data: 268700 - - m_Data: 268950 - - m_Data: 269138 - - m_Data: 269170 - - m_Data: 269258 - - m_Data: 269818 - - m_Data: 269906 - - m_Data: 269972 - - m_Data: 270088 - - m_Data: 270384 - - m_Data: 270528 - - m_Data: 361978 - - m_Data: 362164 - - m_Data: 362194 - - m_Data: 362594 - - m_Data: 363008 - - m_Data: 363410 + - m_Data: -191216 + - m_Data: -190792 + - m_Data: -188452 + - m_Data: -184458 + - m_Data: -171200 + - m_Data: -170772 + - m_Data: -168428 + - m_Data: -164434 + - m_Data: -93312 + - m_Data: -92884 + - m_Data: -90540 + - m_Data: -86546 + - m_Data: -80070 + - m_Data: -71632 + - m_Data: -71208 + - m_Data: -68884 + - m_Data: -64906 + - m_Data: -1342 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1023,16 +994,16 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: "\u573A\u666F" - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, + m_Text: Scene + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "\u573A\u666F\u200B" + m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 269.33334 + x: 268.6667 y: 78.66667 - width: 860 + width: 860.66675 height: 545.3333 m_SerializedDataModeController: m_DataMode: 0 @@ -1702,9 +1673,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: 7.1922092, y: 103.64482, z: -8.535217} + m_Target: {x: 12.81906, y: 12.520589, z: 2236.83} speed: 2 - m_Value: {x: -24.563862, y: -6.6147346, z: -1.0688499} + m_Value: {x: 12.81906, y: 12.520589, z: 2236.83} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1750,17 +1721,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.034498498, y: -0.002649789, z: 0.00032535294, w: 0.9995643} + m_Target: {x: 0.1383886, y: -0.40541148, z: 0.06271537, w: 0.9016005} speed: 2 - m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Value: {x: 0.13836603, y: -0.40534532, z: 0.06270514, w: 0.9014534} m_Size: - m_Target: 192.90724 + m_Target: 8.783796 speed: 2 - m_Value: 116.885475 + m_Value: 8.783796 m_Ortho: m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -1774,7 +1745,7 @@ MonoBehaviour: m_FarClip: 1000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: -0.034498498, y: -0.002649789, z: 0.00032535294, w: 0.9995643} m_LastSceneViewOrtho: 0 m_Viewpoint: m_SceneView: {fileID: 17} @@ -1805,11 +1776,11 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: "\u52A8\u753B\u5668" - m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, + m_Text: Animator + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "\u52A8\u753B\u5668\u200B" + m_TextWithWhitespace: "Animator\u200B" m_Pos: serializedVersion: 2 x: 269.33334 @@ -1933,17 +1904,17 @@ MonoBehaviour: m_MinSize: {x: 230, y: 250} m_MaxSize: {x: 10000, y: 10000} m_TitleContent: - m_Text: "\u9879\u76EE" - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, + m_Text: Project + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "\u9879\u76EE\u200B" + m_TextWithWhitespace: "Project\u200B" m_Pos: serializedVersion: 2 x: 0 - y: 587 - width: 912 - height: 212 + y: 650 + width: 1130.3334 + height: 216 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1968,7 +1939,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 0 m_Folders: - - Assets/Localization + - Assets/Resources m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1978,68 +1949,136 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Localization + - Assets/Resources m_LastFoldersGridSize: 16 m_LastProjectPath: D:\Projects\ichni Official m_LockTracker: m_IsLocked: 0 m_LastLocalAssetsSearchArea: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 240} + scrollPos: {x: 0, y: 308} m_SelectedIDs: - - m_Data: 84960 + - m_Data: 85038 m_LastClickedID: - m_Data: 84960 + m_Data: 85038 m_ExpandedIDs: - m_Data: 0 - - m_Data: 85612 - - m_Data: 85614 - - m_Data: 85616 - - m_Data: 85618 - - m_Data: 85620 - - m_Data: 85622 - - m_Data: 85624 - - m_Data: 85626 - - m_Data: 85628 - - m_Data: 85630 - - m_Data: 85632 - - m_Data: 85634 - - m_Data: 85636 - - m_Data: 85638 - - m_Data: 85640 - - m_Data: 85642 - - m_Data: 85644 - - m_Data: 85646 - - m_Data: 85648 - - m_Data: 85650 - - m_Data: 85652 - - m_Data: 85654 - - m_Data: 85656 - - m_Data: 85658 - - m_Data: 85660 - - m_Data: 85662 - - m_Data: 85664 - - m_Data: 85666 - - m_Data: 85668 - - m_Data: 85670 - - m_Data: 85672 - - m_Data: 85674 - - m_Data: 85676 - - m_Data: 85678 - - m_Data: 85680 - - m_Data: 85682 - - m_Data: 85684 - - m_Data: 85686 - - m_Data: 85688 - - m_Data: 85690 - - m_Data: 85692 - - m_Data: 85694 - - m_Data: 85696 - - m_Data: 85698 - - m_Data: 85700 - - m_Data: 85702 - - m_Data: 85704 - - m_Data: 85706 + - m_Data: 84816 + - m_Data: 84818 + - m_Data: 84820 + - m_Data: 84822 + - m_Data: 84824 + - m_Data: 84826 + - m_Data: 84828 + - m_Data: 84830 + - m_Data: 84832 + - m_Data: 84834 + - m_Data: 84836 + - m_Data: 84838 + - m_Data: 84840 + - m_Data: 84842 + - m_Data: 84844 + - m_Data: 84846 + - m_Data: 84848 + - m_Data: 84850 + - m_Data: 84852 + - m_Data: 84854 + - m_Data: 84856 + - m_Data: 84858 + - m_Data: 84860 + - m_Data: 84862 + - m_Data: 84864 + - m_Data: 84866 + - m_Data: 84868 + - m_Data: 84870 + - m_Data: 84872 + - m_Data: 84874 + - m_Data: 84876 + - m_Data: 84878 + - m_Data: 84880 + - m_Data: 84882 + - m_Data: 84884 + - m_Data: 84886 + - m_Data: 84888 + - m_Data: 84890 + - m_Data: 84892 + - m_Data: 84894 + - m_Data: 84896 + - m_Data: 84898 + - m_Data: 84900 + - m_Data: 84902 + - m_Data: 84904 + - m_Data: 84906 + - m_Data: 84908 + - m_Data: 84910 + - m_Data: 84912 + - m_Data: 84914 + - m_Data: 84916 + - m_Data: 84918 + - m_Data: 84920 + - m_Data: 84922 + - m_Data: 84924 + - m_Data: 84926 + - m_Data: 84928 + - m_Data: 84930 + - m_Data: 84932 + - m_Data: 84934 + - m_Data: 84936 + - m_Data: 84938 + - m_Data: 84940 + - m_Data: 84942 + - m_Data: 84944 + - m_Data: 84946 + - m_Data: 84948 + - m_Data: 84950 + - m_Data: 84952 + - m_Data: 84954 + - m_Data: 84956 + - m_Data: 84958 + - m_Data: 84960 + - m_Data: 84962 + - m_Data: 84964 + - m_Data: 84966 + - m_Data: 84968 + - m_Data: 84970 + - m_Data: 84972 + - m_Data: 84974 + - m_Data: 84976 + - m_Data: 84978 + - m_Data: 84980 + - m_Data: 84982 + - m_Data: 84984 + - m_Data: 84986 + - m_Data: 84988 + - m_Data: 84990 + - m_Data: 84992 + - m_Data: 84994 + - m_Data: 84996 + - m_Data: 84998 + - m_Data: 85000 + - m_Data: 85002 + - m_Data: 85004 + - m_Data: 85006 + - m_Data: 85008 + - m_Data: 85010 + - m_Data: 85012 + - m_Data: 85014 + - m_Data: 85016 + - m_Data: 85018 + - m_Data: 85020 + - m_Data: 85022 + - m_Data: 85024 + - m_Data: 85026 + - m_Data: 85028 + - m_Data: 85030 + - m_Data: 85032 + - m_Data: 85034 + - m_Data: 85036 + - m_Data: 85038 + - m_Data: 85040 + - m_Data: 85486 + - m_Data: 85488 + - m_Data: 1000000000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -2072,54 +2111,120 @@ MonoBehaviour: m_Data: 0 m_ExpandedIDs: - m_Data: 0 - - m_Data: 85612 - - m_Data: 85614 - - m_Data: 85616 - - m_Data: 85618 - - m_Data: 85620 - - m_Data: 85622 - - m_Data: 85624 - - m_Data: 85626 - - m_Data: 85628 - - m_Data: 85630 - - m_Data: 85632 - - m_Data: 85634 - - m_Data: 85636 - - m_Data: 85638 - - m_Data: 85640 - - m_Data: 85642 - - m_Data: 85644 - - m_Data: 85646 - - m_Data: 85648 - - m_Data: 85650 - - m_Data: 85652 - - m_Data: 85654 - - m_Data: 85656 - - m_Data: 85658 - - m_Data: 85660 - - m_Data: 85662 - - m_Data: 85664 - - m_Data: 85666 - - m_Data: 85668 - - m_Data: 85670 - - m_Data: 85672 - - m_Data: 85674 - - m_Data: 85676 - - m_Data: 85678 - - m_Data: 85680 - - m_Data: 85682 - - m_Data: 85684 - - m_Data: 85686 - - m_Data: 85688 - - m_Data: 85690 - - m_Data: 85692 - - m_Data: 85694 - - m_Data: 85696 - - m_Data: 85698 - - m_Data: 85700 - - m_Data: 85702 - - m_Data: 85704 - - m_Data: 85706 + - m_Data: 84816 + - m_Data: 84818 + - m_Data: 84820 + - m_Data: 84822 + - m_Data: 84824 + - m_Data: 84826 + - m_Data: 84828 + - m_Data: 84830 + - m_Data: 84832 + - m_Data: 84834 + - m_Data: 84836 + - m_Data: 84838 + - m_Data: 84840 + - m_Data: 84842 + - m_Data: 84844 + - m_Data: 84846 + - m_Data: 84848 + - m_Data: 84850 + - m_Data: 84852 + - m_Data: 84854 + - m_Data: 84856 + - m_Data: 84858 + - m_Data: 84860 + - m_Data: 84862 + - m_Data: 84864 + - m_Data: 84866 + - m_Data: 84868 + - m_Data: 84870 + - m_Data: 84872 + - m_Data: 84874 + - m_Data: 84876 + - m_Data: 84878 + - m_Data: 84880 + - m_Data: 84882 + - m_Data: 84884 + - m_Data: 84886 + - m_Data: 84888 + - m_Data: 84890 + - m_Data: 84892 + - m_Data: 84894 + - m_Data: 84896 + - m_Data: 84898 + - m_Data: 84900 + - m_Data: 84902 + - m_Data: 84904 + - m_Data: 84906 + - m_Data: 84908 + - m_Data: 84910 + - m_Data: 84912 + - m_Data: 84914 + - m_Data: 84916 + - m_Data: 84918 + - m_Data: 84920 + - m_Data: 84922 + - m_Data: 84924 + - m_Data: 84926 + - m_Data: 84928 + - m_Data: 84930 + - m_Data: 84932 + - m_Data: 84934 + - m_Data: 84936 + - m_Data: 84938 + - m_Data: 84940 + - m_Data: 84942 + - m_Data: 84944 + - m_Data: 84946 + - m_Data: 84948 + - m_Data: 84950 + - m_Data: 84952 + - m_Data: 84954 + - m_Data: 84956 + - m_Data: 84958 + - m_Data: 84960 + - m_Data: 84962 + - m_Data: 84964 + - m_Data: 84966 + - m_Data: 84968 + - m_Data: 84970 + - m_Data: 84972 + - m_Data: 84974 + - m_Data: 84976 + - m_Data: 84978 + - m_Data: 84980 + - m_Data: 84982 + - m_Data: 84984 + - m_Data: 84986 + - m_Data: 84988 + - m_Data: 84990 + - m_Data: 84992 + - m_Data: 84994 + - m_Data: 84996 + - m_Data: 84998 + - m_Data: 85000 + - m_Data: 85002 + - m_Data: 85004 + - m_Data: 85006 + - m_Data: 85008 + - m_Data: 85010 + - m_Data: 85012 + - m_Data: 85014 + - m_Data: 85016 + - m_Data: 85018 + - m_Data: 85020 + - m_Data: 85022 + - m_Data: 85024 + - m_Data: 85026 + - m_Data: 85028 + - m_Data: 85030 + - m_Data: 85032 + - m_Data: 85034 + - m_Data: 85036 + - m_Data: 85038 + - m_Data: 85040 + - m_Data: 85042 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -2148,7 +2253,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: [] m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: - m_Data: 0 - m_Data: 80838 @@ -2209,11 +2314,11 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: "\u63A7\u5236\u53F0" - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, + m_Text: Console + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "\u63A7\u5236\u53F0\u200B" + m_TextWithWhitespace: "Console\u200B" m_Pos: serializedVersion: 2 x: 0 @@ -2248,11 +2353,11 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: "\u52A8\u753B" - m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, + m_Text: Animation + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "\u52A8\u753B\u200B" + m_TextWithWhitespace: "Animation\u200B" m_Pos: serializedVersion: 2 x: 63 @@ -2274,7 +2379,7 @@ MonoBehaviour: m_DynamicPanelBehavior: 0 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 0 + m_LastSelectedObjectID: 75236 --- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 @@ -2370,17 +2475,17 @@ MonoBehaviour: m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: "\u68C0\u67E5\u5668" - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, + m_Text: Inspector + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "\u68C0\u67E5\u5668\u200B" + m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 914 - y: 24 - width: 463 - height: 775 + x: 1131.3334 + y: 78.66667 + width: 574.33325 + height: 787.3333 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -2422,11 +2527,11 @@ MonoBehaviour: m_MinSize: {x: 275, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: "\u68C0\u67E5\u5668" - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, + m_Text: Inspector + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "\u68C0\u67E5\u5668\u200B" + m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 x: 1131.3334 @@ -2474,11 +2579,11 @@ MonoBehaviour: m_MinSize: {x: 275, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: "\u68C0\u67E5\u5668" - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, + m_Text: Inspector + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "\u68C0\u67E5\u5668\u200B" + m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 x: 1131.3334 @@ -2526,11 +2631,11 @@ MonoBehaviour: m_MinSize: {x: 390, y: 390} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: "\u5149\u7167" - m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, + m_Text: Lighting + m_Image: {fileID: -1477008817101679558, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "\u5149\u7167\u200B" + m_TextWithWhitespace: "Lighting\u200B" m_Pos: serializedVersion: 2 x: 1102.6667 diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings index 0b8c36e3..e287990a 100644 --- a/UserSettings/Search.settings +++ b/UserSettings/Search.settings @@ -82,6 +82,8 @@ providers = { objectSelectors = { } recentSearches = [ + "st: reset" + "st: uieff" "st: story" "st: illust" "st: chart" @@ -99,9 +101,6 @@ recentSearches = [ "st: resol" "st: bloom" "st: render" - "st: ingam" - "st: music" - "p:" ] searchItemFavorites = [ ]