1192 Commits

Author SHA1 Message Date
Fang
536cc1dfc3 道具获取的头像品质颜色错误fix 2023-08-01 17:12:39 +08:00
Fang
d79e24d01f 装备副本材料获取界面排序 2023-08-01 16:43:48 +08:00
Fang
4bc9f441a5 防具升级刷新不及时fix 2023-08-01 14:45:49 +08:00
Fang
678a8fbd4c 添加音效 2023-08-01 11:10:51 +08:00
Fang
d30f382d40 道具获取的头像品质颜色错误fix 2023-08-01 10:28:22 +08:00
xiekaidong
0c840c0cc8 Merge branch 'battle' into dev_20230809 2023-07-31 16:25:48 +08:00
xiekaidong
80be66cc4b Merge branch 'master' into dev_20230809
# Conflicts:
#	lua/app/userdata/hero/hero_entity.lua
2023-07-31 16:25:06 +08:00
xiekaidong
caf1fd0af9 战斗续关 2023-07-31 16:22:05 +08:00
xiekaidong
9c04ce2fe0 增加gm 2023-07-31 14:11:25 +08:00
Fang
bdd7aaaf26 超框 2023-07-31 10:06:11 +08:00
Fang
532feae309 支线基金奖励领取按钮文案修改 2023-07-31 09:57:06 +08:00
xiekaidong
ef6969c4d9 引导修改 2023-07-28 18:40:11 +08:00
Fang
7145fb758a 修改副本入口命名 2023-07-28 18:04:24 +08:00
Fang
1b435f5c4b 1、抽卡界面不展示装备升级红点2、英雄未解锁时显示初始数值 2023-07-28 17:58:21 +08:00
Fang
3cd7442a8e 英雄未解锁时显示初始数值 2023-07-28 15:35:28 +08:00
Fang
d89238a763 抽卡界面不展示装备升级红点 2023-07-28 12:05:32 +08:00
Fang
7c7d201e01 技能tips 2023-07-28 11:46:22 +08:00
xiekaidong
63269b6af6 Merge branch 'dev_20230728_hotupdate' of http://git.juzugame.com/b6-client/b6-lua into dev_20230728_hotupdate 2023-07-28 10:49:18 +08:00
xiekaidong
0fd125dcfc 增加容错 2023-07-28 10:49:14 +08:00
Fang
29a149dab5 英雄收集文案fix、武器升级动效显示fix 2023-07-28 09:50:16 +08:00
Fang
9740e4b4f6 红点修改 2023-07-27 12:02:48 +08:00
Fang
7ffd2ee992 英雄图鉴红点fix 2023-07-27 10:32:52 +08:00
xiekaidong
e2e17b28c6 显示优化 2023-07-27 09:51:12 +08:00
Fang
e688bfd26d 英雄红点fix 2023-07-26 18:23:12 +08:00
Fang
9a3850c145 添加英雄升级标签红点,标签红点更新fix 2023-07-26 16:14:24 +08:00
Fang
a80e0b5e90 装备红点、文案 2023-07-26 15:14:44 +08:00
xiekaidong
52bc10db15 显示优化 2023-07-26 11:47:45 +08:00
Fang
6d3a0748a1 fix 2023-07-25 23:32:59 +08:00
xiekaidong
25bb8df7df Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-25 23:14:06 +08:00
xiekaidong
c71e0cd4d0 bug修复 2023-07-25 23:13:59 +08:00
Fang
0448dd5fa2 支线基金跨阶段fix 2023-07-25 23:10:35 +08:00
Fang
11624308ea 动效、fix 2023-07-25 22:33:51 +08:00
xiekaidong
84b0d6111f Merge branch 'master' into dev_20230725 2023-07-25 22:07:48 +08:00
xiekaidong
fd73d1b27e 优化显示 2023-07-25 21:52:29 +08:00
Fang
3dbb432b51 显示fix 2023-07-25 21:01:32 +08:00
Fang
01c2ed492c 拼写错误fix 2023-07-25 20:28:20 +08:00
Fang
4fe57bcfe8 装备界面显示fix 2023-07-25 19:59:31 +08:00
Fang
a5d2749ede 支线基金看完广告直接领奖 2023-07-25 19:59:31 +08:00
xiekaidong
a47d66626e 审核模式不显示基金 2023-07-25 19:31:58 +08:00
Fang
093decfeeb 显示fix 2023-07-25 18:16:44 +08:00
Fang
b2d2b65e73 显示fix 2023-07-25 18:11:05 +08:00
Fang
27affc743b 装备数值显示与计算分开处理 2023-07-25 17:18:43 +08:00
xiekaidong
03c6bdd523 bug修复 2023-07-25 17:16:54 +08:00
xiekaidong
cda0708069 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-25 16:36:28 +08:00
xiekaidong
b6d66aa8be 多语言 2023-07-25 16:36:25 +08:00
Fang
668fbe6611 副本扫荡fix 2023-07-25 16:12:45 +08:00
xiekaidong
3cd1b81e8f Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-25 16:06:07 +08:00
xiekaidong
74ccb9ac05 韩国社区跳转处理 2023-07-25 16:06:04 +08:00
Fang
6753303909 界面跳转未关闭fix 2023-07-25 15:44:10 +08:00
Fang
ce1e2f557d 收集奖励报错fix 2023-07-25 15:44:10 +08:00