12 Commits

Author SHA1 Message Date
CloudJ
602cd716df Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/common/pay_manager.lua
2023-05-25 10:18:31 +08:00
chenxi
4212a80a4a 等级基金 2023-05-24 21:05:52 +08:00
CloudJ
5888ee766f 助力礼包 2023-05-24 17:26:52 +08:00
CloudJ
eb531423dd 章节礼包与新手礼包 2023-05-24 16:00:43 +08:00
CloudJ
ca51dddab2 章节礼包 2023-05-24 11:33:54 +08:00
chenxi
c95e0cb014 merge 2023-05-23 17:04:04 +08:00
chenxi
ee23cd83ad 金猪和邮件 2023-05-23 17:02:14 +08:00
CloudJ
13d53c5166 提一波 2023-05-23 14:17:29 +08:00
chenxi
32051d90c6 战令 2023-05-15 21:32:13 +08:00
xiekaidong
ce5d8a9832 日志打点 2023-04-26 18:12:49 +08:00
xiekaidong
ccdd6a778b 棋盘 2023-04-06 10:38:04 +08:00
xiekaidong
e30ad1dbd0 整理代码 2023-04-03 10:59:13 +08:00