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 |
|
xiekaidong
|
c89eb8ef3f
|
禁锢
|
2023-05-26 18:08:05 +08:00 |
|
xiekaidong
|
cff917cac8
|
显示优化
|
2023-05-26 16:32:13 +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 |
|
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 |
|
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
|
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 |
|
CloudJ
|
4fa2d67de2
|
礼包
|
2023-05-25 17:30:57 +08:00 |
|
chenxi
|
189faa4701
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/config/buff_daily_challenge.lua.meta
# lua/app/config/chapter_board_daily_challenge.lua.meta
# lua/app/config/chapter_daily_challenge.lua.meta
# lua/app/config/monster_daily_challenge.lua.meta
# lua/app/config/strings/cn/buff_daily_challenge.lua.meta
# lua/app/config/strings/cn/task_daily_challenge.lua.meta
# lua/app/config/strings/de/buff_daily_challenge.lua.meta
# lua/app/config/strings/de/task_daily_challenge.lua.meta
# lua/app/config/strings/en/buff_daily_challenge.lua.meta
# lua/app/config/strings/en/task_daily_challenge.lua.meta
# lua/app/config/strings/fr/buff_daily_challenge.lua.meta
# lua/app/config/strings/fr/task_daily_challenge.lua.meta
# lua/app/config/strings/id/buff_daily_challenge.lua.meta
# lua/app/config/strings/id/task_daily_challenge.lua.meta
# lua/app/config/strings/ja/buff_daily_challenge.lua.meta
# lua/app/config/strings/ja/task_daily_challenge.lua.meta
# lua/app/config/strings/ko/buff_daily_challenge.lua.meta
# lua/app/config/strings/ko/task_daily_challenge.lua.meta
# lua/app/config/strings/pt/buff_daily_challenge.lua.meta
# lua/app/config/strings/pt/task_daily_challenge.lua.meta
# lua/app/config/strings/ru/buff_daily_challenge.lua.meta
# lua/app/config/strings/ru/task_daily_challenge.lua.meta
# lua/app/config/strings/th/buff_daily_challenge.lua.meta
# lua/app/config/strings/th/task_daily_challenge.lua.meta
# lua/app/config/strings/vi/buff_daily_challenge.lua.meta
# lua/app/config/strings/vi/task_daily_challenge.lua.meta
# lua/app/config/strings/zh/buff_daily_challenge.lua.meta
# lua/app/config/strings/zh/task_daily_challenge.lua.meta
# lua/app/config/task_daily_challenge.lua.meta
|
2023-05-25 17:06:46 +08:00 |
|
chenxi
|
56a4f329c3
|
紧急
|
2023-05-25 17:05:55 +08:00 |
|
CloudJ
|
b784b7aeda
|
金币礼包逻辑调整
|
2023-05-25 16:30:10 +08:00 |
|
CloudJ
|
cc674c3204
|
更新配置表与pb 修复一些问题
|
2023-05-25 15:26:57 +08:00 |
|
CloudJ
|
df62beaafe
|
金币礼包
|
2023-05-25 14:42:52 +08:00 |
|
CloudJ
|
93d091c462
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-25 12:01:04 +08:00 |
|
CloudJ
|
423b4a8f78
|
助力与金币礼包
|
2023-05-25 12:00:57 +08:00 |
|
xiekaidong
|
cbba15794a
|
增加一下受击动画容错
|
2023-05-25 10:37:49 +08:00 |
|
CloudJ
|
602cd716df
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/pay_manager.lua
|
2023-05-25 10:18:31 +08:00 |
|
chenxi
|
80f6d6d76d
|
奖励展示
|
2023-05-24 21:48:13 +08:00 |
|
chenxi
|
4212a80a4a
|
等级基金
|
2023-05-24 21:05:52 +08:00 |
|
chenxi
|
143c5282e0
|
merge
|
2023-05-24 19:20:05 +08:00 |
|
chenxi
|
fdc400fd8d
|
基金
|
2023-05-24 19:19:34 +08:00 |
|
CloudJ
|
5888ee766f
|
助力礼包
|
2023-05-24 17:26:52 +08:00 |
|
CloudJ
|
eb531423dd
|
章节礼包与新手礼包
|
2023-05-24 16:00:43 +08:00 |
|
CloudJ
|
9ac84611b4
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-24 14:33:47 +08:00 |
|
xiekaidong
|
f7a4a0fe31
|
表现bug修复
|
2023-05-24 12:07:20 +08:00 |
|