452 Commits

Author SHA1 Message Date
Fang
6f8acc2673 新号报错处理 2023-07-17 15:18:57 +08:00
Fang
2101a422bb 英雄图鉴 2023-07-14 17:08:08 +08:00
xiekaidong
641deeedf0 侧边栏增加前往优惠商城的按钮,修改战斗内技能链接显示bug 2023-07-13 15:52:56 +08:00
xiekaidong
36af88f4b5 更新配置 2023-07-10 18:30:47 +08:00
xiekaidong
47a5446628 修改战斗伤害公式 2023-07-10 16:07:46 +08:00
xiekaidong
c8e1980dac 编译lua 2023-07-07 17:20:00 +08:00
xiekaidong
84ae5c96c6 出包前得资源检查和设置abName 2023-07-07 16:04:44 +08:00
xiekaidong
50f4e6c871 bug修复 2023-07-06 18:42:49 +08:00
xiekaidong
939b0c4651 竞技场日志上报 2023-07-06 18:09:03 +08:00
xiekaidong
3b67015da8 bug修复 2023-07-06 17:42:19 +08:00
xiekaidong
f98da34bda 引导延迟 2023-07-06 14:44:48 +08:00
xiekaidong
b8e057fab3 英雄面板属性加密 2023-07-05 17:25:46 +08:00
xiekaidong
de21e7b5d7 显示问题修复 2023-07-05 14:26:04 +08:00
xiekaidong
2ce21cba6d 连击提示 2023-07-05 11:23:19 +08:00
xiekaidong
c5ec2e1853 竞技场任务 2023-07-05 10:16:00 +08:00
xiekaidong
ca456f4bbe bug修复 2023-07-04 20:21:48 +08:00
xiekaidong
0320ef81bd prefab资源检查,更新字体 2023-07-04 20:16:20 +08:00
xiekaidong
3c66b5c3da 取消连线 2023-07-04 18:05:41 +08:00
Fang
829a6e65b0 fix 2023-07-04 15:15:36 +08:00
xiekaidong
d2a75b56d1 竞技场节奏调整 2023-07-04 10:55:31 +08:00
Fang
0e7f765ca2 fix 2023-07-03 09:51:15 +08:00
xiekaidong
f7c7f3ad27 bug修复 2023-06-30 17:54:39 +08:00
xiekaidong
03cce7d521 战斗处理 2023-06-30 16:04:26 +08:00
xiekaidong
826cdd1c32 战斗系数 2023-06-29 21:57:26 +08:00
xiekaidong
cbca95b111 战斗bug修复 2023-06-29 21:25:44 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
xiekaidong
46d7ebb42e 调整格子效果生效顺序 2023-06-21 16:03:04 +08:00
xiekaidong
bb0b9a6673 bug修复,上传资源 2023-06-20 17:51:19 +08:00
xiekaidong
3fc9c15755 bug修复 2023-06-20 16:29:21 +08:00
xiekaidong
ec2932edd3 bug修复 2023-06-20 11:35:39 +08:00
xiekaidong
9d0901dc2b 免控 2023-06-19 11:55:52 +08:00
xiekaidong
116fa0ef75 bug修复 2023-06-19 10:13:34 +08:00
chenxi
3791c54170 ab name 2023-06-16 21:55:12 +08:00
xiekaidong
da555bd8f3 怪物经验可配置根据血量的分段经验 2023-06-16 18:44:43 +08:00
xiekaidong
989a7c63e5 火蛇海蛇效果 2023-06-16 15:14:33 +08:00
xiekaidong
c0e16123f8 bug修复 2023-06-16 14:30:30 +08:00
xiekaidong
187dab8ee6 bug修复,更新图集 2023-06-16 10:59:00 +08:00
xiekaidong
62f45a0392 战斗支持血量换皮肤 2023-06-15 18:56:07 +08:00
xiekaidong
ef7d1f78cd bug修复 2023-06-15 17:53:01 +08:00
xiekaidong
0b5670c7a4 每日挑战任务完成情况上报 2023-06-15 17:30:49 +08:00
xiekaidong
2b3f4255a0 buff显示修改 2023-06-15 14:18:22 +08:00
xiekaidong
972a339c4a bug修复 2023-06-14 19:05:47 +08:00
xiekaidong
e98b0d2368 伤害数字重叠问题 2023-06-14 18:35:41 +08:00
xiekaidong
a3a9ac1fb7 连携提示 2023-06-14 18:21:48 +08:00
chenxi
25534ecacb 编译 2023-06-14 15:40:09 +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
523c2e4a7f 交换一下战斗双方死亡的判定顺序 2023-06-14 10:43:29 +08:00
xiekaidong
2c10467ffc 对手先手期间,英雄不会播放死亡动作bug修复 2023-06-14 10:03:52 +08:00
xiekaidong
7e8b46effc 技能音效 2023-06-13 17:44:37 +08:00
xiekaidong
80d3f8cb17 grideffect=6的处理 2023-06-13 15:08:42 +08:00