chenxi
|
031034db50
|
特效大小和层级
|
2023-04-21 17:58:51 +08:00 |
|
chenxi
|
a0b27ce82d
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/config/monster_chapter.lua
# lua/app/config/skill.lua
|
2023-04-21 17:12:31 +08:00 |
|
chenxi
|
2a9f4350b0
|
普攻改成数组
|
2023-04-21 17:11:59 +08:00 |
|
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
|
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 |
|
xiekaidong
|
565cfbc817
|
动画
|
2023-04-21 10:57:27 +08:00 |
|
xiekaidong
|
e34b3df0aa
|
删除代码
|
2023-04-20 21:28:42 +08:00 |
|
xiekaidong
|
a2e20a7c37
|
技能解锁
|
2023-04-20 21:26:35 +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
|
c874c9026b
|
特效
|
2023-04-20 18:13:56 +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
|
a6b3df378f
|
buff显示逻辑
|
2023-04-19 22:20:07 +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
|
7afa7f77b5
|
填充bug修复
|
2023-04-19 21:03:53 +08:00 |
|
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 |
|