2337 Commits

Author SHA1 Message Date
chenxi
32edfe2a3a 波次之间回血 2023-04-20 20:53:26 +08:00
xiekaidong
75bca07d4d Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-20 20:30:39 +08:00
xiekaidong
a11f8613e1 动画调整 2023-04-20 20:30:35 +08:00
chenxi
94b3c3ddc5 伤害数字对象池 2023-04-20 20:22:14 +08:00
chenxi
d52e92b6b0 伤害数字 2023-04-20 19:03:55 +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
1f0cba25d6 修复 2023-04-20 18:57:04 +08:00
xiekaidong
ccddeb8aa3 修复 2023-04-20 18:50:19 +08:00
xiekaidong
b9a42b317b 动画 2023-04-20 18:45:38 +08:00
chenxi
b8517ba934 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-20 18:22:43 +08:00
chenxi
666e36416e tips 2023-04-20 18:22:39 +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
e136291098 主城箭头 2023-04-20 18:01:39 +08:00
chenxi
f73980c7de 奖励显示碎片 2023-04-20 17:40:25 +08:00
chenxi
a44fb6ca2c 移动速度 2023-04-20 17:08:27 +08:00
chenxi
aae29468f7 距离 2023-04-20 17:01:53 +08:00
chenxi
a7f8eb8c5a 更新配置 2023-04-20 16:33:47 +08:00
chenxi
e979862f49 移动速度 2023-04-20 16:27:23 +08:00
chenxi
ad9dc7d8e2 修改字段名 2023-04-20 16:03:18 +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
59c1daf2e3 更新配置 2023-04-20 12:08:33 +08:00
chenxi
bd57840816 buff tips 2023-04-20 12:06:33 +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
a98cf98c58 系数 2023-04-19 22:41:01 +08:00
xiekaidong
ce145b8014 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-19 22:31:18 +08:00
xiekaidong
213c4c1188 界面处理 2023-04-19 22:31:15 +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
90070e8798 更新配置 2023-04-19 20:06:25 +08:00
chenxi
e95f512ac4 更新配置 2023-04-19 20:05:47 +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