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/Fog/Core/Pipelines/Built-in
+++ b/Fog/Core/Pipelines/Built-in
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 1782b72cd0e99a54fac09382c482e3db
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/VFXs/BOXOPHOBIC/Atmospheric
+++ b/VFXs/BOXOPHOBIC/Atmospheric
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 49d5bcbbd4cbd754b98cf3200197b0f1
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/VFXs/BOXOPHOBIC/Atmospheric
+++ b/VFXs/BOXOPHOBIC/Atmospheric
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: eefe45a405f061045be947217e30ed10
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/VFXs/BOXOPHOBIC/Atmospheric
+++ b/VFXs/BOXOPHOBIC/Atmospheric
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 2e995dfe11e22d34d92432383d15c067
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/VFXs/BOXOPHOBIC/Atmospheric
+++ b/VFXs/BOXOPHOBIC/Atmospheric
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ec984c51d4ae2504184eeb292734c672
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/VFXs/BOXOPHOBIC/Atmospheric
+++ b/VFXs/BOXOPHOBIC/Atmospheric
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: e447b3d7d913d694ca35f74e30581840
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Fog/Core/Pipelines/Universal
+++ b/Fog/Core/Pipelines/Universal
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 6584a66582083a1459dcf5e4e87f6d62
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Fog/Core/Pipelines/Universal
+++ b/Fog/Core/Pipelines/Universal
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0190b8bde50f12943926613d9a63c89a
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Fog/Core/Pipelines/Universal
+++ b/Fog/Core/Pipelines/Universal
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ae2ce8ad295486349839288636aed1ed
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Fog/Core/Pipelines/Universal
+++ b/Fog/Core/Pipelines/Universal
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: d69745226619e3241a8e04ce86aee6a6
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Fog/Core/Pipelines/Universal
+++ b/Fog/Core/Pipelines/Universal
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 37e6a9374416bc946a55779c58d0d984
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: