122 Commits

Author SHA1 Message Date
Fang
aeb1c8e24a 更换皮肤卡面变化 2023-08-30 17:31:56 +08:00
Fang
c22b887d48 加载资源优化 2023-08-29 17:11:27 +08:00
Fang
36bb8eede2 段位奖励添加奖励光效 2023-08-28 17:41:52 +08:00
Fang
e0db8bcfda 夏日活动 2023-08-11 11:52:12 +08:00
Fang
9c42fe1da6 皮肤功能 2023-08-09 14:16:27 +08:00
xiekaidong
42ad5ec9fa Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
#	lua/app/config/const.lua
#	lua/app/config/item.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/item.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/fr/item.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ja/skill.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/ru/item.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/strings/zh/skill.lua
2023-08-08 15:58:56 +08:00
xiekaidong
1620d69548 英雄竞技场段位解锁 2023-08-03 18:07:24 +08:00
Fang
d30f382d40 道具获取的头像品质颜色错误fix 2023-08-01 10:28:22 +08:00
Fang
d89238a763 抽卡界面不展示装备升级红点 2023-07-28 12:05:32 +08:00
xiekaidong
0fd125dcfc 增加容错 2023-07-28 10:49:14 +08:00
Fang
9740e4b4f6 红点修改 2023-07-27 12:02:48 +08:00
Fang
e688bfd26d 英雄红点fix 2023-07-26 18:23:12 +08:00
Fang
a80e0b5e90 装备红点、文案 2023-07-26 15:14:44 +08:00
xiekaidong
b1df62d3a4 英雄属性bug修复,查看其他玩家信息时带入装备信息 2023-07-22 18:15:46 +08:00
Fang
bafb8673ec 装备升级材料获取 2023-07-21 09:50:45 +08:00
xiekaidong
000bc5e926 武器副本的一些界面 2023-07-19 16:52:28 +08:00
xiekaidong
854ce2b986 通用扫荡弹窗 2023-07-19 10:39:22 +08:00
xiekaidong
27ef576c8f 副本入口 2023-07-18 21:00:12 +08:00
Fang
e580b332a9 添加头像、头像框道具解锁逻辑 2023-07-07 11:04:22 +08:00
xiekaidong
f13f1f3e3a 引导处理一下 2023-07-05 21:58:38 +08:00
Fang
c2843e5a88 完善细节 2023-07-03 18:34:51 +08:00
Fang
52a1631ad4 逻辑完善 2023-06-29 16:09:54 +08:00
xiekaidong
7f7707094d 竞技场战斗 2023-06-29 14:24:29 +08:00
Fang
a522015156 逻辑补充 2023-06-28 18:36:53 +08:00
Fang
cd09e79bca 竞技场 2023-06-27 18:27:11 +08:00
Fang
364cec49b5 添加头像背景品质 2023-06-20 14:22:55 +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
2df5f6a66c 结算界面、功能解锁界面dotween代码优化 2023-06-06 10:14:00 +08:00
Fang
d41a0f7744 战斗结算界面动画 2023-06-05 17:15:51 +08:00
CloudJ
6c673d7977 调整召唤动画 2023-06-05 16:50:54 +08:00
chenxi
0037311647 英雄大cell 2023-06-05 15:49:43 +08:00
chenxi
fa63de8ad9 英雄icon资源大小 2023-06-02 21:03:34 +08:00
CloudJ
5b667ffc0b 替换主界面 2023-06-02 19:32:39 +08:00
xiekaidong
fabf2372d4 显示问题 2023-05-31 14:30:17 +08:00
chenxi
71b9dd23a1 解锁逻辑 2023-05-29 15:19:24 +08:00
chenxi
d47baeebc1 调整一下英雄解锁的逻辑 2023-05-29 15:06:25 +08:00
chenxi
7cfdc4a2f1 奖励图标 2023-05-26 18:47:31 +08:00
chenxi
fc16894571 英雄图标 2023-05-26 18:16:57 +08:00
chenxi
a78be93bc1 宝箱tips 2023-05-19 16:36:59 +08:00
chenxi
b6da2f4bd6 挂机 2023-05-18 22:09:43 +08:00
xiekaidong
15cc2bd437 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
#	lua/app/config/chapter_board.lua
#	lua/app/config/mail.lua.meta
#	lua/app/config/strings/cn/mail.lua.meta
#	lua/app/config/strings/de/mail.lua.meta
#	lua/app/config/strings/en/mail.lua.meta
#	lua/app/config/strings/fr/mail.lua.meta
#	lua/app/config/strings/ja/mail.lua.meta
#	lua/app/config/strings/ko/mail.lua.meta
#	lua/app/config/strings/zh/mail.lua.meta
2023-05-17 19:19:35 +08:00
xiekaidong
2023930d62 宝箱 2023-05-17 19:19:24 +08:00
chenxi
0c775e8215 卡牌tips 2023-05-17 19:05:29 +08:00
chenxi
32051d90c6 战令 2023-05-15 21:32:13 +08:00
xiekaidong
18c83cfa0c 联网 2023-05-08 11:02:42 +08:00
chenxi
342c12d46a item cell 2023-04-26 18:27:48 +08:00
chenxi
78f0b9d91b 进度条规则 2023-04-25 12:08:46 +08:00
xiekaidong
e45172d4f5 一些spine 2023-04-24 15:49:57 +08:00