28 Commits

Author SHA1 Message Date
puxuan
6ab80119eb 局内 2025-08-08 11:41:36 +08:00
puxuan
a142d9e9d2 boss技能 2025-06-11 23:51:45 +08:00
xiekaidong
935bd0c2ba fix 2024-01-26 11:08:52 +08:00
xiekaidong
859bbd42b9 增加容错 2023-08-29 14:54:54 +08:00
xiekaidong
5d910f5ebc 容错和容错 2023-08-15 19:34:02 +08:00
xiekaidong
9c8b20f1fb bug修复 2023-08-10 19:27:48 +08:00
xiekaidong
8f07e19054 新机制 2023-08-08 16:37:57 +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
24d90bfd1c 战斗血条优化 2023-08-02 20:34:25 +08:00
xiekaidong
62ee8bab01 木棍边缘障碍物 2023-08-02 18:07:44 +08:00
xiekaidong
caf1fd0af9 战斗续关 2023-07-31 16:22:05 +08:00
xiekaidong
0e2bb42a25 一些报错修复 2023-07-24 18:32:41 +08:00
xiekaidong
026166478e buff机制修改 2023-07-21 11:37:29 +08:00
xiekaidong
8e17ed9850 技能显示bug修复 2023-07-07 18:00:02 +08:00
xiekaidong
c2622e3013 bug修复 2023-07-05 14:44:48 +08:00
xiekaidong
21365f487e 显示问题修复 2023-07-05 14:25:27 +08:00
xiekaidong
afd2c11ef1 连击提示 2023-07-05 11:22:46 +08:00
xiekaidong
9718eca3d7 竞技场任务 2023-07-05 10:15:33 +08:00
xiekaidong
c1592accae 敌方也显示combo 2023-07-04 21:04:50 +08:00
xiekaidong
d7cf21fde6 竞技场波次显示 2023-07-04 20:13:24 +08:00
xiekaidong
47d5b00318 取消连线 2023-07-04 18:05:17 +08:00
xiekaidong
a51ee6d872 竞技场战斗流程更改 2023-06-30 20:47:22 +08:00
xiekaidong
3f4f62903d bug修复 2023-06-30 17:54:07 +08:00
xiekaidong
84f1f27c3c 战斗处理 2023-06-30 16:03:51 +08:00
xiekaidong
2ad12c4b46 竞技场节奏调整 2023-06-30 14:45:30 +08:00
xiekaidong
36526bcd5e 战斗调整 2023-06-29 21:14:24 +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