163 Commits

Author SHA1 Message Date
xiekaidong
afb44e8661 符文引导 2023-09-15 17:38:44 +08:00
xiekaidong
d4c7cf71b0 优化一下断线续关,并增加上报 2023-09-12 19:43:58 +08:00
xiekaidong
1f85dc4681 配置 2023-09-05 23:42:01 +08:00
xiekaidong
d003c8a551 bug修复 2023-09-04 16:51:34 +08:00
xiekaidong
3e06b26e1f 侧边栏 2023-09-04 16:48:15 +08:00
xiekaidong
0cdb8515ca 侧边栏 2023-09-04 16:06:42 +08:00
xiekaidong
eed3f88d79 首领公开赛 2023-09-01 21:10:05 +08:00
xiekaidong
211d7cc71e boss_rush 2023-08-30 19:11:38 +08:00
xiekaidong
4d5c23a6b6 容错 2023-08-24 14:30:39 +08:00
xiekaidong
c880279be1 英雄基金 2023-08-18 18:08:48 +08:00
Fang
84796cd4a8 活动礼包弹出逻辑补充 2023-08-11 15:08:23 +08:00
Fang
9c42fe1da6 皮肤功能 2023-08-09 14:16:27 +08:00
xiekaidong
a47f18db07 日志上报 2023-08-03 14:20:16 +08:00
xiekaidong
e954484a13 技能机制优化 2023-08-01 17:35:58 +08:00
xiekaidong
0c840c0cc8 Merge branch 'battle' into dev_20230809 2023-07-31 16:25:48 +08:00
xiekaidong
caf1fd0af9 战斗续关 2023-07-31 16:22:05 +08:00
Fang
7ffd2ee992 英雄图鉴红点fix 2023-07-27 10:32:52 +08:00
xiekaidong
37482eb2ca 副本引导 2023-07-24 17:10:39 +08:00
xiekaidong
f204a47316 试玩弹窗优化 2023-07-21 16:24:04 +08:00
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