190 Commits

Author SHA1 Message Date
xiekaidong
0cbb46e649 设置adName 2023-07-25 22:15:06 +08:00
xiekaidong
0a7c4c5170 bug修复 2023-07-24 20:55:03 +08:00
xiekaidong
cdcc498a7e 支线副本 2023-07-20 19:46:26 +08:00
xiekaidong
61336e5d6c 编译lua 2023-07-19 20:24:13 +08:00
xiekaidong
8978455495 战斗引导问题 2023-07-17 18:38:25 +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
de21e7b5d7 显示问题修复 2023-07-05 14:26:04 +08:00
xiekaidong
c5ec2e1853 竞技场任务 2023-07-05 10:16:00 +08:00
xiekaidong
0320ef81bd prefab资源检查,更新字体 2023-07-04 20:16:20 +08:00
xiekaidong
3c66b5c3da 取消连线 2023-07-04 18:05:41 +08:00
xiekaidong
d2a75b56d1 竞技场节奏调整 2023-07-04 10:55:31 +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
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
chenxi
3791c54170 ab name 2023-06-16 21:55:12 +08:00
xiekaidong
187dab8ee6 bug修复,更新图集 2023-06-16 10:59:00 +08:00
xiekaidong
ef7d1f78cd bug修复 2023-06-15 17:53:01 +08:00
xiekaidong
0b5670c7a4 每日挑战任务完成情况上报 2023-06-15 17:30:49 +08:00
xiekaidong
972a339c4a bug修复 2023-06-14 19:05:47 +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
523c2e4a7f 交换一下战斗双方死亡的判定顺序 2023-06-14 10:43:29 +08:00
xiekaidong
7e8b46effc 技能音效 2023-06-13 17:44:37 +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
xiekaidong
dd104eae3f 每日挑战不显示每日buff信息 2023-06-12 09:47:25 +08:00
xiekaidong
de983ee4e5 战斗bi日志上报 2023-06-06 18:07:07 +08:00
xiekaidong
f3c87a786f 修改上报 2023-06-06 15:25:51 +08:00
xiekaidong
ffcfe93299 切换波次时自动关闭buff弹窗 2023-06-06 14:13:07 +08:00
CloudJ
e7d278de0c 编译 2023-06-06 11:15:26 +08:00
xiekaidong
b2f8e11059 音效 2023-06-06 11:01:33 +08:00
xiekaidong
5bc73b98ab 消除显示优化 2023-06-05 20:53:19 +08:00
xiekaidong
e2e071c73d 技能选择规则优化 2023-06-05 10:46:37 +08:00
xiekaidong
9d25c123c5 bug修复 2023-06-05 10:37:15 +08:00
xiekaidong
e6a28c8acd 修改bug,优化战斗流程逻辑 2023-06-03 19:12:33 +08:00
xiekaidong
a0ee5ae6f1 更改一下死亡召唤触发时机 2023-06-03 17:47:04 +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
e4d84563f9 先更新一下格子 2023-06-02 16:54:59 +08:00
xiekaidong
79a5f0d641 战斗速度 2023-06-02 15:15:39 +08:00
xiekaidong
15e4af5d92 过场动画 2023-06-02 11:08:04 +08:00
xiekaidong
fb38d04282 bug修复 2023-06-01 21:12:26 +08:00