136 Commits

Author SHA1 Message Date
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
Fang
da6e53abfe 修改副本显示顺序、碎片副本奖励逻辑 2023-06-15 16:08:37 +08:00
Fang
193ea8902f 金币副本新增boss抗性 2023-06-15 10:46:36 +08:00
xiekaidong
47d8b479f9 连携提示 2023-06-14 18:21:42 +08:00
xiekaidong
918146dda0 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-14 15:34:25 +08:00
xiekaidong
e3b8eaa04c 显示buff 2023-06-14 15:34:21 +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
ecb24214aa fix 2023-06-14 11:38:50 +08:00
Fang
1d68846a85 ui细节调整 2023-06-13 18:44:47 +08:00
xiekaidong
e010700340 技能音效 2023-06-13 17:43:55 +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
66db212dd4 更新配置 2023-06-09 17:34:07 +08:00
chenxi
94ce7bdc8e 更新配置 2023-06-06 18:40:23 +08:00
xiekaidong
c9558263e2 更新配置 2023-06-06 14:39:25 +08:00
xiekaidong
24a853e31a 显示优化 2023-06-06 11:32:07 +08:00
chenxi
952ada512e 更新配置 2023-06-06 10:49:11 +08:00
chenxi
16975e700e 充值后没有绑定则提示绑定 2023-06-05 18:32:51 +08:00
Fang
c5c36cbb86 更表 2023-06-05 17:29:36 +08:00
xiekaidong
e85af27bf2 更新配置 2023-06-05 15:54:09 +08:00
CloudJ
d20aa78385 配置表 2023-06-05 14:10:27 +08:00
CloudJ
98a9658bca 抽卡跳过 2023-06-05 10:24:01 +08:00
chenxi
c73734a068 更新配置 2023-06-02 17:20:31 +08:00
xiekaidong
eb1354f807 先更新一下格子 2023-06-02 16:54:16 +08:00
chenxi
51a60e0f1e 模块解锁 2023-05-31 20:53:57 +08:00
xiekaidong
4c4ae980dc bug修复 2023-05-31 18:06:16 +08:00
chenxi
7569ae41d4 更新配置 2023-05-31 14:32:01 +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
xiekaidong
063df7972b 显示优化 2023-05-30 18:40:48 +08:00
chenxi
4b7a41f638 基金显示模型 2023-05-30 17:22:42 +08:00
chenxi
9feb782b67 界面文本 2023-05-30 15:50:18 +08:00
xiekaidong
a828972f43 更新配置 2023-05-30 15:08:16 +08:00
Fang
9b3a00e809 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/skill.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/global.lua
#	lua/app/config/strings/de/buff.lua
#	lua/app/config/strings/en/buff.lua
#	lua/app/config/strings/fr/buff.lua
#	lua/app/config/strings/id/buff.lua
#	lua/app/config/strings/ja/buff.lua
#	lua/app/config/strings/ko/buff.lua
#	lua/app/config/strings/pt/buff.lua
#	lua/app/config/strings/ru/buff.lua
#	lua/app/config/strings/th/buff.lua
#	lua/app/config/strings/vi/buff.lua
#	lua/app/config/strings/zh/buff.lua
2023-05-30 10:35:05 +08:00
CloudJ
c01f881307 配置表 2023-05-30 09:43:49 +08:00
Fang
74f242b214 每日挑战开启状态变化fix 2023-05-29 18:22:17 +08:00
chenxi
5565fb2f8c 更新配置 2023-05-29 15:21:58 +08:00