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
|
7e8b46effc
|
技能音效
|
2023-06-13 17:44:37 +08:00 |
|
xiekaidong
|
59f0cd755b
|
修改每日挑战战斗界面的任务入口
|
2023-06-13 15:25:06 +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
|
dd104eae3f
|
每日挑战不显示每日buff信息
|
2023-06-12 09:47:25 +08:00 |
|
xiekaidong
|
ffcfe93299
|
切换波次时自动关闭buff弹窗
|
2023-06-06 14:13:07 +08:00 |
|
xiekaidong
|
85eff9cbec
|
调快速度
|
2023-06-06 11:56:34 +08:00 |
|
xiekaidong
|
d56c7110d7
|
boss预警音效
|
2023-06-06 10:39:04 +08:00 |
|
xiekaidong
|
5bc73b98ab
|
消除显示优化
|
2023-06-05 20:53:19 +08:00 |
|
xiekaidong
|
e6a28c8acd
|
修改bug，优化战斗流程逻辑
|
2023-06-03 19:12:33 +08:00 |
|
xiekaidong
|
b60f9b1ca4
|
boss机制棋盘效果处理
|
2023-06-02 22:28:55 +08:00 |
|
xiekaidong
|
c65d52c8de
|
水泡动画
|
2023-06-02 19:02:18 +08:00 |
|
xiekaidong
|
e4d84563f9
|
先更新一下格子
|
2023-06-02 16:54:59 +08:00 |
|
xiekaidong
|
9a32b0d721
|
去掉boss停帧
|
2023-06-02 09:37:41 +08:00 |
|
xiekaidong
|
f2c54a2677
|
bug修复
|
2023-06-01 16:35:33 +08:00 |
|
xiekaidong
|
6142cbd292
|
显示问题修复
|
2023-06-01 10:06:54 +08:00 |
|
xiekaidong
|
075d7a2480
|
层级调整
|
2023-05-30 22:04:57 +08:00 |
|
xiekaidong
|
ec4c24b366
|
boss出场动画
|
2023-05-30 18:33:31 +08:00 |
|
xiekaidong
|
29a8e59133
|
编译lua
|
2023-05-30 17:50:23 +08:00 |
|
xiekaidong
|
ca8109cd8d
|
buff描述
|
2023-05-30 14:16:28 +08:00 |
|
chenxi
|
2fbe01e673
|
每日挑战
|
2023-05-30 11:45:27 +08:00 |
|
xiekaidong
|
cd90b01e62
|
引导表现
|
2023-05-29 11:20:12 +08:00 |
|
xiekaidong
|
f40ddbf2ea
|
技能刷新接入联网
|
2023-05-24 10:03:20 +08:00 |
|
xiekaidong
|
47b32345d6
|
反击表现
|
2023-05-23 20:10:54 +08:00 |
|
xiekaidong
|
97953f1958
|
格挡动作表现、反击界面表现
|
2023-05-23 16:40:45 +08:00 |
|
xiekaidong
|
1d657e3128
|
boss入场动画
|
2023-05-22 20:32:26 +08:00 |
|
xiekaidong
|
f4b1d70efa
|
boss的buff自动提示
|
2023-05-22 17:24:07 +08:00 |
|
xiekaidong
|
abd32989ad
|
通用技能tips
|
2023-05-22 16:38:42 +08:00 |
|
xiekaidong
|
cf654fe422
|
技能tips
|
2023-05-22 16:00:44 +08:00 |
|
chenxi
|
ebb71fdd31
|
任务点击箱子的tips
|
2023-05-19 16:52:45 +08:00 |
|
xiekaidong
|
fff1c9260e
|
宝箱
|
2023-05-17 19:20:18 +08:00 |
|
xiekaidong
|
63ad1d641a
|
神灯障碍物
|
2023-05-16 21:24:26 +08:00 |
|
xiekaidong
|
098220b08c
|
编译lua
|
2023-05-12 20:30:10 +08:00 |
|
xiekaidong
|
250c8a0827
|
表现修改一下
|
2023-05-11 20:15:19 +08:00 |
|
xiekaidong
|
9122032a63
|
一些技能机制
|
2023-05-11 19:19:06 +08:00 |
|
xiekaidong
|
d60bf3eec9
|
节奏调整
|
2023-05-04 18:06:13 +08:00 |
|
xiekaidong
|
af35eb8118
|
节奏
|
2023-05-04 17:42:00 +08:00 |
|
xiekaidong
|
9fb9e32fc8
|
调整一下下落动画节奏
|
2023-05-04 17:33:14 +08:00 |
|
chenxi
|
2505cff6d3
|
还原combo
|
2023-04-27 19:14:55 +08:00 |
|
chenxi
|
0cbfa8841c
|
编译
|
2023-04-27 18:39:24 +08:00 |
|
xiekaidong
|
379f98d728
|
技能回收最多3个
|
2023-04-27 17:43:41 +08:00 |
|
xiekaidong
|
05965fa97e
|
bug修复
|
2023-04-27 15:24:50 +08:00 |
|
chenxi
|
c2ce86c24b
|
震屏bug
|
2023-04-27 11:02:57 +08:00 |
|
chenxi
|
d305b7c103
|
编译
|
2023-04-26 22:32:38 +08:00 |
|
chenxi
|
a3ee32d64c
|
编译
|
2023-04-26 21:36:01 +08:00 |
|
chenxi
|
1de83c3dfb
|
节点
|
2023-04-26 21:00:58 +08:00 |
|
chenxi
|
e81de3ea03
|
连击效果
|
2023-04-26 20:48:06 +08:00 |
|
xiekaidong
|
8dd23fb8ce
|
特效丢失问题
|
2023-04-26 18:48:15 +08:00 |
|
chenxi
|
e564a8a4b2
|
编译
|
2023-04-26 18:08:48 +08:00 |
|