780 Commits

Author SHA1 Message Date
Fang
0b8904f47a 每日挑战界面调整、扣除次数修复 2023-05-31 10:27:09 +08:00
chenxi
86a321a568 七天乐界面调整 2023-05-31 10:12:26 +08:00
xiekaidong
129d617360 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-05-31 10:07:30 +08:00
xiekaidong
8f85fd61cc 适配问题 2023-05-31 10:07:27 +08:00
chenxi
af2ef4f074 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-05-31 10:00:59 +08:00
chenxi
8834252c36 七天乐宝箱 2023-05-31 10:00:52 +08:00
CloudJ
6f1e049253 礼包样式调整 2023-05-31 09:46:07 +08:00
CloudJ
de67799f89 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-05-31 09:45:57 +08:00
chenxi
e6e294b949 七天乐 2023-05-30 22:23:55 +08:00
xiekaidong
075d7a2480 层级调整 2023-05-30 22:04:57 +08:00
chenxi
a58c63a617 ab name 2023-05-30 21:15:29 +08:00
chenxi
3b85a8f27d 资源纠正 2023-05-30 21:12:21 +08:00
CloudJ
4fbdaa31e5 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-05-30 19:35:25 +08:00
CloudJ
d1ab31227b 替换首充界面 2023-05-30 19:35:02 +08:00
chenxi
42395ab955 七天乐天数不够时的表现 2023-05-30 19:14:56 +08:00
xiekaidong
b5ec3d4eff 显示优化 2023-05-30 18:41:09 +08:00
xiekaidong
222c19ea40 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-05-30 18:33:14 +08:00
xiekaidong
937145b857 boss出场动画 2023-05-30 18:33:11 +08:00
chenxi
8a6f2ac884 邮箱加一个开启限制 2023-05-30 18:18:56 +08:00
xiekaidong
f42fc92736 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-05-30 18:13:06 +08:00
xiekaidong
7f9bdc0508 显示bug修复 2023-05-30 18:13:01 +08:00
DESKTOP-5E92U9B\BigFoot
c0d8209a37 BOSS出场ui字体动效添加 2023-05-30 18:06:34 +08:00
xiekaidong
d13af1bd70 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-05-30 17:42:30 +08:00
xiekaidong
203c2699e9 boss入场动画 2023-05-30 17:42:26 +08:00
chenxi
7232c65937 更新任务界面 2023-05-30 17:30:35 +08:00
chenxi
5b5109c5ae 基金展示大小 2023-05-30 17:26:32 +08:00
chenxi
e8a737bec6 基金展示 2023-05-30 17:24:34 +08:00
chenxi
315d5bf0e8 战令点击预览跳转 2023-05-30 16:26:21 +08:00
chenxi
7af6800ea0 功能解锁弹窗 2023-05-30 15:33:46 +08:00
xiekaidong
cd99e669cb 更新配置 2023-05-30 15:08:30 +08:00
CloudJ
7a786d8729 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-05-30 14:49:59 +08:00
CloudJ
580d184f17 prefab 2023-05-30 14:49:56 +08:00
xiekaidong
0ca0434498 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-05-30 14:16:31 +08:00
xiekaidong
ca8109cd8d buff描述 2023-05-30 14:16:28 +08:00
chenxi
02b776eaf9 英雄解锁 2023-05-30 12:17:31 +08:00
xiekaidong
4ff60e7b0c 资源 2023-05-30 11:59:38 +08:00
Fang
75d132c7c3 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge 2023-05-30 10:35:24 +08:00
chenxi
4ab5ab8364 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-05-30 10:19:00 +08:00
chenxi
b1d4cc7728 英雄解锁界面 2023-05-30 10:18:57 +08:00
xiekaidong
747c85556f 资源提交 2023-05-30 09:37:14 +08:00
Fang
9a0d2fc84d 材质丢失fix 2023-05-29 18:32:09 +08:00
Fang
c5ca672020 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
#	Assets/arts/atlas/ui/battle.spriteatlas
#	Assets/arts/atlas/ui/common.asset
#	Assets/arts/textures/ui/common/common_board_23.png.meta
#	Assets/arts/textures/ui/common/common_board_24.png.meta
#	Assets/arts/textures/ui/common/common_board_25.png.meta
#	Assets/arts/textures/ui/common/common_dec_12.png.meta
#	Assets/arts/textures/ui/common/common_title_9.png.meta
#	Assets/arts/textures/ui/common/common_toast_2.png.meta
2023-05-29 18:23:09 +08:00
CloudJ
47e09a5249 红点逻辑 2023-05-29 18:08:29 +08:00
CloudJ
b25a43efbf 更新首充界面 2023-05-29 17:16:00 +08:00
chenxi
866e5ff242 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-05-29 15:50:11 +08:00
chenxi
a47d2ea405 按钮设置 2023-05-29 15:50:08 +08:00
CloudJ
821c1f0365 字体 2023-05-29 15:12:47 +08:00
chenxi
809fda8619 基金重命名 2023-05-29 10:54:43 +08:00
chenxi
6c59617e8d 战令滑动区域 2023-05-26 22:44:39 +08:00
chenxi
9a5d50b728 调整界面 2023-05-26 19:01:36 +08:00