179 Commits

Author SHA1 Message Date
CloudJ
74e2ecbb76 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/common/bi_report.lua
2023-05-23 14:17:44 +08:00
CloudJ
13d53c5166 提一波 2023-05-23 14:17:29 +08:00
chenxi
78e03328ce 邮件 2023-05-22 21:23:07 +08:00
CloudJ
46a2c52ca4 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/common/bi_report.lua
2023-05-22 17:50:24 +08:00
CloudJ
58de179979 每日特惠 2023-05-22 17:27:12 +08:00
xiekaidong
b56f68d102 显示修改 2023-05-22 16:51:51 +08:00
chenxi
e97c1cd4e9 玩家升级界面 2023-05-22 16:22:26 +08:00
chenxi
f18e16103c 邮箱 2023-05-22 11:36:26 +08:00
chenxi
a47b2bdf2c 先屏蔽金猪 2023-05-22 11:21:55 +08:00
chenxi
7552e3a946 sidebar 2023-05-19 23:10:28 +08:00
chenxi
deeeedbfaa 金猪 2023-05-19 23:02:02 +08:00
chenxi
b6da2f4bd6 挂机 2023-05-18 22:09:43 +08:00
chenxi
3cb5152538 挂机 2023-05-18 15:39:44 +08:00
chenxi
0289de2d9a merge 2023-05-17 22:28:26 +08:00
chenxi
84be3f721b 挂机 2023-05-17 22:27:58 +08:00
xiekaidong
d7bee9480c 宝箱显示 2023-05-17 20:17:56 +08:00
chenxi
8c2d9c26bb 多语言 2023-05-17 16:26:33 +08:00
chenxi
4a162302ff 主城战令显示 2023-05-16 22:39:23 +08:00
chenxi
dfc705fbe8 商城 2023-05-12 21:07:05 +08:00
chenxi
6369eab7f6 战令 2023-05-12 15:32:53 +08:00
chenxi
2a8dd6bbca 主城资源栏 2023-05-12 11:54:45 +08:00
chenxi
b5b1ad00e7 红点 2023-05-12 11:23:06 +08:00
chenxi
482e1a2127 任务 2023-05-11 18:20:10 +08:00
chenxi
df3a225ebd 任务 2023-05-09 17:41:27 +08:00
chenxi
8e590c242b 任务 2023-05-09 15:24:20 +08:00
chenxi
d930b3ded7 设置 2023-05-08 21:45:28 +08:00
xiekaidong
cb0e613e47 Merge branch 'dev' into net 2023-05-08 09:48:06 +08:00
xiekaidong
55ec0dd76c 联网 2023-05-08 09:47:58 +08:00
chenxi
ff6226a2df Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-06 11:34:43 +08:00
chenxi
04e6bdcfda 主城侧边栏 2023-05-06 11:34:41 +08:00
xiekaidong
5ee674bc60 界面宝箱调整 2023-05-06 10:04:32 +08:00
chenxi
5e2644ee6e 主城 2023-05-05 22:03:42 +08:00
chenxi
606ec1e5c0 缩进 2023-05-05 21:06:27 +08:00
chenxi
50a2ff4b9f 金猪 2023-05-05 14:59:02 +08:00
chenxi
be01873d54 金猪 2023-05-05 11:57:41 +08:00
chenxi
47cd13f4ad 一些系统代码 2023-05-05 10:32:50 +08:00
chenxi
fe18d54aa7 gm工具 2023-04-26 19:43:12 +08:00
xiekaidong
de21e5e1a8 界面调整和gm修改 2023-04-26 18:25:17 +08:00
xiekaidong
9e4db809a7 英雄升级红点 2023-04-26 11:43:16 +08:00
xiekaidong
e4c0ea6be5 主界面宝箱 2023-04-26 10:36:53 +08:00
xiekaidong
e085aad38f 进度条显示bug修复 2023-04-25 22:39:11 +08:00
xiekaidong
188ff47265 修改主界面 2023-04-24 17:38:22 +08:00
xiekaidong
d88f15e72f 动画 2023-04-24 17:20:51 +08:00
xiekaidong
2dc875d7d7 下边页签动效 2023-04-24 16:12:37 +08:00
xiekaidong
f465fa1435 bug修复 2023-04-24 11:29:16 +08:00
xiekaidong
0d0d0ca50b 宝箱修改 2023-04-24 11:21:26 +08:00
xiekaidong
a2001646f2 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-24 10:37:44 +08:00
xiekaidong
f83b482908 引导条件判断修改 2023-04-24 10:37:36 +08:00
chenxi
7508f219d2 体力 2023-04-24 10:30:40 +08:00
xiekaidong
664b2b2590 bug和显示优化 2023-04-23 17:22:11 +08:00