447 Commits

Author SHA1 Message Date
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
de67799f89 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-05-31 09:45:57 +08:00
chenxi
6e0ae548e2 ab name 2023-05-30 22:24:50 +08:00
chenxi
e6e294b949 七天乐 2023-05-30 22:23:55 +08:00
chenxi
a58c63a617 ab name 2023-05-30 21:15:29 +08:00
chenxi
a05dac0974 图集 2023-05-30 21:12:52 +08:00
chenxi
9a7e0c48f7 资源重命名 2023-05-30 21:09:45 +08:00
chenxi
0b0c229b43 材质球冗余苏醒 2023-05-30 20:04:00 +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
937145b857 boss出场动画 2023-05-30 18:33:11 +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
cdbec02808 字体 2023-05-30 17:26:51 +08:00
chenxi
7db78de72f Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-05-30 17:24:41 +08:00
chenxi
e8a737bec6 基金展示 2023-05-30 17:24:34 +08:00
2a60a2cbea Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-05-30 17:04:52 +08:00
ab28cb0408 32,33,40小怪优化 2023-05-30 17:04:45 +08:00
chenxi
075291e173 编译 2023-05-30 15:58:54 +08:00
d7f823e0b4 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-05-30 15:56:58 +08:00
9e4816b76c 28,29小怪加move 2023-05-30 15:56:53 +08:00
4f611f5307 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-05-30 15:51:09 +08:00
bc093e586d 1111 2023-05-30 15:50:45 +08:00
d72c59ad8d 小怪24.25.26.27死亡 2023-05-30 15:47:27 +08:00
e25f79dd83 小怪45.46死亡 2023-05-30 15:33:43 +08:00
c761680469 30,31小怪加move 2023-05-30 15:24:19 +08:00
6e6f2c4cb6 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-05-30 14:37:11 +08:00
d7b78e4d56 角色大小,boss加死亡 2023-05-30 14:36:59 +08:00
chenxi
02b776eaf9 英雄解锁 2023-05-30 12:17:31 +08:00
xiekaidong
4ff60e7b0c 资源 2023-05-30 11:59:38 +08:00
陈希
11b199ad84 Merge branch 'fang/daily_challenge' into 'dev'
每日挑战

See merge request b6-client/b6-unity!1
2023-05-30 03:38:31 +00:00
xiekaidong
d62a8edbe0 提交资源 2023-05-30 11:33:36 +08:00
Fang
75d132c7c3 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge 2023-05-30 10:35:24 +08:00
DESKTOP-5E92U9B\BigFoot
eeb05be577 BOSS修改 2023-05-30 10:23:53 +08:00
chenxi
feb719eab7 英雄解锁 2023-05-30 10:20:22 +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
5b99d61887 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-05-30 09:48:00 +08:00
12b3e4507e 10030 2023-05-30 09:47:51 +08:00
DESKTOP-5E92U9B\BigFoot
ee2e0152f8 BOSS修改 2023-05-30 09:43:39 +08:00
c7dd2e7925 20021 2023-05-29 21:49:37 +08:00
ccbe86f71d boss0001,0002 2023-05-29 21:41:26 +08:00
91e865aa4c 21资源更新 2023-05-29 21:33:31 +08:00
832c666514 增加hit帧 2023-05-29 21:13:22 +08:00