diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 00000000..ddb6ff85 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "visualstudiotoolsforunity.vstuc" + ] +} diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..da60e25a --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,10 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Attach to Unity", + "type": "vstuc", + "request": "attach" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..47146fcd --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,71 @@ +{ + "files.exclude": { + "**/.DS_Store": true, + "**/.git": true, + "**/.vs": true, + "**/.gitmodules": true, + "**/.vsconfig": true, + "**/*.booproj": true, + "**/*.pidb": true, + "**/*.suo": true, + "**/*.user": true, + "**/*.userprefs": true, + "**/*.unityproj": true, + "**/*.dll": true, + "**/*.exe": true, + "**/*.pdf": true, + "**/*.mid": true, + "**/*.midi": true, + "**/*.wav": true, + "**/*.gif": true, + "**/*.ico": true, + "**/*.jpg": true, + "**/*.jpeg": true, + "**/*.png": true, + "**/*.psd": true, + "**/*.tga": true, + "**/*.tif": true, + "**/*.tiff": true, + "**/*.3ds": true, + "**/*.3DS": true, + "**/*.fbx": true, + "**/*.FBX": true, + "**/*.lxo": true, + "**/*.LXO": true, + "**/*.ma": true, + "**/*.MA": true, + "**/*.obj": true, + "**/*.OBJ": true, + "**/*.asset": true, + "**/*.cubemap": true, + "**/*.flare": true, + "**/*.mat": true, + "**/*.meta": true, + "**/*.prefab": true, + "**/*.unity": true, + "build/": true, + "Build/": true, + "Library/": true, + "library/": true, + "obj/": true, + "Obj/": true, + "Logs/": true, + "logs/": true, + "ProjectSettings/": true, + "UserSettings/": true, + "temp/": true, + "Temp/": true + }, + "files.associations": { + "*.asset": "yaml", + "*.meta": "yaml", + "*.prefab": "yaml", + "*.unity": "yaml", + }, + "explorer.fileNesting.enabled": true, + "explorer.fileNesting.patterns": { + "*.sln": "*.csproj", + "*.slnx": "*.csproj" + }, + "dotnet.defaultSolution": "ichni_Official.slnx" +} \ No newline at end of file diff --git a/Assets/AmplifyShaderEditor/Examples/Built-In Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Built-In Samples.unitypackage.meta deleted file mode 100644 index ee1d5e40..00000000 --- a/Assets/AmplifyShaderEditor/Examples/Built-In Samples.unitypackage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e00e6f90ab8233e46a41c5e33917c642 -timeCreated: 1585839223 -licenseType: Store -DefaultImporter: - 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 59379f1b..00000000 --- a/Assets/AmplifyShaderEditor/Examples/HDRP Samples.unitypackage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d1c0b77896049554fa4b635531caf741 -timeCreated: 1533059192 -licenseType: Store -DefaultImporter: - 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 2de62af1..00000000 --- a/Assets/AmplifyShaderEditor/Examples/Sample Resources.unitypackage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c0a0a980c9ba86345bc15411db88d34f -timeCreated: 1585839223 -licenseType: Store -DefaultImporter: - 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 10f67fac..00000000 --- a/Assets/AmplifyShaderEditor/Examples/URP Samples.unitypackage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a9d68dd8913f05d4d9ce75e7b40c6044 -timeCreated: 1575902011 -licenseType: Store -DefaultImporter: - 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/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/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/Android/gradleTemplate.properties b/Assets/Plugins/Android/gradleTemplate.properties new file mode 100644 index 00000000..87046809 --- /dev/null +++ b/Assets/Plugins/Android/gradleTemplate.properties @@ -0,0 +1,8 @@ +org.gradle.jvmargs=-Xmx**JVM_HEAP_SIZE**M +org.gradle.parallel=true +unityStreamingAssets=**STREAMING_ASSETS** +# Android Resolver Properties Start +android.useAndroidX=true +android.enableJetifier=true +# Android Resolver Properties End +**ADDITIONAL_PROPERTIES** diff --git a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 15x.unitypackage.meta b/Assets/Plugins/Android/gradleTemplate.properties.meta similarity index 74% rename from Assets/AmplifyShaderEditor/Examples/HDRP Samples 15x.unitypackage.meta rename to Assets/Plugins/Android/gradleTemplate.properties.meta index 3c5ca728..78e9e02d 100644 --- a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 15x.unitypackage.meta +++ b/Assets/Plugins/Android/gradleTemplate.properties.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 641c955d37d2fac4f87e00ac5c9d9bd8 +guid: 2f011dc9caa295e4ba52ccf2f88914df DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle new file mode 100644 index 00000000..8ae26caa --- /dev/null +++ b/Assets/Plugins/Android/mainTemplate.gradle @@ -0,0 +1,62 @@ +apply plugin: 'com.android.library' +apply from: '../shared/keepUnitySymbols.gradle' +apply from: '../shared/common.gradle' +**APPLY_PLUGINS** + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) +// Android Resolver Dependencies Start + implementation 'com.taptap.sdk:tap-core-unity:4.5.4' // Packages/com.taptap.sdk.core/Mobile/Editor/NativeDependencies.xml:7 + implementation 'com.taptap.sdk:tap-login-unity:4.5.4' // Packages/com.taptap.sdk.login/Mobile/Editor/NativeDependencies.xml:7 +// Android Resolver Dependencies End +**DEPS**} + +// Android Resolver Exclusions Start +android { + packagingOptions { + exclude ('/lib/armeabi/*' + '*') + exclude ('/lib/mips/*' + '*') + exclude ('/lib/mips64/*' + '*') + exclude ('/lib/x86/*' + '*') + exclude ('/lib/x86_64/*' + '*') + } +} +// Android Resolver Exclusions End +android { + namespace "com.unity3d.player" + ndkPath "**NDKPATH**" + ndkVersion "**NDKVERSION**" + + compileSdk **APIVERSION** + buildToolsVersion = "**BUILDTOOLS**" + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + defaultConfig { + minSdk **MINSDK** + targetSdk **TARGETSDK** + ndk { + abiFilters **ABIFILTERS** + debugSymbolLevel **DEBUGSYMBOLLEVEL** + } + versionCode **VERSIONCODE** + versionName '**VERSIONNAME**' + consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD** +**DEFAULT_CONFIG_SETUP** + } + + lint { + abortOnError false + } + + androidResources { + noCompress = **BUILTIN_NOCOMPRESS** + unityStreamingAssets.tokenize(', ') + ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~" + }**PACKAGING** +} +**IL_CPP_BUILD_SETUP** +**SOURCE_BUILD_SETUP** +**EXTERNAL_SOURCES** diff --git a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 10x.unitypackage.meta b/Assets/Plugins/Android/mainTemplate.gradle.meta similarity index 74% rename from Assets/AmplifyShaderEditor/Examples/HDRP Samples 10x.unitypackage.meta rename to Assets/Plugins/Android/mainTemplate.gradle.meta index d4db3873..ccddc97f 100644 --- a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 10x.unitypackage.meta +++ b/Assets/Plugins/Android/mainTemplate.gradle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9da5530d5ebfab24c8ecad68795e720f +guid: 655395b375b4d6a42912b6dcb6975d5a DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/Android/settingsTemplate.gradle b/Assets/Plugins/Android/settingsTemplate.gradle new file mode 100644 index 00000000..968dbfd1 --- /dev/null +++ b/Assets/Plugins/Android/settingsTemplate.gradle @@ -0,0 +1,30 @@ +pluginManagement { + repositories { + **ARTIFACTORYREPOSITORY** + gradlePluginPortal() + google() + mavenCentral() + } +} + +include ':launcher', ':unityLibrary' +**INCLUDES** + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS) + repositories { + **ARTIFACTORYREPOSITORY** + google() + mavenCentral() +// Android Resolver Repos Start + def unityProjectPath = $/file:///**DIR_UNITYPROJECT**/$.replace("\\", "/") + maven { + url "https://repo.maven.apache.org/maven2" // Packages/com.taptap.sdk.core/Mobile/Editor/NativeDependencies.xml:6, Packages/com.taptap.sdk.login/Mobile/Editor/NativeDependencies.xml:6 + } + mavenLocal() +// Android Resolver Repos End + flatDir { + dirs "${project(':unityLibrary').projectDir}/libs" + } + } +} diff --git a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 12x.unitypackage.meta b/Assets/Plugins/Android/settingsTemplate.gradle.meta similarity index 74% rename from Assets/AmplifyShaderEditor/Examples/HDRP Samples 12x.unitypackage.meta rename to Assets/Plugins/Android/settingsTemplate.gradle.meta index c3c98f27..9cf0f85c 100644 --- a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 12x.unitypackage.meta +++ b/Assets/Plugins/Android/settingsTemplate.gradle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aa102d640b98b5d4781710a3a3dd6983 +guid: 118024034a116824492c045e4ed76102 DefaultImporter: externalObjects: {} userData: 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/AmplifyShaderEditor/Examples/HDRP Samples 14x.unitypackage.meta b/Assets/Plugins/iOS.meta similarity index 67% rename from Assets/AmplifyShaderEditor/Examples/HDRP Samples 14x.unitypackage.meta rename to Assets/Plugins/iOS.meta index ba827d29..55660f98 100644 --- a/Assets/AmplifyShaderEditor/Examples/HDRP Samples 14x.unitypackage.meta +++ b/Assets/Plugins/iOS.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 7a0bb33169d95ec499136d59cb25918b +guid: 10881d2adadf8ec4b98d2d82ac5aeced +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/iOS/Resource.meta b/Assets/Plugins/iOS/Resource.meta new file mode 100644 index 00000000..47a90839 --- /dev/null +++ b/Assets/Plugins/iOS/Resource.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4c5a6a4ceeed31244bc9f461a3d7ed74 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/iOS/Resource/TDS-Info.plist b/Assets/Plugins/iOS/Resource/TDS-Info.plist new file mode 100644 index 00000000..05eba1f3 --- /dev/null +++ b/Assets/Plugins/iOS/Resource/TDS-Info.plist @@ -0,0 +1,11 @@ + + + + + taptap + + client_id + hkbfpbh2jv2kbxupmo + + + \ No newline at end of file diff --git a/Assets/Plugins/iOS/Resource/TDS-Info.plist.meta b/Assets/Plugins/iOS/Resource/TDS-Info.plist.meta new file mode 100644 index 00000000..74fb58eb --- /dev/null +++ b/Assets/Plugins/iOS/Resource/TDS-Info.plist.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2e16439f3c8742e290813744436c8547 +timeCreated: 1777006961 \ No newline at end of file diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index 00d362fd..e3739cd4 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -18735,6 +18735,59 @@ RectTransform: m_AnchoredPosition: {x: 64.99996, y: 393} m_SizeDelta: {x: 980, y: 50} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1644203569 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1644203571} + - component: {fileID: 1644203570} + m_Layer: 0 + m_Name: ThirdPartyService + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1644203570 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1644203569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 656278590545491483e2e888078b504e, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Online.Logic.ThirdPartyServiceManager + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] +--- !u!4 &1644203571 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1644203569} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 224.24973, y: 0, z: 3.18235} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1647879290 GameObject: m_ObjectHideFlags: 0 @@ -30046,3 +30099,4 @@ SceneRoots: - {fileID: 2081546315} - {fileID: 1067413317} - {fileID: 325881262} + - {fileID: 1644203571} diff --git a/Assets/Scripts/Online.meta b/Assets/Scripts/Online.meta new file mode 100644 index 00000000..5c6135ef --- /dev/null +++ b/Assets/Scripts/Online.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8cd5753e721a43d49cb651f2c5479bac +timeCreated: 1777005537 \ No newline at end of file diff --git a/Assets/Scripts/Online/Logic.meta b/Assets/Scripts/Online/Logic.meta new file mode 100644 index 00000000..0614e170 --- /dev/null +++ b/Assets/Scripts/Online/Logic.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a90bb157de744750b0c7ca5b7f8b21ba +timeCreated: 1777007121 \ No newline at end of file diff --git a/Assets/Scripts/Online/Logic/ThirdPartyServiceManager.cs b/Assets/Scripts/Online/Logic/ThirdPartyServiceManager.cs new file mode 100644 index 00000000..5253982f --- /dev/null +++ b/Assets/Scripts/Online/Logic/ThirdPartyServiceManager.cs @@ -0,0 +1,68 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Ichni.RhythmGame; +using Sirenix.OdinInspector; +using TapSDK.Core; +using TapSDK.Login; +using UnityEngine; + +namespace Online.Logic +{ + public class ThirdPartyServiceManager:SerializedMonoBehaviour + { + public static ThirdPartyServiceManager Instance { get; private set; } = null!; + + private void Awake() + { + if (Instance != null) + { + Destroy(gameObject); + return; + } + + Instance = this; + DontDestroyOnLoad(gameObject); + } + + private void Start() + { + // 核心配置 详细参数见 [TapTapSDK] + TapTapSdkOptions coreOptions = new TapTapSdkOptions() + { + clientId = "hkbfpbh2jv2kbxupmo", + clientToken = "Cry8OrA9EmfAetgu1RduPrWntgba2Qt44uC5tfEB", + region = TapTapRegionType.Overseas, + preferredLanguage = TapTapLanguageType.en, + enableLog = true + }; + // TapSDK 初始化 + TapTapSDK.Init(coreOptions); + TapTapLoginTest(); + } + + async Task TapTapLoginTest() + { + try + { + // 定义授权范围 + List scopes = new List + { + TapTapLogin.TAP_LOGIN_SCOPE_PUBLIC_PROFILE, + TapTapLogin.TAP_LOGIN_SCOPE_EMAIL + }; + // 发起 Tap 登录 + var userInfo = await TapTapLogin.Instance.LoginWithScopes(scopes.ToArray()); + Debug.Log($"登录成功，当前用户 ID：{JsonUtility.ToJson(userInfo.accessToken)}"); + } + catch (TaskCanceledException) + { + Debug.Log("用户取消登录"); + } + catch (Exception exception) + { + Debug.Log($"登录失败，出现异常：{exception}"); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Online/Logic/ThirdPartyServiceManager.cs.meta b/Assets/Scripts/Online/Logic/ThirdPartyServiceManager.cs.meta new file mode 100644 index 00000000..8e667f42 --- /dev/null +++ b/Assets/Scripts/Online/Logic/ThirdPartyServiceManager.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 656278590545491483e2e888078b504e +timeCreated: 1777007160 \ No newline at end of file diff --git a/Assets/Scripts/Online/Models.meta b/Assets/Scripts/Online/Models.meta new file mode 100644 index 00000000..5c05cfaf --- /dev/null +++ b/Assets/Scripts/Online/Models.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: bac26c98fb9d45778f0a351adbbb33e8 +timeCreated: 1777005546 \ No newline at end of file diff --git a/Assets/Scripts/Online/Models/OnlineEnumeration.cs b/Assets/Scripts/Online/Models/OnlineEnumeration.cs new file mode 100644 index 00000000..f6b58f73 --- /dev/null +++ b/Assets/Scripts/Online/Models/OnlineEnumeration.cs @@ -0,0 +1,48 @@ +namespace Online.Models +{ + public enum UserPermission + { + Guest = 0, + Player = 1, + Admin = 2 + } + + public enum BeatmapStatus + { + /// + /// 已发布并且可用 + /// + Public = 0, + /// + /// 未发布 + /// + Private = 1, + /// + /// 定时发布 + /// + Scheduled = 2, + } + + /// + /// 游戏将要发布的平台 + /// + public enum GamePublishPlatform + { + TapTapInternational = 0, + GooglePlay = 1, + AppStore = 2, + Steam = 3 + } + + public enum ThirdPartyDataStatus + { + /// + /// 等待用户注册或绑定账号/用户删除等情况 + /// + Unavailable = 0, + /// + /// 正常可用 + /// + Available = 1 + } +} \ No newline at end of file diff --git a/Assets/Scripts/Online/Models/OnlineEnumeration.cs.meta b/Assets/Scripts/Online/Models/OnlineEnumeration.cs.meta new file mode 100644 index 00000000..3d7764b3 --- /dev/null +++ b/Assets/Scripts/Online/Models/OnlineEnumeration.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 861c1de6a1154e3fa51b1d28f79ff932 +timeCreated: 1777005936 \ No newline at end of file diff --git a/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset b/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset index 28a0076c..a96901e1 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:1cb80e3125f963a32dd3373ef7cf8255d30a78cd6c1b02bc2f9f26527e25108b -size 60777 +oid sha256:9130525958951ddcda5dba2e3174ed49fc988aa5f8bef0a9988bf9eca6025b4d +size 60801 diff --git a/Assets/WwiseSettings.xml b/Assets/WwiseSettings.xml index dc5c29cb..416963fc 100644 --- a/Assets/WwiseSettings.xml +++ b/Assets/WwiseSettings.xml @@ -1,20 +1,29 @@ - - - true - false - Audio/GeneratedSoundBanks - true - true - true - true - true - true - - D:\Wwise\Wwise2024.1.9.8920 - ../../ichni Official/ichni Official_WwiseProject/ichni Official_WwiseProject.wproj - true - 8080 - 127.0.0.1 - 10 - 0 + + + true + false + Audio/GeneratedSoundBanks + true + true + true + true + true + true + true + + D:\Wwise\Wwise2024.1.9.8920 + ../ichni Official_WwiseProject/ichni Official_WwiseProject.wproj + true + 8080 + 127.0.0.1 + false + true + https://github.com/audiokinetic/WwiseUnityAddressables.git#v24.1.9 + WwiseData/Bank + false + Assets/AddressableAssetsData/DataBuilders/BuildScriptWwisePacked.asset + false + WwiseData/Bank + 10 + 0 \ No newline at end of file diff --git a/Packages/manifest.json b/Packages/manifest.json index 465d900c..95c9c427 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,7 @@ { "dependencies": { + "com.taptap.sdk.core": "4.5.4", + "com.taptap.sdk.login": "4.10.0", "com.unity.burst": "1.8.27", "com.unity.collab-proxy": "2.11.3", "com.unity.collections": "2.6.2", @@ -9,6 +11,7 @@ "com.unity.ide.visualstudio": "2.0.26", "com.unity.inputsystem": "1.18.0", "com.unity.multiplayer.center": "1.0.1", + "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.render-pipelines.universal": "17.3.0", "com.unity.test-framework": "1.6.0", "com.unity.timeline": "1.8.10", @@ -48,5 +51,21 @@ "com.unity.modules.vr": "1.0.0", "com.unity.modules.wind": "1.0.0", "com.unity.modules.xr": "1.0.0" - } + }, + "scopedRegistries": [ + { + "name": "package.openupm.com", + "url": "https://package.openupm.com", + "scopes": [ + "com.google.external-dependency-manager" + ] + }, + { + "name": "NPMJS", + "url": "https://registry.npmjs.org/", + "scopes": [ + "com.taptap" + ] + } + ] } diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml new file mode 100644 index 00000000..5c089657 --- /dev/null +++ b/ProjectSettings/AndroidResolverDependencies.xml @@ -0,0 +1,24 @@ + + + com.taptap.sdk:tap-core-unity:4.5.4 + com.taptap.sdk:tap-login-unity:4.5.4 + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ProjectSettings/GvhProjectSettings.xml b/ProjectSettings/GvhProjectSettings.xml new file mode 100644 index 00000000..98c84d90 --- /dev/null +++ b/ProjectSettings/GvhProjectSettings.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/ichni Official_WwiseProject/.cache/LMDB/data.mdb b/ichni Official_WwiseProject/.cache/LMDB/data.mdb index 692096fa..ea27c4f1 100644 Binary files a/ichni Official_WwiseProject/.cache/LMDB/data.mdb and b/ichni Official_WwiseProject/.cache/LMDB/data.mdb differ diff --git a/ichni Official_WwiseProject/ichni Official_WwiseProject.user.validationcache b/ichni Official_WwiseProject/ichni Official_WwiseProject.user.validationcache new file mode 100644 index 00000000..4f4f9170 --- /dev/null +++ b/ichni Official_WwiseProject/ichni Official_WwiseProject.user.validationcache @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ichni Official_WwiseProject/ichni Official_WwiseProject.user.wsettings b/ichni Official_WwiseProject/ichni Official_WwiseProject.user.wsettings new file mode 100644 index 00000000..0ae61f2b --- /dev/null +++ b/ichni Official_WwiseProject/ichni Official_WwiseProject.user.wsettings @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + GeneratedSoundBanks\iOS\ + GeneratedSoundBanks\Android\ + GeneratedSoundBanks\Mac\ + GeneratedSoundBanks\Windows\ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GeneratedSoundBanks\iOS\ + GeneratedSoundBanks\Android\ + GeneratedSoundBanks\Mac\ + GeneratedSoundBanks\Windows\ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ichni Official_WwiseProject/ichni Official_WwiseProject.wproj b/ichni Official_WwiseProject/ichni Official_WwiseProject.wproj index 8af97f5b..eb848820 100644 --- a/ichni Official_WwiseProject/ichni Official_WwiseProject.wproj +++ b/ichni Official_WwiseProject/ichni Official_WwiseProject.wproj @@ -25,17 +25,18 @@ - GeneratedSoundBanks\iOS\ - GeneratedSoundBanks\Android\ - GeneratedSoundBanks\Mac\ - GeneratedSoundBanks\Windows\ + GeneratedSoundBanks\iOS + GeneratedSoundBanks\Android + GeneratedSoundBanks\Mac + GeneratedSoundBanks\Windows + - + GeneratedSoundBanks\iOS\ @@ -78,6 +79,10 @@ + + + +