102 Commits

Author SHA1 Message Date
xiekaidong
e4aa6e2edd 更新配置 2023-09-01 21:21:02 +08:00
xiekaidong
9641889e5d 重生处理 2023-08-14 16:29:01 +08:00
Fang
5f53448c75 新加颜色生命值加成 2023-08-11 18:16:16 +08:00
xiekaidong
ce7ad3cb8c 新buff和新机制 2023-08-08 16:39:03 +08:00
xiekaidong
51d857b64e 新增两个反伤护盾 2023-08-04 16:35:56 +08:00
xiekaidong
b38cc4acca 新增buff和叠加方式优化 2023-07-21 14:40:39 +08:00
xiekaidong
ef7fed0faa buff机制修改 2023-07-21 11:39:02 +08:00
xiekaidong
cdcc498a7e 支线副本 2023-07-20 19:46:26 +08:00
xiekaidong
61336e5d6c 编译lua 2023-07-19 20:24:13 +08:00
Fang
6f8acc2673 新号报错处理 2023-07-17 15:18:57 +08:00
Fang
2101a422bb 英雄图鉴 2023-07-14 17:08:08 +08:00
xiekaidong
47a5446628 修改战斗伤害公式 2023-07-10 16:07:46 +08:00
xiekaidong
b8e057fab3 英雄面板属性加密 2023-07-05 17:25:46 +08:00
xiekaidong
2ce21cba6d 连击提示 2023-07-05 11:23:19 +08:00
xiekaidong
ca456f4bbe bug修复 2023-07-04 20:21:48 +08:00
xiekaidong
03cce7d521 战斗处理 2023-06-30 16:04:26 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
xiekaidong
9d0901dc2b 免控 2023-06-19 11:55:52 +08:00
xiekaidong
e98b0d2368 伤害数字重叠问题 2023-06-14 18:35:41 +08:00
xiekaidong
a3a9ac1fb7 连携提示 2023-06-14 18:21:48 +08:00
Fang
ee97ab1c93 Merge branch 'dev' into fang/dungeon
# Conflicts:
#	Assets/lua/app/config/item.lua.bytes
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/skill.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/global.lua.bytes
#	Assets/lua/app/config/strings/en/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/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/global.lua.bytes
#	Assets/lua/app/config/strings/zh/item.lua.bytes
#	Assets/lua/app/module/battle/battle_const.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
#	Assets/lua/app/ui/battle/battle_ui.lua.bytes
#	Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
2023-06-14 11:42:03 +08:00
xiekaidong
80d3f8cb17 grideffect=6的处理 2023-06-13 15:08:42 +08:00
xiekaidong
3e92da4286 界面处理 2023-06-13 10:20:17 +08:00
xiekaidong
47ddf4f7c7 更新协议 2023-06-12 16:53:24 +08:00
chenxi
92f0b087c9 编译 2023-06-08 21:38:54 +08:00
xiekaidong
b60f9b1ca4 boss机制棋盘效果处理 2023-06-02 22:28:55 +08:00
xiekaidong
ffcd0014c7 新增障碍物效果类型 2023-06-02 20:14:09 +08:00
xiekaidong
bba75a2806 特效问题修复 2023-06-01 18:19:14 +08:00
xiekaidong
0fc01c78b6 战斗相关bug修复 2023-05-31 14:24:15 +08:00
CloudJ
fdd3963902 编译 2023-05-31 11:38:15 +08:00
chenxi
2fbe01e673 每日挑战 2023-05-30 11:45:27 +08:00
xiekaidong
2d14102407 反伤bug、反击bug、死亡时带有流血buff触发机制实现 2023-05-26 21:37:35 +08:00
xiekaidong
6e544c41d4 相互反击的bug 2023-05-24 11:02:53 +08:00
xiekaidong
47b32345d6 反击表现 2023-05-23 20:10:54 +08:00
xiekaidong
f8bfac1c35 冰冻状态、昏睡状态 2023-05-23 18:36:03 +08:00
xiekaidong
97953f1958 格挡动作表现、反击界面表现 2023-05-23 16:40:45 +08:00
xiekaidong
27bd9d3b09 果冻 2023-05-19 20:45:09 +08:00
xiekaidong
36950a4364 更新pb 2023-05-19 18:23:35 +08:00
xiekaidong
7d72a0fbad 新增技能机制 2023-05-19 10:52:23 +08:00
xiekaidong
efaa9ff92a 修改prefab 2023-05-18 22:09:30 +08:00
xiekaidong
fff1c9260e 宝箱 2023-05-17 19:20:18 +08:00
xiekaidong
63ad1d641a 神灯障碍物 2023-05-16 21:24:26 +08:00
xiekaidong
55e4216493 打开广告刷新按钮 2023-05-15 11:04:23 +08:00
xiekaidong
098220b08c 编译lua 2023-05-12 20:30:10 +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
xiekaidong
d60bf3eec9 节奏调整 2023-05-04 18:06:13 +08:00
chenxi
2505cff6d3 还原combo 2023-04-27 19:14:55 +08:00