126 Commits

Author SHA1 Message Date
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
xiekaidong
947fc23ff0 棋盘增加属性 2023-04-18 10:36:00 +08:00
chenxi
74cffb310d 援助技能 2023-04-17 22:10:29 +08:00
chenxi
602983faee 使用技能 2023-04-17 18:40:39 +08:00
chenxi
5977527c8d 删除不用的属性 2023-04-17 17:27:37 +08:00
chenxi
5a164c77cf 改一下技能名字 2023-04-17 16:27:22 +08:00
xiekaidong
65f695030e 局内升级 2023-04-17 15:43:23 +08:00
chenxi
b311395f10 怪物技能 2023-04-16 22:59:00 +08:00
chenxi
fc44d4dc8f 切波次 2023-04-16 22:23:34 +08:00
xiekaidong
dc5a37ac0f 一些细节调整 2023-04-15 16:47:18 +08:00
xiekaidong
328515c82a 开宝箱 2023-04-15 14:57:34 +08:00
xiekaidong
f74a7f6080 关卡宝箱 2023-04-15 14:45:42 +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
3269a4c6a3 增加最大血量 2023-04-14 21:25:01 +08:00
chenxi
c6ae8e7c99 血量 2023-04-14 21:21:03 +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
0d7d3a5b72 merge 2023-04-14 15:55:14 +08:00
chenxi
7400f41cea 伤害工时 2023-04-14 15:54:51 +08:00
xiekaidong
ab14bce85c Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-14 15:18:17 +08:00
xiekaidong
d1c95c8979 战斗暂停、技能选择、战斗结算、通用奖励获取等界面的处理 2023-04-14 15:18:14 +08:00
chenxi
442e59c95a 攻击属性 2023-04-14 00:21:26 +08:00
xiekaidong
c0eedc10ce Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-13 22:30:12 +08:00
xiekaidong
8424303c97 英雄改一下 2023-04-13 22:30:08 +08:00
chenxi
15a182cd30 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-13 22:04:25 +08:00
chenxi
d5c99276b5 冒伤害 2023-04-13 22:04:22 +08:00
xiekaidong
0d2e914210 战斗rogue技能接入上阵 2023-04-13 21:30:07 +08:00
xiekaidong
d1b80d3527 英雄养成 2023-04-13 21:13:43 +08:00
chenxi
f79124999a 英雄属性 2023-04-13 14:32:47 +08:00
chenxi
f41759dff4 移动攻击表现 2023-04-12 23:10:22 +08:00
chenxi
f970cd2ec5 merge 2023-04-12 21:15:24 +08:00
chenxi
25d13668e6 战斗 2023-04-12 21:14:10 +08:00
xiekaidong
cbad76a7d9 技能回收和吐出来 2023-04-12 21:03:07 +08:00
xiekaidong
a2e859e6ee 处理一下主界面 2023-04-12 17:55:01 +08:00
xiekaidong
e68d5a1982 一些棋盘上的技能调整 2023-04-12 16:23:06 +08:00
xiekaidong
4b1875aafd 棋盘新的读取方式 2023-04-12 15:16:30 +08:00
xiekaidong
4c752c0e78 调整一些逻辑 2023-04-12 11:19:24 +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
8de863c989 主城金币 2023-04-11 21:58:05 +08:00
chenxi
46d338e13d 显示模型 2023-04-11 20:52:14 +08:00
chenxi
dd6e751174 修复一些报错 2023-04-11 20:33:13 +08:00