Merge remote-tracking branch 'refs/remotes/origin/taptap'

# Conflicts: # Assets/000_assets/material/M_SquareFrame 1.mat # Assets/FR2_Cache.asset # Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset # Packages/packages-lock.json # ProjectSettings/PackageManagerSettings.asset # ProjectSettings/ProjectSettings.asset # UserSettings/Layouts/CurrentMaximizeLayout.dwlt # UserSettings/Layouts/default-6000.dwlt # ichni Official_WwiseProject/.cache/SoundBankInfoCache.dat # ichni_Official.slnx
2026-06-15 12:44:31 +08:00
parent 379ac3fbd2 00c4432007
commit 69ce880d05
79 changed files with 720 additions and 378 deletions
--- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP
+++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 2243c8b4e1ab6914995699133f67ab5a
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP
+++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 9a5e61a8b3421b944863d0946e32da0a
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP
+++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 89f0b84148d149d4d96b838d7ef60e92
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP
+++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 19939ee2cdb76e0489b1b8cd4bed7f3d
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP
+++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 70777e8ce9f3c8d4a8182ca2f965cdb2
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP
+++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ba281a1a00c8ac54c914e0763299f637
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP
+++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: e6fc8948257acee42b666d0bfe1d782c
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP
+++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDRP
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 4b5cb8698f2d9c14fadf8e2383441d37
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP
+++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: b460b52e6c1feae45b70b7ddc2c45bd6
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP
+++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 57fcea0ed8b5eb347923c4c21fa31b57
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP
+++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 2e9da72e7e3196146bf7d27450013734
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP
+++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0904cdf24ddcd5042b024326476220d5
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP
+++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 929783250050f8a448821b6ca1f2c578
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP
+++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: fcc4d2eb0af82e546ae75506872cf092
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP
+++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: cd0a0171c5157b748afe763b89f71211
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP
+++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/URP
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f4990f6ace6142c4bbbf41cdd80b0bd3
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: