diff --git a/Assets/000_assets/material/M_SquareFrame 1.mat b/Assets/000_assets/material/M_SquareFrame 1.mat index 1e9cb6e7..8dccb0da 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.93644387 + - _EdgeValue: 0.30297375 - _EnvironmentReflections: 1 - _FNLfanxiangkaiguan: 0 - _Face: 1 @@ -258,7 +258,7 @@ Material: - _Mask_scale: 1 - _Metallic: 0 - _OcclusionStrength: 1 - - _Opacity: 0.063556135 + - _Opacity: 0.69702625 - _Parallax: 0.005 - _Pass: 0 - _QueueOffset: 0 diff --git a/Assets/AddressableAssetsData/Android.meta b/Assets/AddressableAssetsData/Android.meta new file mode 100644 index 00000000..32c270c9 --- /dev/null +++ b/Assets/AddressableAssetsData/Android.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: de233eed6b857cc4b9577804ccd84680 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/Android/addressables_content_state.bin b/Assets/AddressableAssetsData/Android/addressables_content_state.bin new file mode 100644 index 00000000..bacf069c Binary files /dev/null and b/Assets/AddressableAssetsData/Android/addressables_content_state.bin differ diff --git a/Assets/AddressableAssetsData/Android/addressables_content_state.bin.meta b/Assets/AddressableAssetsData/Android/addressables_content_state.bin.meta new file mode 100644 index 00000000..298d3c58 --- /dev/null +++ b/Assets/AddressableAssetsData/Android/addressables_content_state.bin.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3977ac8aeca6a7342901ef341d55891d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset new file mode 100644 index 00000000..45ba2259 --- /dev/null +++ b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8de3d32f69bdd89cd640986e03089048c2254d92b7067f6d649e084d360fdfb +size 917 diff --git a/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta new file mode 100644 index 00000000..49e85113 --- /dev/null +++ b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 59fa770367ea1e247bb76f22eab57a75 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DefaultVolumeProfile.asset b/Assets/DefaultVolumeProfile.asset index 08c46a75..f622fe68 100644 --- a/Assets/DefaultVolumeProfile.asset +++ b/Assets/DefaultVolumeProfile.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f15d4b4de327fcea274fd7fff2afa3f5907697948de0998f0c72fd63a462a93e -size 30877 +oid sha256:7db5709980ff11921a02cfd4c1dfb605883fad1b9512a7905d96307c395d4da4 +size 30871 diff --git a/Assets/FR2_Cache.asset b/Assets/FR2_Cache.asset index e691b902..45f1ea7e 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:4dd4c135e6f362a49f7315955737baa5cf9a8ba1898022474e6ed7b72a8bf6ec -size 8581242 +oid sha256:2b2bde799fdd9d45e07e8f4cbd69a1771939e1740a3693f8db93dcb94b9b9ec7 +size 8544933 diff --git a/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Distortion/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Distortion/Beatmap.bytes index 2a42d75d..b53ac3f1 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Distortion/Beatmap.bytes and b/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Distortion/Beatmap.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Distortion/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Distortion/CommandScripts.bytes index dc09725f..da9b6448 100644 --- a/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Distortion/CommandScripts.bytes +++ b/Assets/Resources/Beatmaps/Chapter0/Fate of Fear/Distortion/CommandScripts.bytes @@ -1 +1 @@ -(x5f^ %d~QF O(DӶH#s? ':)8ᐚGtK"Mس݃"dg֑"';y fE4m)#\gܼ=b]UzP~{%:F "Hidden/Custom/Pixelate"; @@ -32,11 +35,11 @@ namespace SLSUtilities.Rendering.PostProcessing { if (material == null) return; - cmd.SetGlobalFloat(InternalShaderHelpers.ID._PixelateStrengthX, strengthX.value); - cmd.SetGlobalFloat(InternalShaderHelpers.ID._PixelateStrengthY, strengthY.value); + cmd.SetGlobalFloat(InternalShaderHelpers.ID._PixelateStrengthX, Mathf.Clamp01(strengthX.value)); + cmd.SetGlobalFloat(InternalShaderHelpers.ID._PixelateStrengthY, Mathf.Clamp01(strengthY.value)); // 使用你的统一管家分发的 Blitter 进行优雅渲染 Blitter.BlitCameraTexture(cmd, source, destination, material, 0); } } -} \ No newline at end of file +} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 9e97b6b9..e6feffa3 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e09a11b73259f9a19926cfe167319440ba950a30bd2fa76ee5daac0c41945757 -size 29333 +oid sha256:98070dc3faf2c78cc7ecd30a9ae94234da040e23f97124f83b0ce8ee09f0d877 +size 29405 diff --git a/ProjectSettings/ScriptableBuildPipeline.json b/ProjectSettings/ScriptableBuildPipeline.json new file mode 100644 index 00000000..dfa4f083 --- /dev/null +++ b/ProjectSettings/ScriptableBuildPipeline.json @@ -0,0 +1,14 @@ +{ + "useBuildCacheServer": false, + "cacheServerHost": "", + "cacheServerPort": 8126, + "threadedArchiving": true, + "logCacheMiss": false, + "logAssetWarnings": true, + "slimWriteResults": true, + "maximumCacheSize": 20, + "useDetailedBuildLog": false, + "useV2Hasher": true, + "fileIDHashSeed": 0, + "prefabPackedHeaderSize": 2 +} \ No newline at end of file diff --git a/UserSettings/Layouts/default-6000.dwlt b/UserSettings/Layouts/default-6000.dwlt index 853c9fb7..70db7835 100644 --- a/UserSettings/Layouts/default-6000.dwlt +++ b/UserSettings/Layouts/default-6000.dwlt @@ -262,7 +262,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: @@ -271,16 +271,16 @@ MonoBehaviour: y: 513.3333 width: 1195.3334 height: 300 - m_MinSize: {x: 101, y: 126} - m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 19} + m_MinSize: {x: 231, y: 276} + m_MaxSize: {x: 10001, y: 10026} + m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} - {fileID: 19} - {fileID: 20} - {fileID: 21} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -332,7 +332,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 42.666668 + y: 0 width: 1706.6666 height: 36 m_SerializedDataModeController: @@ -717,7 +717,7 @@ MonoBehaviour: height: 720 m_MinimalGUI: 1 m_defaultScale: 0.64768517 - m_LastWindowPixelSize: {x: 1384.0001, y: 731} + m_LastWindowPixelSize: {x: 922.66675, y: 487.3333} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -747,7 +747,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 78.66667 + y: 24 width: 269.66666 height: 487.3333 m_SerializedDataModeController: @@ -770,27 +770,15 @@ MonoBehaviour: m_LastClickedID: m_Data: 0 m_ExpandedIDs: - - m_Data: -90416 - - m_Data: -90342 - - m_Data: -90336 - - m_Data: -65648 - - m_Data: -61864 - - m_Data: -61850 - - m_Data: -61846 - - m_Data: -61842 - - m_Data: -61836 - - m_Data: -61828 - - m_Data: -61816 - - m_Data: -59336 - - m_Data: -41986 - - m_Data: -41980 - - m_Data: -13506 - - m_Data: -10978 + - m_Data: -13608 + - m_Data: -13180 + - m_Data: -10902 + - m_Data: -8312 - m_Data: -1338 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: DTM_CircleSpinTrails(Clone) - m_OriginalName: DTM_CircleSpinTrails(Clone) + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 @@ -798,10 +786,10 @@ MonoBehaviour: width: 0 height: 0 m_UserData: - m_Data: -90342 + 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} @@ -834,8 +822,8 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 270.6667 - y: 78.66667 + x: 271.66666 + y: 24 width: 922.66675 height: 487.3333 m_SerializedDataModeController: @@ -1556,11 +1544,11 @@ MonoBehaviour: m_Rotation: m_Target: {x: -0.23046315, y: 0.41502702, z: -0.10957123, w: -0.8734504} speed: 2 - m_Value: {x: -0.23054008, y: 0.41409498, z: -0.109325305, w: -0.87374175} + m_Value: {x: -0.23046315, y: 0.41502702, z: -0.10957123, w: -0.8734504} m_Size: m_Target: 324.6959 speed: 2 - m_Value: 310.71378 + m_Value: 324.6959 m_Ortho: m_Target: 0 speed: 2 @@ -1724,7 +1712,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 592 + y: 537.3333 width: 1194.3334 height: 274 m_SerializedDataModeController: @@ -1751,7 +1739,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Packages/com.unity.visualscripting/Editor/VisualScripting.Core/Plugins + - Assets/Resources/Beatmaps/Chapter0/Space Rain/Special m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1761,27 +1749,20 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Packages/com.unity.visualscripting/Editor/VisualScripting.Core/Plugins + - Assets/Resources/Beatmaps/Chapter0/Space Rain/Special m_LastFoldersGridSize: 16 m_LastProjectPath: D:\Projects\ichni Official m_LockTracker: m_IsLocked: 0 m_LastLocalAssetsSearchArea: 1 m_FolderTreeState: - scrollPos: {x: 0, y: 3714} + scrollPos: {x: 0, y: 802} m_SelectedIDs: - - m_Data: 108238 + - m_Data: 82862 m_LastClickedID: - m_Data: 108238 + m_Data: 82862 m_ExpandedIDs: - m_Data: 0 - - m_Data: 82164 - - m_Data: 82166 - - m_Data: 82168 - - m_Data: 82170 - - m_Data: 82172 - - m_Data: 82174 - - m_Data: 82176 - m_Data: 82178 - m_Data: 82180 - m_Data: 82182 @@ -1868,15 +1849,25 @@ MonoBehaviour: - m_Data: 82344 - m_Data: 82346 - m_Data: 82348 - - m_Data: 82828 - - m_Data: 82886 - - m_Data: 82888 - - m_Data: 82934 - - m_Data: 82938 - - m_Data: 82962 - - m_Data: 108240 - - m_Data: 1000000000 - - m_Data: 2147483647 + - 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: 82380 + - m_Data: 82382 + - m_Data: 82384 + - m_Data: 82386 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1909,13 +1900,6 @@ MonoBehaviour: m_Data: 0 m_ExpandedIDs: - m_Data: 0 - - m_Data: 82164 - - m_Data: 82166 - - m_Data: 82168 - - m_Data: 82170 - - m_Data: 82172 - - m_Data: 82174 - - m_Data: 82176 - m_Data: 82178 - m_Data: 82180 - m_Data: 82182 @@ -2002,6 +1986,25 @@ MonoBehaviour: - 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: 82380 + - m_Data: 82382 + - m_Data: 82384 + - m_Data: 82386 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -2028,10 +2031,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - - m_Data: 48546 - m_LastClickedInstanceID: 48546 - m_HadKeyboardFocusLastEvent: 0 + m_SelectedInstanceIDs: [] + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: - m_Data: 0 - m_Data: 80838 @@ -2209,8 +2211,8 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 1195.3334 - y: 78.66667 + x: 1196.3334 + y: 24 width: 510.33325 height: 787.3333 m_SerializedDataModeController: