239 Commits

Author SHA1 Message Date
xiekaidong
9249ee3210 重生处理 2023-08-14 16:27:52 +08:00
xiekaidong
4c65578099 更新配置 2023-08-11 10:41:09 +08:00
xiekaidong
5eff2c3633 上报和容错 2023-08-10 18:41:24 +08:00
xiekaidong
5b8030552d 皮肤技能表现 2023-08-10 10:48:30 +08:00
xiekaidong
8f07e19054 新机制 2023-08-08 16:37:57 +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
97cddfa125 复活buff 2023-08-08 15:27:21 +08:00
xiekaidong
a6b05117b7 Merge branch 'master' into dev_20230809
# Conflicts:
#	lua/app/config/grid_type.lua
#	lua/app/userdata/dungeon/dungeon_armor_entity.lua
2023-08-08 11:41:34 +08:00
xiekaidong
82823526d9 自愈、海洋护盾buff 2023-08-04 16:19:59 +08:00
xiekaidong
8266b13b9a 棋盘机制调整 2023-08-04 14:24:01 +08:00
xiekaidong
fdfeae8819 bug修复 2023-08-03 16:53:47 +08:00
xiekaidong
62ee8bab01 木棍边缘障碍物 2023-08-02 18:07:44 +08:00
xiekaidong
caf1fd0af9 战斗续关 2023-07-31 16:22:05 +08:00
xiekaidong
933e402b85 bug修复 2023-07-24 21:20:06 +08:00
xiekaidong
bfff21b619 伤害公式bug修复 2023-07-21 17:46:56 +08:00
xiekaidong
dbbfbf4842 优化技能的释放位置逻辑 2023-07-21 15:36:05 +08:00
Fang
cc7feea039 review 2023-07-20 16:20:11 +08:00
xiekaidong
de16d711ec 层数护盾 2023-07-17 14:28:55 +08:00
xiekaidong
b1dd325b05 伤害公式 2023-07-13 18:18:22 +08:00
xiekaidong
90711c7e2a 英雄属性增加,以及战斗伤害治疗公式修改 2023-07-13 18:02:46 +08:00
xiekaidong
1759c04305 修改战斗伤害公式 2023-07-10 16:07:32 +08:00
xiekaidong
55a7ec4b82 战斗开始时更新英雄数据 2023-07-05 18:24:33 +08:00
xiekaidong
61b76292c9 英雄面板属性加密 2023-07-05 17:25:14 +08:00
xiekaidong
e597b9f7be 战斗中属性加密 2023-07-05 17:05:17 +08:00
xiekaidong
045b774449 战斗速度 2023-07-04 18:24:33 +08:00
xiekaidong
47d5b00318 取消连线 2023-07-04 18:05:17 +08:00
xiekaidong
8bc3bdba34 报错修复 2023-06-29 10:12:33 +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
63cfbbca68 bug修复 2023-06-20 21:02:13 +08:00
xiekaidong
f1b4a21ae6 免控 2023-06-19 11:55:10 +08:00
xiekaidong
aa5f557c75 怪物经验可配置根据血量的分段经验 2023-06-16 18:42:41 +08:00
xiekaidong
7dae3a6ab5 火蛇海蛇效果 2023-06-16 15:13:38 +08:00
xiekaidong
027809a5bd 战斗支持血量换皮肤 2023-06-15 18:55:10 +08:00
xiekaidong
4cce3bb36b buff显示修改 2023-06-15 14:17:48 +08:00
xiekaidong
e664f4ab0a 连携提示 2023-06-14 18:20:57 +08:00
xiekaidong
e3b8eaa04c 显示buff 2023-06-14 15:34:21 +08:00
xiekaidong
e010700340 技能音效 2023-06-13 17:43:55 +08:00
xiekaidong
ad7212ff13 新的肉鸽机制-改变effect概率 2023-06-13 11:11:06 +08:00
xiekaidong
47ee292697 更改近身攻击距离 2023-06-12 10:09:42 +08:00
xiekaidong
225fa8ad1f 每日挑战不显示每日buff信息 2023-06-12 09:46:51 +08:00
xiekaidong
538c9e51b1 bug修复 2023-06-06 16:44:59 +08:00
xiekaidong
eb2872b7ee 修改bug,优化战斗流程逻辑 2023-06-03 19:11:19 +08:00
xiekaidong
5a9558184b 火箭动画 2023-06-02 17:58:18 +08:00
xiekaidong
eb1354f807 先更新一下格子 2023-06-02 16:54:16 +08:00
xiekaidong
09e4b06ccd 显示优化 2023-06-01 22:10:01 +08:00
xiekaidong
694ef22777 格子支持一下spine 2023-05-31 20:11:00 +08:00
xiekaidong
981c440e5d 更新配置 2023-05-30 21:30:14 +08:00