xiekaidong 15cc2bd437 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev ...

# Conflicts:
#	lua/app/config/chapter_board.lua
#	lua/app/config/mail.lua.meta
#	lua/app/config/strings/cn/mail.lua.meta
#	lua/app/config/strings/de/mail.lua.meta
#	lua/app/config/strings/en/mail.lua.meta
#	lua/app/config/strings/fr/mail.lua.meta
#	lua/app/config/strings/ja/mail.lua.meta
#	lua/app/config/strings/ko/mail.lua.meta
#	lua/app/config/strings/zh/mail.lua.meta

2023-05-17 19:19:35 +08:00

..

app

Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev

2023-05-17 19:19:35 +08:00

app.meta

整理代码

2023-04-03 10:59:13 +08:00

main.lua

整理代码

2023-04-03 10:59:13 +08:00

main.lua.meta

整理代码

2023-04-03 10:59:13 +08:00