chenxi
|
7e26dee2d3
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-12 21:07:07 +08:00 |
|
chenxi
|
dfc705fbe8
|
商城
|
2023-05-12 21:07:05 +08:00 |
|
xiekaidong
|
fa0b4a354a
|
Merge branch 'battle' into dev
|
2023-05-12 20:29:39 +08:00 |
|
chenxi
|
6369eab7f6
|
战令
|
2023-05-12 15:32:53 +08:00 |
|
xiekaidong
|
39a2eee61a
|
格子类型的一些配置改为配置表控制
|
2023-05-12 11:43:49 +08:00 |
|
xiekaidong
|
11d28008db
|
死亡召唤buff
|
2023-05-11 19:11:21 +08:00 |
|
xiekaidong
|
a864b53830
|
Merge branch 'dev' into battle_buff
# Conflicts:
# lua/app/config/act_gift.lua
# lua/app/config/act_gift.lua.meta
# lua/app/config/bounty_level.lua.meta
# lua/app/config/bounty_time.lua.meta
# lua/app/config/buff.lua
# lua/app/config/task.lua.meta
# lua/app/config/task_daily.lua.meta
|
2023-05-10 21:11:51 +08:00 |
|
xiekaidong
|
e6ee7b0093
|
先手buff
|
2023-05-10 10:10:58 +08:00 |
|
xiekaidong
|
607d9d9d65
|
流血buff
|
2023-05-09 15:47:38 +08:00 |
|
xiekaidong
|
187a7ee6bd
|
灼烧、易伤、中毒、腐败、削弱、诅咒buff提交
|
2023-05-09 15:15:07 +08:00 |
|
chenxi
|
3c6a538338
|
设置
|
2023-05-08 21:10:41 +08:00 |
|
xiekaidong
|
518aabb829
|
buff叠加机制和然烧buff
|
2023-05-08 16:31:44 +08:00 |
|
xiekaidong
|
3cc17442b6
|
更新配置
|
2023-05-08 11:50:53 +08:00 |
|
chenxi
|
50a2ff4b9f
|
金猪
|
2023-05-05 14:59:02 +08:00 |
|
chenxi
|
92771ae95d
|
更新配置
|
2023-04-27 19:19:25 +08:00 |
|
chenxi
|
549e285299
|
修改配置
|
2023-04-27 19:08:14 +08:00 |
|
chenxi
|
e724a9e523
|
更新配置
|
2023-04-27 16:54:57 +08:00 |
|
chenxi
|
47a75078dc
|
更新配置
|
2023-04-26 22:32:08 +08:00 |
|
chenxi
|
a903fe2950
|
更新配置
|
2023-04-26 19:01:23 +08:00 |
|
xiekaidong
|
de21e5e1a8
|
界面调整和gm修改
|
2023-04-26 18:25:17 +08:00 |
|
chenxi
|
f1274720e8
|
更新配置
|
2023-04-26 14:17:54 +08:00 |
|
chenxi
|
54174019ee
|
技能加速
|
2023-04-26 14:17:08 +08:00 |
|
chenxi
|
736ed2b7cb
|
fix bug
|
2023-04-25 22:14:19 +08:00 |
|
chenxi
|
b60e0c1a37
|
更新配置
|
2023-04-25 21:55:17 +08:00 |
|
chenxi
|
3caafceabd
|
更新配置
|
2023-04-25 20:19:09 +08:00 |
|
chenxi
|
84ee036fea
|
fix bug
|
2023-04-25 20:18:17 +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
|
d88e267558
|
编译
|
2023-04-24 22:02:01 +08:00 |
|
chenxi
|
39e5879e70
|
更新配置
|
2023-04-24 21:50:57 +08:00 |
|
chenxi
|
7f3c65c7ef
|
体力恢复
|
2023-04-24 21:20:55 +08:00 |
|
chenxi
|
d1707711b3
|
更新配置
|
2023-04-24 17:39:08 +08:00 |
|
chenxi
|
c42a3dd0b1
|
更新配置
|
2023-04-24 17:25:59 +08:00 |
|
xiekaidong
|
0d0d0ca50b
|
宝箱修改
|
2023-04-24 11:21:26 +08:00 |
|
xiekaidong
|
f83b482908
|
引导条件判断修改
|
2023-04-24 10:37:36 +08:00 |
|
chenxi
|
3785afdf9c
|
更新配置
|
2023-04-24 09:39:09 +08:00 |
|
chenxi
|
ffe9c309fc
|
特效bug
|
2023-04-23 21:37:09 +08:00 |
|
chenxi
|
b14ca15ad2
|
更新配置
|
2023-04-23 21:26:22 +08:00 |
|
chenxi
|
c0b2c67fdd
|
技能音效
|
2023-04-23 19:20:44 +08:00 |
|
chenxi
|
1f44d96a32
|
更新配置
|
2023-04-23 17:30:17 +08:00 |
|
xiekaidong
|
69fc9ac72d
|
更新配置
|
2023-04-23 15:55:23 +08:00 |
|
chenxi
|
6dac30d394
|
更新配置
|
2023-04-23 10:35:26 +08:00 |
|
chenxi
|
794deae7a0
|
更新配置
|
2023-04-22 00:06:58 +08:00 |
|
chenxi
|
af56d4b400
|
伤害统计
|
2023-04-21 22:14:57 +08:00 |
|
xiekaidong
|
ee1b719517
|
更新配置
|
2023-04-21 19:49:20 +08:00 |
|
xiekaidong
|
806ab5170f
|
bug和引导
|
2023-04-21 19:48:08 +08:00 |
|
chenxi
|
8701bda613
|
更新配置
|
2023-04-21 18:22:29 +08:00 |
|
chenxi
|
0e43cbbbd0
|
更新配置
|
2023-04-21 17:44:07 +08:00 |
|