diff --git a/Assets/000_assets/material/M_SquareFrame 1.mat b/Assets/000_assets/material/M_SquareFrame 1.mat index 8b34c8da..206ea6c4 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.5088004 + - _EdgeValue: 0.012226982 - _EnvironmentReflections: 1 - _FNLfanxiangkaiguan: 0 - _Face: 1 @@ -258,7 +258,7 @@ Material: - _Mask_scale: 1 - _Metallic: 0 - _OcclusionStrength: 1 - - _Opacity: 0.4911996 + - _Opacity: 0.987773 - _Parallax: 0.005 - _Pass: 0 - _QueueOffset: 0 diff --git a/Assets/000_assets/shader/EdgeShader.shader b/Assets/000_assets/shader/EdgeShader.shader index 62660459..fc4f963d 100644 --- a/Assets/000_assets/shader/EdgeShader.shader +++ b/Assets/000_assets/shader/EdgeShader.shader @@ -70,24 +70,8 @@ Shader "Soullies/EdgeShader" #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl" #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderGraphFunctions.hlsl" - #include "Packages/com.unity.render-pipelines.universal/Shaders/2D/Include/LightingUtility.hlsl" - - #if USE_SHAPE_LIGHT_TYPE_0 - SHAPE_LIGHT(0) - #endif - - #if USE_SHAPE_LIGHT_TYPE_1 - SHAPE_LIGHT(1) - #endif - - #if USE_SHAPE_LIGHT_TYPE_2 - SHAPE_LIGHT(2) - #endif - - #if USE_SHAPE_LIGHT_TYPE_3 - SHAPE_LIGHT(3) - #endif - + #include "Packages/com.unity.render-pipelines.universal/Shaders/2D/Include/SurfaceData2D.hlsl" + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Debug/Debugging2D.hlsl" #include "Packages/com.unity.render-pipelines.universal/Shaders/2D/Include/CombinedShapeLightShared.hlsl" #pragma shader_feature_local _CIRCLE_ON_ON @@ -197,7 +181,7 @@ Shader "Soullies/EdgeShader" InitializeSurfaceData(Color.rgb, Color.a, Mask, surfaceData); InputData2D inputData; InitializeInputData(IN.texCoord0.xy, half2(IN.screenPosition.xy / IN.screenPosition.w), inputData); - SETUP_DEBUG_DATA_2D(inputData, positionWS); + SETUP_DEBUG_DATA_2D(inputData, positionWS, IN.positionCS); return CombinedShapeLightShared(surfaceData, inputData); } @@ -480,7 +464,7 @@ Shader "Soullies/EdgeShader" InitializeInputData(positionWS.xy, half2(IN.texCoord0.xy), inputData); half4 debugColor = 0; - SETUP_DEBUG_DATA_2D(inputData, positionWS); + SETUP_DEBUG_DATA_2D(inputData, positionWS, IN.positionCS); if (CanDebugOverrideOutputColor(surfaceData, inputData, debugColor)) { diff --git a/Assets/000_assets/shader/floor.shader b/Assets/000_assets/shader/floor.shader index 3be5876d..00430016 100644 --- a/Assets/000_assets/shader/floor.shader +++ b/Assets/000_assets/shader/floor.shader @@ -44,7 +44,7 @@ Shader "Soullies/floor" HLSLINCLUDE - #pragma target 4.5 + #pragma target 3.5 #pragma prefer_hlslcc gles // ensure rendering platforms toggle list is visible diff --git a/Assets/000_assets/shader/hold 1.shader b/Assets/000_assets/shader/hold 1.shader index 5f99a9d0..8f6b0fb1 100644 --- a/Assets/000_assets/shader/hold 1.shader +++ b/Assets/000_assets/shader/hold 1.shader @@ -49,7 +49,7 @@ Shader "Soullies/hold1" HLSLINCLUDE - #pragma target 4.5 + #pragma target 3.5 #pragma prefer_hlslcc gles // ensure rendering platforms toggle list is visible diff --git a/Assets/000_assets/shader/hold.shader b/Assets/000_assets/shader/hold.shader index f7bee606..d86c3c15 100644 --- a/Assets/000_assets/shader/hold.shader +++ b/Assets/000_assets/shader/hold.shader @@ -49,7 +49,7 @@ Shader "Soullies/hold" HLSLINCLUDE - #pragma target 4.5 + #pragma target 3.5 #pragma prefer_hlslcc gles // ensure rendering platforms toggle list is visible diff --git a/Assets/000_assets/shader/parallax.shader b/Assets/000_assets/shader/parallax.shader index bb221cb7..c8a4d38c 100644 --- a/Assets/000_assets/shader/parallax.shader +++ b/Assets/000_assets/shader/parallax.shader @@ -50,7 +50,7 @@ Shader "Soullies/parallax" HLSLINCLUDE - #pragma target 4.5 + #pragma target 3.5 #pragma prefer_hlslcc gles // ensure rendering platforms toggle list is visible diff --git a/Assets/AddressableAssetsData/Android/addressables_content_state.bin b/Assets/AddressableAssetsData/Android/addressables_content_state.bin index bacf069c..625c3b8d 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/link.xml b/Assets/AddressableAssetsData/link.xml deleted file mode 100644 index d011ce72..00000000 --- a/Assets/AddressableAssetsData/link.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 15x.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/HDRP Samples 15x.unitypackage.meta deleted file mode 100644 index 3c5ca728..00000000 --- a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 15x.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 249f4ab1..00000000 --- a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 16x.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 3ee0254d..00000000 --- a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 17.0.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 4557a1b4..00000000 --- a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 17.1.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 677da0f0..00000000 --- a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 17.2.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 872a1e1a..00000000 --- a/Assets/AmplifyShaderEditor/Examples/HDRP Samples.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 9d944382..00000000 --- a/Assets/AmplifyShaderEditor/Examples/Sample Resources.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 819d3c7d..00000000 --- a/Assets/AmplifyShaderEditor/Examples/URP Samples 10x.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 9c0d665d..00000000 --- a/Assets/AmplifyShaderEditor/Examples/URP Samples 12x.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 624d8621..00000000 --- a/Assets/AmplifyShaderEditor/Examples/URP Samples 14x.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 7e2a8a41..00000000 --- a/Assets/AmplifyShaderEditor/Examples/URP Samples 15x.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 9d2cb068..00000000 --- a/Assets/AmplifyShaderEditor/Examples/URP Samples 16x.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index aa70a0f5..00000000 --- a/Assets/AmplifyShaderEditor/Examples/URP Samples 17.0.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 013c35c6..00000000 --- a/Assets/AmplifyShaderEditor/Examples/URP Samples 17.1.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 42051740..00000000 --- a/Assets/AmplifyShaderEditor/Examples/URP Samples 17.2.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index da8ce241..00000000 --- a/Assets/AmplifyShaderEditor/Examples/URP Samples.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a9d68dd8913f05d4d9ce75e7b40c6044 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 10x.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 10x.unitypackage.meta deleted file mode 100644 index 602bd09a..00000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 10x.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index e51ee6d4..00000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 12x.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 82a2ab0e..00000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 14x.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 54836f2b..00000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 15x.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 65b98bd3..00000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 16x.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index c32e9f8f..00000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 17.0.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 0a18ad9c..00000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 17.1.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 314aa79b..00000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP 17.2.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 34f23836..00000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 10x.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 04c4f886..00000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 12x.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index d5cd3087..00000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 14x.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 0b6cd6d0..00000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 15x.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 2b33d7ab..00000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 16x.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index e0b5ad87..00000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 17.0.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 6338d388..00000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 17.1.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 47f972a0..00000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP 17.2.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f4990f6ace6142c4bbbf41cdd80b0bd3 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP/2DLit.shader b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP/2DLit.shader index 835fe5b7..bfc39ca0 100644 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP/2DLit.shader +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP/2DLit.shader @@ -104,28 +104,11 @@ Shader /*ase_name*/ "Hidden/Universal/2D Lit" /*end*/ #include_with_pragmas "Packages/com.unity.render-pipelines.core/ShaderLibrary/FoveatedRenderingKeywords.hlsl" #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/DebugMipmapStreamingMacros.hlsl" #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderGraphFunctions.hlsl" - #include "Packages/com.unity.render-pipelines.universal/Shaders/2D/Include/LightingUtility.hlsl" #include "Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/ShaderPass.hlsl" #include "Packages/com.unity.render-pipelines.universal/Shaders/2D/Include/SurfaceData2D.hlsl" #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Debug/Debugging2D.hlsl" - #if USE_SHAPE_LIGHT_TYPE_0 - SHAPE_LIGHT(0) - #endif - - #if USE_SHAPE_LIGHT_TYPE_1 - SHAPE_LIGHT(1) - #endif - - #if USE_SHAPE_LIGHT_TYPE_2 - SHAPE_LIGHT(2) - #endif - - #if USE_SHAPE_LIGHT_TYPE_3 - SHAPE_LIGHT(3) - #endif - #include "Packages/com.unity.render-pipelines.universal/Shaders/2D/Include/CombinedShapeLightShared.hlsl" /*ase_pragma*/ diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP/Lit.shader b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP/Lit.shader index e15102a4..c5614aa5 100644 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP/Lit.shader +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP/Lit.shader @@ -484,7 +484,7 @@ Shader /*ase_name*/ "Hidden/Universal/Lit" /*end*/ /*ase_stencil*/ HLSLINCLUDE - #pragma target 4.5 + #pragma target 3.5 #pragma prefer_hlslcc gles #pragma exclude_renderers d3d9 // ensure rendering platforms toggle list is visible diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP/Unlit.shader b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP/Unlit.shader index c5939bb9..23ff8bd7 100644 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP/Unlit.shader +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP/Unlit.shader @@ -250,7 +250,7 @@ Shader /*ase_name*/ "Hidden/Universal/Unlit" /*end*/ /*ase_stencil*/ HLSLINCLUDE - #pragma target 4.5 + #pragma target 3.5 #pragma prefer_hlslcc gles #pragma exclude_renderers d3d9 // ensure rendering platforms toggle list is visible diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/UI/Buttons/OpenSourceCodeOFF.PNG b/Assets/AmplifyShaderEditor/Plugins/EditorResources/UI/Buttons/OpenSourceCodeOFF.PNG index f93eae3f..1f21bc11 100644 Binary files a/Assets/AmplifyShaderEditor/Plugins/EditorResources/UI/Buttons/OpenSourceCodeOFF.PNG and b/Assets/AmplifyShaderEditor/Plugins/EditorResources/UI/Buttons/OpenSourceCodeOFF.PNG differ diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/UI/Buttons/OpenSourceCodeON.PNG b/Assets/AmplifyShaderEditor/Plugins/EditorResources/UI/Buttons/OpenSourceCodeON.PNG index 21394dbf..3ece0aaf 100644 Binary files a/Assets/AmplifyShaderEditor/Plugins/EditorResources/UI/Buttons/OpenSourceCodeON.PNG and b/Assets/AmplifyShaderEditor/Plugins/EditorResources/UI/Buttons/OpenSourceCodeON.PNG differ diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/UI/Canvas/MaterialModeIcon.PNG b/Assets/AmplifyShaderEditor/Plugins/EditorResources/UI/Canvas/MaterialModeIcon.PNG index 95efd603..b36b7bd8 100644 Binary files a/Assets/AmplifyShaderEditor/Plugins/EditorResources/UI/Canvas/MaterialModeIcon.PNG and b/Assets/AmplifyShaderEditor/Plugins/EditorResources/UI/Canvas/MaterialModeIcon.PNG differ diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/UI/Canvas/ShaderModeIcon.PNG b/Assets/AmplifyShaderEditor/Plugins/EditorResources/UI/Canvas/ShaderModeIcon.PNG index fe8ea72f..750df501 100644 Binary files a/Assets/AmplifyShaderEditor/Plugins/EditorResources/UI/Canvas/ShaderModeIcon.PNG and b/Assets/AmplifyShaderEditor/Plugins/EditorResources/UI/Canvas/ShaderModeIcon.PNG differ diff --git a/Assets/Dreamteck/Splines/Components/TubeGenerator.cs b/Assets/Dreamteck/Splines/Components/TubeGenerator.cs index bc6e5539..fbf33971 100644 --- a/Assets/Dreamteck/Splines/Components/TubeGenerator.cs +++ b/Assets/Dreamteck/Splines/Components/TubeGenerator.cs @@ -295,7 +295,7 @@ namespace Dreamteck.Splines float anglePercent = (float)lon / sides; int index = bodyVertexCount + lon + (lat-1) * (sides + 1); Quaternion rot = Quaternion.AngleAxis(_revolve * anglePercent + rotation + 180f, -Vector3.forward) * Quaternion.AngleAxis(latAngle, Vector3.up); - _tsMesh.vertices[index] = center + lookRot * rot * -Vector3.right * (size * 0.5f * evalResult.size); + _tsMesh.vertices[index] = center + lookRot * rot * -Vector3.right * (size * 0.5f * resultSize); _tsMesh.colors[index] = vertexColor; _tsMesh.normals[index] = (_tsMesh.vertices[index] - center).normalized; float baseV = startV + capLengthPercent * latitudePercent; @@ -360,7 +360,7 @@ namespace Dreamteck.Splines float anglePercent = (float)lon / sides; int index = bodyVertexCount + capVertexCount + lon + (lat - 1) * (sides + 1); Quaternion rot = Quaternion.AngleAxis(_revolve * anglePercent + rotation + 180f, Vector3.forward) * Quaternion.AngleAxis(latAngle, -Vector3.up); - _tsMesh.vertices[index] = center + lookRot * rot * Vector3.right * size * 0.5f * evalResult.size; + _tsMesh.vertices[index] = center + lookRot * rot * Vector3.right * size * 0.5f * resultSize; _tsMesh.normals[index] = (_tsMesh.vertices[index] - center).normalized; _tsMesh.colors[index] = vertexColor; float baseV = startV + capLengthPercent * latitudePercent; diff --git a/Assets/Dreamteck/Splines/Core/TransformModule.cs b/Assets/Dreamteck/Splines/Core/TransformModule.cs index bfdab568..4e5aeb36 100644 --- a/Assets/Dreamteck/Splines/Core/TransformModule.cs +++ b/Assets/Dreamteck/Splines/Core/TransformModule.cs @@ -231,7 +231,7 @@ namespace Dreamteck.Splines #endif input.transform.localScale = GetScale(input.transform.localScale); input.position = GetPosition(input.position); - if (!input.isKinematic) + if (input.bodyType != RigidbodyType2D.Kinematic) { #if UNITY_6000_OR_NEWER input.linearVelocity = HandleVelocity(input.linearVelocity); 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 deleted file mode 100644 index d4c3ffb4..00000000 --- a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Built-in Pipeline.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 378f3f8d..00000000 --- a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 2022.3+.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 2d5423a9..00000000 --- a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 6000.0+.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index ccb4a903..00000000 --- a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 6000.1+.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 03ead5d2..00000000 --- a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 6000.2+.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 767ec46b..00000000 --- a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/High Definition 6000.3+.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 3502d9ed..00000000 --- a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 2022.3+.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 615e9057..00000000 --- a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 6000.0+.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 9835f913..00000000 --- a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 6000.1+.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 1002df1c..00000000 --- a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 6000.2+.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 98204661..00000000 --- a/Assets/External VFXs/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines/Universal 6000.3+.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 37e6a9374416bc946a55779c58d0d984 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FR2_Cache.asset b/Assets/FR2_Cache.asset index 7d94fd5a..cbd12a9e 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:191053d1e63631b6c6122e65bbccc859efc89724b369ba72446f09e3af6f18ed -size 8641969 +oid sha256:7896c4e4298e2b060ba495966935a574030b231b8d0ae48a6ffe9d46df551260 +size 8593072 diff --git a/Assets/Le Tai's Asset/TranslucentImage/URP support.unitypackage.meta b/Assets/Le Tai's Asset/TranslucentImage/URP support.unitypackage.meta deleted file mode 100644 index 9e552100..00000000 --- a/Assets/Le Tai's Asset/TranslucentImage/URP support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e45363610a59a4543a9793b3bf2be4aa -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Easy Save 3/Editor/ES3Asmdefs.unitypackage.meta b/Assets/Plugins/Easy Save 3/Editor/ES3Asmdefs.unitypackage.meta deleted file mode 100644 index 550f254c..00000000 --- a/Assets/Plugins/Easy Save 3/Editor/ES3Asmdefs.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 1eadf09a..00000000 --- a/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index f073d2ab..00000000 --- a/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 130722af..00000000 --- a/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index f9b8ed82..00000000 --- a/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: cc355dd4cf1e6173beaeb22c2858cbe1 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/The Sixth/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/The Sixth/Beatmap.bytes index d316fc77..ddfebec1 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/The Sixth/Beatmap.bytes and b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/The Sixth/Beatmap.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/The Sixth/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/The Sixth/CommandScripts.bytes index cf7f65e1..a9a411a9 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/The Sixth/CommandScripts.bytes and b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/The Sixth/CommandScripts.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/The Sixth/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/The Sixth/ProjectInfo.bytes index 91fa5822..0cfc67b5 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/The Sixth/ProjectInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/The Sixth/ProjectInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/The Sixth/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/The Sixth/SongInfo.bytes index c9eed4d4..0b99a687 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/The Sixth/SongInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/The Sixth/SongInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Drowning in a Moment/Abyss/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Drowning in a Moment/Abyss/Beatmap.bytes index e8987de4..7d605748 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Drowning in a Moment/Abyss/Beatmap.bytes and b/Assets/Resources/Beatmaps/Chapter0/Drowning in a Moment/Abyss/Beatmap.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Drowning in a Moment/Abyss/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Drowning in a Moment/Abyss/CommandScripts.bytes index d163b7e8..8f0eab1d 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Drowning in a Moment/Abyss/CommandScripts.bytes and b/Assets/Resources/Beatmaps/Chapter0/Drowning in a Moment/Abyss/CommandScripts.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Drowning in a Moment/Abyss/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Drowning in a Moment/Abyss/ProjectInfo.bytes index fa682870..e36d18e2 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Drowning in a Moment/Abyss/ProjectInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Drowning in a Moment/Abyss/ProjectInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Drowning in a Moment/Abyss/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Drowning in a Moment/Abyss/SongInfo.bytes index 4f6f5b02..b0373ddc 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Drowning in a Moment/Abyss/SongInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Drowning in a Moment/Abyss/SongInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Solitudes/Alone/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Solitudes/Alone/Beatmap.bytes index 52f48386..8f175bc2 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Solitudes/Alone/Beatmap.bytes and b/Assets/Resources/Beatmaps/Chapter0/Solitudes/Alone/Beatmap.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Solitudes/Alone/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Solitudes/Alone/CommandScripts.bytes index 0eb3e234..bbe8f86a 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Solitudes/Alone/CommandScripts.bytes and b/Assets/Resources/Beatmaps/Chapter0/Solitudes/Alone/CommandScripts.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Solitudes/Alone/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Solitudes/Alone/ProjectInfo.bytes index 9ca238e4..9ac08d14 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Solitudes/Alone/ProjectInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Solitudes/Alone/ProjectInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Solitudes/Alone/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Solitudes/Alone/SongInfo.bytes index fc112360..6e9970ab 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Solitudes/Alone/SongInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Solitudes/Alone/SongInfo.bytes differ diff --git a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 12x.unitypackage.meta b/Assets/Resources/Beatmaps/Chapter0/Solitudes/Ever.meta similarity index 67% rename from Assets/AmplifyShaderEditor/Examples/HDRP Samples 12x.unitypackage.meta rename to Assets/Resources/Beatmaps/Chapter0/Solitudes/Ever.meta index c3c98f27..4081e260 100644 --- a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 12x.unitypackage.meta +++ b/Assets/Resources/Beatmaps/Chapter0/Solitudes/Ever.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: aa102d640b98b5d4781710a3a3dd6983 +guid: be22839879f1dc641a008819df53d051 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Beatmaps/Chapter0/Solitudes/Ever/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Solitudes/Ever/Beatmap.bytes new file mode 100644 index 00000000..c85ba9b8 Binary files /dev/null and b/Assets/Resources/Beatmaps/Chapter0/Solitudes/Ever/Beatmap.bytes differ diff --git a/Assets/AddressableAssetsData/link.xml.meta b/Assets/Resources/Beatmaps/Chapter0/Solitudes/Ever/Beatmap.bytes.meta similarity index 75% rename from Assets/AddressableAssetsData/link.xml.meta rename to Assets/Resources/Beatmaps/Chapter0/Solitudes/Ever/Beatmap.bytes.meta index 20a74f4a..3fde3bd3 100644 --- a/Assets/AddressableAssetsData/link.xml.meta +++ b/Assets/Resources/Beatmaps/Chapter0/Solitudes/Ever/Beatmap.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6ce491c0f528de74dbed99b700a51ea5 +guid: 431ae7bf897120f44997f1e3752720a4 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Beatmaps/Chapter0/Solitudes/Ever/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Solitudes/Ever/CommandScripts.bytes new file mode 100644 index 00000000..81546104 --- /dev/null +++ b/Assets/Resources/Beatmaps/Chapter0/Solitudes/Ever/CommandScripts.bytes @@ -0,0 +1,3 @@ +: +dVSZ6uƢS; :EgʃA?Ү&yH)CK LƟR|(ES3Reader reader, object obj) + { + var instance = (FlexibleBool_BM)obj; + foreach (string propertyName in reader.Properties) + { + switch (propertyName) + { + case "animatedBoolList": + case "animations": + instance.animatedBoolList = reader.Read>(); + break; + default: + reader.Skip(); + break; + } + } + + instance.animatedBoolList ??= new List(); + } + + protected override object ReadObject(ES3Reader reader) + { + var instance = new FlexibleBool_BM(); + ReadObject(reader, instance); + return instance; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/DataCore/DataTypes/ES3Types/ES3Type_FlexibleBool_BM.cs.meta b/Assets/Scripts/DataCore/DataTypes/ES3Types/ES3Type_FlexibleBool_BM.cs.meta new file mode 100644 index 00000000..75f1ef2a --- /dev/null +++ b/Assets/Scripts/DataCore/DataTypes/ES3Types/ES3Type_FlexibleBool_BM.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3d28b97050e8b4b418d3cb79369e51a2 \ No newline at end of file diff --git a/Assets/Scripts/DataCore/DataTypes/ES3Types/ES3Type_FlexibleFloat_BM.cs b/Assets/Scripts/DataCore/DataTypes/ES3Types/ES3Type_FlexibleFloat_BM.cs new file mode 100644 index 00000000..52c9a6d2 --- /dev/null +++ b/Assets/Scripts/DataCore/DataTypes/ES3Types/ES3Type_FlexibleFloat_BM.cs @@ -0,0 +1,51 @@ +using System.Collections.Generic; +using Ichni.RhythmGame; +using Ichni.RhythmGame.Beatmap; + +namespace ES3Types +{ + [UnityEngine.Scripting.Preserve] + public class ES3Type_FlexibleFloat_BM : ES3ObjectType + { + public static ES3Type Instance = null; + + public ES3Type_FlexibleFloat_BM() : base(typeof(FlexibleFloat_BM)) + { + Instance = this; + priority = 1; + } + + protected override void WriteObject(object obj, ES3Writer writer) + { + var instance = (FlexibleFloat_BM)obj; + writer.WriteProperty("animatedFloatList", instance.animatedFloatList); + } + + protected override void ReadObject(ES3Reader reader, object obj) + { + var instance = (FlexibleFloat_BM)obj; + foreach (string propertyName in reader.Properties) + { + switch (propertyName) + { + case "animatedFloatList": + case "animations": + instance.animatedFloatList = reader.Read>(); + break; + default: + reader.Skip(); + break; + } + } + + instance.animatedFloatList ??= new List(); + } + + protected override object ReadObject(ES3Reader reader) + { + var instance = new FlexibleFloat_BM(); + ReadObject(reader, instance); + return instance; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/DataCore/DataTypes/ES3Types/ES3Type_FlexibleFloat_BM.cs.meta b/Assets/Scripts/DataCore/DataTypes/ES3Types/ES3Type_FlexibleFloat_BM.cs.meta new file mode 100644 index 00000000..0675b063 --- /dev/null +++ b/Assets/Scripts/DataCore/DataTypes/ES3Types/ES3Type_FlexibleFloat_BM.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 44246e8e433f04748926353a4242ef0b \ No newline at end of file diff --git a/Assets/Scripts/DataCore/DataTypes/ES3Types/ES3Type_FlexibleInt_BM.cs b/Assets/Scripts/DataCore/DataTypes/ES3Types/ES3Type_FlexibleInt_BM.cs new file mode 100644 index 00000000..d0091de4 --- /dev/null +++ b/Assets/Scripts/DataCore/DataTypes/ES3Types/ES3Type_FlexibleInt_BM.cs @@ -0,0 +1,51 @@ +using System.Collections.Generic; +using Ichni.RhythmGame; +using Ichni.RhythmGame.Beatmap; + +namespace ES3Types +{ + [UnityEngine.Scripting.Preserve] + public class ES3Type_FlexibleInt_BM : ES3ObjectType + { + public static ES3Type Instance = null; + + public ES3Type_FlexibleInt_BM() : base(typeof(FlexibleInt_BM)) + { + Instance = this; + priority = 1; + } + + protected override void WriteObject(object obj, ES3Writer writer) + { + var instance = (FlexibleInt_BM)obj; + writer.WriteProperty("animatedIntList", instance.animatedIntList); + } + + protected override void ReadObject(ES3Reader reader, object obj) + { + var instance = (FlexibleInt_BM)obj; + foreach (string propertyName in reader.Properties) + { + switch (propertyName) + { + case "animatedIntList": + case "animations": + instance.animatedIntList = reader.Read>(); + break; + default: + reader.Skip(); + break; + } + } + + instance.animatedIntList ??= new List(); + } + + protected override object ReadObject(ES3Reader reader) + { + var instance = new FlexibleInt_BM(); + ReadObject(reader, instance); + return instance; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/DataCore/DataTypes/ES3Types/ES3Type_FlexibleInt_BM.cs.meta b/Assets/Scripts/DataCore/DataTypes/ES3Types/ES3Type_FlexibleInt_BM.cs.meta new file mode 100644 index 00000000..3b56eebe --- /dev/null +++ b/Assets/Scripts/DataCore/DataTypes/ES3Types/ES3Type_FlexibleInt_BM.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 526f6c8e10ef19448b07a14433c76b5c \ No newline at end of file diff --git a/Assets/AmplifyShaderEditor/Examples/Built-In Samples.unitypackage.meta b/Assets/Scripts/DataCore/ES3Types.meta similarity index 67% rename from Assets/AmplifyShaderEditor/Examples/Built-In Samples.unitypackage.meta rename to Assets/Scripts/DataCore/ES3Types.meta index d97f4fc6..9afe69e1 100644 --- a/Assets/AmplifyShaderEditor/Examples/Built-In Samples.unitypackage.meta +++ b/Assets/Scripts/DataCore/ES3Types.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: e00e6f90ab8233e46a41c5e33917c642 +guid: b3fedf623afb11744ad76c6d4fb5994c +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scripts/DataCore/ES3Types/ES3Type_CrossTrackPoint_BM.cs b/Assets/Scripts/DataCore/ES3Types/ES3Type_CrossTrackPoint_BM.cs new file mode 100644 index 00000000..97d97100 --- /dev/null +++ b/Assets/Scripts/DataCore/ES3Types/ES3Type_CrossTrackPoint_BM.cs @@ -0,0 +1,106 @@ +using System; +using System.Collections.Generic; +using Ichni.RhythmGame; +using Ichni.RhythmGame.Beatmap; + +namespace ES3Types +{ + [UnityEngine.Scripting.Preserve] + [ES3Properties("attachedElementGuid", "elementName", "tags", "elementGuid", "trackSwitch", "trackPercent")] + public class ES3Type_CrossTrackPoint_BM : ES3ObjectType + { + public static ES3Type Instance = null; + + public ES3Type_CrossTrackPoint_BM() : base(typeof(CrossTrackPoint_BM)) + { + Instance = this; + priority = 1; + } + + protected override void WriteObject(object obj, ES3Writer writer) + { + var instance = (CrossTrackPoint_BM)obj; + instance.NormalizeFlexibleFields(); + + writer.WriteProperty("attachedElementGuid", instance.attachedElementGuid, ES3Type_Guid.Instance); + writer.WriteProperty("elementName", instance.elementName, ES3Type_string.Instance); + writer.WriteProperty("tags", instance.tags); + writer.WriteProperty("elementGuid", instance.elementGuid, ES3Type_Guid.Instance); + writer.WriteProperty("trackSwitch", instance.trackSwitch); + writer.WriteProperty("trackPercent", instance.trackPercent); + } + + protected override void ReadObject(ES3Reader reader, object obj) + { + var instance = (CrossTrackPoint_BM)obj; + foreach (string propertyName in reader.Properties) + { + switch (propertyName) + { + case "attachedElementGuid": + instance.attachedElementGuid = reader.Read(ES3Type_Guid.Instance); + break; + case "elementName": + instance.elementName = reader.Read(ES3Type_string.Instance); + break; + case "tags": + instance.tags = reader.Read>(); + break; + case "elementGuid": + instance.elementGuid = reader.Read(ES3Type_Guid.Instance); + break; + case "trackSwitch": + instance.trackSwitch = ReadFlexibleIntBM(reader); + break; + case "trackPercent": + instance.trackPercent = ReadFlexibleFloatBM(reader); + break; + default: + reader.Skip(); + break; + } + } + + instance.NormalizeFlexibleFields(); + } + + protected override object ReadObject(ES3Reader reader) + { + var instance = new CrossTrackPoint_BM(); + ReadObject(reader, instance); + return instance; + } + + private static FlexibleInt_BM ReadFlexibleIntBM(ES3Reader reader) + { + return EnsureFlexibleIntBM(reader.Read() ?? new FlexibleInt_BM()); + } + + private static FlexibleFloat_BM ReadFlexibleFloatBM(ES3Reader reader) + { + return EnsureFlexibleFloatBM(reader.Read() ?? new FlexibleFloat_BM()); + } + + private static FlexibleInt_BM EnsureFlexibleIntBM(FlexibleInt_BM value) + { + value.animatedIntList ??= new List(); + return value; + } + + private static FlexibleFloat_BM EnsureFlexibleFloatBM(FlexibleFloat_BM value) + { + value.animatedFloatList ??= new List(); + return value; + } + } + + public class ES3Type_CrossTrackPoint_BMArray : ES3ArrayType + { + public static ES3Type Instance; + + public ES3Type_CrossTrackPoint_BMArray() : base(typeof(CrossTrackPoint_BM[]), ES3Type_CrossTrackPoint_BM.Instance) + { + Instance = this; + } + } +} diff --git a/Assets/Scripts/DataCore/ES3Types/ES3Type_CrossTrackPoint_BM.cs.meta b/Assets/Scripts/DataCore/ES3Types/ES3Type_CrossTrackPoint_BM.cs.meta new file mode 100644 index 00000000..82252142 --- /dev/null +++ b/Assets/Scripts/DataCore/ES3Types/ES3Type_CrossTrackPoint_BM.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 89971996fb6f16743b057517ae4b87a7 \ No newline at end of file diff --git a/Assets/Scripts/DataCore/GameElements_BM/Note/JudgeUnit/TouchAreaJudgeUnit_BM.cs b/Assets/Scripts/DataCore/GameElements_BM/Note/JudgeUnit/TouchAreaJudgeUnit_BM.cs index c28ac0fb..7d0a5261 100644 --- a/Assets/Scripts/DataCore/GameElements_BM/Note/JudgeUnit/TouchAreaJudgeUnit_BM.cs +++ b/Assets/Scripts/DataCore/GameElements_BM/Note/JudgeUnit/TouchAreaJudgeUnit_BM.cs @@ -21,7 +21,7 @@ namespace Ichni.RhythmGame.Beatmap #if UNITY_STANDALONE return new FullScreenNearTimeJudgeUnit(attachedNote); #elif UNITY_ANDROID || UNITY_IOS - if (SettingsManager.instance.gameSettings.judgeType) + if (SettingsManager.instance.gameSettings.ShouldUseFullScreenJudge()) { return new FullScreenNearTimeJudgeUnit(attachedNote); } @@ -29,6 +29,10 @@ namespace Ichni.RhythmGame.Beatmap { return new TouchAreaJudgeUnit(attachedNote, areaRadius); } +#else + return SettingsManager.instance.gameSettings.ShouldUseFullScreenJudge() + ? new FullScreenNearTimeJudgeUnit(attachedNote) + : new TouchAreaJudgeUnit(attachedNote, areaRadius); #endif } } diff --git a/Assets/Scripts/DataCore/GameElements_BM/Track/CrossTrackPoint_BM.cs b/Assets/Scripts/DataCore/GameElements_BM/Track/CrossTrackPoint_BM.cs index 28f8e67c..a32021e3 100644 --- a/Assets/Scripts/DataCore/GameElements_BM/Track/CrossTrackPoint_BM.cs +++ b/Assets/Scripts/DataCore/GameElements_BM/Track/CrossTrackPoint_BM.cs @@ -1,29 +1,47 @@ using System; +using System.Collections.Generic; namespace Ichni.RhythmGame.Beatmap { public class CrossTrackPoint_BM : GameElement_BM { - public FlexibleInt trackSwitch; - public FlexibleFloat trackPercent; + public FlexibleInt_BM trackSwitch; + public FlexibleFloat_BM trackPercent; public CrossTrackPoint_BM() { - } - public CrossTrackPoint_BM(string elementName, Guid elementGuid, System.Collections.Generic.List tags, - GameElement_BM attachedElement, FlexibleInt trackSwitch, FlexibleFloat trackPercent) + public CrossTrackPoint_BM(string elementName, Guid elementGuid, List tags, + GameElement_BM attachedElement, FlexibleInt_BM trackSwitch, FlexibleFloat_BM trackPercent) : base(elementName, elementGuid, tags, attachedElement) { this.trackSwitch = trackSwitch; this.trackPercent = trackPercent; } + public CrossTrackPoint_BM(string elementName, Guid elementGuid, List tags, + GameElement_BM attachedElement, FlexibleInt trackSwitch, FlexibleFloat trackPercent) + : this(elementName, elementGuid, tags, attachedElement, trackSwitch?.ConvertToBM(), trackPercent?.ConvertToBM()) + { + } + public override void ExecuteBM() { + NormalizeFlexibleFields(); matchedElement = CrossTrackPoint.GenerateElement(elementName, elementGuid, tags, false, - GetElement(attachedElementGuid) as ElementFolder, trackSwitch, trackPercent); + GetElement(attachedElementGuid) as ElementFolder, + trackSwitch?.ConvertToGameType() ?? new FlexibleInt(), + trackPercent?.ConvertToGameType() ?? new FlexibleFloat()); + } + + internal void NormalizeFlexibleFields() + { + trackSwitch ??= new FlexibleInt_BM(); + trackSwitch.animatedIntList ??= new List(); + + trackPercent ??= new FlexibleFloat_BM(); + trackPercent.animatedFloatList ??= new List(); } } } diff --git a/Assets/Scripts/Game/Animations/Track/TrackGlobalColorChange.cs b/Assets/Scripts/Game/Animations/Track/TrackGlobalColorChange.cs index ba1fdcfb..8eb7860d 100644 --- a/Assets/Scripts/Game/Animations/Track/TrackGlobalColorChange.cs +++ b/Assets/Scripts/Game/Animations/Track/TrackGlobalColorChange.cs @@ -54,9 +54,9 @@ namespace Ichni.RhythmGame (colorB.returnType is FlexibleReturnType.MiddleExecuting || colorB.isSwitchingReturnType) || (colorA.returnType is FlexibleReturnType.MiddleExecuting || colorA.isSwitchingReturnType)) { - if(!forceUpdate) animationReturnType = FlexibleReturnType.MiddleExecuting; + if (!forceUpdate) animationReturnType = FlexibleReturnType.MiddleExecuting; Color color = new Color(colorR.value, colorG.value, colorB.value, colorA.value); - ((Track)animatedObject).trackRendererSubmodule.meshGenerator.color = color; + ((Track)animatedObject).trackRendererSubmodule.SetColor(color, true); } else { @@ -71,13 +71,13 @@ namespace Ichni.RhythmGame foreach (var item in colorB.animations) item.ApplyTimeOffset(offset); foreach (var item in colorA.animations) item.ApplyTimeOffset(offset); } - + public override void Refresh() { base.Refresh(); if (colorR.animations.Count == 0 && colorG.animations.Count == 0 && colorB.animations.Count == 0 && colorA.animations.Count == 0) { - ((Track)animatedObject).trackRendererSubmodule.meshGenerator.color = Color.white; + ((Track)animatedObject).trackRendererSubmodule.SetColor(Color.white, true); } else { @@ -87,4 +87,4 @@ namespace Ichni.RhythmGame #endregion } -} \ No newline at end of file +} diff --git a/Assets/Scripts/Game/Base/FlexibleTypes/FlexibleFloat.cs b/Assets/Scripts/Game/Base/FlexibleTypes/FlexibleFloat.cs index 8b29383a..d22e8acc 100644 --- a/Assets/Scripts/Game/Base/FlexibleTypes/FlexibleFloat.cs +++ b/Assets/Scripts/Game/Base/FlexibleTypes/FlexibleFloat.cs @@ -60,6 +60,16 @@ namespace Ichni.RhythmGame animations = anim; } + public FlexibleFloat_BM ConvertToBM() + { + if (animations == null || animations.Count == 0) + { + return new FlexibleFloat_BM(); + } + + return new FlexibleFloat_BM(new List(animations)); + } + public void Add(AnimatedFloat animatedFloat) { animations.Add(animatedFloat); diff --git a/Assets/Scripts/Game/Base/FlexibleTypes/FlexibleInt.cs b/Assets/Scripts/Game/Base/FlexibleTypes/FlexibleInt.cs index 6e22f042..5442fe97 100644 --- a/Assets/Scripts/Game/Base/FlexibleTypes/FlexibleInt.cs +++ b/Assets/Scripts/Game/Base/FlexibleTypes/FlexibleInt.cs @@ -44,6 +44,16 @@ namespace Ichni.RhythmGame this.animations = anim; } + public FlexibleInt_BM ConvertToBM() + { + if (animations == null || animations.Count == 0) + { + return new FlexibleInt_BM(); + } + + return new FlexibleInt_BM(new List(animations)); + } + public void Add(AnimatedInt animatedInt) { animations.Add(animatedInt); diff --git a/Assets/Scripts/Game/GameElements/Notes/NoteObjects/Hold.cs b/Assets/Scripts/Game/GameElements/Notes/NoteObjects/Hold.cs index 0f747077..7e6a74f2 100644 --- a/Assets/Scripts/Game/GameElements/Notes/NoteObjects/Hold.cs +++ b/Assets/Scripts/Game/GameElements/Notes/NoteObjects/Hold.cs @@ -261,7 +261,7 @@ namespace Ichni.RhythmGame public override void UpdateNoteInStaticTrack(float songTime) { base.UpdateNoteInStaticTrack(songTime); - if (noteVisual is INoteVisualHold noteVisualHold) noteVisualHold.UpdateHoldInStaticTrack(); + if (noteVisual is INoteVisualHold noteVisualHold) noteVisualHold.UpdateHoldInStaticTrack(songTime); } public override void SetPerfectPosition() diff --git a/Assets/Scripts/Game/GameElements/Notes/NoteVisual/NoteVisualBaseHold.cs b/Assets/Scripts/Game/GameElements/Notes/NoteVisual/NoteVisualBaseHold.cs index 9275b23d..a539d00a 100644 --- a/Assets/Scripts/Game/GameElements/Notes/NoteVisual/NoteVisualBaseHold.cs +++ b/Assets/Scripts/Game/GameElements/Notes/NoteVisual/NoteVisualBaseHold.cs @@ -17,7 +17,7 @@ namespace Ichni.RhythmGame } - public virtual void UpdateHoldInStaticTrack() + public virtual void UpdateHoldInStaticTrack(float songTime) { } @@ -28,6 +28,6 @@ namespace Ichni.RhythmGame { public Hold hold { get; set; } public void UpdateHoldInMovableTrack(); - public void UpdateHoldInStaticTrack(); + public void UpdateHoldInStaticTrack(float songTime); } } diff --git a/Assets/Scripts/Game/GameElements/Track/TrackSubmodules/TrackRendererSubmodule/TrackRendererSubmodule.cs b/Assets/Scripts/Game/GameElements/Track/TrackSubmodules/TrackRendererSubmodule/TrackRendererSubmodule.cs index cfe6fbe3..ff3b883b 100644 --- a/Assets/Scripts/Game/GameElements/Track/TrackSubmodules/TrackRendererSubmodule/TrackRendererSubmodule.cs +++ b/Assets/Scripts/Game/GameElements/Track/TrackSubmodules/TrackRendererSubmodule/TrackRendererSubmodule.cs @@ -68,6 +68,21 @@ namespace Ichni.RhythmGame SetUV(); } + public void SetColor(Color color, bool forceImmediateRebuild = false) + { + if (meshGenerator == null) return; + + if (meshGenerator.color != color) + { + meshGenerator.color = color; + } + + if (forceImmediateRebuild && track.trackTimeSubmodule is not TrackTimeSubmoduleMovable) + { + meshGenerator.RebuildImmediate(); + } + } + protected void SetMesh() { if (track.trackTimeSubmodule is TrackTimeSubmoduleMovable trackTimeSubmoduleMovable) diff --git a/Assets/Scripts/Menu/ChapterSelection/ChapterSelectionUnit.cs b/Assets/Scripts/Menu/ChapterSelection/ChapterSelectionUnit.cs index d2f6ea1f..38955bdb 100644 --- a/Assets/Scripts/Menu/ChapterSelection/ChapterSelectionUnit.cs +++ b/Assets/Scripts/Menu/ChapterSelection/ChapterSelectionUnit.cs @@ -20,26 +20,26 @@ namespace Ichni.Menu public Color themeColor; public Sprite avatar; public Switch chapterSwitch; - + [Searchable] public List songs = new List(); - + [Button] public void SetUpDefaultDifficulties() { foreach (SongItemData song in songs) { - if(song.difficultyDataList.All(d => d.difficultyName != "Easy")) + if (song.difficultyDataList.All(d => d.difficultyName != "Easy")) { song.difficultyDataList.Add(new DifficultyData( - 0, "Easy","Easy", 0, "", + 0, "Easy", "Easy", 0, "", new Color(0f, 0.7f, 0.2f, 1f))); } if (song.difficultyDataList.All(d => d.difficultyName != "Hard")) { song.difficultyDataList.Add(new DifficultyData( - 1,"Hard", "Hard", 0, "", + 1, "Hard", "Hard", 0, "", new Color(1f, 0.2f, 0.2f, 1f))); } } @@ -58,7 +58,7 @@ namespace Ichni.Menu { return (from song in songs where song.storyUnlockKey == key select song.songName).ToList(); } - + public (int, int, int, int, int) GetChapterSaveInfo() { int beatmapCount = 0; @@ -66,7 +66,7 @@ namespace Ichni.Menu int finishedBeatmapCount = 0; int fullComboCount = 0; int allPerfectCount = 0; - + foreach (SongItemData song in songs) { if (GameSaveManager.instance.SongSaveModule.songStatusSaves.TryGetValue(song.songName, out var songStatus)) @@ -79,65 +79,65 @@ namespace Ichni.Menu { thisSongFinished = true; finishedBeatmapCount++; - + if (beatmapSave.isFullCombo) { fullComboCount++; } - + if (beatmapSave.isAllPerfect) { allPerfectCount++; } } } - + if (thisSongFinished) { finishedSongCount++; } } } - + return (beatmapCount, finishedSongCount, finishedBeatmapCount, fullComboCount, allPerfectCount); } } - + [InlineProperty] [Serializable] public class SongItemData { [FoldoutGroup("$songName", false)] public string songName; - + [FoldoutGroup("$songName")] public string displaySongName; - + [FoldoutGroup("$songName")] public string composer; - + [FoldoutGroup("$songName")] public Switch songSwitch; - + [FoldoutGroup("$songName")] public Sprite illustration; - + [FoldoutGroup("$songName")] public string illustratorName; - + [FoldoutGroup("$songName")] public string additionalInformation; - + [FoldoutGroup("$songName")] public List difficultyDataList; - - [FoldoutGroup("$songName")] + + [FoldoutGroup("$songName")] public string storyUnlockKey; - [FoldoutGroup("$songName")] + [FoldoutGroup("$songName")] public string paymentUnlockKey; } - + [Serializable] public class DifficultyData { @@ -148,13 +148,13 @@ namespace Ichni.Menu public string charterName; public Color color; public bool isAvailable; - + public bool ForceFullScreenJudge = false; public DifficultyData() { - + } - - public DifficultyData(int difficultyIndex, string difficultyName, string displayDifficultyName, int difficultyValue, string charterName, Color color) + + public DifficultyData(int difficultyIndex, string difficultyName, string displayDifficultyName, int difficultyValue, string charterName, Color color, bool ForceFullScreenJudge = false) { this.difficultyIndex = difficultyIndex; this.difficultyName = difficultyName; @@ -163,8 +163,9 @@ namespace Ichni.Menu this.difficultyValue = difficultyValue; this.color = color; this.isAvailable = true; + this.ForceFullScreenJudge = ForceFullScreenJudge; } - + public string GetDifficultyName() { return string.IsNullOrEmpty(displayDifficultyName) ? difficultyName : displayDifficultyName; diff --git a/Assets/Scripts/Settings/GameSettings.cs b/Assets/Scripts/Settings/GameSettings.cs index 19cdd137..3e4d626f 100644 --- a/Assets/Scripts/Settings/GameSettings.cs +++ b/Assets/Scripts/Settings/GameSettings.cs @@ -26,6 +26,11 @@ namespace Ichni public bool judgeType = false; public bool autoPlay = false; + public bool ShouldUseFullScreenJudge() + { + return judgeType || InformationTransistor.instance?.difficulty?.ForceFullScreenJudge == true; + } + public GameSettings() { @@ -70,4 +75,4 @@ namespace Ichni I2.Loc.LocalizationManager.UpdateSources(); } } -} \ No newline at end of file +} diff --git a/Assets/Scripts/UI/SongSelection/DifficultySelectionContainer.cs b/Assets/Scripts/UI/SongSelection/DifficultySelectionContainer.cs index 9044db34..30b241c2 100644 --- a/Assets/Scripts/UI/SongSelection/DifficultySelectionContainer.cs +++ b/Assets/Scripts/UI/SongSelection/DifficultySelectionContainer.cs @@ -8,7 +8,7 @@ namespace Ichni.Menu { public List buttons; public DifficultySelectionButton selectedButton; - + public void SetUp(List difficulties) { int difficultyCount = difficulties.Count; @@ -24,13 +24,13 @@ namespace Ichni.Menu } SongSelectionRecord songSelectionRecord = MenuInformationRecorder.instance.GetRecordOfThisChapter(); - + if (songSelectionRecord.difficultyIndex >= difficultyCount) { songSelectionRecord.difficultyIndex = difficultyCount - 1; } - - buttons[songSelectionRecord.difficultyIndex].Select(); + + buttons[songSelectionRecord.difficultyIndex % buttons.Count].Select(); } } } \ No newline at end of file diff --git a/Assets/Settings/URP-HighFidelity.asset b/Assets/Settings/URP-HighFidelity.asset index 80e6a2fc..73e13997 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:2e89fcced8d03b3fd373cf87198ccd482c03f4ecdec6a39f12e27ba4273bcf07 -size 4596 +oid sha256:783d254aca85b2bf3c2418d59303b12b8eedde55370331e642d29564d510a954 +size 4594 diff --git a/Assets/Shaders/ScriptablePostProcessor/Volumes/AnimeBloom.cs b/Assets/Shaders/ScriptablePostProcessor/Volumes/AnimeBloom.cs index b2408798..c53d609b 100644 --- a/Assets/Shaders/ScriptablePostProcessor/Volumes/AnimeBloom.cs +++ b/Assets/Shaders/ScriptablePostProcessor/Volumes/AnimeBloom.cs @@ -64,7 +64,7 @@ namespace SLSUtilities.Rendering.PostProcessing // 【移动端极限优化】：强制降级到 32位 HDR 格式 (B10G11R11)， // 相比主相机默认的 64位 R16G16B16A16，带宽消耗直接砍半，且肉眼几乎无损！ - if (SystemInfo.IsFormatSupported(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Linear | FormatUsage.Render)) + if (SystemInfo.IsFormatSupported(GraphicsFormat.B10G11R11_UFloatPack32, GraphicsFormatUsage.Linear | GraphicsFormatUsage.Render)) { desc.graphicsFormat = GraphicsFormat.B10G11R11_UFloatPack32; } @@ -116,7 +116,7 @@ namespace SLSUtilities.Rendering.PostProcessing desc.width = Mathf.Max(1, desc.width >> shift); desc.height = Mathf.Max(1, desc.height >> shift); - RenderingUtils.ReAllocateIfNeeded(ref _bloomMipDown[0], desc, FilterMode.Bilinear, + RenderingUtils.ReAllocateHandleIfNeeded(ref _bloomMipDown[0], desc, FilterMode.Bilinear, TextureWrapMode.Clamp, name: "_BloomDown0"); // Source → Down[0] via Pass 0 (Prefilter) @@ -131,7 +131,7 @@ namespace SLSUtilities.Rendering.PostProcessing desc.width = Mathf.Max(1, desc.width >> 1); desc.height = Mathf.Max(1, desc.height >> 1); - RenderingUtils.ReAllocateIfNeeded(ref _bloomMipDown[i], desc, FilterMode.Bilinear, + RenderingUtils.ReAllocateHandleIfNeeded(ref _bloomMipDown[i], desc, FilterMode.Bilinear, TextureWrapMode.Clamp, name: "_BloomDown" + i); // Down[i-1] → Down[i] via Pass 1 (Dual Kawase Downsample) @@ -153,7 +153,7 @@ namespace SLSUtilities.Rendering.PostProcessing // 由于 desc 已经在 downsample 中不断减半，我们要重新从 Down[i] 读尺寸 for (int i = mipCount - 1; i >= 0; i--) { - RenderingUtils.ReAllocateIfNeeded(ref _bloomMipUp[i], + RenderingUtils.ReAllocateHandleIfNeeded(ref _bloomMipUp[i], _bloomMipDown[i].rt.descriptor, FilterMode.Bilinear, TextureWrapMode.Clamp, name: "_BloomUp" + i); } @@ -188,4 +188,4 @@ namespace SLSUtilities.Rendering.PostProcessing } } } -} \ No newline at end of file +} diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Scripts/RuntimeCore/Note/NoteEffect/DTMNoteGenerateExpand.cs b/Assets/ThemeBundles/DepartureToMultiverse/Scripts/RuntimeCore/Note/NoteEffect/DTMNoteGenerateExpand.cs index 84d3efbd..e312fbd9 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Scripts/RuntimeCore/Note/NoteEffect/DTMNoteGenerateExpand.cs +++ b/Assets/ThemeBundles/DepartureToMultiverse/Scripts/RuntimeCore/Note/NoteEffect/DTMNoteGenerateExpand.cs @@ -18,13 +18,13 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse #region [效果核心实现] Core Effect Implementation public sealed override void Recover() { - noteVisual.noteMain.SetActive(false); + SetVisualShown(false); noteVisual.noteMain.transform.localScale = Vector3.zero; } public override void PreExecute() { - noteVisual.noteMain.SetActive(true); + SetVisualShown(true); } public override void Execute() @@ -35,9 +35,20 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse public override void Adjust() { + SetVisualShown(true); noteVisual.noteMain.transform.localScale = Vector3.one; } + + private void SetVisualShown(bool isShown) + { + if (noteVisual is DTMNoteVisualHold holdVisual) + { + holdVisual.SetHoldVisualShown(isShown); + return; + } + + noteVisual.noteMain.SetActive(isShown); + } #endregion } - -} +} \ No newline at end of file diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Scripts/RuntimeCore/Note/NoteEffect/DTMNoteGenerateExtend.cs b/Assets/ThemeBundles/DepartureToMultiverse/Scripts/RuntimeCore/Note/NoteEffect/DTMNoteGenerateExtend.cs index 953586a7..61da3672 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Scripts/RuntimeCore/Note/NoteEffect/DTMNoteGenerateExtend.cs +++ b/Assets/ThemeBundles/DepartureToMultiverse/Scripts/RuntimeCore/Note/NoteEffect/DTMNoteGenerateExtend.cs @@ -26,30 +26,32 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse #region [效果核心逻辑] Core Effect Logic private void UpdateHold() { - hold.trackPositioner.SetPercent(startPercent); - noteVisualHold.meshGenerator.SetClipRange(startPercent, endPercent); - //noteVisualHold.extrude.Range = new Vector2(startPercent, endPercent); - noteVisualHold.headPoint.SetPercent(startPercent); - noteVisualHold.tailPoint.SetPercent(endPercent); + noteVisualHold.SetHoldPercentRange(startPercent, endPercent, true); + } + + private void UpdateTargetPercents(float songTime) + { + targetStartPercent = noteVisualHold.GetTrackPercent(hold.exactJudgeTime, songTime); + targetEndPercent = noteVisualHold.GetTrackPercent(hold.holdEndTime, songTime); } public override void Recover() { - noteVisualHold.noteMain.SetActive(false); + noteVisualHold.SetHoldVisualShown(false); } public override void PreExecute() { - TrackTimeSubmoduleMovable trackTimeSubmoduleMovable = hold.track.trackTimeSubmodule as TrackTimeSubmoduleMovable; - targetStartPercent = trackTimeSubmoduleMovable.GetTrackPercent(hold.exactJudgeTime); - targetEndPercent = trackTimeSubmoduleMovable.GetTrackPercent(hold.holdEndTime); + UpdateTargetPercents(CoreServices.TimeProvider?.SongTime ?? 0f); startPercent = targetStartPercent; endPercent = targetStartPercent; - noteVisual.noteMain.SetActive(true); + noteVisualHold.SetHoldVisualShown(true); + UpdateHold(); } public override void Execute() { + UpdateTargetPercents(CoreServices.TimeProvider?.SongTime ?? 0f); float e = AnimationCurveEvaluator.Evaluate(AnimationCurveType.OutQuad, effectProgressPercent); startPercent = targetStartPercent; endPercent = Mathf.Lerp(targetStartPercent, targetEndPercent, e); @@ -58,11 +60,12 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse public override void Adjust() { + UpdateTargetPercents(CoreServices.TimeProvider?.SongTime ?? 0f); startPercent = targetStartPercent; endPercent = targetEndPercent; + noteVisualHold.SetHoldVisualShown(true); UpdateHold(); } #endregion } - -} +} \ No newline at end of file diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Scripts/RuntimeCore/Note/NoteVisual/DTMNoteVisualHold.cs b/Assets/ThemeBundles/DepartureToMultiverse/Scripts/RuntimeCore/Note/NoteVisual/DTMNoteVisualHold.cs index aad5045f..32163b48 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Scripts/RuntimeCore/Note/NoteVisual/DTMNoteVisualHold.cs +++ b/Assets/ThemeBundles/DepartureToMultiverse/Scripts/RuntimeCore/Note/NoteVisual/DTMNoteVisualHold.cs @@ -45,8 +45,16 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse this.hold.trackPositioner.autoUpdate = false; headPoint.spline = hold.track.trackPathSubmodule.path; + headPoint.autoUpdate = false; meshGenerator.spline = hold.track.trackPathSubmodule.path; tailPoint.spline = hold.track.trackPathSubmodule.path; + tailPoint.autoUpdate = false; + ConfigurePathNodeScaleIsolation(); + + startPercent = GetTrackPercent(hold.exactJudgeTime); + endPercent = GetTrackPercent(hold.holdEndTime); + ApplyHoldPositionOffset(GetCurrentPositionOffset()); + SetHoldPercentRange(startPercent, endPercent, true); //meshGenerator.enabled = false; //extrude.Container = hold.track.trackPathSubmodule.container; @@ -69,11 +77,11 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse { rend.materials[0].SetFloat("_MainAlpha", 1f); rend.materials[1].SetFloat("_MainAlpha", 1f); - note.track.trackPathSubmodule.path.RebuildImmediate(); + note?.track?.trackPathSubmodule?.path?.RebuildImmediate(); } } - foreach (EffectBase effect in effectSubmodule.effectCollection["Generate"]) + foreach (EffectBase effect in GetEffects("Generate")) { effect.Recover(); } @@ -85,41 +93,279 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse { #region [长条动态更新] Hold Updates private float startPercent, endPercent; + private Vector2 positionOffset; + private SplineSample offsetSample = new(); + private Transform hitPointTransform; + private Vector3 hitPointBaseLocalScale = Vector3.one; + private bool isHoldVisualShown = true; + + public float holdThickness => Mathf.Max(0f, transformSubmodule?.currentScale.x ?? 1f); + + public void ApplyHoldThicknessFromScale() + { + if (meshGenerator == null) return; + meshGenerator.size = holdThickness; + } + + private void ConfigurePathNodeScaleIsolation() + { + if (meshGenerator != null) meshGenerator.useSplineSize = false; + DisableSplineSizeScale(hold?.trackPositioner); + DisableSplineSizeScale(headPoint); + DisableSplineSizeScale(tailPoint); + ApplyHitPointScaleIsolation(); + } + + private void DisableSplineSizeScale(SplinePositioner positioner) + { + if (positioner == null) return; + positioner.motion.applyScaleX = false; + positioner.motion.applyScaleY = false; + positioner.motion.applyScaleZ = false; + } + + private Vector2 GetCurrentPositionOffset() + { + if (transformSubmodule == null) return Vector2.zero; + return new Vector2(transformSubmodule.currentPosition.x, transformSubmodule.currentPosition.y); + } + + private List GetEffects(string key) + { + if (effectSubmodule?.effectCollection != null && + effectSubmodule.effectCollection.TryGetValue(key, out List effects)) + { + return effects; + } + + return new List(); + } + + private bool IsGenerateEffectMiddle() + { + return GetEffects("Generate").Any(e => e.nowEffectState == EffectBase.EffectState.Middle); + } + + private void ApplyHoldPositionOffset(Vector2 offset) + { + positionOffset = offset; + if (meshGenerator != null) meshGenerator.offset = offset; + ClearSplineSizeScaledOffset(hold?.trackPositioner); + ClearSplineSizeScaledOffset(headPoint); + ClearSplineSizeScaledOffset(tailPoint); + } + + private void ClearSplineSizeScaledOffset(SplinePositioner positioner) + { + if (positioner == null) return; + positioner.motion.offset = Vector2.zero; + } + + private void ApplyPositionerWorldOffset(SplinePositioner positioner, float percent) + { + if (positioner == null || positioner.targetObject == null || positionOffset == Vector2.zero) return; + if (positioner.sampleCount == 0) return; + + positioner.Evaluate(percent, ref offsetSample); + positioner.targetObject.transform.position += + offsetSample.right * positionOffset.x + + offsetSample.up * positionOffset.y; + } + + public override void SetHighlight() + { + SetHitPointVisible(isHoldVisualShown); + } + + public void SetHoldVisualShown(bool isShown) + { + isHoldVisualShown = isShown; + if (noteMain != null) noteMain.SetActive(isShown); + SetHitPointVisible(isShown); + } + + private void SetHitPointVisible(bool isVisualShown) + { + if (extraPartList == null || extraPartList.Count == 0 || extraPartList[0] == null) return; + extraPartList[0].SetActive(isVisualShown && isHighlighted); + ApplyHitPointScaleIsolation(); + } + + private void CacheHitPointTransform() + { + if (hitPointTransform != null) return; + if (extraPartList == null || extraPartList.Count == 0 || extraPartList[0] == null) return; + + hitPointTransform = extraPartList[0].transform; + hitPointBaseLocalScale = hitPointTransform.localScale; + } + + private void ApplyHitPointScaleIsolation() + { + CacheHitPointTransform(); + if (hitPointTransform == null) return; + + Vector3 targetWorldScale = hitPointBaseLocalScale * holdThickness; + Transform parent = hitPointTransform.parent; + if (parent == null) + { + hitPointTransform.localScale = targetWorldScale; + return; + } + + Vector3 parentScale = parent.lossyScale; + hitPointTransform.localScale = new Vector3( + DivideScaleAxis(targetWorldScale.x, parentScale.x), + DivideScaleAxis(targetWorldScale.y, parentScale.y), + DivideScaleAxis(targetWorldScale.z, parentScale.z) + ); + } + + private float DivideScaleAxis(float targetScale, float parentScale) + { + return Mathf.Approximately(parentScale, 0f) ? targetScale : targetScale / parentScale; + } + + public float GetTrackPercent(float targetTime) + { + return GetTrackPercent(targetTime, CoreServices.TimeProvider?.SongTime ?? 0f); + } + + public float GetTrackPercent(float targetTime, float songTime) + { + if (hold.track.trackTimeSubmodule is TrackTimeSubmoduleMovable trackTimeSubmoduleMovable) + { + return trackTimeSubmoduleMovable.GetTrackPercent(targetTime); + } + + if (hold.track.trackTimeSubmodule is TrackTimeSubmoduleStatic trackTimeSubmoduleStatic) + { + float startMove = targetTime - trackTimeSubmoduleStatic.trackTotalTime; + float percent = AnimationCurveEvaluator.Evaluate(trackTimeSubmoduleStatic.animationCurveType, + (songTime - startMove) / trackTimeSubmoduleStatic.trackTotalTime); + + return 1 - Mathf.Clamp01(percent); + } + + throw new InvalidOperationException("Hold NoteVisual needs a TrackTimeSubmodule."); + } public void UpdateHoldInMovableTrack() { - if (effectSubmodule.effectCollection["Generate"].Any(e => e.nowEffectState == EffectBase.EffectState.Middle)) + if (IsGenerateEffectMiddle()) { return; } - TrackTimeSubmoduleMovable trackTimeSubmoduleMovable = hold.track.trackTimeSubmodule as TrackTimeSubmoduleMovable; - - startPercent = trackTimeSubmoduleMovable.GetTrackPercent(hold.exactJudgeTime + hold.holdingTime); - endPercent = trackTimeSubmoduleMovable.GetTrackPercent(hold.holdEndTime); + startPercent = GetTrackPercent(hold.exactJudgeTime); + endPercent = GetTrackPercent(hold.holdEndTime); - hold.trackPositioner.SetPercent(startPercent); - meshGenerator.SetClipRange(startPercent, endPercent); - //Debug.Log("Range: " + startPercent + " - " + endPercent); - //extrude.Range = new Vector2(startPercent, endPercent); - headPoint.SetPercent(startPercent); - tailPoint.SetPercent(endPercent); + if (hold.isHolding) + { + startPercent = GetTrackPercent(hold.exactJudgeTime + hold.holdingTime); + endPercent = GetTrackPercent(hold.holdEndTime); + } + else if (hold.isFinalJudged) + { + startPercent = GetTrackPercent(hold.holdEndTime); + endPercent = GetTrackPercent(hold.holdEndTime); + } + + SetHoldPercentRange(startPercent, endPercent, true); } - public void UpdateHoldInStaticTrack() + public void UpdateHoldInStaticTrack(float songTime) { - //throw new NotImplementedException(); + if (IsGenerateEffectMiddle()) + { + return; + } + + startPercent = GetTrackPercent(hold.exactJudgeTime, songTime); + endPercent = GetTrackPercent(hold.holdEndTime, songTime); + + if (hold.isHolding) + { + startPercent = GetTrackPercent(hold.exactJudgeTime + hold.holdingTime, songTime); + endPercent = GetTrackPercent(hold.holdEndTime, songTime); + } + else if (hold.isFinalJudged) + { + startPercent = GetTrackPercent(hold.holdEndTime, songTime); + endPercent = GetTrackPercent(hold.holdEndTime, songTime); + } + + SetHoldPercentRange(startPercent, endPercent, true); + } + + public void SetHoldPercentRange(float startPercent, float endPercent, bool rebuildImmediately) + { + this.startPercent = startPercent; + this.endPercent = endPercent; + + if (rebuildImmediately) + { + hold.trackPositioner.RebuildImmediate(); + } + + ApplyHoldPositionOffset(positionOffset); + hold.trackPositioner.SetPercent(startPercent); + ApplyPositionerWorldOffset(hold.trackPositioner, startPercent); + meshGenerator.SetClipRange(startPercent, endPercent); + ApplyHoldThicknessFromScale(); + + if (rebuildImmediately) + { + meshGenerator.RebuildImmediate(); + headPoint.RebuildImmediate(); + } + + headPoint.SetPercent(startPercent); + ApplyPositionerWorldOffset(headPoint, startPercent); + ApplyHitPointScaleIsolation(); + + if (rebuildImmediately) + { + tailPoint.RebuildImmediate(); + } + + tailPoint.SetPercent(endPercent); + ApplyPositionerWorldOffset(tailPoint, endPercent); } #endregion #region [变化监听与重置] Transform & Refresh Overrides public void UpdateTransform(bool refreshAll = true) { + if (transformSubmodule == null) return; + bool willRefresh = false; + if (transformSubmodule.scaleDirtyMark) + { + transformSubmodule.currentScale = transformSubmodule.originalScale + transformSubmodule.scaleOffset; + transform.localScale = Vector3.one; + ApplyHoldThicknessFromScale(); + ApplyHitPointScaleIsolation(); + transformSubmodule.scaleDirtyMark = false; + willRefresh = true; + transformSubmodule.scaleOffset = Vector3.zero; + } + + if (!transformSubmodule.eulerAnglesOffsetLock && transformSubmodule.eulerAnglesDirtyMark) + { + transformSubmodule.currentEulerAngles = transformSubmodule.originalEulerAngles + transformSubmodule.eulerAnglesOffset; + transform.localEulerAngles = transformSubmodule.currentEulerAngles; + transformSubmodule.eulerAnglesDirtyMark = false; + willRefresh = true; + transformSubmodule.eulerAnglesOffset = Vector3.zero; + } + if (transformSubmodule.positionDirtyMark) { transformSubmodule.currentPosition = transformSubmodule.originalPosition + transformSubmodule.positionOffset; + transform.localPosition = transformSubmodule.currentPosition; + ApplyHoldPositionOffset(GetCurrentPositionOffset()); transformSubmodule.positionDirtyMark = false; willRefresh = true; transformSubmodule.positionOffset = Vector3.zero; @@ -137,13 +383,19 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse public override void Refresh() { base.Refresh(); - - Vector2 posOffset = new Vector2(transformSubmodule.currentPosition.x, transformSubmodule.currentPosition.y); - hold.trackPositioner.motion.offset = posOffset; - meshGenerator.offset = posOffset; - headPoint.motion.offset = posOffset; - tailPoint.motion.offset = posOffset; + + foreach (EffectBase effect in GetEffects("Generate")) + { + if (effect.nowEffectState == EffectBase.EffectState.Middle) + { + effect.Recover(); + } + } + + ApplyHoldPositionOffset(GetCurrentPositionOffset()); + ApplyHoldThicknessFromScale(); + ApplyHitPointScaleIsolation(); } #endregion } -} \ No newline at end of file +} diff --git a/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset b/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset index bec99ea1..2628cf96 100644 --- a/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset +++ b/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ece839e033f3f7a553c08cfca79658ad6961013920973b1df9ff6c874d0a02a7 +oid sha256:244a91da0c89c63a86084841d6f337030e6bb8d5fbcc1099167386f78845b2b2 size 60801 diff --git a/ProjectSettings/Packages/dev.yarnspinner/Assembly-CSharp-generated.ysls.json b/ProjectSettings/Packages/dev.yarnspinner/Assembly-CSharp-generated.ysls.json index 6a045c0a..7836caa2 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":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/GeneralFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":7,"character":8},"end":{"line":27,"character":9}},"parameters":[{"name":"message","isParamsArray":false,"type":"string"},{"name":"logType","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":"\u89e3\u9501\u4e00\u9996\u65b0\u6b4c\u66f2\uff0c\u5e76\u5728\u5f53\u524d\u8fd9\u6bb5\u5bf9\u8bdd\u7ed3\u675f\uff08\u5bf9\u8bdd UI \u6de1\u51fa\uff09\u540e\uff0c\u5f39\u51fa MessageBox \u63d0\u793a\u3002 \u683c\u5f0f: <<unlock_song songUnlockKey>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":20,"character":8},"end":{"line":60,"character":9}},"parameters":[{"name":"songUnlockKey","documentation":"\u8981\u89e3\u9501\u7684\u6b4c\u66f2\u5bc6\u94a5/ID","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 \u4f1a\u5c1d\u8bd5\u4f7f\u7528 Unity Localization \u8fdb\u884c\u7ffb\u8bd1\uff0c\u5982\u679c\u627e\u4e0d\u5230\u5bf9\u5e94\u6761\u76ee\u5219\u56de\u9000\u663e\u793a\u539f\u6587\u672c\uff08Key\uff09\u3002 \u683c\u5f0f: <<show_message titleKey contentKey [tableName]>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":70,"character":8},"end":{"line":80,"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":13,"character":8},"end":{"line":17,"character":9}},"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":25,"character":8},"end":{"line":29,"character":9}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"value","isParamsArray":false,"type":"number"}]},{"yarnName":"modify_int","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.ModifyInt","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":31,"character":8},"end":{"line":36,"character":9}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"modification","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":44,"character":8},"end":{"line":48,"character":9}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"value","isParamsArray":false,"type":"number"}]},{"yarnName":"modify_float","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.ModifyFloat","fileName":"D:\\Projects\\ichni Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":50,"character":8},"end":{"line":55,"character":9}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"modification","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":63,"character":8},"end":{"line":67,"character":9}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"value","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":19,"character":8},"end":{"line":23,"character":9}},"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":38,"character":8},"end":{"line":42,"character":9}},"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":57,"character":8},"end":{"line":61,"character":9}},"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":69,"character":8},"end":{"line":73,"character":9}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"}],"return":{"type":"string"}}]} \ No newline at end of file +{"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":27,"character":9}},"parameters":[{"name":"message","isParamsArray":false,"type":"string"},{"name":"logType","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":"\u89e3\u9501\u4e00\u9996\u65b0\u6b4c\u66f2\uff0c\u5e76\u5728\u5f53\u524d\u8fd9\u6bb5\u5bf9\u8bdd\u7ed3\u675f\uff08\u5bf9\u8bdd UI \u6de1\u51fa\uff09\u540e\uff0c\u5f39\u51fa MessageBox \u63d0\u793a\u3002 \u683c\u5f0f: <<unlock_song songUnlockKey>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":20,"character":8},"end":{"line":60,"character":9}},"parameters":[{"name":"songUnlockKey","documentation":"\u8981\u89e3\u9501\u7684\u6b4c\u66f2\u5bc6\u94a5/ID","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 \u4f1a\u5c1d\u8bd5\u4f7f\u7528 Unity Localization \u8fdb\u884c\u7ffb\u8bd1\uff0c\u5982\u679c\u627e\u4e0d\u5230\u5bf9\u5e94\u6761\u76ee\u5219\u56de\u9000\u663e\u793a\u539f\u6587\u672c\uff08Key\uff09\u3002 \u683c\u5f0f: <<show_message titleKey contentKey [tableName]>>","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":70,"character":8},"end":{"line":80,"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":13,"character":8},"end":{"line":17,"character":9}},"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":25,"character":8},"end":{"line":29,"character":9}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"value","isParamsArray":false,"type":"number"}]},{"yarnName":"modify_int","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.ModifyInt","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":31,"character":8},"end":{"line":36,"character":9}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"modification","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":44,"character":8},"end":{"line":48,"character":9}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"value","isParamsArray":false,"type":"number"}]},{"yarnName":"modify_float","definitionName":"global::Ichni.Story.YarnFunctions.VariableCommands.ModifyFloat","fileName":"C:\\ichniOfficial\\ichni_Official\\Assets/Scripts/NewStorySystem/YarnFunctions/VariableFunctions.cs","language":"csharp","async":false,"containsErrors":false,"location":{"start":{"line":50,"character":8},"end":{"line":55,"character":9}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"modification","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":63,"character":8},"end":{"line":67,"character":9}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"},{"name":"value","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":19,"character":8},"end":{"line":23,"character":9}},"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":38,"character":8},"end":{"line":42,"character":9}},"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":57,"character":8},"end":{"line":61,"character":9}},"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":69,"character":8},"end":{"line":73,"character":9}},"parameters":[{"name":"key","isParamsArray":false,"type":"string"}],"return":{"type":"string"}}]} \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e6feffa3..f2a9d94e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98070dc3faf2c78cc7ecd30a9ae94234da040e23f97124f83b0ce8ee09f0d877 -size 29405 +oid sha256:88f3289dbf0b17be0eed0a0b23214dab461bb159e595a7c371f21cabc6b9e212 +size 29407 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 99b29d71..997dda38 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -18,12 +18,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 36 - width: 1706.6666 - height: 813.3333 + width: 1377 + height: 801 m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 56 + controlID: 40596 draggingID: 0 --- !u!114 &2 MonoBehaviour: @@ -40,17 +40,17 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Game - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, + m_Text: "\u6E38\u620F" + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Game\u200B" + m_TextWithWhitespace: "\u6E38\u620F\u200B" m_Pos: serializedVersion: 2 - x: 270.6667 - y: 78.66667 - width: 922.66675 - height: 554 + x: 310 + y: 79 + width: 758 + height: 500 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -72,7 +72,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 2732, y: 2048} + m_TargetSize: {x: 1920, y: 1080} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -81,16 +81,16 @@ MonoBehaviour: m_VSyncEnabled: 0 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 03000000000000001200000015000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 03000000000000001200000006000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -910.6667 - m_HBaseRangeMax: 910.6667 - m_VBaseRangeMin: -682.6667 - m_VBaseRangeMax: 682.6667 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -540 + m_VBaseRangeMax: 540 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -108,26 +108,26 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 922.66675 - height: 533 - m_Scale: {x: 0.39038086, y: 0.39038086} - m_Translation: {x: 461.3334, y: 266.5} + width: 758 + height: 479 + m_Scale: {x: 0.39479166, y: 0.39479163} + m_Translation: {x: 379, y: 239.49998} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1181.7521 - y: -682.6667 - width: 2363.5042 - height: 1365.3334 + x: -960 + y: -606.6491 + width: 1920 + height: 1213.2982 m_MinimalGUI: 1 - m_defaultScale: 0.39038086 - m_LastWindowPixelSize: {x: 1384.0001, y: 831} + m_defaultScale: 0.39479166 + m_LastWindowPixelSize: {x: 758, y: 500} m_ClearInEditMode: 1 m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 00000000000000000000 + m_LowResolutionForAspectRatios: 00000001000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} m_showToolbar: 1 @@ -150,12 +150,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1706.6666 - height: 813.3333 + width: 1377 + height: 801 m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 57 + controlID: 40597 draggingID: 0 --- !u!114 &4 MonoBehaviour: @@ -176,12 +176,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1195.3334 - height: 813.3333 + width: 1007 + height: 801 m_MinSize: {x: 200, y: 112} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 58 + controlID: 40598 draggingID: 0 --- !u!114 &5 MonoBehaviour: @@ -202,12 +202,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1195.3334 - height: 580 + width: 1007 + height: 526 m_MinSize: {x: 200, y: 56} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 59 + controlID: 40599 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -226,10 +226,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 270.66666 - height: 580 - m_MinSize: {x: 201, y: 226} - m_MaxSize: {x: 4001, y: 4026} + width: 247 + height: 526 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 7} m_Panes: - {fileID: 7} @@ -250,17 +250,17 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, + m_Text: "\u5C42\u7EA7" + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Hierarchy\u200B" + m_TextWithWhitespace: "\u5C42\u7EA7\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 78.66667 - width: 269.66666 - height: 554 + x: 63 + y: 79 + width: 246 + height: 500 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -277,18 +277,73 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - - m_Data: 153856 + m_SelectedIDs: [] m_LastClickedID: - m_Data: 153856 + m_Data: 0 m_ExpandedIDs: - - m_Data: -396126 - - m_Data: -55988 - - m_Data: -1346 + - m_Data: -1199280 + - m_Data: -1098744 + - m_Data: -1098662 + - m_Data: -1098442 + - m_Data: -1087556 + - m_Data: -1085012 + - m_Data: -1078918 + - m_Data: -967208 + - m_Data: -964668 + - m_Data: -846458 + - m_Data: -843914 + - m_Data: -836534 + - m_Data: -724824 + - m_Data: -722280 + - m_Data: -603336 + - m_Data: -603300 + - m_Data: -603262 + - m_Data: -601088 + - m_Data: -386232 + - m_Data: -386226 + - m_Data: -385554 + - m_Data: -385398 + - m_Data: -385392 + - m_Data: -385108 + - m_Data: -384994 + - m_Data: -344416 + - m_Data: -341844 + - m_Data: -341738 + - m_Data: -341732 + - m_Data: -341726 + - m_Data: -341448 + - m_Data: -341442 + - m_Data: -338886 + - m_Data: -319590 + - m_Data: -319562 + - m_Data: -319532 + - m_Data: -319148 + - m_Data: -306072 + - m_Data: -294202 + - m_Data: -294196 + - m_Data: -293968 + - m_Data: -293912 + - m_Data: -293894 + - m_Data: -293888 + - m_Data: -293800 + - m_Data: -37716 + - m_Data: -37380 + - m_Data: -35298 + - m_Data: -32708 + - m_Data: -27252 + - m_Data: -26916 + - m_Data: -24614 + - m_Data: -22008 + - m_Data: -15996 + - m_Data: -15660 + - m_Data: -13358 + - m_Data: -10752 + - m_Data: -1366 + - m_Data: -12 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: par_04 - m_OriginalName: par_04 + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 @@ -296,10 +351,10 @@ MonoBehaviour: width: 0 height: 0 m_UserData: - m_Data: 132906 + m_Data: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_TrimLeadingAndTrailingWhitespace: 0 m_ClientGUIView: {fileID: 6} @@ -325,12 +380,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 270.66666 + x: 247 y: 0 - width: 924.66675 - height: 580 - m_MinSize: {x: 202, y: 226} - m_MaxSize: {x: 4002, y: 4026} + width: 760 + height: 526 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 9} @@ -353,17 +408,17 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Scene - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, + m_Text: "\u573A\u666F" + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Scene\u200B" + m_TextWithWhitespace: "\u573A\u666F\u200B" m_Pos: serializedVersion: 2 - x: 270.6667 - y: 78.66667 - width: 922.66675 - height: 554 + x: 310 + y: 79 + width: 758 + height: 500 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -406,10 +461,10 @@ MonoBehaviour: displayed: 1 id: unity-scene-view-toolbar index: 4 - contents: '{"m_Layout":1,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-469.3333740234375,"y":25.333332061767579},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":1,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-361.3333740234375,"y":25.333332061767579},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":1,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: -469.33337, y: 25.333332} + snapOffset: {x: -361.33337, y: 25.333332} snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 layout: 1 @@ -1022,7 +1077,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_DynamicPanelBehavior: 0 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 - m_Gizmos: 0 + m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 @@ -1032,9 +1087,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: -0.5405235, y: 2.8840332, z: 907.6481} + m_Target: {x: -26.095776, y: -16.051174, z: 261.14813} speed: 2 - m_Value: {x: -0.5405235, y: 2.8840332, z: 907.6481} + m_Value: {x: -26.095776, y: -16.051174, z: 261.14813} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1080,13 +1135,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.16703576, y: 0.50507236, z: -0.10018564, w: 0.8409851} + m_Target: {x: 0.047870737, y: -0.064884216, z: 0.003383693, w: 0.9968884} speed: 2 - m_Value: {x: 0.16701137, y: 0.5049986, z: -0.100171015, w: 0.84086233} + m_Value: {x: 0.04786357, y: -0.0648745, z: 0.0033831864, w: 0.99673915} m_Size: - m_Target: 185.30441 + m_Target: 114.11437 speed: 2 - m_Value: 185.30441 + m_Value: 114.11437 m_Ortho: m_Target: 0 speed: 2 @@ -1135,17 +1190,17 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Animator - m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, + m_Text: "\u52A8\u753B\u5668" + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Animator\u200B" + m_TextWithWhitespace: "\u52A8\u753B\u5668\u200B" m_Pos: serializedVersion: 2 - x: -2153.3333 - y: -7.9999924 - width: 1384 - height: 882.6667 + x: 260.6667 + y: 78.66667 + width: 890.66675 + height: 554 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1243,9 +1298,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 580 - width: 1195.3334 - height: 233.33331 + y: 526 + width: 1007 + height: 275 m_MinSize: {x: 231, y: 276} m_MaxSize: {x: 10001, y: 10026} m_ActualView: {fileID: 12} @@ -1272,17 +1327,17 @@ MonoBehaviour: m_MinSize: {x: 230, y: 250} m_MaxSize: {x: 10000, y: 10000} m_TitleContent: - m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + m_Text: "\u9879\u76EE" + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Project\u200B" + m_TextWithWhitespace: "\u9879\u76EE\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 658.6667 - width: 1194.3334 - height: 207.33331 + x: 63 + y: 605 + width: 1006 + height: 249 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1307,7 +1362,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/ThemeBundles/DepartureToMultiverse/Prefabs/NoteEffects + - Assets/Wwise/API/Runtime/Generated/Common m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1317,127 +1372,33 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/ThemeBundles/DepartureToMultiverse/Prefabs/NoteEffects + - Assets/Wwise/API/Runtime/Generated/Common m_LastFoldersGridSize: 16 - m_LastProjectPath: D:\Projects\ichni Official + m_LastProjectPath: C:\ichniOfficial\ichni_Official m_LockTracker: m_IsLocked: 0 m_LastLocalAssetsSearchArea: 1 m_FolderTreeState: - scrollPos: {x: 0, y: 780.66675} + scrollPos: {x: 0, y: 555} m_SelectedIDs: - - m_Data: 97658 + - m_Data: 198596 m_LastClickedID: - m_Data: 97658 + m_Data: 198596 m_ExpandedIDs: - m_Data: 0 - - m_Data: 82178 - - m_Data: 82180 - - m_Data: 82182 - - m_Data: 82184 - - m_Data: 82186 - - m_Data: 82188 - - m_Data: 82190 - - m_Data: 82192 - - m_Data: 82194 - - m_Data: 82196 - - m_Data: 82198 - - m_Data: 82200 - - m_Data: 82202 - - m_Data: 82204 - - m_Data: 82206 - - m_Data: 82208 - - m_Data: 82210 - - m_Data: 82212 - - m_Data: 82214 - - m_Data: 82216 - - m_Data: 82218 - - m_Data: 82220 - - m_Data: 82222 - - m_Data: 82224 - - m_Data: 82226 - - m_Data: 82228 - - m_Data: 82230 - - m_Data: 82232 - - m_Data: 82234 - - m_Data: 82236 - - m_Data: 82238 - - m_Data: 82240 - - m_Data: 82242 - - m_Data: 82244 - - m_Data: 82246 - - m_Data: 82248 - - m_Data: 82252 - - m_Data: 82254 - - m_Data: 82256 - - m_Data: 82258 - - m_Data: 82260 - - m_Data: 82262 - - m_Data: 82264 - - m_Data: 82266 - - m_Data: 82268 - - m_Data: 82270 - - m_Data: 82272 - - m_Data: 82274 - - m_Data: 82276 - - m_Data: 82278 - - m_Data: 82280 - - m_Data: 82282 - - m_Data: 82284 - - m_Data: 82286 - - m_Data: 82288 - - m_Data: 82290 - - m_Data: 82292 - - m_Data: 82294 - - m_Data: 82296 - - m_Data: 82298 - - m_Data: 82300 - - m_Data: 82302 - - m_Data: 82304 - - m_Data: 82306 - - m_Data: 82308 - - m_Data: 82310 - - m_Data: 82312 - - m_Data: 82314 - - m_Data: 82316 - - m_Data: 82318 - - m_Data: 82320 - - m_Data: 82322 - - m_Data: 82324 - - m_Data: 82326 - - m_Data: 82328 - - m_Data: 82330 - - m_Data: 82332 - - m_Data: 82334 - - m_Data: 82336 - - m_Data: 82338 - - m_Data: 82340 - - m_Data: 82342 - - m_Data: 82344 - - m_Data: 82346 - - m_Data: 82348 - - m_Data: 82350 - - m_Data: 82352 - - m_Data: 82354 - - m_Data: 82356 - - m_Data: 82358 - - m_Data: 82360 - - m_Data: 82362 - - m_Data: 82364 - - m_Data: 82366 - - m_Data: 82368 - - m_Data: 82370 - - m_Data: 82372 - - m_Data: 82374 - - m_Data: 82376 - - m_Data: 82378 - - m_Data: 87000 - - m_Data: 87024 + - m_Data: 82468 + - m_Data: 82470 + - m_Data: 82472 + - m_Data: 82474 + - m_Data: 82988 + - m_Data: 198598 + - m_Data: 198600 + - m_Data: 198602 - m_Data: 1000000000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: NoteEffects - m_OriginalName: NoteEffects + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 @@ -1445,10 +1406,10 @@ MonoBehaviour: width: 0 height: 0 m_UserData: - m_Data: 97658 + m_Data: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 m_ClientGUIView: {fileID: 11} @@ -1466,107 +1427,11 @@ MonoBehaviour: m_Data: 0 m_ExpandedIDs: - m_Data: 0 - - m_Data: 82178 - - m_Data: 82180 - - m_Data: 82182 - - m_Data: 82184 - - m_Data: 82186 - - m_Data: 82188 - - m_Data: 82190 - - m_Data: 82192 - - m_Data: 82194 - - m_Data: 82196 - - m_Data: 82198 - - m_Data: 82200 - - m_Data: 82202 - - m_Data: 82204 - - m_Data: 82206 - - m_Data: 82208 - - m_Data: 82210 - - m_Data: 82212 - - m_Data: 82214 - - m_Data: 82216 - - m_Data: 82218 - - m_Data: 82220 - - m_Data: 82222 - - m_Data: 82224 - - m_Data: 82226 - - m_Data: 82228 - - m_Data: 82230 - - m_Data: 82232 - - m_Data: 82234 - - m_Data: 82236 - - m_Data: 82238 - - m_Data: 82240 - - m_Data: 82242 - - m_Data: 82244 - - m_Data: 82246 - - m_Data: 82248 - - m_Data: 82250 - - m_Data: 82252 - - m_Data: 82254 - - m_Data: 82256 - - m_Data: 82258 - - m_Data: 82260 - - m_Data: 82262 - - m_Data: 82264 - - m_Data: 82266 - - m_Data: 82268 - - m_Data: 82270 - - m_Data: 82272 - - m_Data: 82274 - - m_Data: 82276 - - m_Data: 82278 - - m_Data: 82280 - - m_Data: 82282 - - m_Data: 82284 - - m_Data: 82286 - - m_Data: 82288 - - m_Data: 82290 - - m_Data: 82292 - - m_Data: 82294 - - m_Data: 82296 - - m_Data: 82298 - - m_Data: 82300 - - m_Data: 82302 - - m_Data: 82304 - - m_Data: 82306 - - m_Data: 82308 - - m_Data: 82310 - - m_Data: 82312 - - m_Data: 82314 - - m_Data: 82316 - - m_Data: 82318 - - m_Data: 82320 - - m_Data: 82322 - - m_Data: 82324 - - m_Data: 82326 - - m_Data: 82328 - - m_Data: 82330 - - m_Data: 82332 - - m_Data: 82334 - - m_Data: 82336 - - m_Data: 82338 - - m_Data: 82340 - - m_Data: 82342 - - m_Data: 82344 - - m_Data: 82346 - - m_Data: 82348 - - m_Data: 82350 - - m_Data: 82352 - - m_Data: 82354 - - m_Data: 82356 - - m_Data: 82358 - - m_Data: 82360 - - m_Data: 82362 - - m_Data: 82364 - - m_Data: 82366 - - m_Data: 82368 - - m_Data: 82370 - - m_Data: 82372 - - m_Data: 82374 - - m_Data: 82376 - - m_Data: 82378 + - m_Data: 82468 + - m_Data: 82470 + - m_Data: 82472 + - m_Data: 82474 + - m_Data: 1000000000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1593,10 +1458,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - - m_Data: 153856 - m_LastClickedInstanceID: 153856 - m_HadKeyboardFocusLastEvent: 1 + m_SelectedInstanceIDs: [] + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: - m_Data: 0 - m_Data: 80838 @@ -1606,8 +1470,8 @@ MonoBehaviour: - m_Data: 74112 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: DTM_NoteVisualFlick - m_OriginalName: DTM_NoteVisualFlick + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 @@ -1615,10 +1479,10 @@ MonoBehaviour: width: 0 height: 0 m_UserData: - m_Data: 97250 + m_Data: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 m_ClientGUIView: {fileID: 11} @@ -1629,7 +1493,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} + m_ScrollPosition: {x: 0, y: 299} m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 209 @@ -1648,17 +1512,17 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Console - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, + m_Text: "\u63A7\u5236\u53F0" + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Console\u200B" + m_TextWithWhitespace: "\u63A7\u5236\u53F0\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 658.6667 - width: 1194.3334 - height: 207.33331 + x: 63 + y: 605 + width: 1006 + height: 249 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1687,17 +1551,17 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Animation - m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, + m_Text: "\u52A8\u753B" + m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Animation\u200B" + m_TextWithWhitespace: "\u52A8\u753B\u200B" m_Pos: serializedVersion: 2 - x: -2560 - y: 898.6667 - width: 1791.6666 - height: 360.6667 + x: 63 + y: 605 + width: 1006 + height: 249 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1735,10 +1599,10 @@ MonoBehaviour: m_TextWithWhitespace: "AkWwisePicker\u200B" m_Pos: serializedVersion: 2 - x: -2560 - y: 898.6667 - width: 1791.6666 - height: 360.6667 + x: 63 + y: 605 + width: 1006 + height: 249 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1767,17 +1631,17 @@ MonoBehaviour: m_MinSize: {x: 50, y: 50} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Audio Mixer - m_Image: {fileID: -3283902137440876849, guid: 0000000000000000d000000000000000, + m_Text: "\u97F3\u9891\u6DF7\u5408\u5668" + m_Image: {fileID: 2344599766593239149, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Audio Mixer\u200B" + m_TextWithWhitespace: "\u97F3\u9891\u6DF7\u5408\u5668\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 658.6667 - width: 1194.3334 - height: 207.33331 + x: 63 + y: 605 + width: 1006 + height: 249 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1914,12 +1778,12 @@ MonoBehaviour: oldMaxSizes: oldSplitSize: 0 m_HorizontalSplitter: - ID: 97 + ID: 38933 splitterInitialOffset: 0 currentActiveSplitter: -1 realSizes: - - 358.66666 - - 836 + - 302 + - 704 relativeSizes: - 0.3 - 0.7 @@ -1929,7 +1793,7 @@ MonoBehaviour: maxSizes: - 0 - 0 - lastTotalSize: 1194.6666 + lastTotalSize: 1006 splitSize: 6 xOffset: 0 m_Version: 1 @@ -1958,21 +1822,94 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1195.3334 + x: 1007 y: 0 - width: 511.33325 - height: 813.3333 - m_MinSize: {x: 276, y: 126} - m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 19} + width: 370 + height: 801 + m_MinSize: {x: 275, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 20} m_Panes: - {fileID: 18} - {fileID: 19} - {fileID: 20} - {fileID: 21} - m_Selected: 1 - m_LastSelected: 3 + - {fileID: 22} + m_Selected: 2 + m_LastSelected: 0 --- !u!114 &18 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 41147144ff556e246b736135eb26f185, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Core.Editor::UnityEditor.Rendering.DebugWindow + m_MinSize: {x: 800, y: 300} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Rendering Debugger + m_Image: {fileID: 0} + m_Tooltip: + m_TextWithWhitespace: "Rendering Debugger\u200B" + m_Pos: + serializedVersion: 2 + x: 913 + y: 79 + width: 526 + height: 775 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_DynamicPanelContainerData: [] + m_OverlaysVisible: 1 + m_DynamicPanelBehavior: 0 + m_WidgetStates: + m_Keys: + - Display Stats -> Frame Stats + - Display Stats -> Bottlenecks + - Display Stats -> Detailed Stats + - Frequently Used -> Rendering Debug + - Frequently Used -> Material Filters + - Frequently Used -> Lighting Debug Modes + - Rendering -> Pixel Validation + - Rendering -> HDR Output + - Rendering -> GPU Resident Drawer Settings + - Rendering -> Occlusion Context Stats + - Rendering -> Instance Culler Stats + - Rendering -> Render Graph + - Material -> Material Validation + - Volume -> Camera + - Volume -> Component + m_Values: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_Settings: {fileID: 0} +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1987,17 +1924,17 @@ MonoBehaviour: m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + m_Text: "\u68C0\u67E5\u5668" + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Inspector\u200B" + m_TextWithWhitespace: "\u68C0\u67E5\u5668\u200B" m_Pos: serializedVersion: 2 - x: 1195.3334 - y: 78.66667 - width: 510.33325 - height: 787.3333 + x: 913 + y: 79 + width: 526 + height: 775 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -2011,20 +1948,21 @@ MonoBehaviour: m_DynamicPanelContainerData: [] m_OverlaysVisible: 1 m_DynamicPanelBehavior: 0 - m_ObjectsLockedBeforeSerialization: [] + m_ObjectsLockedBeforeSerialization: + - {fileID: 11400000, guid: f36a8d771b3945a4c9968628b65ac876, type: 2} m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: m_CachedPref: 312.99988 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 + m_LastInspectedObjectInstanceID: 74056 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: - m_IsLocked: 0 + m_IsLocked: 1 m_PreviewWindow: {fileID: 0} ---- !u!114 &19 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2039,17 +1977,17 @@ MonoBehaviour: m_MinSize: {x: 275, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + m_Text: "\u68C0\u67E5\u5668" + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Inspector\u200B" + m_TextWithWhitespace: "\u68C0\u67E5\u5668\u200B" m_Pos: serializedVersion: 2 - x: 1195.3334 - y: 78.66667 - width: 510.33325 - height: 787.3333 + x: 1070 + y: 79 + width: 369 + height: 775 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -2076,7 +2014,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &20 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2091,11 +2029,11 @@ MonoBehaviour: m_MinSize: {x: 275, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + m_Text: "\u68C0\u67E5\u5668" + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Inspector\u200B" + m_TextWithWhitespace: "\u68C0\u67E5\u5668\u200B" m_Pos: serializedVersion: 2 x: 1195.3334 @@ -2121,14 +2059,14 @@ MonoBehaviour: m_CachedPref: 165.66669 m_ControlHash: 1412526313 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 + m_LastInspectedObjectInstanceID: 48546 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &21 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2143,11 +2081,11 @@ MonoBehaviour: m_MinSize: {x: 390, y: 390} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Lighting - m_Image: {fileID: -1477008817101679558, guid: 0000000000000000d000000000000000, + m_Text: "\u5149\u7167" + m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Lighting\u200B" + m_TextWithWhitespace: "\u5149\u7167\u200B" m_Pos: serializedVersion: 2 x: 1195.3334 diff --git a/UserSettings/Layouts/default-6000.dwlt b/UserSettings/Layouts/default-6000.dwlt index 9670b9f4..7fdf09a3 100644 --- a/UserSettings/Layouts/default-6000.dwlt +++ b/UserSettings/Layouts/default-6000.dwlt @@ -1,6 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.ContainerWindow + m_PixelRect: + serializedVersion: 2 + x: 269 + y: 153 + width: 725 + height: 530 + m_ShowMode: 0 + m_Title: "\u6784\u5EFA\u914D\u7F6E\u6587\u4EF6" + m_RootView: {fileID: 4} + m_MinSize: {x: 725, y: 426} + m_MaxSize: {x: 4000, y: 4026} + m_Maximized: 0 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -14,17 +38,68 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 - y: 42.666668 - width: 1706.6667 - height: 869.3334 + x: 63 + y: 43 + width: 1377 + height: 857 m_ShowMode: 4 - m_Title: Inspector - m_RootView: {fileID: 2} + m_Title: "\u9879\u76EE" + m_RootView: {fileID: 5} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 ---- !u!114 &2 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: BuildProfileWindow + m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.DockArea + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 725 + height: 530 + m_MinSize: {x: 725, y: 426} + m_MaxSize: {x: 4000, y: 4026} + m_ActualView: {fileID: 16} + m_Panes: + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.SplitView + m_Children: + - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 725 + height: 530 + m_MinSize: {x: 725, y: 426} + m_MaxSize: {x: 4000, y: 4026} + vertical: 0 + controlID: 3319 + draggingID: 0 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -37,22 +112,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 3} - - {fileID: 5} - - {fileID: 4} + - {fileID: 6} + - {fileID: 8} + - {fileID: 7} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1706.6666 - height: 869.3333 + width: 1377 + height: 857 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 36 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &3 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -69,12 +144,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1706.6666 + width: 1377 height: 36 m_MinSize: {x: 50, y: 50} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 14} ---- !u!114 &4 + m_ActualView: {fileID: 17} +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -90,12 +165,12 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 849.3333 - width: 1706.6666 + y: 837 + width: 1377 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &5 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -108,95 +183,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.SplitView m_Children: - - {fileID: 6} + - {fileID: 9} m_Position: serializedVersion: 2 x: 0 y: 36 - width: 1706.6666 - height: 813.3333 + width: 1377 + height: 801 m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 87258 - draggingID: 0 ---- !u!114 &6 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 7} - - {fileID: 12} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1706.6666 - height: 813.3333 - m_MinSize: {x: 300, y: 112} - m_MaxSize: {x: 24288, y: 16192} - vertical: 0 - controlID: 87259 - draggingID: 0 ---- !u!114 &7 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 8} - - {fileID: 11} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1153.3334 - height: 813.3333 - m_MinSize: {x: 200, y: 112} - m_MaxSize: {x: 16192, y: 16192} - vertical: 1 - controlID: 87233 - draggingID: 0 ---- !u!114 &8 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 9} - - {fileID: 10} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1153.3334 - height: 580 - m_MinSize: {x: 200, y: 56} - m_MaxSize: {x: 16192, y: 8096} - vertical: 0 - controlID: 87234 + controlID: 2046 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -207,24 +204,76 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_Children: [] + m_Children: + - {fileID: 10} + - {fileID: 15} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 260.66666 - height: 580 - m_MinSize: {x: 201, y: 226} - m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 16} - m_Panes: - - {fileID: 16} - m_Selected: 0 - m_LastSelected: 0 + width: 1377 + height: 801 + m_MinSize: {x: 300, y: 112} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 2047 + draggingID: 0 --- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 11} + - {fileID: 14} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 850 + height: 801 + m_MinSize: {x: 200, y: 112} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 2048 + draggingID: 0 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 12} + - {fileID: 13} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 850 + height: 526 + m_MinSize: {x: 200, y: 56} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 1519 + draggingID: 0 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -234,25 +283,51 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 260.66666 + x: 0 y: 0 - width: 892.66675 - height: 580 + width: 214 + height: 526 + m_MinSize: {x: 201, y: 226} + m_MaxSize: {x: 4001, y: 4026} + m_ActualView: {fileID: 19} + m_Panes: + - {fileID: 19} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 214 + y: 0 + width: 636 + height: 526 m_MinSize: {x: 202, y: 226} m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 17} - - {fileID: 15} + - {fileID: 20} - {fileID: 18} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &11 + - {fileID: 21} + m_Selected: 1 + m_LastSelected: 0 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -268,21 +343,21 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 580 - width: 1153.3334 - height: 233.33331 + y: 526 + width: 850 + height: 275 m_MinSize: {x: 231, y: 276} m_MaxSize: {x: 10001, y: 10026} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 22} m_Panes: - - {fileID: 19} - - {fileID: 20} - - {fileID: 21} - {fileID: 22} - {fileID: 23} + - {fileID: 24} + - {fileID: 25} + - {fileID: 26} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &12 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -297,46 +372,46 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1153.3334 + x: 850 y: 0 - width: 553.33325 - height: 813.3333 + width: 527 + height: 801 m_MinSize: {x: 276, y: 76} m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 24} + m_ActualView: {fileID: 28} m_Panes: - - {fileID: 13} - - {fileID: 24} - - {fileID: 25} - - {fileID: 26} - {fileID: 27} + - {fileID: 28} + - {fileID: 29} + - {fileID: 30} + - {fileID: 31} m_Selected: 1 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &16 MonoBehaviour: - m_ObjectHideFlags: 61 + m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 41147144ff556e246b736135eb26f185, type: 3} + m_Script: {fileID: 15004, guid: 0000000000000000e000000000000000, type: 0} m_Name: - m_EditorClassIdentifier: Unity.RenderPipelines.Core.Editor::UnityEditor.Rendering.DebugWindow - m_MinSize: {x: 800, y: 300} + m_EditorClassIdentifier: UnityEditor.BuildProfileModule.dll::UnityEditor.Build.Profile.BuildProfileWindow + m_MinSize: {x: 725, y: 400} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Rendering Debugger + m_Text: "\u6784\u5EFA\u914D\u7F6E\u6587\u4EF6" m_Image: {fileID: 0} m_Tooltip: - m_TextWithWhitespace: "Rendering Debugger\u200B" + m_TextWithWhitespace: "\u6784\u5EFA\u914D\u7F6E\u6587\u4EF6\u200B" m_Pos: serializedVersion: 2 - x: 1153.3334 - y: 78.66667 - width: 552.33325 - height: 787.3333 + x: 0 + y: 26 + width: 725 + height: 504 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -350,81 +425,7 @@ MonoBehaviour: m_DynamicPanelContainerData: [] m_OverlaysVisible: 1 m_DynamicPanelBehavior: 0 - m_WidgetStates: - m_Keys: - - Display Stats -> Frame Stats - - Display Stats -> Bottlenecks - - Display Stats -> Detailed Stats - - Frequently Used -> Rendering Debug - - Frequently Used -> Material Filters - - Frequently Used -> Lighting Debug Modes - - Rendering -> Pixel Validation - - Rendering -> HDR Output - - Rendering -> GPU Resident Drawer Settings - - Rendering -> Occlusion Context Stats - - Rendering -> Instance Culler Stats - - Rendering -> Render Graph - - Material -> Material Validation - - Volume -> Camera - - Volume -> Component - - Display Stats -> Detailed Stats -> Update every second with average - - Display Stats -> Detailed Stats -> Hide empty scopes - - Display Stats -> Detailed Stats -> Profiling Scopes - - Frequently Used -> Rendering Debug -> Map Overlays - - Frequently Used -> Rendering Debug -> -> Map Size - - Frequently Used -> Rendering Debug -> HDR - - Frequently Used -> Rendering Debug -> MSAA - - Frequently Used -> Rendering Debug -> TAA Debug Mode - - Frequently Used -> Rendering Debug -> Post-processing - - Frequently Used -> Rendering Debug -> Additional Wireframe Modes - - Frequently Used -> Rendering Debug -> Overdraw Mode - - Frequently Used -> Rendering Debug -> -> Max Overdraw Count - - Frequently Used -> Rendering Debug -> Mipmap Streaming -> Disable Mip Caching - - Frequently Used -> Rendering Debug -> Mipmap Streaming -> Debug View - - Frequently Used -> Material Filters -> Material Override - - Frequently Used -> Material Filters -> Vertex Attribute - - Frequently Used -> Lighting Debug Modes -> Lighting Debug Mode - - Frequently Used -> Lighting Debug Modes -> HDR Debug Mode - - Frequently Used -> Lighting Debug Modes -> Lighting Features - - Material -> Material Validation -> Material Validation Mode - m_Values: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - m_Settings: {fileID: 0} ---- !u!114 &14 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -446,8 +447,8 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 42.666668 - width: 1706.6666 + y: 0 + width: 1377 height: 36 m_SerializedDataModeController: m_DataMode: 0 @@ -505,10 +506,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":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}' + 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: 250.66666, y: 0} + snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 @@ -530,7 +531,7 @@ MonoBehaviour: sizeOverridden: 0 - dockPosition: 0 containerId: overlay-toolbar__top - displayed: 1 + displayed: 0 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}' @@ -572,8 +573,8 @@ MonoBehaviour: sizeOverridden: 0 - dockPosition: 1 containerId: overlay-toolbar__top - displayed: 0 - id: Editor Utility/Quality + displayed: 1 + id: Editor Controls/Layout 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 @@ -586,8 +587,8 @@ MonoBehaviour: sizeOverridden: 0 - dockPosition: 1 containerId: overlay-toolbar__top - displayed: 1 - id: Editor Controls/Layout + displayed: 0 + id: Editor Utility/Quality 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 @@ -673,57 +674,15 @@ 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":-781.333251953125,"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":-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}' floating: 0 collapsed: 0 - snapOffset: {x: -781.33325, y: -36} + snapOffset: {x: -644, 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 @@ -732,7 +691,7 @@ MonoBehaviour: m_DynamicPanelContainerData: [] m_OverlaysVisible: 1 m_DynamicPanelBehavior: 0 ---- !u!114 &15 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -747,17 +706,17 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Game - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, + m_Text: "\u6E38\u620F" + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Game\u200B" + m_TextWithWhitespace: "\u6E38\u620F\u200B" m_Pos: serializedVersion: 2 - x: 260.6667 - y: 78.66667 - width: 890.66675 - height: 554 + x: 215 + y: 24 + width: 634 + height: 500 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -779,7 +738,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: 634, y: 479} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -788,16 +747,16 @@ MonoBehaviour: m_VSyncEnabled: 0 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 03000000000000001200000015000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 03000000000000001200000011000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -640 - m_HBaseRangeMax: 640 - m_VBaseRangeMin: -360 - m_VBaseRangeMax: 360 + m_HBaseRangeMin: -317 + m_HBaseRangeMax: 317 + m_VBaseRangeMin: -239.5 + m_VBaseRangeMax: 239.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -815,30 +774,30 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 890.66675 - height: 533 - m_Scale: {x: 0.6958334, y: 0.6958334} - m_Translation: {x: 445.33337, y: 266.5} + width: 634 + height: 479 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 317, y: 239.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -640 - y: -382.994 - width: 1280 - height: 765.988 + x: -317 + y: -239.5 + width: 634 + height: 479 m_MinimalGUI: 1 - m_defaultScale: 0.6958334 - m_LastWindowPixelSize: {x: 1336.0001, y: 831} + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 634, y: 500} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} m_showToolbar: 1 ---- !u!114 &16 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -853,17 +812,17 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, + m_Text: "\u5C42\u7EA7" + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Hierarchy\u200B" + m_TextWithWhitespace: "\u5C42\u7EA7\u200B" m_Pos: serializedVersion: 2 x: 0 - y: 78.66667 - width: 259.66666 - height: 554 + y: 24 + width: 213 + height: 500 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -884,42 +843,16 @@ MonoBehaviour: m_LastClickedID: m_Data: 0 m_ExpandedIDs: - - m_Data: -533198 - - m_Data: -532770 - - m_Data: -530468 - - m_Data: -527862 - - m_Data: -520162 - - m_Data: -519734 - - m_Data: -517448 - - m_Data: -514858 - - m_Data: -455372 - - m_Data: -455364 - - m_Data: -455352 - - m_Data: -452048 - - m_Data: -446284 - - m_Data: -441396 - - m_Data: -410798 - - m_Data: -410788 - - m_Data: -410780 - - m_Data: -410644 - - m_Data: -406882 - - m_Data: -406850 - - m_Data: -406844 - - m_Data: -406780 - - m_Data: -406774 - - m_Data: -406610 - - m_Data: -398638 - - m_Data: -398634 - - m_Data: -398628 - - m_Data: -398620 - - m_Data: -398608 - - m_Data: -396126 - - m_Data: -55988 - - m_Data: -1346 + - m_Data: -107618 + - m_Data: -55098 + - m_Data: 97924 + - m_Data: 98496 + - m_Data: 99338 + - m_Data: 99938 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: TrackRenderer - m_OriginalName: TrackRenderer + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 @@ -927,13 +860,13 @@ MonoBehaviour: width: 0 height: 0 m_UserData: - m_Data: -406858 + m_Data: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 12} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -941,7 +874,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &17 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -956,17 +889,17 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Scene - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, + m_Text: "\u573A\u666F" + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Scene\u200B" + m_TextWithWhitespace: "\u573A\u666F\u200B" m_Pos: serializedVersion: 2 - x: 260.6667 - y: 78.66667 - width: 890.66675 - height: 554 + x: 357 + y: 79 + width: 872 + height: 546 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1625,7 +1558,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_DynamicPanelBehavior: 0 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 - m_Gizmos: 0 + m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 @@ -1635,9 +1568,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: 0.13010406, y: -3.9978065, z: 6046.298} + m_Target: {x: -24.840952, y: 3.5599465, z: 144.3027} speed: 2 - m_Value: {x: 0.42972642, y: 0.064101696, z: 0.10551739} + m_Value: {x: -24.840952, y: 3.5599465, z: 144.3027} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1683,13 +1616,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.09883887, y: 0.018740486, z: -0.0017335806, w: 0.9950739} + m_Target: {x: 0.18493801, y: -0.013752429, z: 0.0026287613, w: 0.98279434} speed: 2 - m_Value: {x: -0.18042754, y: 0.25265226, z: -0.048016366, w: -0.94937205} + m_Value: {x: -0.184938, y: 0.013752429, z: -0.0026287613, w: -0.98279434} m_Size: - m_Target: 11.926286 + m_Target: 61.722412 speed: 2 - m_Value: 2.2818341 + m_Value: 61.722412 m_Ortho: m_Target: 0 speed: 2 @@ -1710,7 +1643,7 @@ MonoBehaviour: m_LastSceneViewRotation: {x: -0.0018017952, y: 0.09097248, z: -0.00016610812, w: -0.9958704} m_LastSceneViewOrtho: 0 m_Viewpoint: - m_SceneView: {fileID: 17} + m_SceneView: {fileID: 20} m_CameraOverscanSettings: m_Opacity: 50 m_Scale: 1 @@ -1723,7 +1656,7 @@ MonoBehaviour: name: Light Overlap section: Baked Global Illumination m_ViewIsLockedToObject: 0 ---- !u!114 &18 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1738,11 +1671,11 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Animator - m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, + m_Text: "\u52A8\u753B\u5668" + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Animator\u200B" + m_TextWithWhitespace: "\u52A8\u753B\u5668\u200B" m_Pos: serializedVersion: 2 x: 260.6667 @@ -1830,7 +1763,7 @@ MonoBehaviour: m_CurrentEditor: 0 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &19 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1845,17 +1778,17 @@ MonoBehaviour: m_MinSize: {x: 230, y: 250} m_MaxSize: {x: 10000, y: 10000} m_TitleContent: - m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + m_Text: "\u9879\u76EE" + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Project\u200B" + m_TextWithWhitespace: "\u9879\u76EE\u200B" m_Pos: serializedVersion: 2 x: 0 - y: 658.6667 - width: 1152.3334 - height: 207.33331 + y: 550 + width: 849 + height: 249 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1880,7 +1813,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Shaders + - Assets/Resources/Beatmaps/Chapter0 m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1890,127 +1823,28 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Shaders + - Assets/Resources/Beatmaps/Chapter0 m_LastFoldersGridSize: 16 - m_LastProjectPath: D:\Projects\ichni Official + m_LastProjectPath: C:\ichniOfficial\ichni_Official m_LockTracker: m_IsLocked: 0 m_LastLocalAssetsSearchArea: 1 m_FolderTreeState: - scrollPos: {x: 0, y: 527} + scrollPos: {x: 0, y: 507} m_SelectedIDs: - - m_Data: 87006 + - m_Data: 110654 m_LastClickedID: - m_Data: 87006 + m_Data: 110654 m_ExpandedIDs: - m_Data: 0 - - m_Data: 82178 - - m_Data: 82180 - - m_Data: 82182 - - m_Data: 82184 - - m_Data: 82186 - - m_Data: 82188 - - m_Data: 82190 - - m_Data: 82192 - - m_Data: 82194 - - m_Data: 82196 - - m_Data: 82198 - - m_Data: 82200 - - m_Data: 82202 - - m_Data: 82204 - - m_Data: 82206 - - m_Data: 82208 - - m_Data: 82210 - - m_Data: 82212 - - m_Data: 82214 - - m_Data: 82216 - - m_Data: 82218 - - m_Data: 82220 - - m_Data: 82222 - - m_Data: 82224 - - m_Data: 82226 - - m_Data: 82228 - - m_Data: 82232 - - m_Data: 82234 - - m_Data: 82236 - - m_Data: 82238 - - m_Data: 82240 - - m_Data: 82242 - - m_Data: 82244 - - m_Data: 82246 - - m_Data: 82248 - - m_Data: 82250 - - m_Data: 82252 - - m_Data: 82254 - - m_Data: 82256 - - m_Data: 82258 - - m_Data: 82260 - - m_Data: 82262 - - m_Data: 82264 - - m_Data: 82266 - - m_Data: 82268 - - m_Data: 82270 - - m_Data: 82272 - - m_Data: 82274 - - m_Data: 82276 - - m_Data: 82278 - - m_Data: 82280 - - m_Data: 82282 - - m_Data: 82284 - - m_Data: 82286 - - m_Data: 82288 - - m_Data: 82290 - - m_Data: 82292 - - m_Data: 82294 - - m_Data: 82296 - - m_Data: 82298 - - m_Data: 82300 - - m_Data: 82302 - - m_Data: 82304 - - m_Data: 82306 - - m_Data: 82308 - - m_Data: 82310 - - m_Data: 82312 - - m_Data: 82314 - - m_Data: 82316 - - m_Data: 82318 - - m_Data: 82320 - - m_Data: 82322 - - m_Data: 82324 - - m_Data: 82326 - - m_Data: 82328 - - m_Data: 82330 - - m_Data: 82332 - - m_Data: 82336 - - m_Data: 82338 - - m_Data: 82340 - - m_Data: 82342 - - m_Data: 82344 - - m_Data: 82346 - - m_Data: 82348 - - m_Data: 82350 - - m_Data: 82352 - - m_Data: 82354 - - m_Data: 82356 - - m_Data: 82358 - - m_Data: 82360 - - m_Data: 82362 - - m_Data: 82364 - - m_Data: 82366 - - m_Data: 82368 - - m_Data: 82370 - - m_Data: 82372 - - m_Data: 82374 - - m_Data: 82376 - - m_Data: 82378 - - m_Data: 87000 - - m_Data: 87024 - - m_Data: 94662 - - m_Data: 1000000000 + - m_Data: 82468 + - m_Data: 82470 + - m_Data: 82472 + - m_Data: 82474 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Models - m_OriginalName: Models + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 @@ -2018,13 +1852,13 @@ MonoBehaviour: width: 0 height: 0 m_UserData: - m_Data: 97246 + m_Data: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 14} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -2039,109 +1873,10 @@ MonoBehaviour: m_Data: 0 m_ExpandedIDs: - m_Data: 0 - - m_Data: 82178 - - m_Data: 82180 - - m_Data: 82182 - - m_Data: 82184 - - m_Data: 82186 - - m_Data: 82188 - - m_Data: 82190 - - m_Data: 82192 - - m_Data: 82194 - - m_Data: 82196 - - m_Data: 82198 - - m_Data: 82200 - - m_Data: 82202 - - m_Data: 82204 - - m_Data: 82206 - - m_Data: 82208 - - m_Data: 82210 - - m_Data: 82212 - - m_Data: 82214 - - m_Data: 82216 - - m_Data: 82218 - - m_Data: 82220 - - m_Data: 82222 - - m_Data: 82224 - - m_Data: 82226 - - m_Data: 82228 - - m_Data: 82230 - - m_Data: 82232 - - m_Data: 82234 - - m_Data: 82236 - - m_Data: 82238 - - m_Data: 82240 - - m_Data: 82242 - - m_Data: 82244 - - m_Data: 82246 - - m_Data: 82248 - - m_Data: 82252 - - m_Data: 82254 - - m_Data: 82256 - - m_Data: 82258 - - m_Data: 82260 - - m_Data: 82262 - - m_Data: 82264 - - m_Data: 82266 - - m_Data: 82268 - - m_Data: 82270 - - m_Data: 82272 - - m_Data: 82274 - - m_Data: 82276 - - m_Data: 82278 - - m_Data: 82280 - - m_Data: 82282 - - m_Data: 82284 - - m_Data: 82286 - - m_Data: 82288 - - m_Data: 82290 - - m_Data: 82292 - - m_Data: 82294 - - m_Data: 82296 - - m_Data: 82298 - - m_Data: 82300 - - m_Data: 82302 - - m_Data: 82304 - - m_Data: 82306 - - m_Data: 82308 - - m_Data: 82310 - - m_Data: 82312 - - m_Data: 82314 - - m_Data: 82316 - - m_Data: 82318 - - m_Data: 82320 - - m_Data: 82322 - - m_Data: 82324 - - m_Data: 82326 - - m_Data: 82328 - - m_Data: 82330 - - m_Data: 82332 - - m_Data: 82334 - - m_Data: 82336 - - m_Data: 82338 - - m_Data: 82340 - - m_Data: 82342 - - m_Data: 82344 - - m_Data: 82346 - - m_Data: 82348 - - m_Data: 82350 - - m_Data: 82352 - - m_Data: 82354 - - m_Data: 82356 - - m_Data: 82358 - - m_Data: 82360 - - m_Data: 82362 - - m_Data: 82364 - - m_Data: 82366 - - m_Data: 82368 - - m_Data: 82370 - - m_Data: 82372 - - m_Data: 82374 - - m_Data: 82376 - - m_Data: 82378 - - m_Data: 87000 - - m_Data: 87024 - - m_Data: 1000000000 + - m_Data: 82468 + - m_Data: 82470 + - m_Data: 82472 + - m_Data: 82474 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -2168,8 +1903,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: [] - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: + - m_Data: 110670 + m_LastClickedInstanceID: 110670 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: - m_Data: 0 @@ -2180,8 +1916,8 @@ MonoBehaviour: - m_Data: 74112 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Flick_HitFX - m_OriginalName: Flick_HitFX + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 @@ -2189,13 +1925,13 @@ MonoBehaviour: width: 0 height: 0 m_UserData: - m_Data: 116466 + m_Data: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 14} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -2203,11 +1939,11 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} + m_ScrollPosition: {x: 0, y: 22} m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 209 ---- !u!114 &20 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2222,17 +1958,17 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Console - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, + m_Text: "\u63A7\u5236\u53F0" + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Console\u200B" + m_TextWithWhitespace: "\u63A7\u5236\u53F0\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 658.6667 - width: 1152.3334 - height: 207.33331 + x: 63 + y: 651 + width: 1167 + height: 203 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -2246,7 +1982,7 @@ MonoBehaviour: m_DynamicPanelContainerData: [] m_OverlaysVisible: 1 m_DynamicPanelBehavior: 0 ---- !u!114 &21 +--- !u!114 &24 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2261,11 +1997,11 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Animation - m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, + m_Text: "\u52A8\u753B" + m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Animation\u200B" + m_TextWithWhitespace: "\u52A8\u753B\u200B" m_Pos: serializedVersion: 2 x: -2560 @@ -2288,7 +2024,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_LastSelectedObjectID: 48546 ---- !u!114 &22 +--- !u!114 &25 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2326,7 +2062,7 @@ MonoBehaviour: m_DynamicPanelContainerData: [] m_OverlaysVisible: 1 m_DynamicPanelBehavior: 0 ---- !u!114 &23 +--- !u!114 &26 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2341,11 +2077,11 @@ MonoBehaviour: m_MinSize: {x: 50, y: 50} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Audio Mixer - m_Image: {fileID: -3283902137440876849, guid: 0000000000000000d000000000000000, + m_Text: "\u97F3\u9891\u6DF7\u5408\u5668" + m_Image: {fileID: 2344599766593239149, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Audio Mixer\u200B" + m_TextWithWhitespace: "\u97F3\u9891\u6DF7\u5408\u5668\u200B" m_Pos: serializedVersion: 2 x: 0 @@ -2517,7 +2253,49 @@ MonoBehaviour: m_ShowReferencedBuses: 1 m_ShowBusConnections: 0 m_ShowBusConnectionsOfSelection: 0 ---- !u!114 &24 +--- !u!114 &27 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 41147144ff556e246b736135eb26f185, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Core.Editor::UnityEditor.Rendering.DebugWindow + m_MinSize: {x: 800, y: 300} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Rendering Debugger + m_Image: {fileID: 0} + m_Tooltip: + m_TextWithWhitespace: "Rendering Debugger\u200B" + m_Pos: + serializedVersion: 2 + x: 1153.3334 + y: 78.66667 + width: 552.33325 + height: 787.3333 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_DynamicPanelContainerData: [] + m_OverlaysVisible: 1 + m_DynamicPanelBehavior: 0 + m_WidgetStates: + m_Keys: [] + m_Values: [] + m_Settings: {fileID: 0} +--- !u!114 &28 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2532,17 +2310,17 @@ MonoBehaviour: m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + m_Text: "\u68C0\u67E5\u5668" + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Inspector\u200B" + m_TextWithWhitespace: "\u68C0\u67E5\u5668\u200B" m_Pos: serializedVersion: 2 - x: 1153.3334 - y: 78.66667 - width: 552.33325 - height: 787.3333 + x: 851 + y: 24 + width: 526 + height: 775 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -2569,7 +2347,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &25 +--- !u!114 &29 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2584,11 +2362,11 @@ MonoBehaviour: m_MinSize: {x: 275, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + m_Text: "\u68C0\u67E5\u5668" + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Inspector\u200B" + m_TextWithWhitespace: "\u68C0\u67E5\u5668\u200B" m_Pos: serializedVersion: 2 x: 1153.3334 @@ -2614,14 +2392,14 @@ MonoBehaviour: m_CachedPref: 184.33334 m_ControlHash: 1412526313 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 51.333374 + m_LastInspectedObjectInstanceID: 48546 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &26 +--- !u!114 &30 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2636,11 +2414,11 @@ MonoBehaviour: m_MinSize: {x: 275, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + m_Text: "\u68C0\u67E5\u5668" + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Inspector\u200B" + m_TextWithWhitespace: "\u68C0\u67E5\u5668\u200B" m_Pos: serializedVersion: 2 x: 1195.3334 @@ -2666,14 +2444,14 @@ MonoBehaviour: m_CachedPref: 165.66669 m_ControlHash: 1412526313 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 + m_LastInspectedObjectInstanceID: 48546 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &27 +--- !u!114 &31 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2688,11 +2466,11 @@ MonoBehaviour: m_MinSize: {x: 390, y: 390} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Lighting - m_Image: {fileID: -1477008817101679558, guid: 0000000000000000d000000000000000, + m_Text: "\u5149\u7167" + m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Lighting\u200B" + m_TextWithWhitespace: "\u5149\u7167\u200B" m_Pos: serializedVersion: 2 x: 1195.3334 diff --git a/ichni_Official.slnx b/ichni_Official.slnx index 37f44dc6..e3c2d483 100644 --- a/ichni_Official.slnx +++ b/ichni_Official.slnx @@ -1,53 +1,64 @@  - - - + - - + + - - + + + + - - - + + + + - + - - + + - + - - + - + + + - + - - - + + + + + - - + + + - + + - - - + + + + + + + +