182 Commits

Author SHA1 Message Date
chenxi
c73734a068 更新配置 2023-06-02 17:20:31 +08:00
xiekaidong
eb1354f807 先更新一下格子 2023-06-02 16:54:16 +08:00
xiekaidong
9a6c3966cb bug修复 2023-06-01 17:25:28 +08:00
chenxi
51a60e0f1e 模块解锁 2023-05-31 20:53:57 +08:00
xiekaidong
4c4ae980dc bug修复 2023-05-31 18:06:16 +08:00
chenxi
7569ae41d4 更新配置 2023-05-31 14:32:01 +08:00
xiekaidong
abc9c6af93 更新配置 2023-05-31 09:34:19 +08:00
chenxi
e86e750a1b 更新配置 2023-05-30 22:23:19 +08:00
chenxi
8aee4b4ed9 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-30 22:22:49 +08:00
chenxi
ad9f510a1e 七天乐 2023-05-30 22:22:46 +08:00
xiekaidong
981c440e5d 更新配置 2023-05-30 21:30:14 +08:00
xiekaidong
063df7972b 显示优化 2023-05-30 18:40:48 +08:00
chenxi
284f7ce3c7 设置界面里的邮箱加一个开启限制 2023-05-30 18:17:51 +08:00
chenxi
43733762a0 更新配置 2023-05-30 17:24:02 +08:00
chenxi
4b7a41f638 基金显示模型 2023-05-30 17:22:42 +08:00
chenxi
9feb782b67 界面文本 2023-05-30 15:50:18 +08:00
xiekaidong
a828972f43 更新配置 2023-05-30 15:08:16 +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
CloudJ
c01f881307 配置表 2023-05-30 09:43:49 +08:00
Fang
74f242b214 每日挑战开启状态变化fix 2023-05-29 18:22:17 +08:00
chenxi
5565fb2f8c 更新配置 2023-05-29 15:21:58 +08:00
chenxi
71b9dd23a1 解锁逻辑 2023-05-29 15:19:24 +08:00
chenxi
d47baeebc1 调整一下英雄解锁的逻辑 2023-05-29 15:06:25 +08:00
chenxi
905cf03f74 更新配置 2023-05-26 19:44:55 +08:00
Fang
0288f2a300 boss界面模型比例适配 2023-05-26 18:39:07 +08:00
Fang
b57318f3a6 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge 2023-05-26 18:26:21 +08:00
xiekaidong
c89eb8ef3f 禁锢 2023-05-26 18:08:05 +08:00
xiekaidong
ccfbdd8232 每日战斗战斗部分 2023-05-26 15:43:01 +08:00
xiekaidong
5c1307ad0d 一些数据和更新配置 2023-05-26 15:43:01 +08:00
xiekaidong
7fa2c93ad5 每日战斗战斗部分 2023-05-26 15:42:35 +08:00
chenxi
0b6607d714 七天乐 2023-05-26 14:51:24 +08:00
chenxi
e552761eea 七天乐 2023-05-26 11:39:23 +08:00
chenxi
eac2f98a21 更新配置 2023-05-25 17:07:17 +08:00
chenxi
56a4f329c3 紧急 2023-05-25 17:05:55 +08:00
CloudJ
21f1a9cd89 抽奖逻辑 2023-05-24 10:44:11 +08:00
CloudJ
1fb818d12b 提交一波 2023-05-23 18:37:09 +08:00
xiekaidong
fb0ebff007 Merge branch 'battle' into dev 2023-05-23 16:40:13 +08:00
xiekaidong
637264f383 格挡动作表现、反击界面表现 2023-05-23 16:39:29 +08:00
CloudJ
74e2ecbb76 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/common/bi_report.lua
2023-05-23 14:17:44 +08:00
CloudJ
13d53c5166 提一波 2023-05-23 14:17:29 +08:00
xiekaidong
ccb54ff7e9 删除多余配置表 2023-05-22 20:37:02 +08:00
xiekaidong
f3946e1424 boss入场动画 2023-05-22 20:29:25 +08:00
xiekaidong
8ae7df28e2 通用技能tips 2023-05-22 16:38:04 +08:00
xiekaidong
14dfdecddc Merge branch 'battle' into dev
# Conflicts:
#	lua/app/config/strings/cn/global.lua
2023-05-22 15:59:54 +08:00
xiekaidong
528ac6a89b 技能tips 2023-05-22 15:59:17 +08:00
chenxi
f18e16103c 邮箱 2023-05-22 11:36:26 +08:00
chenxi
2f24834d5e 更新配置 2023-05-19 21:57:36 +08:00
xiekaidong
5309687502 果冻 2023-05-19 20:44:38 +08:00
chenxi
0ab51fcc07 购买体力和邮箱 2023-05-19 18:32:23 +08:00
xiekaidong
f6d5546d2b 战斗任务数据 2023-05-19 18:00:03 +08:00