xiekaidong
|
fa0b4a354a
|
Merge branch 'battle' into dev
|
2023-05-12 20:29:39 +08:00 |
|
xiekaidong
|
2775d669ba
|
bug修复
|
2023-05-12 20:29:30 +08:00 |
|
xiekaidong
|
5f4b142a3f
|
锁定格子
|
2023-05-12 19:56:35 +08:00 |
|
xiekaidong
|
9bf1f41725
|
修改消除逻辑，方便以后扩展
|
2023-05-12 17:03:14 +08:00 |
|
xiekaidong
|
673bfccc40
|
增加一个技能
|
2023-05-12 14:44:01 +08:00 |
|
xiekaidong
|
39a2eee61a
|
格子类型的一些配置改为配置表控制
|
2023-05-12 11:43:49 +08:00 |
|
xiekaidong
|
af3fc811ff
|
技能机制修改
|
2023-05-12 10:55:40 +08:00 |
|
chenxi
|
b1ca8106a9
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/config/act_chapter_store.lua.meta
# lua/app/config/act_gift.lua
# lua/app/config/act_growup_gift.lua.meta
# lua/app/config/act_level_fund.lua.meta
# lua/app/config/act_sevenday_quest.lua
# lua/app/config/act_sevenday_quest.lua.meta
# lua/app/config/act_sevenday_quest_reward.lua.meta
# lua/app/config/buff.lua
# lua/app/config/player_exp.lua.meta
# lua/app/config/strings/cn/task.lua.meta
# lua/app/config/strings/de/task.lua.meta
# lua/app/config/strings/en/task.lua.meta
# lua/app/config/strings/fr/task.lua.meta
# lua/app/config/strings/ja/task.lua.meta
# lua/app/config/strings/ko/task.lua.meta
# lua/app/config/strings/zh/task.lua.meta
|
2023-05-11 21:34:45 +08:00 |
|
xiekaidong
|
4bf948f670
|
表现修改一下
|
2023-05-11 20:14:59 +08:00 |
|
chenxi
|
09e3d41928
|
任务
|
2023-05-11 20:05:50 +08:00 |
|
xiekaidong
|
240517e04e
|
调整一下队伍死亡判定逻辑
|
2023-05-11 19:17:29 +08:00 |
|
xiekaidong
|
11d28008db
|
死亡召唤buff
|
2023-05-11 19:11:21 +08:00 |
|
xiekaidong
|
7a7bde728e
|
消灭随机1种颜色的棋子并回血技能机制
|
2023-05-11 17:21:53 +08:00 |
|
xiekaidong
|
bea9daf0bc
|
随机消灭x行列空闲元素技能机制
|
2023-05-11 16:57:39 +08:00 |
|
xiekaidong
|
5f7cca6351
|
打乱棋盘的技能机制
|
2023-05-11 15:31:06 +08:00 |
|
xiekaidong
|
9d70b5b8b1
|
随机消除x个技能元素 的技能机制
|
2023-05-11 15:17:42 +08:00 |
|
xiekaidong
|
5fc337e78b
|
改变棋盘所有元素的技能机制
|
2023-05-11 14:31:24 +08:00 |
|
xiekaidong
|
d9bf3ee52b
|
修改影响棋盘的技能的逻辑
|
2023-05-11 11:22:46 +08:00 |
|
xiekaidong
|
f89e3f1256
|
调整战斗节奏顺序
|
2023-05-11 09:59:10 +08:00 |
|
xiekaidong
|
9a9d4447ac
|
禁锢
|
2023-05-10 21:04:30 +08:00 |
|
xiekaidong
|
af0c61130d
|
冻结buff
|
2023-05-10 20:53:06 +08:00 |
|
xiekaidong
|
530ea14776
|
禁锢buff
|
2023-05-10 16:51:45 +08:00 |
|
xiekaidong
|
b7dda49394
|
主动技能伤害增加
|
2023-05-10 15:17:30 +08:00 |
|
xiekaidong
|
1c6ff387fc
|
反击
|
2023-05-10 11:53:44 +08:00 |
|
xiekaidong
|
e6ee7b0093
|
先手buff
|
2023-05-10 10:10:58 +08:00 |
|
xiekaidong
|
c9558d872e
|
反伤
|
2023-05-09 20:39:00 +08:00 |
|
xiekaidong
|
fd44822cd7
|
不死buff
|
2023-05-09 20:05:37 +08:00 |
|
xiekaidong
|
199ff4a7a2
|
bug修复
|
2023-05-09 19:40:47 +08:00 |
|
xiekaidong
|
1f911a21a7
|
昏睡buff
|
2023-05-09 16:49:27 +08:00 |
|
xiekaidong
|
607d9d9d65
|
流血buff
|
2023-05-09 15:47:38 +08:00 |
|
xiekaidong
|
187a7ee6bd
|
灼烧、易伤、中毒、腐败、削弱、诅咒buff提交
|
2023-05-09 15:15:07 +08:00 |
|
xiekaidong
|
518aabb829
|
buff叠加机制和然烧buff
|
2023-05-08 16:31:44 +08:00 |
|
xiekaidong
|
8801943ae3
|
整理一下代码，接入联网
|
2023-05-05 18:27:33 +08:00 |
|
xiekaidong
|
fc39a3487d
|
修改战斗逻辑
|
2023-05-05 17:05:38 +08:00 |
|
xiekaidong
|
bee5e556bf
|
服务器列表
|
2023-05-05 16:17:13 +08:00 |
|
xiekaidong
|
7de12f99e5
|
搬运一下b5的网络模块
|
2023-05-05 10:42:56 +08:00 |
|
xiekaidong
|
07b11eea6f
|
节奏调整
|
2023-05-04 18:06:03 +08:00 |
|
xiekaidong
|
f9f5587e0c
|
多指操作的bug修复
|
2023-04-28 09:57:11 +08:00 |
|
xiekaidong
|
165a4a3226
|
bug修复
|
2023-04-28 00:07:38 +08:00 |
|
xiekaidong
|
8ef8955972
|
棋盘死局
|
2023-04-27 20:15:25 +08:00 |
|
xiekaidong
|
c251d1c3cf
|
不冻结棋盘
|
2023-04-27 19:25:46 +08:00 |
|
xiekaidong
|
c0fea24029
|
技能回收最多3个
|
2023-04-27 17:43:27 +08:00 |
|
xiekaidong
|
c01cc5c9db
|
bug修复
|
2023-04-27 15:24:24 +08:00 |
|
chenxi
|
fe39dbe13c
|
连击bug
|
2023-04-27 11:27:31 +08:00 |
|
chenxi
|
ecd18170cc
|
combo表现
|
2023-04-26 21:35:24 +08:00 |
|
chenxi
|
5f8c7e2295
|
combo
|
2023-04-26 20:47:02 +08:00 |
|
chenxi
|
467e775042
|
战斗清理
|
2023-04-26 19:33:25 +08:00 |
|
chenxi
|
d0c0b398bc
|
fix bug
|
2023-04-26 19:22:10 +08:00 |
|
xiekaidong
|
ce5d8a9832
|
日志打点
|
2023-04-26 18:12:49 +08:00 |
|
chenxi
|
9b28cded0f
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-26 14:17:11 +08:00 |
|