144 Commits

Author SHA1 Message Date
xiekaidong
8c3ce37bbe 引导问题 2023-07-12 16:46:21 +08:00
xiekaidong
9f9ee9e1d9 引导问题修复 2023-07-12 16:02:38 +08:00
xiekaidong
62989cb4cf 修改引导逻辑,防止异常卡死 2023-07-12 15:44:54 +08:00
xiekaidong
460a60a34f 木兰试玩 2023-07-10 12:00:32 +08:00
Fang
c4aed1b62d 主界面英雄页图标显示处理 2023-07-07 15:39:50 +08:00
xiekaidong
a34edc2fd7 快捷切换多语言 2023-07-07 11:39:30 +08:00
Fang
b8155b97de 成长礼包触发方式修改 2023-07-06 18:17:37 +08:00
xiekaidong
d90bff1941 引导 2023-07-06 09:57:57 +08:00
xiekaidong
7c3f2cd890 竞技场开启引导 2023-07-05 15:45:28 +08:00
xiekaidong
cb34322f99 竞技场解锁动画 2023-07-05 15:33:39 +08:00
xiekaidong
9ae7f3d8a0 英雄红点 2023-07-05 11:45:41 +08:00
Fang
5c4cfdcf28 段位图标重叠fix 2023-07-04 18:50:18 +08:00
xiekaidong
ce97be9b65 Merge branch 'dev' into arena
# Conflicts:
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/strings/cn/global.lua
#	lua/app/module/battle/controller/battle_controller.lua
#	lua/app/ui/main_city/main_city_ui.lua
2023-07-04 15:36:04 +08:00
xiekaidong
b445b12dff 客服系统红点 2023-07-04 10:41:10 +08:00
xiekaidong
a454faa670 Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena
# Conflicts:
#	lua/app/config/strings/cn/global.lua
2023-07-03 19:57:49 +08:00
xiekaidong
c976166cc9 竞技场弹窗礼包 2023-07-03 19:57:39 +08:00
Fang
c2843e5a88 完善细节 2023-07-03 18:34:51 +08:00
Fang
83f6a11b03 fix 2023-06-30 18:45:56 +08:00
Fang
52a1631ad4 逻辑完善 2023-06-29 16:09:54 +08:00
CloudJ
9b9bc72aa1 战令调整 2023-06-28 14:22:37 +08:00
CloudJ
519dc9822e Merge branch 'arena' of git.juzugame.com:b6-client/b6-lua into arena
# Conflicts:
#	lua/app/common/module_manager.lua
2023-06-28 09:38:58 +08:00
CloudJ
5cbcb29a4d 成长礼包 2023-06-28 09:38:29 +08:00
Fang
cd09e79bca 竞技场 2023-06-27 18:27:11 +08:00
CloudJ
b59a8d20d6 入门礼包 2023-06-27 17:24:32 +08:00
xiekaidong
e7a0f46fcb 传参改一下 2023-06-19 15:14:56 +08:00
Fang
e5e12f9b0b 修改传参 2023-06-19 15:06:54 +08:00
Fang
cbec901af5 玩家头像抽象成独立cell 2023-06-19 14:58:15 +08:00
Fang
c2734a66fb 头像框显示fix 2023-06-19 14:38:39 +08:00
Fang
700c007d73 添加容错 2023-06-19 11:41:16 +08:00
Fang
f3924368ce 头像昵称功能 2023-06-19 10:57:39 +08:00
chenxi
c1b1d0748a 一些界面响应安卓返回键 2023-06-15 22:02:38 +08:00
xiekaidong
e8b6534d3b 副本开启引导触发 2023-06-15 15:32:27 +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
097812e730 fix 2023-06-14 10:22:34 +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
Fang
e4dad61f52 活动副本 2023-06-12 15:39:52 +08:00
chenxi
c1c5e8415e 金猪满了后下一次进主城要弹出来 2023-06-08 20:20:42 +08:00
CloudJ
f95926cfde 增加一部分上报 2023-06-06 17:11:16 +08:00
Fang
1cebb9f5aa 引导和界面冲突处理 2023-06-06 10:39:13 +08:00
chenxi
418390a920 红点位置 2023-06-05 20:41:35 +08:00
chenxi
f4876233ae bug 2023-06-05 19:08:23 +08:00
chenxi
5216c8ff69 侧边栏优化 2023-06-05 16:23:55 +08:00
CloudJ
aa3bb714ac Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 11:45:42 +08:00
CloudJ
f2c8b0317b 替换宝箱UI 2023-06-05 11:45:39 +08:00
xiekaidong
c43e51b3d4 每日挑战引导 2023-06-05 11:05:00 +08:00
CloudJ
954d4c317d 商城跳转功能 2023-06-03 23:29:23 +08:00
chenxi
74ba59f107 调整一下货币顺序 2023-06-02 21:30:30 +08:00
CloudJ
6ff90dafa4 主界面调整 2023-06-02 19:58:05 +08:00
Fang
b6936a2c4a 功能解锁飞行动画 2023-06-02 18:35:36 +08:00