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
|
c6ea40de7e
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-21 16:27:27 +08:00 |
|
chenxi
|
9a0ebd1318
|
技能抖屏
|
2023-04-21 16:27:24 +08:00 |
|
xiekaidong
|
867bf72134
|
引导，更新配置
|
2023-04-21 16:26:57 +08:00 |
|
xiekaidong
|
5d1bc62572
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-21 16:10:31 +08:00 |
|
xiekaidong
|
eeb0af1262
|
战斗引导
|
2023-04-21 16:10:28 +08:00 |
|
chenxi
|
4d4bd0fc61
|
技能特效
|
2023-04-21 15:52:50 +08:00 |
|
chenxi
|
d3ee3c6799
|
fix bug
|
2023-04-21 14:21:54 +08:00 |
|
xiekaidong
|
01e691fceb
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-21 10:57:34 +08:00 |
|
xiekaidong
|
565cfbc817
|
动画
|
2023-04-21 10:57:27 +08:00 |
|
chenxi
|
3abfa8ce27
|
打赢最新的关卡去下一关
|
2023-04-21 10:56:25 +08:00 |
|
chenxi
|
79bad73dfe
|
打赢后去下一关
|
2023-04-21 10:55:13 +08:00 |
|
chenxi
|
c068622521
|
战斗加速的逻辑
|
2023-04-20 23:08:28 +08:00 |
|
chenxi
|
de5d0e34e5
|
还原测试代码
|
2023-04-20 22:49:56 +08:00 |
|
xiekaidong
|
d1c7f22f03
|
修改
|
2023-04-20 21:37:09 +08:00 |
|
xiekaidong
|
e34b3df0aa
|
删除代码
|
2023-04-20 21:28:42 +08:00 |
|
xiekaidong
|
44102b81b9
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/config/skill_rogue.lua
# lua/app/config/tutorial.lua.meta
# lua/app/config/tutorial_start.lua.meta
# lua/app/module/battle/battle_const.lua
|
2023-04-20 21:26:51 +08:00 |
|
xiekaidong
|
a2e20a7c37
|
技能解锁
|
2023-04-20 21:26:35 +08:00 |
|
chenxi
|
32edfe2a3a
|
波次之间回血
|
2023-04-20 20:53:26 +08:00 |
|
chenxi
|
94b3c3ddc5
|
伤害数字对象池
|
2023-04-20 20:22:14 +08:00 |
|
chenxi
|
d52e92b6b0
|
伤害数字
|
2023-04-20 19:03:55 +08:00 |
|
chenxi
|
3a916fd7ee
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-20 18:59:08 +08:00 |
|
chenxi
|
5303638b99
|
伤害数字
|
2023-04-20 18:59:06 +08:00 |
|
xiekaidong
|
b9a42b317b
|
动画
|
2023-04-20 18:45:38 +08:00 |
|
xiekaidong
|
6fb864fa79
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-20 18:13:59 +08:00 |
|
xiekaidong
|
c874c9026b
|
特效
|
2023-04-20 18:13:56 +08:00 |
|
chenxi
|
a44fb6ca2c
|
移动速度
|
2023-04-20 17:08:27 +08:00 |
|
chenxi
|
aae29468f7
|
距离
|
2023-04-20 17:01:53 +08:00 |
|
chenxi
|
e979862f49
|
移动速度
|
2023-04-20 16:27:23 +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
|
79852d0c6e
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-20 11:19:41 +08:00 |
|
chenxi
|
ae30c47881
|
战斗buff
|
2023-04-20 11:19:31 +08:00 |
|
xiekaidong
|
ce3706369e
|
更新配置，优化一下检查棋盘的逻辑
|
2023-04-20 10:43:08 +08:00 |
|
chenxi
|
2e4df00490
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-19 22:30:28 +08:00 |
|
chenxi
|
12f3e8ebf4
|
表现处理
|
2023-04-19 22:30:26 +08:00 |
|
xiekaidong
|
2f28925a71
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-19 22:20:25 +08:00 |
|
xiekaidong
|
9be9feefbd
|
英雄解锁和强制上阵的判定
|
2023-04-19 22:20:22 +08:00 |
|
chenxi
|
a6b3df378f
|
buff显示逻辑
|
2023-04-19 22:20:07 +08:00 |
|
chenxi
|
1fad0b8c47
|
加成计算错误
|
2023-04-19 21:32:33 +08:00 |
|
chenxi
|
87d7f9b597
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-19 21:07:38 +08:00 |
|
chenxi
|
7118b8790a
|
背景移动
|
2023-04-19 21:07:35 +08:00 |
|
xiekaidong
|
ce6c6feee3
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-19 21:03:57 +08:00 |
|
xiekaidong
|
7afa7f77b5
|
填充bug修复
|
2023-04-19 21:03:53 +08:00 |
|
chenxi
|
726e4af821
|
更新配置
|
2023-04-19 20:50:41 +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
|
32b9deba6d
|
战斗节奏调整
|
2023-04-19 18:38:09 +08:00 |
|
xiekaidong
|
a43068daf4
|
bug修复
|
2023-04-19 18:02:32 +08:00 |
|