CloudJ
|
0faa73f5f2
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-29 15:38:15 +08:00 |
|
CloudJ
|
81fe73352d
|
商城开启条件
|
2023-05-29 15:38:13 +08:00 |
|
chenxi
|
71b9dd23a1
|
解锁逻辑
|
2023-05-29 15:19:24 +08:00 |
|
CloudJ
|
2fffb5c88a
|
商城
|
2023-05-29 15:10:04 +08:00 |
|
chenxi
|
d47baeebc1
|
调整一下英雄解锁的逻辑
|
2023-05-29 15:06:25 +08:00 |
|
CloudJ
|
8cc59343b7
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-29 14:05:35 +08:00 |
|
CloudJ
|
f8a4bf7935
|
多语言
|
2023-05-29 14:05:32 +08:00 |
|
chenxi
|
6c4e4da30a
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-29 12:01:54 +08:00 |
|
chenxi
|
a68579db48
|
修复任务bug
|
2023-05-29 12:01:46 +08:00 |
|
xiekaidong
|
5d92a06f2f
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-29 11:20:03 +08:00 |
|
xiekaidong
|
28cebc3702
|
引导表现
|
2023-05-29 11:20:00 +08:00 |
|
chenxi
|
e99af16f39
|
从任务跳转去战令，如果没有购买一定要弹出购买界面
|
2023-05-29 11:15:30 +08:00 |
|
CloudJ
|
8ed5c657b1
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/module/maincity/maincity_const.lua
|
2023-05-29 11:04:25 +08:00 |
|
CloudJ
|
792830c90e
|
首充礼包
|
2023-05-29 11:03:43 +08:00 |
|
chenxi
|
5ab6aac2b6
|
代码重命名
|
2023-05-29 10:54:10 +08:00 |
|
chenxi
|
b76db94a30
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-26 22:43:46 +08:00 |
|
chenxi
|
66c0f4810f
|
战令滑动区域
|
2023-05-26 22:43:43 +08:00 |
|
CloudJ
|
d53e491175
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-26 19:57:16 +08:00 |
|
CloudJ
|
c106607a65
|
成长礼包逻辑
|
2023-05-26 19:57:13 +08:00 |
|
chenxi
|
dc96cf269e
|
调整侧标栏按钮位置
|
2023-05-26 19:25:41 +08:00 |
|
chenxi
|
7cfdc4a2f1
|
奖励图标
|
2023-05-26 18:47:31 +08:00 |
|
Fang
|
0288f2a300
|
boss界面模型比例适配
|
2023-05-26 18:39:07 +08:00 |
|
Fang
|
b57318f3a6
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
|
2023-05-26 18:26:21 +08:00 |
|
chenxi
|
fc16894571
|
英雄图标
|
2023-05-26 18:16:57 +08:00 |
|
Fang
|
858de8d1eb
|
每日挑战任务奖励
|
2023-05-26 18:00:46 +08:00 |
|
chenxi
|
280d6d2c07
|
七天乐进度显示
|
2023-05-26 17:33:29 +08:00 |
|
xiekaidong
|
944dfd1b5f
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-26 17:14:19 +08:00 |
|
xiekaidong
|
8eb1c39caf
|
bug修复
|
2023-05-26 17:13:41 +08:00 |
|
chenxi
|
4c8b21dc7a
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-26 17:01:19 +08:00 |
|
chenxi
|
3262bb7633
|
七天乐红点
|
2023-05-26 17:01:16 +08:00 |
|
xiekaidong
|
eb2e858213
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-26 15:46:19 +08:00 |
|
xiekaidong
|
77a9039092
|
多段伤害的更改
|
2023-05-26 15:46:15 +08:00 |
|
chenxi
|
45184588b4
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-26 15:44:59 +08:00 |
|
chenxi
|
fcd79434d1
|
七天乐按钮文本
|
2023-05-26 15:44:52 +08:00 |
|
CloudJ
|
ec6ce43f70
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/bi_report.lua
|
2023-05-26 15:44:50 +08:00 |
|
CloudJ
|
01922a4c0d
|
成长礼包
|
2023-05-26 15:44:35 +08:00 |
|
Fang
|
d473cbc537
|
提示逻辑补全
|
2023-05-26 15:43:01 +08:00 |
|
xiekaidong
|
7a87210ae3
|
局内任务显示
|
2023-05-26 15:43:01 +08:00 |
|
xiekaidong
|
4b5b0cfae2
|
每日挑战战斗界面
|
2023-05-26 15:43:01 +08:00 |
|
Fang
|
9d212aaf26
|
部分ui逻辑
|
2023-05-26 15:43:01 +08:00 |
|
xiekaidong
|
13d470ad5b
|
每日挑战战斗内部界面
|
2023-05-26 15:43:01 +08:00 |
|
xiekaidong
|
5c1307ad0d
|
一些数据和更新配置
|
2023-05-26 15:43:01 +08:00 |
|
Fang
|
9830ac3cbd
|
每日挑战
|
2023-05-26 15:42:35 +08:00 |
|
chenxi
|
8eccf012ba
|
七天乐
|
2023-05-26 15:38:55 +08:00 |
|
chenxi
|
0b6607d714
|
七天乐
|
2023-05-26 14:51:24 +08:00 |
|
chenxi
|
e552761eea
|
七天乐
|
2023-05-26 11:39:23 +08:00 |
|
CloudJ
|
9c87bbc5d7
|
助力礼包逻辑调整
|
2023-05-25 19:18:46 +08:00 |
|
CloudJ
|
8158609a45
|
修复一个拼写报错
|
2023-05-25 18:47:18 +08:00 |
|
CloudJ
|
6cbf391728
|
礼包逻辑调整
|
2023-05-25 18:18:08 +08:00 |
|
CloudJ
|
4d6bdbed51
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-25 17:31:00 +08:00 |
|