159 Commits

Author SHA1 Message Date
Fang
c5c36cbb86 更表 2023-06-05 17:29:36 +08:00
xiekaidong
e85af27bf2 更新配置 2023-06-05 15:54:09 +08:00
chenxi
a438b745a3 更新配置 2023-06-05 10:07:46 +08:00
xiekaidong
eb1354f807 先更新一下格子 2023-06-02 16:54:16 +08:00
chenxi
51a60e0f1e 模块解锁 2023-05-31 20:53:57 +08:00
xiekaidong
4c4ae980dc bug修复 2023-05-31 18:06:16 +08:00
xiekaidong
abc9c6af93 更新配置 2023-05-31 09:34:19 +08:00
chenxi
e86e750a1b 更新配置 2023-05-30 22:23:19 +08:00
xiekaidong
981c440e5d 更新配置 2023-05-30 21:30:14 +08:00
chenxi
4b7a41f638 基金显示模型 2023-05-30 17:22:42 +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
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
5c1307ad0d 一些数据和更新配置 2023-05-26 15:43:01 +08:00
chenxi
e552761eea 七天乐 2023-05-26 11:39:23 +08:00
chenxi
56a4f329c3 紧急 2023-05-25 17:05:55 +08:00
chenxi
6f6b8ed3f3 金猪 2023-05-23 18:21:24 +08:00
xiekaidong
ccb54ff7e9 删除多余配置表 2023-05-22 20:37:02 +08:00
xiekaidong
f3946e1424 boss入场动画 2023-05-22 20:29:25 +08:00
xiekaidong
5309687502 果冻 2023-05-19 20:44:38 +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
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
ad0ab2b8ba 宝箱 2023-05-17 18:17:09 +08:00
chenxi
6e33313f69 购买战令界面 2023-05-17 14:40:54 +08:00
chenxi
f7cd1c6094 战令 2023-05-16 18:17:05 +08:00
chenxi
dc095e626b 配置 2023-05-12 21:08:50 +08:00
xiekaidong
11d28008db 死亡召唤buff 2023-05-11 19:11:21 +08:00
xiekaidong
187a7ee6bd 灼烧、易伤、中毒、腐败、削弱、诅咒buff提交 2023-05-09 15:15:07 +08:00
chenxi
549e285299 修改配置 2023-04-27 19:08:14 +08:00
chenxi
e724a9e523 更新配置 2023-04-27 16:54:57 +08:00
chenxi
a903fe2950 更新配置 2023-04-26 19:01:23 +08:00
chenxi
2742782204 配置 2023-04-25 15:20:05 +08:00
chenxi
7f3c65c7ef 体力恢复 2023-04-24 21:20:55 +08:00
chenxi
c42a3dd0b1 更新配置 2023-04-24 17:25:59 +08:00
chenxi
af56d4b400 伤害统计 2023-04-21 22:14:57 +08:00
chenxi
9c70bfbfed 更新配置 2023-04-20 20:54:29 +08:00
xiekaidong
06bc25c2d2 rogue技能显示修改 2023-04-20 15:17:14 +08:00