97 Commits

Author SHA1 Message Date
Fang
c2843e5a88 完善细节 2023-07-03 18:34:51 +08:00
Fang
a522015156 逻辑补充 2023-06-28 18:36:53 +08:00
Fang
cd09e79bca 竞技场 2023-06-27 18:27:11 +08:00
Fang
f47a35f2e7 显示fix 2023-06-21 15:17:14 +08:00
chenxi
4c80f6ee3d 白名单和审核模式 2023-06-21 11:35:44 +08:00
chenxi
1e8aebf944 注释和删除中文 2023-06-20 20:18:11 +08:00
Fang
6e3c2523a5 英雄编队拆分出来 2023-06-20 11:02:45 +08:00
Fang
cbec901af5 玩家头像抽象成独立cell 2023-06-19 14:58:15 +08:00
Fang
f3924368ce 头像昵称功能 2023-06-19 10:57:39 +08:00
chenxi
d3bb4c3698 Merge branch 'dev_ios' into dev 2023-06-14 15:40:47 +08:00
Fang
a788b1cb8c ui资源补充替换 2023-06-13 16:16:18 +08:00
chenxi
d8b335daf5 支付转菊花 2023-06-12 22:19:11 +08:00
Fang
e4dad61f52 活动副本 2023-06-12 15:39:52 +08:00
chenxi
1461bc9d7f 调长一点 2023-06-06 18:40:49 +08:00
xiekaidong
4d6e578982 显示 2023-06-06 15:06:18 +08:00
CloudJ
9a5d42c753 音效 2023-06-06 11:08:37 +08:00
CloudJ
8b0a3dd24a 界面调整 2023-06-06 10:16:13 +08:00
chenxi
38b099a0ec 英雄展示界面 2023-06-05 10:24:26 +08:00
chenxi
40f09ed39f 战令界面 2023-06-04 22:31:11 +08:00
chenxi
e3e0b5c761 邮箱 2023-06-03 23:52:18 +08:00
CloudJ
5b667ffc0b 替换主界面 2023-06-02 19:32:39 +08:00
CloudJ
5f7a3e733b 商城UI替换 2023-06-01 21:09:06 +08:00
chenxi
51a60e0f1e 模块解锁 2023-05-31 20:53:57 +08:00
xiekaidong
ededa19132 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-31 18:06:18 +08:00
xiekaidong
4c4ae980dc bug修复 2023-05-31 18:06:16 +08:00
chenxi
bd4672641a 作弊相关 2023-05-31 17:58:07 +08:00
Fang
2b92ed0909 main界面模块切换逻辑重构 2023-05-31 14:40:08 +08:00
xiekaidong
19f2695c22 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-31 11:10:33 +08:00
xiekaidong
d4a1b5be93 描述修改 2023-05-31 11:10:29 +08:00
chenxi
ce822360d2 七天乐界面调整 2023-05-31 10:11:45 +08:00
CloudJ
0b6af4320d Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/common/module_manager.lua
2023-05-30 19:35:22 +08:00
CloudJ
3baef020b0 替换首充界面 2023-05-30 19:34:37 +08:00
xiekaidong
b7614062f0 boss入场动画 2023-05-30 17:42:02 +08:00
Fang
3880dfd3d2 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
#	lua/app/common/module_manager.lua
#	lua/app/config/buff_daily_challenge.lua
#	lua/app/config/chapter.lua
#	lua/app/config/hero.lua
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/skill.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/global.lua
2023-05-29 18:24:33 +08:00
CloudJ
2f15a426bc 更新配置表 2023-05-29 16:25:50 +08:00
Fang
b57318f3a6 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge 2023-05-26 18:26:21 +08:00
xiekaidong
cff917cac8 显示优化 2023-05-26 16:32:13 +08:00
Fang
9d212aaf26 部分ui逻辑 2023-05-26 15:43:01 +08:00
xiekaidong
5c1307ad0d 一些数据和更新配置 2023-05-26 15:43:01 +08:00
chenxi
0b6607d714 七天乐 2023-05-26 14:51:24 +08:00
chenxi
56a4f329c3 紧急 2023-05-25 17:05:55 +08:00
chenxi
fdc400fd8d 基金 2023-05-24 19:19:34 +08:00
chenxi
9e1cf32daa 修改英雄界面 2023-05-23 19:02:30 +08:00
CloudJ
38a9faffb6 提交一波 2023-05-23 16:37:01 +08:00
CloudJ
99fedebb96 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-22 16:14:47 +08:00
xiekaidong
528ac6a89b 技能tips 2023-05-22 15:59:17 +08:00
CloudJ
d1d0c736cb Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-22 09:59:08 +08:00
chenxi
a1cfb3d3c3 邮箱 2023-05-19 21:55:40 +08:00
CloudJ
52bd3a3167 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/global/global_const.lua
2023-05-19 20:03:48 +08:00
CloudJ
f04108a58d tmp 2023-05-19 20:03:28 +08:00