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 |
|
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 |
|
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
|
303b535ded
|
引导处理
|
2023-05-25 14:27:02 +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
|
b18187a937
|
主城货币显示
|
2023-05-24 21:50:51 +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
|
01522e6e0c
|
基金界面货币
|
2023-05-24 19:28: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
|
08631456a2
|
助力礼包
|
2023-05-24 17:28:45 +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 |
|
xiekaidong
|
715408f15f
|
反击表现
|
2023-05-23 20:09:09 +08:00 |
|
chenxi
|
142bf926b2
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-23 19:02:33 +08:00 |
|
chenxi
|
9e1cf32daa
|
修改英雄界面
|
2023-05-23 19:02:30 +08:00 |
|
CloudJ
|
58f261aeef
|
注释
|
2023-05-23 18:49:27 +08:00 |
|
CloudJ
|
dc96fdcb1f
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-23 18:43:45 +08:00 |
|
CloudJ
|
9a7f8b069f
|
布局
|
2023-05-23 18:43:42 +08:00 |
|
chenxi
|
8574d33716
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-23 18:41:41 +08:00 |
|
chenxi
|
624dcb208e
|
英雄详情界面
|
2023-05-23 18:41:35 +08:00 |
|
CloudJ
|
af4c09d6b8
|
宝箱奖励
|
2023-05-23 18:38:58 +08:00 |
|