451 Commits

Author SHA1 Message Date
xiekaidong
528ac6a89b 技能tips 2023-05-22 15:59:17 +08:00
xiekaidong
2959b8db73 弹窗 2023-05-22 10:24:45 +08:00
chenxi
deeeedbfaa 金猪 2023-05-19 23:02:02 +08:00
xiekaidong
fd2c150b19 bug修复 2023-05-19 21:44:36 +08:00
xiekaidong
d4d1249f09 bug修复 2023-05-19 21:37:56 +08:00
xiekaidong
d2eff9d230 随机位置 2023-05-19 20:59:18 +08:00
xiekaidong
4708ed1ae2 随机 2023-05-19 20:55:41 +08:00
xiekaidong
9067a7ffa1 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-19 20:44:41 +08:00
xiekaidong
5309687502 果冻 2023-05-19 20:44:38 +08:00
chenxi
e85131f041 任务 2023-05-19 20:43:35 +08:00
xiekaidong
1fcf0137e3 死局问题修改 2023-05-19 20:09:32 +08:00
chenxi
0ab51fcc07 购买体力和邮箱 2023-05-19 18:32:23 +08:00
xiekaidong
b8d7fa533d 战斗内部计数相关任务 2023-05-19 18:18:33 +08:00
xiekaidong
58d366ba9d Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-19 18:00:05 +08:00
xiekaidong
f6d5546d2b 战斗任务数据 2023-05-19 18:00:03 +08:00
chenxi
502f35bf2e 体力不足得时候弹出来购买体力界面 2023-05-19 17:08:19 +08:00
chenxi
af59a3f9a2 体力不足的时候弹出来购买体力 2023-05-19 17:05:28 +08:00
chenxi
23de1b57e0 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-19 16:37:04 +08:00
chenxi
a78be93bc1 宝箱tips 2023-05-19 16:36:59 +08:00
xiekaidong
d1fe14d396 删除打印 2023-05-19 16:31:26 +08:00
xiekaidong
ff56360efa 技能机制 2023-05-19 16:27:54 +08:00
xiekaidong
8316e48633 随机技能机制 2023-05-19 15:15:02 +08:00
xiekaidong
aae0f74648 新增消除类型 2023-05-19 10:51:48 +08:00
xiekaidong
7ab28c41b4 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-19 10:00:16 +08:00
xiekaidong
91680e5c9a 被动触发时机 2023-05-19 10:00:14 +08:00
chenxi
9ab1297bce Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-18 22:09:46 +08:00
chenxi
b6da2f4bd6 挂机 2023-05-18 22:09:43 +08:00
xiekaidong
0f8121fea1 增加触发机制 2023-05-18 22:07:35 +08:00
xiekaidong
ccea5fedfa 技能生效条件 2023-05-18 21:20:10 +08:00
xiekaidong
82d95ee5fd 被动、buff触发时机 2023-05-18 20:43:10 +08:00
xiekaidong
6596d89003 Merge branch 'dev' into battle 2023-05-18 20:31:32 +08:00
chenxi
a783d2120c 挂机 2023-05-18 20:24:04 +08:00
chenxi
88631429fe Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-18 15:39:47 +08:00
chenxi
3cb5152538 挂机 2023-05-18 15:39:44 +08:00
xiekaidong
170ddb3066 技能效果生效条件判定 2023-05-18 15:34:17 +08:00
xiekaidong
15c315cbed 技能修改 2023-05-18 11:18:51 +08:00
xiekaidong
98070979dc 多段伤害 2023-05-18 10:58:49 +08:00
xiekaidong
15cc2bd437 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
#	lua/app/config/chapter_board.lua
#	lua/app/config/mail.lua.meta
#	lua/app/config/strings/cn/mail.lua.meta
#	lua/app/config/strings/de/mail.lua.meta
#	lua/app/config/strings/en/mail.lua.meta
#	lua/app/config/strings/fr/mail.lua.meta
#	lua/app/config/strings/ja/mail.lua.meta
#	lua/app/config/strings/ko/mail.lua.meta
#	lua/app/config/strings/zh/mail.lua.meta
2023-05-17 19:19:35 +08:00
xiekaidong
2023930d62 宝箱 2023-05-17 19:19:24 +08:00
chenxi
0c775e8215 卡牌tips 2023-05-17 19:05:29 +08:00
xiekaidong
ad0ab2b8ba 宝箱 2023-05-17 18:17:09 +08:00
chenxi
8c2d9c26bb 多语言 2023-05-17 16:26:33 +08:00
chenxi
6e33313f69 购买战令界面 2023-05-17 14:40:54 +08:00
xiekaidong
97e5506ab2 神灯障碍物 2023-05-16 21:22:52 +08:00
xiekaidong
91cd324e44 神灯 2023-05-16 20:39:21 +08:00
xiekaidong
e23a631a7d Merge branch 'battle' into dev
# Conflicts:
#	lua/app/config/grid_type.lua
#	lua/app/config/hero.lua
2023-05-16 19:13:37 +08:00
xiekaidong
4605282d53 障碍物 2023-05-16 19:13:08 +08:00
chenxi
f7cd1c6094 战令 2023-05-16 18:17:05 +08:00
chenxi
e15888698e Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-15 21:32:16 +08:00
chenxi
32051d90c6 战令 2023-05-15 21:32:13 +08:00