118 Commits

Author SHA1 Message Date
chenxi
2d3991fcbd Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-17 16:53:09 +08:00
chenxi
e908d3bc90 更新配置 2023-04-17 16:53:06 +08:00
xiekaidong
9a79b24470 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-17 16:41:20 +08:00
xiekaidong
503b50c03e 普工经验 2023-04-17 16:41:17 +08:00
chenxi
5a164c77cf 改一下技能名字 2023-04-17 16:27:22 +08:00
xiekaidong
65f695030e 局内升级 2023-04-17 15:43:23 +08:00
xiekaidong
4ea4989c85 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-17 15:19:31 +08:00
xiekaidong
03d73d25d3 界面处理 2023-04-17 15:14:58 +08:00
chenxi
6cbd3f8944 怪物攻击 2023-04-17 11:57:59 +08:00
chenxi
2f0e60fb5a battle team 2023-04-17 00:09:48 +08:00
chenxi
210be03aa4 使用技能 2023-04-16 23:06:15 +08:00
chenxi
b311395f10 怪物技能 2023-04-16 22:59:00 +08:00
chenxi
fc44d4dc8f 切波次 2023-04-16 22:23:34 +08:00
chenxi
f291195ccd 攻防反了 2023-04-16 20:46:55 +08:00
chenxi
7b9cd5ac78 最大波次 2023-04-16 20:41:04 +08:00
chenxi
b5f765f74c merge 2023-04-15 23:36:56 +08:00
chenxi
b6cf77022b 战斗怪物死亡 2023-04-15 23:36:26 +08:00
xiekaidong
e58626d82b 界面调整 2023-04-15 16:57:43 +08:00
xiekaidong
00b1c43f54 界面处理 2023-04-15 16:54:44 +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
f9541d56d8 血条 2023-04-14 22:23:03 +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
b7524f89e2 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-14 20:33:07 +08:00
xiekaidong
47439bf597 增加一些判定条件 2023-04-14 18:26:16 +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
f420d73d7a 报错修改 2023-04-14 18:18:22 +08:00
xiekaidong
15f1d9c1cf 更新配置 2023-04-14 18:02:06 +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
e88e9e9e98 配置 2023-04-14 15:57:14 +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
chenxi
fb1571ca1f Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-13 23:21:44 +08:00
chenxi
06145762e1 . 2023-04-13 23:21:40 +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