xiekaidong
|
32b9deba6d
|
战斗节奏调整
|
2023-04-19 18:38:09 +08:00 |
|
xiekaidong
|
a43068daf4
|
bug修复
|
2023-04-19 18:02:32 +08:00 |
|
xiekaidong
|
2c4cc0ef23
|
战斗节奏调整
|
2023-04-19 17:44:23 +08:00 |
|
xiekaidong
|
ecdeca90ec
|
切大波次节奏调整
|
2023-04-19 17:19:39 +08:00 |
|
xiekaidong
|
e07380e7e5
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-19 15:50:09 +08:00 |
|
chenxi
|
904a57760d
|
恢复战斗速度的时机
|
2023-04-19 15:49:58 +08:00 |
|
xiekaidong
|
19ced28f90
|
检查棋盘是否是死局的状态
|
2023-04-19 15:49:57 +08:00 |
|
xiekaidong
|
8641c42a20
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-19 12:06:38 +08:00 |
|
xiekaidong
|
cf7799e633
|
提交第一版查找死局算法
|
2023-04-19 12:06:35 +08:00 |
|
chenxi
|
fa4e1ebd3c
|
战斗加速
|
2023-04-19 11:53:31 +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
|
e6015e7e8c
|
血条动画
|
2023-04-18 22:22:03 +08:00 |
|
xiekaidong
|
bfb9f9834f
|
技能图标变形
|
2023-04-18 21:03:29 +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
|
74a20b6bbe
|
肉鸽技能属性加成
|
2023-04-18 18:40:14 +08:00 |
|
xiekaidong
|
80e06bcef5
|
选择技能时机调整
|
2023-04-18 18:18:55 +08:00 |
|
xiekaidong
|
293facc310
|
读表
|
2023-04-18 18:06:05 +08:00 |
|
xiekaidong
|
375efc10de
|
一些肉鸽技能接入战斗
|
2023-04-18 17:58:19 +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
|
a8d3e443cd
|
换人逻辑
|
2023-04-17 17:13:24 +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 |
|
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
|
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
|
dc5a37ac0f
|
一些细节调整
|
2023-04-15 16:47:18 +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
|
c6ae8e7c99
|
血量
|
2023-04-14 21:21:03 +08:00 |
|
xiekaidong
|
47439bf597
|
增加一些判定条件
|
2023-04-14 18:26:16 +08:00 |
|
xiekaidong
|
f420d73d7a
|
报错修改
|
2023-04-14 18:18:22 +08:00 |
|
xiekaidong
|
642eb4d247
|
战斗回合概念
|
2023-04-14 17:59:12 +08:00 |
|
chenxi
|
d5c99276b5
|
冒伤害
|
2023-04-13 22:04:22 +08:00 |
|
chenxi
|
61127f4261
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-12 23:10:25 +08:00 |
|