133 Commits

Author SHA1 Message Date
xiekaidong
bab7c281ca 更新配置,英雄排序问题 2023-07-21 11:47:19 +08:00
xiekaidong
8b4933f4f0 支线副本 2023-07-20 17:41:42 +08:00
xiekaidong
000bc5e926 武器副本的一些界面 2023-07-19 16:52:28 +08:00
xiekaidong
0cfce182b3 更新配置 2023-07-18 16:45:46 +08:00
xiekaidong
de04cbc6ff 更新配置和优化 2023-07-17 17:21:00 +08:00
Fang
b2dba1de2e 英雄图鉴 2023-07-14 17:07:03 +08:00
xiekaidong
a69305960b 更新配置 2023-07-13 18:03:33 +08:00
xiekaidong
4c8b8116e3 更新配置 2023-07-12 14:57:56 +08:00
xiekaidong
dde65f49c3 设置界面新增社区链接按钮 2023-07-11 15:45:14 +08:00
xiekaidong
576320840a 更新配置 2023-07-07 16:06:11 +08:00
Fang
7eabeeb752 超框 2023-07-06 19:23:17 +08:00
Fang
2a6d74482f 导表 2023-07-06 18:19:11 +08:00
xiekaidong
8ee590a831 bug修复 2023-07-06 17:41:58 +08:00
Fang
47418bab2e 竞技场宝箱增加每日次数控制 2023-07-06 10:24:53 +08:00
Fang
f24f8d5e75 显示修复 2023-07-05 15:55:44 +08:00
xiekaidong
cd4af85987 更新配置 2023-07-05 15:35:10 +08:00
Fang
b563ed2970 导表 2023-07-05 15:04:22 +08:00
Fang
68f80b45d3 竞技场ad宝箱功能补全 2023-07-05 15:02:59 +08:00
xiekaidong
7cb37f9d96 更新配置 2023-07-04 15:37:34 +08:00
Fang
abe661f228 空名称处理 2023-07-03 14:16:03 +08:00
Fang
9dc155e593 ui动画、结算界面逻辑 2023-06-30 16:50:50 +08:00
CloudJ
fdc773df09 竞技场战令 2023-06-26 11:26:28 +08:00
chenxi
b49e4f261f 更新配置 2023-06-21 11:21:20 +08:00
xiekaidong
b75fe6b754 更新配置 2023-06-20 21:03:20 +08:00
chenxi
594a6cced5 更新配置 2023-06-20 19:58:07 +08:00
xiekaidong
749de33dae 更新配置 2023-06-20 15:29:34 +08:00
chenxi
6f33fc030a 更新配置 2023-06-20 14:43:14 +08:00
Fang
b45ee34f5f 导表 2023-06-20 11:44:21 +08:00
Fang
ab4fbf3067 添加重命名与当前昵称相同提示 2023-06-19 16:25:18 +08:00
chenxi
8032ca378d 更新配置 2023-06-16 21:34:30 +08:00
xiekaidong
aa5f557c75 怪物经验可配置根据血量的分段经验 2023-06-16 18:42:41 +08:00
chenxi
e402550d92 更新配置 2023-06-16 12:05:32 +08:00
xiekaidong
c1fb666388 更新配置 2023-06-16 10:09:20 +08:00
xiekaidong
47d8b479f9 连携提示 2023-06-14 18:21:42 +08:00
Fang
98206fea34 Merge branch 'dev' into fang/dungeon
# Conflicts:
#	lua/app/config/avatar.lua.meta
#	lua/app/config/avatar_frame.lua.meta
#	lua/app/config/skill.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/avatar.lua.meta
#	lua/app/config/strings/cn/avatar_frame.lua.meta
#	lua/app/config/strings/cn/hero.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/avatar.lua.meta
#	lua/app/config/strings/de/avatar_frame.lua.meta
#	lua/app/config/strings/en/avatar.lua.meta
#	lua/app/config/strings/en/avatar_frame.lua.meta
#	lua/app/config/strings/fr/avatar.lua.meta
#	lua/app/config/strings/fr/avatar_frame.lua.meta
#	lua/app/config/strings/id/avatar.lua.meta
#	lua/app/config/strings/id/avatar_frame.lua.meta
#	lua/app/config/strings/ja/avatar.lua.meta
#	lua/app/config/strings/ja/avatar_frame.lua.meta
#	lua/app/config/strings/ko/avatar.lua.meta
#	lua/app/config/strings/ko/avatar_frame.lua.meta
#	lua/app/config/strings/pt/avatar.lua.meta
#	lua/app/config/strings/pt/avatar_frame.lua.meta
#	lua/app/config/strings/ru/avatar.lua.meta
#	lua/app/config/strings/ru/avatar_frame.lua.meta
#	lua/app/config/strings/th/avatar.lua.meta
#	lua/app/config/strings/th/avatar_frame.lua.meta
#	lua/app/config/strings/vi/avatar.lua.meta
#	lua/app/config/strings/vi/avatar_frame.lua.meta
#	lua/app/config/strings/zh/avatar.lua.meta
#	lua/app/config/strings/zh/avatar_frame.lua.meta
2023-06-14 11:41:12 +08:00
Fang
a788b1cb8c ui资源补充替换 2023-06-13 16:16:18 +08:00
chenxi
9779e5f4c6 删除多余的lua 2023-06-13 15:12:47 +08:00
chenxi
c65113785d 更新配置 2023-06-13 14:37:42 +08:00
xiekaidong
ad7212ff13 新的肉鸽机制-改变effect概率 2023-06-13 11:11:06 +08:00
Fang
e4dad61f52 活动副本 2023-06-12 15:39:52 +08:00
xiekaidong
eb1354f807 先更新一下格子 2023-06-02 16:54:16 +08:00
xiekaidong
4c4ae980dc bug修复 2023-05-31 18:06:16 +08:00
xiekaidong
abc9c6af93 更新配置 2023-05-31 09:34:19 +08:00
chenxi
e86e750a1b 更新配置 2023-05-30 22:23:19 +08:00
xiekaidong
981c440e5d 更新配置 2023-05-30 21:30:14 +08:00
chenxi
4b7a41f638 基金显示模型 2023-05-30 17:22:42 +08:00
Fang
74f242b214 每日挑战开启状态变化fix 2023-05-29 18:22:17 +08:00
Fang
0288f2a300 boss界面模型比例适配 2023-05-26 18:39:07 +08:00
Fang
b57318f3a6 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge 2023-05-26 18:26:21 +08:00
xiekaidong
c89eb8ef3f 禁锢 2023-05-26 18:08:05 +08:00