1321 Commits

Author SHA1 Message Date
chenxi
33781e32de 七天乐完成后该消失 2023-05-26 17:38:07 +08:00
chenxi
280d6d2c07 七天乐进度显示 2023-05-26 17:33:29 +08:00
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
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
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
Fang
d473cbc537 提示逻辑补全 2023-05-26 15:43:01 +08:00
xiekaidong
7a87210ae3 局内任务显示 2023-05-26 15:43:01 +08:00
xiekaidong
4b5b0cfae2 每日挑战战斗界面 2023-05-26 15:43:01 +08:00
Fang
da120dc0a0 部分ui逻辑 2023-05-26 15:43:01 +08:00
Fang
9d212aaf26 部分ui逻辑 2023-05-26 15:43:01 +08:00
xiekaidong
13d470ad5b 每日挑战战斗内部界面 2023-05-26 15:43:01 +08:00
xiekaidong
b8bbad816b 代码提交 2023-05-26 15:43:01 +08:00
xiekaidong
135920f5c7 构建一些任务需要的战斗数据 2023-05-26 15:43:01 +08:00
xiekaidong
ccfbdd8232 每日战斗战斗部分 2023-05-26 15:43:01 +08:00
xiekaidong
5c1307ad0d 一些数据和更新配置 2023-05-26 15:43:01 +08:00
xiekaidong
55983ad95a 构建一些任务需要的战斗数据 2023-05-26 15:42:35 +08:00
xiekaidong
7fa2c93ad5 每日战斗战斗部分 2023-05-26 15:42:35 +08:00
Fang
9830ac3cbd 每日挑战 2023-05-26 15:42: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
eac2f98a21 更新配置 2023-05-25 17:07:17 +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
303b535ded 引导处理 2023-05-25 14:27:02 +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
b5424dd9fd 红点 2023-05-24 22:17:39 +08:00
chenxi
b18187a937 主城货币显示 2023-05-24 21:50:51 +08:00
chenxi
80f6d6d76d 奖励展示 2023-05-24 21:48:13 +08:00
chenxi
d383c38631 玩家数据跨天重置 2023-05-24 21:45:00 +08:00