CloudJ
|
521bcf9c1a
|
宝箱钥匙展示规则调整
|
2023-05-31 10:12:13 +08:00 |
|
xiekaidong
|
676ea6bfe8
|
显示bug修复
|
2023-05-30 18:12:39 +08:00 |
|
xiekaidong
|
fdbafd1dfe
|
增加一个战斗内使用的gm命令
|
2023-05-30 15:56:29 +08:00 |
|
xiekaidong
|
03061784f1
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-30 15:41:26 +08:00 |
|
xiekaidong
|
6f59974c33
|
优化代码
|
2023-05-30 15:41:23 +08:00 |
|
chenxi
|
1c4589843c
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-30 15:33:04 +08:00 |
|
chenxi
|
5d7771fd87
|
解锁新功能弹窗
|
2023-05-30 15:32:58 +08:00 |
|
xiekaidong
|
71daac9cb7
|
表现优化
|
2023-05-30 15:06:33 +08:00 |
|
xiekaidong
|
122c0da462
|
buff描述
|
2023-05-30 14:15:42 +08:00 |
|
xiekaidong
|
8e8930230f
|
容错
|
2023-05-30 11:54:33 +08:00 |
|
陈希
|
bbc196035c
|
Merge branch 'fang/daily_challenge' into 'dev'
每日挑战
See merge request b6-client/b6-lua!1
|
2023-05-30 03:38:33 +00:00 |
|
CloudJ
|
d4b477410d
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-30 11:34:41 +08:00 |
|
CloudJ
|
47ad46fba9
|
审核模式调整
|
2023-05-30 11:34:38 +08:00 |
|
xiekaidong
|
c512a7fe5f
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-30 11:30:08 +08:00 |
|
xiekaidong
|
c3bcb35a33
|
没有战斗动作的技能
|
2023-05-30 11:29:59 +08:00 |
|
Fang
|
9b3a00e809
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
# 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
# lua/app/config/strings/de/buff.lua
# lua/app/config/strings/en/buff.lua
# lua/app/config/strings/fr/buff.lua
# lua/app/config/strings/id/buff.lua
# lua/app/config/strings/ja/buff.lua
# lua/app/config/strings/ko/buff.lua
# lua/app/config/strings/pt/buff.lua
# lua/app/config/strings/ru/buff.lua
# lua/app/config/strings/th/buff.lua
# lua/app/config/strings/vi/buff.lua
# lua/app/config/strings/zh/buff.lua
|
2023-05-30 10:35:05 +08:00 |
|
chenxi
|
bcfd27d6f0
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-30 10:17:34 +08:00 |
|
chenxi
|
837f54acda
|
英雄解锁
|
2023-05-30 10:17:31 +08:00 |
|
xiekaidong
|
8f1fd47fd2
|
战斗优化
|
2023-05-30 09:57:18 +08:00 |
|
xiekaidong
|
09e8acb915
|
删除空余行
|
2023-05-29 21:00:24 +08:00 |
|
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 |
|
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 |
|
xiekaidong
|
550a51efa7
|
死亡时恢复战斗速度
|
2023-05-29 15:21:56 +08:00 |
|
CloudJ
|
2fffb5c88a
|
商城
|
2023-05-29 15:10:04 +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 |
|
chenxi
|
85cdf222c6
|
修复任务没开启前会显示任务完成得toast
|
2023-05-29 12:05:26 +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
|
6f084d2c91
|
战斗死亡延迟
|
2023-05-29 09:45:36 +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 |
|
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 |
|