xiekaidong
|
b9a42b317b
|
动画
|
2023-04-20 18:45:38 +08:00 |
|
xiekaidong
|
6fb864fa79
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-20 18:13:59 +08:00 |
|
xiekaidong
|
c874c9026b
|
特效
|
2023-04-20 18:13:56 +08:00 |
|
chenxi
|
a44fb6ca2c
|
移动速度
|
2023-04-20 17:08:27 +08:00 |
|
chenxi
|
aae29468f7
|
距离
|
2023-04-20 17:01:53 +08:00 |
|
chenxi
|
e979862f49
|
移动速度
|
2023-04-20 16:27:23 +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
|
2e4df00490
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-19 22:30:28 +08:00 |
|
chenxi
|
12f3e8ebf4
|
表现处理
|
2023-04-19 22:30:26 +08:00 |
|
xiekaidong
|
2f28925a71
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-19 22:20:25 +08:00 |
|
xiekaidong
|
9be9feefbd
|
英雄解锁和强制上阵的判定
|
2023-04-19 22:20:22 +08:00 |
|
chenxi
|
a6b3df378f
|
buff显示逻辑
|
2023-04-19 22:20:07 +08:00 |
|
chenxi
|
1fad0b8c47
|
加成计算错误
|
2023-04-19 21:32:33 +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
|
ce6c6feee3
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-19 21:03:57 +08:00 |
|
xiekaidong
|
7afa7f77b5
|
填充bug修复
|
2023-04-19 21:03:53 +08:00 |
|
chenxi
|
726e4af821
|
更新配置
|
2023-04-19 20:50:41 +08:00 |
|
chenxi
|
afe62c49bc
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-19 18:39:52 +08:00 |
|
chenxi
|
8a334afbff
|
最后一次攻击判断死亡
|
2023-04-19 18:39:46 +08:00 |
|
xiekaidong
|
32b9deba6d
|
战斗节奏调整
|
2023-04-19 18:38:09 +08:00 |
|
xiekaidong
|
a43068daf4
|
bug修复
|
2023-04-19 18:02:32 +08:00 |
|
xiekaidong
|
06d96cefd4
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-19 17:44:26 +08:00 |
|
xiekaidong
|
2c4cc0ef23
|
战斗节奏调整
|
2023-04-19 17:44:23 +08:00 |
|
chenxi
|
1f86476cb0
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-19 17:20:43 +08:00 |
|
chenxi
|
8833471b90
|
限制技能
|
2023-04-19 17:20:28 +08:00 |
|
xiekaidong
|
c8ba1688a0
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/module/battle/controller/battle_controller_stage.lua
|
2023-04-19 17:20:07 +08:00 |
|
xiekaidong
|
ecdeca90ec
|
切大波次节奏调整
|
2023-04-19 17:19:39 +08:00 |
|
chenxi
|
4e629d3da4
|
层级
|
2023-04-19 17:10:23 +08:00 |
|
chenxi
|
c4a922aba8
|
生成怪的逻辑
|
2023-04-19 16:47:11 +08:00 |
|
chenxi
|
dbf3ffa581
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-19 16:27:50 +08:00 |
|
chenxi
|
f7b2b736f8
|
入场表现
|
2023-04-19 16:27:47 +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 |
|
xiekaidong
|
f6847beaa8
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-19 15:50:00 +08:00 |
|
chenxi
|
904a57760d
|
恢复战斗速度的时机
|
2023-04-19 15:49:58 +08:00 |
|
xiekaidong
|
19ced28f90
|
检查棋盘是否是死局的状态
|
2023-04-19 15:49:57 +08:00 |
|
chenxi
|
f9b9dc1726
|
大小
|
2023-04-19 15:36:44 +08:00 |
|
chenxi
|
53f73118a2
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-19 12:23:59 +08:00 |
|
chenxi
|
37476932d7
|
支援间隔
|
2023-04-19 12:23:56 +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 |
|
chenxi
|
5328e6dc7c
|
战场经验
|
2023-04-19 11:02:51 +08:00 |
|
chenxi
|
0f2a085877
|
变量名错误
|
2023-04-19 10:50:10 +08:00 |
|
chenxi
|
431c57c353
|
加一个被动
|
2023-04-19 10:47:02 +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 |
|