CloudJ
|
f8a4bf7935
|
多语言
|
2023-05-29 14:05:32 +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 |
|
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
|
2a9933eba3
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-26 18:08:08 +08:00 |
|
xiekaidong
|
c89eb8ef3f
|
禁锢
|
2023-05-26 18:08:05 +08:00 |
|
chenxi
|
33781e32de
|
七天乐完成后该消失
|
2023-05-26 17:38:07 +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 |
|
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
|
e552761eea
|
七天乐
|
2023-05-26 11:39:23 +08:00 |
|
CloudJ
|
9c87bbc5d7
|
助力礼包逻辑调整
|
2023-05-25 19:18:46 +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
|
095979cd65
|
容错
|
2023-05-25 14:32:00 +08:00 |
|
CloudJ
|
423b4a8f78
|
助力与金币礼包
|
2023-05-25 12:00:57 +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
|
b5424dd9fd
|
红点
|
2023-05-24 22:17:39 +08:00 |
|
chenxi
|
d383c38631
|
玩家数据跨天重置
|
2023-05-24 21:45:00 +08:00 |
|
chenxi
|
8f8e8b3cf0
|
文本适配
|
2023-05-24 21:35:58 +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
|
ca51dddab2
|
章节礼包
|
2023-05-24 11:33:54 +08:00 |
|
CloudJ
|
21f1a9cd89
|
抽奖逻辑
|
2023-05-24 10:44:11 +08:00 |
|
CloudJ
|
dca47040cf
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-24 10:07:09 +08:00 |
|
CloudJ
|
4e5316033a
|
抽卡部分
|
2023-05-24 10:07:07 +08:00 |
|
xiekaidong
|
bff772a1de
|
技能刷新接入联网
|
2023-05-24 10:01:36 +08:00 |
|
CloudJ
|
ada108ac82
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-23 18:37:12 +08:00 |
|
CloudJ
|
1fb818d12b
|
提交一波
|
2023-05-23 18:37:09 +08:00 |
|
xiekaidong
|
d3e38d6583
|
Merge branch 'battle' into dev
|
2023-05-23 18:35:42 +08:00 |
|
xiekaidong
|
e5bcfa3f09
|
冰冻状态、昏睡状态
|
2023-05-23 18:35:08 +08:00 |
|
chenxi
|
6f6b8ed3f3
|
金猪
|
2023-05-23 18:21:24 +08:00 |
|
chenxi
|
c95e0cb014
|
merge
|
2023-05-23 17:04:04 +08:00 |
|