158 Commits

Author SHA1 Message Date
CloudJ
c01f881307 配置表 2023-05-30 09:43:49 +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
xiekaidong
c89eb8ef3f 禁锢 2023-05-26 18:08:05 +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
xiekaidong
43dc8332f8 更新配置 2023-05-19 16:29:02 +08:00
chenxi
ece138f7e3 更新配置 2023-05-18 22:11:31 +08:00
chenxi
4e1f4c2dbb Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/config/hero.lua
#	lua/app/config/item.lua
#	lua/app/config/skill.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/item.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/fr/item.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/ru/item.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/item.lua
2023-05-18 22:11:16 +08:00
chenxi
df51c37505 更新配置 2023-05-18 22:10:22 +08:00
xiekaidong
8225215773 导表 2023-05-18 22:10:04 +08:00
chenxi
b6da2f4bd6 挂机 2023-05-18 22:09:43 +08:00
chenxi
a1e98528ca 更新配置 2023-05-18 20:32:10 +08:00
chenxi
a783d2120c 挂机 2023-05-18 20:24:04 +08:00
xiekaidong
98070979dc 多段伤害 2023-05-18 10:58:49 +08:00
chenxi
8ebd69c6de Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-17 20:05:23 +08:00
chenxi
a1e56df4aa 更新配置 2023-05-17 20:05:18 +08:00
xiekaidong
5b4d00eca5 更新配置 2023-05-17 19:20:30 +08:00
xiekaidong
15cc2bd437 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
#	lua/app/config/chapter_board.lua
#	lua/app/config/mail.lua.meta
#	lua/app/config/strings/cn/mail.lua.meta
#	lua/app/config/strings/de/mail.lua.meta
#	lua/app/config/strings/en/mail.lua.meta
#	lua/app/config/strings/fr/mail.lua.meta
#	lua/app/config/strings/ja/mail.lua.meta
#	lua/app/config/strings/ko/mail.lua.meta
#	lua/app/config/strings/zh/mail.lua.meta
2023-05-17 19:19:35 +08:00
xiekaidong
ad0ab2b8ba 宝箱 2023-05-17 18:17:09 +08:00
chenxi
8c2d9c26bb 多语言 2023-05-17 16:26:33 +08:00
chenxi
74c514f7fe 战令购买提示 2023-05-17 15:00:29 +08:00
chenxi
6e33313f69 购买战令界面 2023-05-17 14:40:54 +08:00
xiekaidong
91cd324e44 神灯 2023-05-16 20:39:21 +08:00
xiekaidong
e23a631a7d Merge branch 'battle' into dev
# Conflicts:
#	lua/app/config/grid_type.lua
#	lua/app/config/hero.lua
2023-05-16 19:13:37 +08:00
xiekaidong
4605282d53 障碍物 2023-05-16 19:13:08 +08:00
chenxi
f7cd1c6094 战令 2023-05-16 18:17:05 +08:00
chenxi
dcc1d8377d 更新配置 2023-05-15 21:37:14 +08:00
chenxi
32051d90c6 战令 2023-05-15 21:32:13 +08:00
chenxi
dc095e626b 配置 2023-05-12 21:08:50 +08:00