Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR

Browse Source

# Conflicts:
#	Assets/My project/Fonts/Pretendard-Black SDF.asset
#	Assets/My project/Inventory/Scripts/InventoryItemType.cs
#	Assets/My project/Inventory/Scripts/InventoryManager.cs
#	Assets/My project/test scene.unity
#	Packages/manifest.json
#	Packages/packages-lock.json
#	ProjectSettings/TagManager.asset

...

This commit is contained in:

aswew1538

2026-06-24 17:33:33 +09:00

parent d601161390 695f9b7a14

commit 24f5f729e4

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

Diff Content Not Available