63 Commits

Author SHA1 Message Date
puxuan
b8b1b86fbb fix bug 2025-10-17 20:46:29 +08:00
puxuan
c450235ffd 肉鸽 2025-10-17 12:18:03 +08:00
puxuan
3ea8d17837 肉鸽 2025-10-16 21:17:02 +08:00
puxuan
e36dd5e583 新增肉鸽类型 2025-09-19 14:50:04 +08:00
xiekaidong
9b4ab7f785 bug修复 2023-08-21 11:24:57 +08:00
xiekaidong
62907b1a83 边缘障碍物逻辑优化 2023-08-11 15:17:49 +08:00
xiekaidong
d93593b5fb 优化木棍障碍物 2023-08-11 11:25:22 +08:00
xiekaidong
ce7ad3cb8c 新buff和新机制 2023-08-08 16:39:03 +08:00
xiekaidong
3b61c03934 Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
#	Assets/lua/app/common/local_data.lua.bytes
#	Assets/lua/app/config/act_gift.lua.bytes
#	Assets/lua/app/config/arena_rank.lua.bytes
#	Assets/lua/app/config/chapter_board.lua.bytes
#	Assets/lua/app/config/const.lua.bytes
#	Assets/lua/app/config/item.lua.bytes
#	Assets/lua/app/config/skill.lua.bytes
#	Assets/lua/app/config/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/cn/buff.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
#	Assets/lua/app/config/strings/cn/item.lua.bytes
#	Assets/lua/app/config/strings/de/item.lua.bytes
#	Assets/lua/app/config/strings/en/item.lua.bytes
#	Assets/lua/app/config/strings/es/item.lua.bytes
#	Assets/lua/app/config/strings/fr/item.lua.bytes
#	Assets/lua/app/config/strings/id/item.lua.bytes
#	Assets/lua/app/config/strings/ja/item.lua.bytes
#	Assets/lua/app/config/strings/ja/skill.lua.bytes
#	Assets/lua/app/config/strings/ko/item.lua.bytes
#	Assets/lua/app/config/strings/pt/item.lua.bytes
#	Assets/lua/app/config/strings/ru/item.lua.bytes
#	Assets/lua/app/config/strings/th/item.lua.bytes
#	Assets/lua/app/config/strings/vi/item.lua.bytes
#	Assets/lua/app/config/strings/zh/item.lua.bytes
#	Assets/lua/app/config/strings/zh/skill.lua.bytes
#	Assets/lua/app/global/global_func.lua.bytes
#	Assets/lua/app/module/arena/arena_manager.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
#	Assets/lua/app/module/battle/helper/battle_snapshot_helper.lua.bytes
#	Assets/lua/app/module/equip/equip_manager.lua.bytes
#	Assets/lua/app/module/shop/shop_manager.lua.bytes
#	Assets/lua/app/proto/proto_msg_type.lua.bytes
#	Assets/lua/app/ui/battle/battle_base_ui.lua.bytes
#	Assets/lua/app/ui/main_city/component/main_comp.lua.bytes
#	Assets/lua/app/ui/ui_manager.lua.bytes
#	Assets/proto/protocol.bytes
2023-08-08 15:59:22 +08:00
xiekaidong
32e93ec980 木棍边缘障碍物 2023-08-02 18:10:43 +08:00
xiekaidong
31a57fddc6 技能机制优化 2023-08-01 17:39:15 +08:00
xiekaidong
dfb2714266 更新配置 2023-07-31 16:28:15 +08:00
xiekaidong
5cb6ae349b 优化技能的释放位置逻辑 2023-07-21 15:36:27 +08:00
xiekaidong
36af88f4b5 更新配置 2023-07-10 18:30:47 +08:00
xiekaidong
de21e7b5d7 显示问题修复 2023-07-05 14:26:04 +08:00
xiekaidong
ca456f4bbe bug修复 2023-07-04 20:21:48 +08:00
Fang
0e7f765ca2 fix 2023-07-03 09:51:15 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
xiekaidong
989a7c63e5 火蛇海蛇效果 2023-06-16 15:14:33 +08:00
xiekaidong
972a339c4a bug修复 2023-06-14 19:05:47 +08:00
xiekaidong
80d3f8cb17 grideffect=6的处理 2023-06-13 15:08:42 +08:00
xiekaidong
de0b2828a7 新的肉鸽机制-改变effect概率 2023-06-13 11:11:46 +08:00
xiekaidong
e6a28c8acd 修改bug,优化战斗流程逻辑 2023-06-03 19:12:33 +08:00
xiekaidong
b60f9b1ca4 boss机制棋盘效果处理 2023-06-02 22:28:55 +08:00
xiekaidong
ffcd0014c7 新增障碍物效果类型 2023-06-02 20:14:09 +08:00
xiekaidong
c65d52c8de 水泡动画 2023-06-02 19:02:18 +08:00
xiekaidong
0f8e6d1cf2 bug修复 2023-06-01 17:26:16 +08:00
xiekaidong
f58ef7302e bug修复 2023-05-29 19:25:52 +08:00
xiekaidong
d54864ecb5 存储一些技能效果 2023-05-29 10:51:29 +08:00
xiekaidong
1d657e3128 boss入场动画 2023-05-22 20:32:26 +08:00
xiekaidong
430637632b 弹窗 2023-05-22 10:25:26 +08:00
xiekaidong
ae8da29f23 bug修复 2023-05-19 21:44:46 +08:00
xiekaidong
5ace2ecbbd bug修复 2023-05-19 21:38:16 +08:00
xiekaidong
f609e0c83c 随机位置 2023-05-19 20:59:31 +08:00
xiekaidong
860baa56b7 effectGrid 2023-05-19 20:56:01 +08:00
xiekaidong
27bd9d3b09 果冻 2023-05-19 20:45:09 +08:00
xiekaidong
36950a4364 更新pb 2023-05-19 18:23:35 +08:00
xiekaidong
1eae40bf23 更新配置 2023-05-19 16:29:20 +08:00
xiekaidong
7d72a0fbad 新增技能机制 2023-05-19 10:52:23 +08:00
xiekaidong
efaa9ff92a 修改prefab 2023-05-18 22:09:30 +08:00
xiekaidong
083d260769 技能修改 2023-05-18 11:19:11 +08:00
xiekaidong
fff1c9260e 宝箱 2023-05-17 19:20:18 +08:00
xiekaidong
63ad1d641a 神灯障碍物 2023-05-16 21:24:26 +08:00
xiekaidong
192b7ad00b 编译lua 2023-05-12 14:44:27 +08:00
xiekaidong
924dd75798 技能机制修改 2023-05-12 10:56:06 +08:00
xiekaidong
9122032a63 一些技能机制 2023-05-11 19:19:06 +08:00
xiekaidong
9c5faae2be 编译lua 2023-05-11 09:59:41 +08:00
chenxi
7e1f206064 fix bug 2023-04-25 22:04:30 +08:00
xiekaidong
fed6c5f070 增加一个生效对象 2023-04-25 18:13:00 +08:00
xiekaidong
09a35689bc 棋盘技能 2023-04-25 09:57:19 +08:00