220 Commits

Author SHA1 Message Date
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
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
681c0965f2 不用额外的开销 2023-04-19 16:31:51 +08:00
chenxi
9c7db3193d 更新配置 2023-04-19 16:29:20 +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
bfdf418a39 大小 2023-04-19 15:39:54 +08:00
chenxi
f9b9dc1726 大小 2023-04-19 15:36:44 +08:00
chenxi
f0cb7a6d73 更新配置 2023-04-19 15:05:27 +08:00
chenxi
6569fabe48 技能可能不可用 2023-04-19 15:04:01 +08:00