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 |
|
chenxi
|
0cbfa8841c
|
编译
|
2023-04-27 18:39:24 +08:00 |
|
xiekaidong
|
379f98d728
|
技能回收最多3个
|
2023-04-27 17:43:41 +08:00 |
|
chenxi
|
46f9462b79
|
回血加盾不算combo
|
2023-04-27 14:22:21 +08:00 |
|
chenxi
|
a3ee32d64c
|
编译
|
2023-04-26 21:36:01 +08:00 |
|
xiekaidong
|
dcd9ed1d3f
|
bug修复
|
2023-04-25 21:10:43 +08:00 |
|
xiekaidong
|
fed6c5f070
|
增加一个生效对象
|
2023-04-25 18:13:00 +08:00 |
|
xiekaidong
|
c100a36de5
|
bug修复
|
2023-04-25 17:52:09 +08:00 |
|
xiekaidong
|
09a35689bc
|
棋盘技能
|
2023-04-25 09:57:19 +08:00 |
|
xiekaidong
|
461cc41ac4
|
修改主界面
|
2023-04-24 17:38:44 +08:00 |
|
xiekaidong
|
39e9ba43a0
|
动画
|
2023-04-24 17:21:12 +08:00 |
|
chenxi
|
0bae4aa36d
|
伤害数字
|
2023-04-24 15:37:48 +08:00 |
|
xiekaidong
|
9184710970
|
显示优化
|
2023-04-24 14:16:44 +08:00 |
|
xiekaidong
|
11219e4716
|
bug修复
|
2023-04-24 10:14:38 +08:00 |
|
chenxi
|
7868fa9aa5
|
编译
|
2023-04-23 21:25:41 +08:00 |
|
xiekaidong
|
1da0916885
|
编译lua
|
2023-04-23 19:03:58 +08:00 |
|
xiekaidong
|
9249bc74f7
|
消除技能特效
|
2023-04-23 19:03:00 +08:00 |
|
chenxi
|
fd1576bec8
|
编译
|
2023-04-23 16:16:35 +08:00 |
|
xiekaidong
|
b2fb08e435
|
英雄排序bug修复
|
2023-04-23 15:49:10 +08:00 |
|