Merge branch 'master' of https://git.bobsong.cn/Game/Fishing2

Browse Source

# Conflicts:
#	Fishing2.sln.DotSettings.user
#	UserSettings/EditorUserSettings.asset

...

This commit is contained in:

BobSong

2025-05-30 20:39:20 +08:00

parent d152b5d000 dea58270fa

commit fcf41c3248

60 changed files with 1147 additions and 460 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/Resources/Fgui/Main/Main_fui.bytes

Binary file not shown.