chenxi
|
95a07316d8
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-23 10:17:48 +08:00 |
|
chenxi
|
df6d39a984
|
第一个主英雄的排序规则改一下
|
2023-04-23 10:17:44 +08:00 |
|
xiekaidong
|
c2bfaf937f
|
增加容错
|
2023-04-23 09:55:01 +08:00 |
|
chenxi
|
4e61053dcb
|
处理
|
2023-04-22 00:18:22 +08:00 |
|
chenxi
|
e4edcfcf69
|
被动技能
|
2023-04-22 00:05:49 +08:00 |
|
xiekaidong
|
7642dbc8f0
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-21 23:16:44 +08:00 |
|
xiekaidong
|
e7c262c34b
|
死局随机棋盘
|
2023-04-21 23:16:41 +08:00 |
|
chenxi
|
902db9d49b
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-21 22:15:01 +08:00 |
|
chenxi
|
af56d4b400
|
伤害统计
|
2023-04-21 22:14:57 +08:00 |
|
xiekaidong
|
a4951d9f89
|
bug修复
|
2023-04-21 21:45:03 +08:00 |
|
chenxi
|
6ecbce4127
|
技能
|
2023-04-21 20:22:27 +08:00 |
|
chenxi
|
a0b27ce82d
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/config/monster_chapter.lua
# lua/app/config/skill.lua
|
2023-04-21 17:12:31 +08:00 |
|
chenxi
|
2a9f4350b0
|
普攻改成数组
|
2023-04-21 17:11:59 +08:00 |
|
xiekaidong
|
c512d7f984
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-21 16:49:30 +08:00 |
|
xiekaidong
|
150e128135
|
关卡固定肉鸽技能、技能可以开始就任意链接
|
2023-04-21 16:49:27 +08:00 |
|
chenxi
|
9a0ebd1318
|
技能抖屏
|
2023-04-21 16:27:24 +08:00 |
|
chenxi
|
4d4bd0fc61
|
技能特效
|
2023-04-21 15:52:50 +08:00 |
|
xiekaidong
|
a2e20a7c37
|
技能解锁
|
2023-04-20 21:26:35 +08:00 |
|
chenxi
|
ad9dc7d8e2
|
修改字段名
|
2023-04-20 16:03:18 +08:00 |
|
xiekaidong
|
3c896cf339
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/config/strings/cn/buff.lua.meta
|
2023-04-20 15:17:23 +08:00 |
|
xiekaidong
|
06bc25c2d2
|
rogue技能显示修改
|
2023-04-20 15:17:14 +08:00 |
|
chenxi
|
bd57840816
|
buff tips
|
2023-04-20 12:06:33 +08:00 |
|
chenxi
|
a6b3df378f
|
buff显示逻辑
|
2023-04-19 22:20:07 +08:00 |
|
xiekaidong
|
7afa7f77b5
|
填充bug修复
|
2023-04-19 21:03:53 +08:00 |
|
chenxi
|
afe62c49bc
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-19 18:39:52 +08:00 |
|
chenxi
|
8a334afbff
|
最后一次攻击判断死亡
|
2023-04-19 18:39:46 +08:00 |
|
xiekaidong
|
a43068daf4
|
bug修复
|
2023-04-19 18:02:32 +08:00 |
|
chenxi
|
f7b2b736f8
|
入场表现
|
2023-04-19 16:27:47 +08:00 |
|
chenxi
|
6569fabe48
|
技能可能不可用
|
2023-04-19 15:04:01 +08:00 |
|
chenxi
|
ea69a44b75
|
修改错名的命名
|
2023-04-19 14:17:17 +08:00 |
|
chenxi
|
fa4e1ebd3c
|
战斗加速
|
2023-04-19 11:53:31 +08:00 |
|
chenxi
|
5328e6dc7c
|
战场经验
|
2023-04-19 11:02:51 +08:00 |
|
chenxi
|
431c57c353
|
加一个被动
|
2023-04-19 10:47:02 +08:00 |
|
xiekaidong
|
64b4a0962c
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-18 22:26:25 +08:00 |
|
xiekaidong
|
10f6569d95
|
肉鸽技能
|
2023-04-18 22:26:21 +08:00 |
|
chenxi
|
d836860db8
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-18 21:32:10 +08:00 |
|
chenxi
|
0fa378ec88
|
生命相关被动改为由队伍记录
|
2023-04-18 21:32:03 +08:00 |
|
xiekaidong
|
bfb9f9834f
|
技能图标变形
|
2023-04-18 21:03:29 +08:00 |
|
chenxi
|
342bae9c82
|
bug
|
2023-04-18 20:37:11 +08:00 |
|
chenxi
|
6ad53ac174
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-18 20:09:53 +08:00 |
|
chenxi
|
b1353d74e0
|
被动
|
2023-04-18 20:09:51 +08:00 |
|
xiekaidong
|
22b46a5129
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/userdata/battle/team/battle_unit_entity.lua
|
2023-04-18 19:52:35 +08:00 |
|
xiekaidong
|
0de7ceb3b3
|
切大波次
|
2023-04-18 19:52:15 +08:00 |
|
chenxi
|
2ff99edc4e
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-18 18:59:39 +08:00 |
|
chenxi
|
281d220052
|
被动
|
2023-04-18 18:59:36 +08:00 |
|
xiekaidong
|
375efc10de
|
一些肉鸽技能接入战斗
|
2023-04-18 17:58:19 +08:00 |
|
chenxi
|
a90d9cf51f
|
fix error
|
2023-04-18 11:54:11 +08:00 |
|
chenxi
|
ff6ebce393
|
重复使用技能
|
2023-04-18 11:52:46 +08:00 |
|
chenxi
|
9305845ef9
|
merge
|
2023-04-18 11:05:39 +08:00 |
|
chenxi
|
3bc1b7b07a
|
处理护盾以及buff
|
2023-04-18 11:04:27 +08:00 |
|