Fang
|
6ad7ea4135
|
编译
|
2023-06-14 14:54:11 +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
|
7e8b46effc
|
技能音效
|
2023-06-13 17:44:37 +08:00 |
|
xiekaidong
|
80d3f8cb17
|
grideffect=6的处理
|
2023-06-13 15:08:42 +08:00 |
|
chenxi
|
04ab254222
|
编译
|
2023-06-13 15:06:57 +08:00 |
|
xiekaidong
|
de0b2828a7
|
新的肉鸽机制-改变effect概率
|
2023-06-13 11:11:46 +08:00 |
|
chenxi
|
e86d257330
|
merge
|
2023-06-13 10:45:07 +08:00 |
|
xiekaidong
|
3e92da4286
|
界面处理
|
2023-06-13 10:20:17 +08:00 |
|
chenxi
|
e81eab8c4f
|
编译
|
2023-06-12 18:27:47 +08:00 |
|
xiekaidong
|
f48f17db38
|
攻击距离可配置
|
2023-06-12 10:38:07 +08:00 |
|
xiekaidong
|
dd104eae3f
|
每日挑战不显示每日buff信息
|
2023-06-12 09:47:25 +08:00 |
|
chenxi
|
92f0b087c9
|
编译
|
2023-06-08 21:38:54 +08:00 |
|
CloudJ
|
700804df00
|
编译
|
2023-06-06 18:22:26 +08:00 |
|
xiekaidong
|
de983ee4e5
|
战斗bi日志上报
|
2023-06-06 18:07:07 +08:00 |
|
Fang
|
49af10d8a9
|
战斗退出后显示主界面控制
|
2023-06-06 17:31:34 +08:00 |
|
CloudJ
|
a7756805cb
|
编译
|
2023-06-06 17:12:25 +08:00 |
|
xiekaidong
|
cb667f4e9c
|
bug修复
|
2023-06-06 16:45:39 +08:00 |
|
chenxi
|
29a6483899
|
编译
|
2023-06-06 12:01:23 +08:00 |
|
CloudJ
|
6e6bbb013b
|
编译
|
2023-06-05 19:43:50 +08:00 |
|
CloudJ
|
5008ac9a76
|
编译
|
2023-06-05 15:21:06 +08:00 |
|
CloudJ
|
9c2745302f
|
编译
|
2023-06-05 14:21:57 +08:00 |
|
CloudJ
|
ab33223ea6
|
编译
|
2023-06-05 14:10:56 +08:00 |
|
CloudJ
|
b46065772c
|
编译
|
2023-06-05 11:48:01 +08:00 |
|
Fang
|
6c637656e5
|
编译
|
2023-06-05 10:43:13 +08:00 |
|
xiekaidong
|
e6a28c8acd
|
修改bug，优化战斗流程逻辑
|
2023-06-03 19:12:33 +08:00 |
|
xiekaidong
|
c65d52c8de
|
水泡动画
|
2023-06-02 19:02:18 +08:00 |
|
CloudJ
|
03424f4786
|
编译
|
2023-06-02 18:43:49 +08:00 |
|
Fang
|
5356a92634
|
功能解锁飞行动画
|
2023-06-02 18:36:05 +08:00 |
|
xiekaidong
|
e4d84563f9
|
先更新一下格子
|
2023-06-02 16:54:59 +08:00 |
|
xiekaidong
|
88008cdf67
|
显示优化
|
2023-06-01 22:10:51 +08:00 |
|
xiekaidong
|
f2c54a2677
|
bug修复
|
2023-06-01 16:35:33 +08:00 |
|
chenxi
|
18bbe0108f
|
编译
|
2023-06-01 11:14:34 +08:00 |
|
CloudJ
|
d532073bd2
|
编译
|
2023-06-01 10:23:11 +08:00 |
|
chenxi
|
791a81438b
|
绑定账号
|
2023-05-31 22:23:48 +08:00 |
|
xiekaidong
|
7e25cb28cb
|
三消格子支持spine动画表现
|
2023-05-31 20:18:57 +08:00 |
|
Fang
|
c5e4e9e4a9
|
主界面按钮切换动画替换
|
2023-05-31 17:57:20 +08:00 |
|
CloudJ
|
e36c841ade
|
编译
|
2023-05-31 15:43:07 +08:00 |
|
Fang
|
645d23fb74
|
编译
|
2023-05-31 14:42:15 +08:00 |
|
xiekaidong
|
0fc01c78b6
|
战斗相关bug修复
|
2023-05-31 14:24:15 +08:00 |
|
CloudJ
|
fdd3963902
|
编译
|
2023-05-31 11:38:15 +08:00 |
|
Fang
|
0b8904f47a
|
每日挑战界面调整、扣除次数修复
|
2023-05-31 10:27:09 +08:00 |
|
CloudJ
|
71c0d6729b
|
编译
|
2023-05-31 09:46:56 +08:00 |
|
xiekaidong
|
b031fe8a9b
|
更新配置
|
2023-05-30 21:30:41 +08:00 |
|
chenxi
|
a58c63a617
|
ab name
|
2023-05-30 21:15:29 +08:00 |
|
chenxi
|
8a6f2ac884
|
邮箱加一个开启限制
|
2023-05-30 18:18:56 +08:00 |
|
chenxi
|
075291e173
|
编译
|
2023-05-30 15:58:54 +08:00 |
|
chenxi
|
7af6800ea0
|
功能解锁弹窗
|
2023-05-30 15:33:46 +08:00 |
|
xiekaidong
|
cd99e669cb
|
更新配置
|
2023-05-30 15:08:30 +08:00 |
|
xiekaidong
|
ca8109cd8d
|
buff描述
|
2023-05-30 14:16:28 +08:00 |
|
chenxi
|
12044a354e
|
容错
|
2023-05-30 11:53:05 +08:00 |
|