xiekaidong
|
381a4477bd
|
bug修复
|
2023-08-21 11:22:31 +08:00 |
|
xiekaidong
|
866094a76f
|
边缘障碍物逻辑优化
|
2023-08-11 15:17:28 +08:00 |
|
xiekaidong
|
f5ed280271
|
优化木棍障碍物
|
2023-08-11 11:24:52 +08:00 |
|
xiekaidong
|
26862b0e02
|
Merge branch 'dev_20230815' into battle
# Conflicts:
# lua/app/config/buff.lua
# lua/app/config/strings/de/buff.lua
# lua/app/config/strings/en/buff.lua
# lua/app/config/strings/es/buff.lua
# lua/app/config/strings/fr/buff.lua
# lua/app/config/strings/id/buff.lua
# lua/app/config/strings/ja/buff.lua
# lua/app/config/strings/ko/buff.lua
# lua/app/config/strings/pt/buff.lua
# lua/app/config/strings/ru/buff.lua
# lua/app/config/strings/th/buff.lua
# lua/app/config/strings/vi/buff.lua
# lua/app/config/strings/zh/buff.lua
# lua/app/module/battle/battle_const.lua
# lua/app/module/battle/helper/battle_buff_handle.lua
|
2023-08-08 16:02:24 +08:00 |
|
xiekaidong
|
42ad5ec9fa
|
Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
# lua/app/config/const.lua
# lua/app/config/item.lua
# lua/app/config/skill_rogue.lua
# lua/app/config/strings/cn/buff.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/de/item.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/es/item.lua
# lua/app/config/strings/fr/item.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ja/skill.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/ru/item.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/zh/item.lua
# lua/app/config/strings/zh/skill.lua
|
2023-08-08 15:58:56 +08:00 |
|
xiekaidong
|
8ae11ac948
|
新机制
|
2023-08-08 15:58:17 +08:00 |
|
xiekaidong
|
62ee8bab01
|
木棍边缘障碍物
|
2023-08-02 18:07:44 +08:00 |
|
xiekaidong
|
e954484a13
|
技能机制优化
|
2023-08-01 17:35:58 +08:00 |
|
xiekaidong
|
caf1fd0af9
|
战斗续关
|
2023-07-31 16:22:05 +08:00 |
|
xiekaidong
|
dbbfbf4842
|
优化技能的释放位置逻辑
|
2023-07-21 15:36:05 +08:00 |
|
xiekaidong
|
b1561991c6
|
更新配置
|
2023-07-10 18:30:30 +08:00 |
|
xiekaidong
|
21365f487e
|
显示问题修复
|
2023-07-05 14:25:27 +08:00 |
|
xiekaidong
|
d030ee5988
|
bug修复
|
2023-07-04 20:21:23 +08:00 |
|
Fang
|
83f6a11b03
|
fix
|
2023-06-30 18:45:56 +08:00 |
|
xiekaidong
|
7f7707094d
|
竞技场战斗
|
2023-06-29 14:24:29 +08:00 |
|
xiekaidong
|
c391fb0fbc
|
bug修复
|
2023-06-29 10:29:46 +08:00 |
|
xiekaidong
|
d4d92cf97d
|
pvp战斗和整合pve战斗
|
2023-06-28 21:24:15 +08:00 |
|
xiekaidong
|
a623c25f6f
|
pvp战斗概念引入
|
2023-06-26 15:28:40 +08:00 |
|
xiekaidong
|
7dae3a6ab5
|
火蛇海蛇效果
|
2023-06-16 15:13:38 +08:00 |
|
xiekaidong
|
3f23f976e3
|
bug修复
|
2023-06-14 19:05:15 +08:00 |
|
xiekaidong
|
4846a97b75
|
grideffect=6的处理
|
2023-06-13 15:08:02 +08:00 |
|
xiekaidong
|
ad7212ff13
|
新的肉鸽机制-改变effect概率
|
2023-06-13 11:11:06 +08:00 |
|
xiekaidong
|
eb2872b7ee
|
修改bug，优化战斗流程逻辑
|
2023-06-03 19:11:19 +08:00 |
|
xiekaidong
|
44ff406135
|
boss机制棋盘效果处理
|
2023-06-02 22:28:22 +08:00 |
|
xiekaidong
|
1689436124
|
新增障碍物效果类型
|
2023-06-02 20:13:38 +08:00 |
|
xiekaidong
|
14f51d2900
|
水泡动画
|
2023-06-02 19:01:33 +08:00 |
|
xiekaidong
|
9a6c3966cb
|
bug修复
|
2023-06-01 17:25:28 +08:00 |
|
xiekaidong
|
13e752a761
|
bug修复
|
2023-05-29 19:25:25 +08:00 |
|
xiekaidong
|
6246a9cd9d
|
存储一些技能效果
|
2023-05-29 10:50:56 +08:00 |
|
xiekaidong
|
2959b8db73
|
弹窗
|
2023-05-22 10:24:45 +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
|
5309687502
|
果冻
|
2023-05-19 20:44:38 +08:00 |
|
xiekaidong
|
f6d5546d2b
|
战斗任务数据
|
2023-05-19 18:00:03 +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
|
0f8121fea1
|
增加触发机制
|
2023-05-18 22:07:35 +08:00 |
|
xiekaidong
|
15c315cbed
|
技能修改
|
2023-05-18 11:18:51 +08:00 |
|
xiekaidong
|
ad0ab2b8ba
|
宝箱
|
2023-05-17 18:17:09 +08:00 |
|
xiekaidong
|
91cd324e44
|
神灯
|
2023-05-16 20:39:21 +08:00 |
|
xiekaidong
|
4605282d53
|
障碍物
|
2023-05-16 19:13:08 +08:00 |
|
xiekaidong
|
673bfccc40
|
增加一个技能
|
2023-05-12 14:44:01 +08:00 |
|
xiekaidong
|
af3fc811ff
|
技能机制修改
|
2023-05-12 10:55:40 +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 |
|