87 Commits

Author SHA1 Message Date
xiekaidong
fe19b35f7d 更新配置 2023-06-16 10:09:59 +08:00
Fang
fa28d96027 修改副本显示顺序、碎片副本奖励逻辑 2023-06-15 16:09:12 +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
7e8b46effc 技能音效 2023-06-13 17:44:37 +08:00
xiekaidong
de0b2828a7 新的肉鸽机制-改变effect概率 2023-06-13 11:11:46 +08:00
xiekaidong
3e92da4286 界面处理 2023-06-13 10:20:17 +08:00
xiekaidong
f48f17db38 攻击距离可配置 2023-06-12 10:38:07 +08:00
xiekaidong
dd104eae3f 每日挑战不显示每日buff信息 2023-06-12 09:47:25 +08:00
chenxi
29832da12e 编译 2023-06-06 18:44:31 +08:00
xiekaidong
77cd8d33ac 编译lua 2023-06-06 15:06:56 +08:00
chenxi
f867b77aa2 编译 2023-06-06 10:49:52 +08:00
chenxi
163ff77186 编译 2023-06-05 21:33:50 +08:00
chenxi
7224512691 充值后提示绑定 2023-06-05 18:33:48 +08:00
Fang
70bb61e9b6 更表 2023-06-05 17:30:58 +08:00
CloudJ
ab33223ea6 编译 2023-06-05 14:10:56 +08:00
chenxi
2fa49ed069 邮箱 2023-06-03 23:54:18 +08:00
CloudJ
30983ba637 编译 2023-06-02 20:35:37 +08:00
chenxi
c475012462 编译 2023-06-02 17:21:20 +08:00
xiekaidong
e4d84563f9 先更新一下格子 2023-06-02 16:54:59 +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
chenxi
e8a737bec6 基金展示 2023-05-30 17:24:34 +08:00
xiekaidong
cd99e669cb 更新配置 2023-05-30 15:08:30 +08:00
chenxi
2fbe01e673 每日挑战 2023-05-30 11:45:27 +08:00
xiekaidong
994fc2e7a2 更新配置 2023-05-30 10:03:53 +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
chenxi
0eaae0108e 编译 2023-05-26 12:52:15 +08:00
CloudJ
f79e8ebe89 编译 2023-05-25 15:27:25 +08:00
chenxi
14bf5e913d 编译 2023-05-19 21:58:07 +08:00
xiekaidong
27bd9d3b09 果冻 2023-05-19 20:45:09 +08:00
xiekaidong
ee9f6680b9 更新资源 2023-05-19 20:00:57 +08:00
xiekaidong
36950a4364 更新pb 2023-05-19 18:23:35 +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
xiekaidong
098220b08c 编译lua 2023-05-12 20:30:10 +08:00
chenxi
b6c15f641d 编译 2023-05-05 15:39:51 +08:00
chenxi
3154a8ab4e 编译 2023-04-27 19:20:01 +08:00
chenxi
5f71cef0f1 编译 2023-04-27 19:09:12 +08:00
chenxi
786937833b 更新配置 2023-04-27 17:29:45 +08:00