69 Commits

Author SHA1 Message Date
Fang
a43ea6c7d7 编译 2023-07-26 16:15:13 +08:00
xiekaidong
66d69032e6 英雄属性bug修复,查看其他玩家信息时带入装备信息 2023-07-22 18:16:26 +08:00
xiekaidong
5b804f59f5 更新配置,上传资源 2023-07-21 17:18:21 +08:00
xiekaidong
5cb6ae349b 优化技能的释放位置逻辑 2023-07-21 15:36:27 +08:00
xiekaidong
36af88f4b5 更新配置 2023-07-10 18:30:47 +08:00
xiekaidong
ae12ce4101 更新配置 2023-07-07 16:06:18 +08:00
xiekaidong
dfd66067ec 更新配置 2023-06-20 21:03:38 +08:00
chenxi
cf3e9051f8 编译 2023-06-20 19:58:29 +08:00
xiekaidong
fe19b35f7d 更新配置 2023-06-16 10:09:59 +08:00
Fang
a5ca47d201 金币副本新增boss抗性 2023-06-15 10:47:11 +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
de0b2828a7 新的肉鸽机制-改变effect概率 2023-06-13 11:11:46 +08:00
xiekaidong
3e92da4286 界面处理 2023-06-13 10:20:17 +08:00
chenxi
29832da12e 编译 2023-06-06 18:44:31 +08:00
chenxi
163ff77186 编译 2023-06-05 21:33:50 +08:00
xiekaidong
0f8e6d1cf2 bug修复 2023-06-01 17:26:16 +08:00
chenxi
59cfb77e28 账号删除 2023-05-31 17:54:31 +08:00
chenxi
0184cce131 更新配置 2023-05-31 14:32:33 +08:00
xiekaidong
179f1279e4 更新配置 2023-05-31 09:34:42 +08:00
CloudJ
b30578771c 编译 2023-05-30 09:44:01 +08:00
chenxi
5eaa1f2f73 编译 2023-05-29 15:22:21 +08:00
CloudJ
35af04e42d compile 2023-05-26 19:58:22 +08:00
xiekaidong
1dbe6be188 禁锢效果 2023-05-26 18:09:46 +08:00
chenxi
b8652d1bbc 七天乐 2023-05-26 14:52:05 +08:00
xiekaidong
abd32989ad 通用技能tips 2023-05-22 16:38:42 +08:00
xiekaidong
27bd9d3b09 果冻 2023-05-19 20:45:09 +08:00
xiekaidong
ee9f6680b9 更新资源 2023-05-19 20:00:57 +08:00
xiekaidong
1eae40bf23 更新配置 2023-05-19 16:29:20 +08:00
chenxi
bcdbcec1db 编译 2023-05-18 22:11:58 +08:00
chenxi
9a122cf094 编译 2023-05-18 20:32:53 +08:00
xiekaidong
54fcd748cf 多段伤害 2023-05-18 10:59:17 +08:00
chenxi
88aa8c35e3 编译 2023-05-17 20:06:15 +08:00
chenxi
ccd4a380d9 编译 2023-05-16 18:18:19 +08:00
chenxi
5f71cef0f1 编译 2023-04-27 19:09:12 +08:00
chenxi
786937833b 更新配置 2023-04-27 17:29:45 +08:00
chenxi
597b00d8ea 编译 2023-04-26 19:02:10 +08:00
chenxi
a5c89fec0a 编译 2023-04-26 14:18:44 +08:00
chenxi
0b148a37da 编译 2023-04-25 22:15:38 +08:00
chenxi
7e1f206064 fix bug 2023-04-25 22:04:30 +08:00
chenxi
7164bd63bb 编译 2023-04-25 20:19:48 +08:00
xiekaidong
fed6c5f070 增加一个生效对象 2023-04-25 18:13:00 +08:00
chenxi
176fa1f3a7 编译 2023-04-25 17:49:16 +08:00
xiekaidong
0ed41e1da1 显示修改 2023-04-25 15:50:04 +08:00
chenxi
9afe9a1af0 编译 2023-04-25 14:40:59 +08:00
chenxi
a4ae91cd5a 编译 2023-04-24 21:51:39 +08:00
chenxi
d8f184dad7 编译 2023-04-24 21:21:49 +08:00
chenxi
82deccace8 更新配置 2023-04-24 17:26:29 +08:00
xiekaidong
f099cf9228 第二次刷新棋盘时,不下落空元素的bug修复 2023-04-24 09:46:55 +08:00