chenxi
|
8575d48b37
|
护盾
|
2023-04-23 15:15:50 +08:00 |
|
xiekaidong
|
c4801087bd
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-23 12:07:45 +08:00 |
|
xiekaidong
|
153cf72fb2
|
优化排序
|
2023-04-23 12:07:42 +08:00 |
|
chenxi
|
087618ab84
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-23 11:44:02 +08:00 |
|
chenxi
|
15226b6b0e
|
伤害数字
|
2023-04-23 11:43:59 +08:00 |
|
xiekaidong
|
26fab280b3
|
随机棋盘bug修复
|
2023-04-23 11:35:20 +08:00 |
|
xiekaidong
|
56745e7a0f
|
bug修复
|
2023-04-23 10:53:18 +08:00 |
|
xiekaidong
|
1a8007c8e6
|
资源替换
|
2023-04-23 09:56:05 +08:00 |
|
xiekaidong
|
f6b7f954c2
|
延迟结算
|
2023-04-22 00:58:27 +08:00 |
|
xiekaidong
|
34312754ef
|
修改特效，消除影响改为十字形
|
2023-04-22 00:46:36 +08:00 |
|
xiekaidong
|
965af02e94
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-22 00:26:57 +08:00 |
|
xiekaidong
|
92766aa8cd
|
动画修改
|
2023-04-22 00:26:54 +08:00 |
|
chenxi
|
e4edcfcf69
|
被动技能
|
2023-04-22 00:05:49 +08:00 |
|
xiekaidong
|
7642dbc8f0
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-21 23:16:44 +08:00 |
|
xiekaidong
|
e7c262c34b
|
死局随机棋盘
|
2023-04-21 23:16:41 +08:00 |
|
chenxi
|
7851d2a5d2
|
，
|
2023-04-21 23:10:29 +08:00 |
|
chenxi
|
594d5ac6c6
|
伤害统计
|
2023-04-21 22:41:32 +08:00 |
|
chenxi
|
902db9d49b
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-21 22:15:01 +08:00 |
|
chenxi
|
af56d4b400
|
伤害统计
|
2023-04-21 22:14:57 +08:00 |
|
xiekaidong
|
a4951d9f89
|
bug修复
|
2023-04-21 21:45:03 +08:00 |
|
xiekaidong
|
0be49bdc32
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-21 21:40:47 +08:00 |
|
xiekaidong
|
8fafdba7fc
|
战斗音效
|
2023-04-21 21:40:44 +08:00 |
|
chenxi
|
7c2e50a338
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-21 21:21:54 +08:00 |
|
chenxi
|
b378de406c
|
fix bug
|
2023-04-21 21:21:51 +08:00 |
|
xiekaidong
|
754bf06d69
|
节奏调整
|
2023-04-21 21:20:51 +08:00 |
|
xiekaidong
|
55894f0bc5
|
表现修改
|
2023-04-21 21:03:01 +08:00 |
|
xiekaidong
|
70058e8cc6
|
bug修复
|
2023-04-21 20:50:52 +08:00 |
|
xiekaidong
|
ac9bea5776
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-21 20:43:52 +08:00 |
|
xiekaidong
|
24a775cfe8
|
bug修复
|
2023-04-21 20:37:07 +08:00 |
|
chenxi
|
57d77849f3
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-21 20:22:30 +08:00 |
|
chenxi
|
6ecbce4127
|
技能
|
2023-04-21 20:22:27 +08:00 |
|
xiekaidong
|
806ab5170f
|
bug和引导
|
2023-04-21 19:48:08 +08:00 |
|
chenxi
|
5982d0083a
|
fix 报错
|
2023-04-21 18:38:31 +08:00 |
|
xiekaidong
|
5dc6d24503
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/config/tutorial.lua
|
2023-04-21 18:10:50 +08:00 |
|
xiekaidong
|
f6503d5a89
|
引导和报错
|
2023-04-21 18:10:38 +08:00 |
|
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
|
867bf72134
|
引导，更新配置
|
2023-04-21 16:26:57 +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 |
|
chenxi
|
d3ee3c6799
|
fix bug
|
2023-04-21 14:21:54 +08:00 |
|
xiekaidong
|
01e691fceb
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-21 10:57:34 +08:00 |
|
xiekaidong
|
565cfbc817
|
动画
|
2023-04-21 10:57:27 +08:00 |
|
chenxi
|
3abfa8ce27
|
打赢最新的关卡去下一关
|
2023-04-21 10:56:25 +08:00 |
|