487 Commits

Author SHA1 Message Date
Fang
364cec49b5 添加头像背景品质 2023-06-20 14:22:55 +08:00
Fang
ab4fbf3067 添加重命名与当前昵称相同提示 2023-06-19 16:25:18 +08:00
Fang
45e6b4d856 跨天关闭副本关卡选择界面 2023-06-19 15:58:51 +08:00
xiekaidong
c440197d57 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-19 11:55:16 +08:00
xiekaidong
f1b4a21ae6 免控 2023-06-19 11:55:10 +08:00
Fang
700c007d73 添加容错 2023-06-19 11:41:16 +08:00
Fang
f3924368ce 头像昵称功能 2023-06-19 10:57:39 +08:00
xiekaidong
aa5f557c75 怪物经验可配置根据血量的分段经验 2023-06-16 18:42:41 +08:00
xiekaidong
7dae3a6ab5 火蛇海蛇效果 2023-06-16 15:13:38 +08:00
xiekaidong
82d6a78a6a bug修复 2023-06-16 11:48:57 +08:00
xiekaidong
2f8ba2991c Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-15 18:55:13 +08:00
xiekaidong
027809a5bd 战斗支持血量换皮肤 2023-06-15 18:55:10 +08:00
chenxi
b48bb85c5f 上报字段统一一下 2023-06-15 18:46:32 +08:00
chenxi
e97edc01df 战令等级bug 2023-06-15 16:57:32 +08:00
Fang
da6e53abfe 修改副本显示顺序、碎片副本奖励逻辑 2023-06-15 16:08:37 +08:00
xiekaidong
4cce3bb36b buff显示修改 2023-06-15 14:17:48 +08:00
Fang
193ea8902f 金币副本新增boss抗性 2023-06-15 10:46:36 +08:00
chenxi
9666158491 adjust上报 2023-06-14 21:43:02 +08:00
xiekaidong
12a68b6f0c Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-14 18:21:01 +08:00
xiekaidong
e664f4ab0a 连携提示 2023-06-14 18:20:57 +08:00
chenxi
ad09f090fe 多语言的缓存bug 2023-06-14 16:45:30 +08:00
xiekaidong
17ad018a43 日志上报 2023-06-14 16:00:17 +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
4d05a6e433 命名修改 2023-06-14 14:51:12 +08:00
Fang
49d9a4ebd9 修改继承类型 2023-06-14 14:35:31 +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
097812e730 fix 2023-06-14 10:22:34 +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
844c587d71 Merge branch 'dev_shenhe' into dev 2023-06-13 15:04:53 +08:00
chenxi
0e62320f31 审核模式不显示金猪 2023-06-13 15:04:47 +08:00
xiekaidong
ad7212ff13 新的肉鸽机制-改变effect概率 2023-06-13 11:11:06 +08:00
xiekaidong
f20f435227 Merge branch 'fang/dungeon' of http://git.juzugame.com/b6-client/b6-lua into fang/dungeon
# Conflicts:
#	lua/app/config/chapter_dungeon_gold.lua
#	lua/app/module/dungeon/dungeon_manager.lua
2023-06-12 18:50:40 +08:00
xiekaidong
30bfbb5476 接入战斗 2023-06-12 18:49:59 +08:00
Fang
decabd89ee 补充奖励显示逻辑 2023-06-12 18:47:09 +08:00
chenxi
0d916a96e8 Merge branch 'dev_shenhe' into dev 2023-06-12 18:25:37 +08:00
chenxi
8891f004ff 审核模式 2023-06-12 18:25:14 +08:00
xiekaidong
59289536d1 副本战斗 2023-06-12 17:58:40 +08:00
Fang
9d648fb450 补充逻辑 2023-06-12 17:14:00 +08:00
Fang
e4dad61f52 活动副本 2023-06-12 15:39:52 +08:00
xiekaidong
47ee292697 更改近身攻击距离 2023-06-12 10:09:42 +08:00
xiekaidong
225fa8ad1f 每日挑战不显示每日buff信息 2023-06-12 09:46:51 +08:00
chenxi
cd0f34f5ee 商店页签红点 2023-06-09 15:45:43 +08:00
chenxi
1d163ad8eb 商店 2023-06-09 15:41:54 +08:00
chenxi
4d898cee05 商店页签红点 2023-06-09 15:33:45 +08:00
chenxi
60e6251493 商店页签红点 2023-06-09 15:30:36 +08:00
chenxi
822b6baa75 商店热卖标签红点 2023-06-08 20:51:09 +08:00