陈希
|
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 |
|
CloudJ
|
b20707cd8c
|
编译
|
2023-05-30 10:14:20 +08:00 |
|
xiekaidong
|
b8faa2553d
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-05-30 10:03:57 +08:00 |
|
xiekaidong
|
994fc2e7a2
|
更新配置
|
2023-05-30 10:03:53 +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 |
|
CloudJ
|
b30578771c
|
编译
|
2023-05-30 09:44:01 +08:00 |
|
xiekaidong
|
747c85556f
|
资源提交
|
2023-05-30 09:37:14 +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 |
|
|
|
f62b961371
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-05-29 21:13:26 +08:00 |
|
|
|
832c666514
|
增加hit帧
|
2023-05-29 21:13:22 +08:00 |
|
xiekaidong
|
9738d04b4f
|
删除空余行
|
2023-05-29 21:00:47 +08:00 |
|
xiekaidong
|
b4b79bc62a
|
技能bug修复
|
2023-05-29 20:27:33 +08:00 |
|
|
|
484899e70e
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-05-29 20:18:31 +08:00 |
|
|
|
9aaf00e22d
|
BOSS优化
|
2023-05-29 20:18:26 +08:00 |
|
xiekaidong
|
f58ef7302e
|
bug修复
|
2023-05-29 19:25:52 +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
|
ba4231ea83
|
编译
|
2023-05-29 18:08:46 +08:00 |
|
CloudJ
|
47e09a5249
|
红点逻辑
|
2023-05-29 18:08:29 +08:00 |
|
CloudJ
|
2850b01d5b
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-29 18:07:53 +08:00 |
|
xiekaidong
|
1637802fe4
|
资源
|
2023-05-29 18:00:04 +08:00 |
|
xiekaidong
|
fda6a5cb08
|
bug修复
|
2023-05-29 17:54:21 +08:00 |
|
xiekaidong
|
16c79f867e
|
更新资源
|
2023-05-29 17:49:45 +08:00 |
|
xiekaidong
|
51aff80206
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-05-29 17:48:32 +08:00 |
|
xiekaidong
|
f8bc9a6663
|
更新资源
|
2023-05-29 17:48:23 +08:00 |
|
DESKTOP-5E92U9B\BigFoot
|
38d26e32ce
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-05-29 17:42:28 +08:00 |
|
DESKTOP-5E92U9B\BigFoot
|
523649a978
|
小怪动画上传更新
|
2023-05-29 17:42:17 +08:00 |
|
xiekaidong
|
7bf8af7f73
|
更新资源
|
2023-05-29 17:36:44 +08:00 |
|
CloudJ
|
b25a43efbf
|
更新首充界面
|
2023-05-29 17:16:00 +08:00 |
|
DESKTOP-5E92U9B\BigFoot
|
d00a39b9b0
|
主角动画修改
|
2023-05-29 17:12:44 +08:00 |
|
DESKTOP-5E92U9B\BigFoot
|
bc1f1f7cb0
|
主角动画修改
|
2023-05-29 15:55:43 +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
|
13e23d167b
|
更配置
|
2023-05-29 15:38:58 +08:00 |
|
CloudJ
|
2dc45895cd
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-29 15:38:23 +08:00 |
|
DESKTOP-5E92U9B\BigFoot
|
fa3ac7f1cc
|
主角动画修改
|
2023-05-29 15:31:03 +08:00 |
|
xiekaidong
|
c3ea73b8fd
|
死亡时恢复战斗速度
|
2023-05-29 15:23:42 +08:00 |
|
chenxi
|
5eaa1f2f73
|
编译
|
2023-05-29 15:22:21 +08:00 |
|
CloudJ
|
85ca1516ff
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-29 15:12:53 +08:00 |
|
CloudJ
|
821c1f0365
|
字体
|
2023-05-29 15:12:47 +08:00 |
|
