Merge branch 'dev_20240625'

Browse Source

...

This commit is contained in:

xiekaidong 2024-06-24 15:06:32 +08:00

parent b29592f4ba f7e06bbbb0

commit 7736db2fd8

10 changed files with 243 additions and 269 deletions

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

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

BIN

Assets/lua/app/config/activity.lua.bytes

Binary file not shown.

BIN

Assets/lua/app/config/activity_boss_rush_rank.lua.bytes

Binary file not shown.

BIN

Assets/lua/app/config/activity_bounty_level.lua.bytes

Binary file not shown.

21

Assets/lua/app/config/activity_exchange.lua.bytes

File diff suppressed because one or more lines are too long

38

Assets/lua/app/config/activity_rank.lua.bytes

File diff suppressed because one or more lines are too long

BIN

Assets/lua/app/config/arena_bounty_level.lua.bytes

Binary file not shown.

BIN

Assets/lua/app/config/arena_rank.lua.bytes

Binary file not shown.

BIN

Assets/lua/app/config/arena_time.lua.bytes

Binary file not shown.

453

Assets/lua/app/config/bounty_level.lua.bytes

File diff suppressed because one or more lines are too long

BIN

Assets/lua/app/config/bounty_time.lua.bytes

Binary file not shown.