60 Commits

Author SHA1 Message Date
chenxi
8575d48b37 护盾 2023-04-23 15:15:50 +08:00
chenxi
15226b6b0e 伤害数字 2023-04-23 11:43:59 +08:00
xiekaidong
1a8007c8e6 资源替换 2023-04-23 09:56:05 +08:00
xiekaidong
34312754ef 修改特效,消除影响改为十字形 2023-04-22 00:46:36 +08:00
chenxi
4d4bd0fc61 技能特效 2023-04-21 15:52:50 +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
5303638b99 伤害数字 2023-04-20 18:59:06 +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
06bc25c2d2 rogue技能显示修改 2023-04-20 15:17:14 +08:00
xiekaidong
7afa7f77b5 填充bug修复 2023-04-19 21:03:53 +08:00
chenxi
37476932d7 支援间隔 2023-04-19 12:23:56 +08:00
chenxi
fa4e1ebd3c 战斗加速 2023-04-19 11:53:31 +08:00
chenxi
431c57c353 加一个被动 2023-04-19 10:47:02 +08:00
chenxi
b1353d74e0 被动 2023-04-18 20:09:51 +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
293facc310 读表 2023-04-18 18:06:05 +08:00
xiekaidong
375efc10de 一些肉鸽技能接入战斗 2023-04-18 17:58:19 +08:00
chenxi
ff6ebce393 重复使用技能 2023-04-18 11:52:46 +08:00
chenxi
74cffb310d 援助技能 2023-04-17 22:10:29 +08:00
chenxi
a8d3e443cd 换人逻辑 2023-04-17 17:13:24 +08:00
chenxi
e908d3bc90 更新配置 2023-04-17 16:53:06 +08:00
chenxi
5a164c77cf 改一下技能名字 2023-04-17 16:27:22 +08:00
xiekaidong
03d73d25d3 界面处理 2023-04-17 15:14:58 +08:00
chenxi
b311395f10 怪物技能 2023-04-16 22:59:00 +08:00
chenxi
fc44d4dc8f 切波次 2023-04-16 22:23:34 +08:00
chenxi
b5f765f74c merge 2023-04-15 23:36:56 +08:00
chenxi
b6cf77022b 战斗怪物死亡 2023-04-15 23:36:26 +08:00
xiekaidong
88b9067fc4 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-14 22:19:25 +08:00
xiekaidong
3b909a2a81 一些界面修改和接入关卡结算 2023-04-14 22:19:22 +08:00
chenxi
93ee4653af 战斗buff 2023-04-14 20:34:36 +08:00
chenxi
0d084c0438 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-14 18:22:39 +08:00
chenxi
3666e425ff buff加属性 2023-04-14 18:22:36 +08:00
xiekaidong
f48194bfd1 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-14 17:59:15 +08:00
xiekaidong
642eb4d247 战斗回合概念 2023-04-14 17:59:12 +08:00
chenxi
7400f41cea 伤害工时 2023-04-14 15:54:51 +08:00
chenxi
d5c99276b5 冒伤害 2023-04-13 22:04:22 +08:00
chenxi
f41759dff4 移动攻击表现 2023-04-12 23:10:22 +08:00
xiekaidong
cbad76a7d9 技能回收和吐出来 2023-04-12 21:03:07 +08:00
xiekaidong
b61b6a6f85 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-11 22:12:55 +08:00
xiekaidong
990a27220e 肉鸽技能和指令集 2023-04-11 22:12:52 +08:00
chenxi
46d338e13d 显示模型 2023-04-11 20:52:14 +08:00
chenxi
dd6e751174 修复一些报错 2023-04-11 20:33:13 +08:00
chenxi
903e4899ca merge 2023-04-11 18:24:00 +08:00