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

Browse Source

# 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

...

This commit is contained in:

stevesensei

2026-06-15 12:44:31 +08:00

parent 379ac3fbd2 00c4432007

commit 69ce880d05

79 changed files with 720 additions and 378 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset LFS

Binary file not shown.