xiekaidong
|
fe6994625c
|
bug修复
|
2023-05-29 20:56:46 +08:00 |
|
xiekaidong
|
c50f92bbc0
|
bug修复
|
2023-05-29 20:21:05 +08:00 |
|
xiekaidong
|
058ff2220d
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-29 19:25:28 +08:00 |
|
xiekaidong
|
13e752a761
|
bug修复
|
2023-05-29 19:25:25 +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 |
|
Fang
|
74f242b214
|
每日挑战开启状态变化fix
|
2023-05-29 18:22:17 +08:00 |
|
CloudJ
|
2cd302d0bf
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-29 18:07:46 +08:00 |
|
CloudJ
|
058c2aec8a
|
商城红点
|
2023-05-29 18:06:40 +08:00 |
|
xiekaidong
|
7b858220aa
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-29 17:54:04 +08:00 |
|
xiekaidong
|
34494cdb1f
|
bug修复
|
2023-05-29 17:54:02 +08:00 |
|
CloudJ
|
23fca8d7bf
|
更新首充界面
|
2023-05-29 17:15:54 +08:00 |
|
CloudJ
|
2f15a426bc
|
更新配置表
|
2023-05-29 16:25:50 +08:00 |
|
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 |
|
xiekaidong
|
2d605a9a91
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-29 15:22:03 +08:00 |
|
chenxi
|
5565fb2f8c
|
更新配置
|
2023-05-29 15:21:58 +08:00 |
|
xiekaidong
|
550a51efa7
|
死亡时恢复战斗速度
|
2023-05-29 15:21:56 +08:00 |
|
chenxi
|
c5b7f6ba96
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-29 15:19:28 +08:00 |
|
chenxi
|
71b9dd23a1
|
解锁逻辑
|
2023-05-29 15:19:24 +08:00 |
|
CloudJ
|
832701111b
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-29 15:10:06 +08:00 |
|
CloudJ
|
2fffb5c88a
|
商城
|
2023-05-29 15:10:04 +08:00 |
|
xiekaidong
|
09cb92bce2
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-29 15:07:49 +08:00 |
|
xiekaidong
|
c4efa0e41b
|
优化
|
2023-05-29 15:07:46 +08:00 |
|
chenxi
|
d47baeebc1
|
调整一下英雄解锁的逻辑
|
2023-05-29 15:06:25 +08:00 |
|
chenxi
|
5493c1b0eb
|
白名单
|
2023-05-29 14:34:31 +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
|
85cdf222c6
|
修复任务没开启前会显示任务完成得toast
|
2023-05-29 12:05:26 +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
|
b00c0eb831
|
buff修改
|
2023-05-29 11:26:25 +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
|
0cb6c115cd
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-29 11:15:36 +08:00 |
|
chenxi
|
e99af16f39
|
从任务跳转去战令，如果没有购买一定要弹出购买界面
|
2023-05-29 11:15:30 +08:00 |
|
xiekaidong
|
f30c2f0c8d
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-29 11:06:28 +08:00 |
|
xiekaidong
|
2d51debf5a
|
显示i问题
|
2023-05-29 11:06:24 +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
|
003d962422
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-29 10:54:13 +08:00 |
|
chenxi
|
5ab6aac2b6
|
代码重命名
|
2023-05-29 10:54:10 +08:00 |
|
xiekaidong
|
6246a9cd9d
|
存储一些技能效果
|
2023-05-29 10:50:56 +08:00 |
|
xiekaidong
|
2cf52fee2d
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-29 09:45:54 +08:00 |
|
xiekaidong
|
6f084d2c91
|
战斗死亡延迟
|
2023-05-29 09:45:36 +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 |
|
xiekaidong
|
fdd5ad08f5
|
反击bug修复
|
2023-05-26 21:36:08 +08:00 |
|
xiekaidong
|
35c56dda72
|
带有流血buff时死亡触发的被动机制
|
2023-05-26 21:22:00 +08:00 |
|
xiekaidong
|
4c9cce7a17
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-26 20:03:41 +08:00 |
|
xiekaidong
|
2430e09f7e
|
bug修复
|
2023-05-26 20:03:33 +08:00 |
|