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
|
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
|
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 |
|
xiekaidong
|
de21e5e1a8
|
界面调整和gm修改
|
2023-04-26 18:25:17 +08:00 |
|
chenxi
|
54174019ee
|
技能加速
|
2023-04-26 14:17:08 +08:00 |
|
chenxi
|
3caafceabd
|
更新配置
|
2023-04-25 20:19:09 +08:00 |
|
chenxi
|
60f6b5c8ef
|
更新配置
|
2023-04-25 18:04:17 +08:00 |
|
xiekaidong
|
99d6318442
|
bug修复
|
2023-04-25 17:50:41 +08:00 |
|
chenxi
|
2742782204
|
配置
|
2023-04-25 15:20:05 +08:00 |
|
chenxi
|
b108325c9f
|
更新配置
|
2023-04-25 14:40:32 +08:00 |
|
chenxi
|
39e5879e70
|
更新配置
|
2023-04-24 21:50:57 +08:00 |
|
chenxi
|
7f3c65c7ef
|
体力恢复
|
2023-04-24 21:20:55 +08:00 |
|
chenxi
|
c42a3dd0b1
|
更新配置
|
2023-04-24 17:25:59 +08:00 |
|
xiekaidong
|
0d0d0ca50b
|
宝箱修改
|
2023-04-24 11:21:26 +08:00 |
|
chenxi
|
1f44d96a32
|
更新配置
|
2023-04-23 17:30:17 +08:00 |
|
xiekaidong
|
69fc9ac72d
|
更新配置
|
2023-04-23 15:55:23 +08:00 |
|
chenxi
|
af56d4b400
|
伤害统计
|
2023-04-21 22:14:57 +08:00 |
|
xiekaidong
|
867bf72134
|
引导，更新配置
|
2023-04-21 16:26:57 +08:00 |
|
xiekaidong
|
eeb0af1262
|
战斗引导
|
2023-04-21 16:10:28 +08:00 |
|
xiekaidong
|
06229275bf
|
关卡数据容错
|
2023-04-21 09:56:30 +08:00 |
|
chenxi
|
a8261cd641
|
merge
|
2023-04-20 21:48:51 +08:00 |
|
chenxi
|
9c70bfbfed
|
更新配置
|
2023-04-20 20:54:29 +08:00 |
|
xiekaidong
|
06bc25c2d2
|
rogue技能显示修改
|
2023-04-20 15:17:14 +08:00 |
|
xiekaidong
|
ce3706369e
|
更新配置，优化一下检查棋盘的逻辑
|
2023-04-20 10:43:08 +08:00 |
|
xiekaidong
|
9be9feefbd
|
英雄解锁和强制上阵的判定
|
2023-04-19 22:20:22 +08:00 |
|
chenxi
|
726e4af821
|
更新配置
|
2023-04-19 20:50:41 +08:00 |
|
chenxi
|
e95f512ac4
|
更新配置
|
2023-04-19 20:05:47 +08:00 |
|
chenxi
|
e908d3bc90
|
更新配置
|
2023-04-17 16:53:06 +08:00 |
|
xiekaidong
|
00b1c43f54
|
界面处理
|
2023-04-15 16:54:44 +08:00 |
|
xiekaidong
|
f74a7f6080
|
关卡宝箱
|
2023-04-15 14:45:42 +08:00 |
|
chenxi
|
e88e9e9e98
|
配置
|
2023-04-14 15:57:14 +08:00 |
|
chenxi
|
0d7d3a5b72
|
merge
|
2023-04-14 15:55:14 +08:00 |
|
chenxi
|
7400f41cea
|
伤害工时
|
2023-04-14 15:54:51 +08:00 |
|
xiekaidong
|
d1c95c8979
|
战斗暂停、技能选择、战斗结算、通用奖励获取等界面的处理
|
2023-04-14 15:18:14 +08:00 |
|
xiekaidong
|
8424303c97
|
英雄改一下
|
2023-04-13 22:30:08 +08:00 |
|