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 |
|
chenxi
|
2ffcb82122
|
更新skill_rouge资源
|
2023-05-29 14:33:18 +08:00 |
|
chenxi
|
f72bc2d7c1
|
任务没开启前不显示任务完成得toast
|
2023-05-29 12:06:51 +08:00 |
|
chenxi
|
56f53666b4
|
任务bug
|
2023-05-29 12:02:44 +08:00 |
|
DESKTOP-5E92U9B\BigFoot
|
e363df91a5
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-05-29 11:59:18 +08:00 |
|
DESKTOP-5E92U9B\BigFoot
|
03aaff5c03
|
主角动画修改
|
2023-05-29 11:59:09 +08:00 |
|
xiekaidong
|
fb0c37f6f9
|
动画报错
|
2023-05-29 11:55:11 +08:00 |
|
xiekaidong
|
819dd83892
|
容错
|
2023-05-29 11:48:09 +08:00 |
|
xiekaidong
|
2b3626b418
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-05-29 11:45:44 +08:00 |
|
xiekaidong
|
7df90d4051
|
优化
|
2023-05-29 11:45:41 +08:00 |
|
|
|
b34b2234cb
|
20023加hit帧
|
2023-05-29 11:29:19 +08:00 |
|
xiekaidong
|
94bfddff2d
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-05-29 11:20:15 +08:00 |
|
xiekaidong
|
cd90b01e62
|
引导表现
|
2023-05-29 11:20:12 +08:00 |
|
|
|
5866513210
|
图集优化
|
2023-05-29 11:19:36 +08:00 |
|
chenxi
|
585bd539c5
|
从任务跳转去战令，一定要弹出购买弹窗
|
2023-05-29 11:16:21 +08:00 |
|
xiekaidong
|
5f97d6eb53
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-05-29 11:06:17 +08:00 |
|
xiekaidong
|
5b3e308748
|
显示i问题
|
2023-05-29 11:06:14 +08:00 |
|
chenxi
|
809fda8619
|
基金重命名
|
2023-05-29 10:54:43 +08:00 |
|
xiekaidong
|
d54864ecb5
|
存储一些技能效果
|
2023-05-29 10:51:29 +08:00 |
|
|
|
37216c6b0d
|
m20024
|
2023-05-29 10:36:09 +08:00 |
|
chenxi
|
934e2970b0
|
更新icon
|
2023-05-29 10:33:01 +08:00 |
|
chenxi
|
e6a36043b6
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-29 10:29:26 +08:00 |
|
chenxi
|
19a27cbdc2
|
更新美术资源
|
2023-05-29 10:29:20 +08:00 |
|
DESKTOP-5E92U9B\BigFoot
|
5fb1d26f18
|
主角动画上传
|
2023-05-29 09:41:42 +08:00 |
|
chenxi
|
6c59617e8d
|
战令滑动区域
|
2023-05-26 22:44:39 +08:00 |
|
xiekaidong
|
2d14102407
|
反伤bug、反击bug、死亡时带有流血buff触发机制实现
|
2023-05-26 21:37:35 +08:00 |
|
