1485 Commits

Author SHA1 Message Date
xiekaidong
ec7420cfaa Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-02 15:52:53 +08:00
xiekaidong
ecf8d1a8b8 增加一个gm 2023-06-02 15:52:43 +08:00
DESKTOP-5E92U9B\BigFoot
def4ec2ca3 主角动画修改 2023-06-02 15:47:35 +08:00
xiekaidong
61496db4cb 资源更新 2023-06-02 15:32:20 +08:00
xiekaidong
79a5f0d641 战斗速度 2023-06-02 15:15:39 +08:00
c9ff7e6563 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-02 15:08:33 +08:00
62e9c9409a 11 2023-06-02 15:08:20 +08:00
CloudJ
04527f1153 抽卡动画调整 2023-06-02 14:47:45 +08:00
9863960fbc Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-02 12:44:29 +08:00
a207fd0cb7 111111 2023-06-02 12:44:12 +08:00
chenxi
7389ba8509 只有主线战斗结算界面显示金猪 2023-06-02 12:12:09 +08:00
CloudJ
0ff9ab14da 抽卡表现 2023-06-02 12:03:44 +08:00
CloudJ
491856d294 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-02 12:02:18 +08:00
CloudJ
b0d20ac96d 召唤表现 2023-06-02 12:02:15 +08:00
xiekaidong
6de85c5b98 bug修复 2023-06-02 11:55:05 +08:00
xiekaidong
15e4af5d92 过场动画 2023-06-02 11:08:04 +08:00
xiekaidong
e8f8ebd985 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-02 11:07:38 +08:00
xiekaidong
f9d4cd133f 过场动画 2023-06-02 11:07:35 +08:00
chenxi
39002faf89 战令奖励数量显示了双份 2023-06-02 10:23:10 +08:00
chenxi
00472c3c92 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-02 10:22:47 +08:00
xiekaidong
27fef80025 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-02 09:53:45 +08:00
xiekaidong
012ddff43e 删除冗余资源 2023-06-02 09:53:43 +08:00
CloudJ
5781fe9bff 替换ui 2023-06-02 09:46:26 +08:00
xiekaidong
9a32b0d721 去掉boss停帧 2023-06-02 09:37:41 +08:00
bf2f896ee0 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-01 22:29:32 +08:00
5e502fbf7c p0016加hit 2023-06-01 22:29:27 +08:00
chenxi
570af5a807 替换界面 2023-06-01 22:12:22 +08:00
xiekaidong
bd35cb7a23 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-01 22:11:02 +08:00
xiekaidong
88008cdf67 显示优化 2023-06-01 22:10:51 +08:00
DESKTOP-5E92U9B\BigFoot
704f288183 BOSS动画修改 2023-06-01 22:10:22 +08:00
xiekaidong
a0508d802e Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-01 22:10:22 +08:00
xiekaidong
db7fec55ec 显示优化 2023-06-01 22:10:15 +08:00
2e2d8de11b Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-01 22:05:25 +08:00
96e56aea96 加hit 2023-06-01 22:04:50 +08:00
CloudJ
ae21941b99 编译 2023-06-01 21:09:57 +08:00
chenxi
3788bedd43 设置界面 2023-06-01 20:58:59 +08:00
chenxi
925dc49910 设置界面 2023-06-01 20:58:17 +08:00
chenxi
aba414d587 merge 2023-06-01 20:53:21 +08:00
chenxi
f369f5f8b5 替换设置界面 2023-06-01 20:51:49 +08:00
CloudJ
1e49cca4f1 替换ui 2023-06-01 20:49:49 +08:00
CloudJ
a1b9dcbf2e 替换一波ui 2023-06-01 20:47:43 +08:00
chenxi
9679058a5f ab name 2023-06-01 20:42:28 +08:00
chenxi
4e01f37df5 资源修复 2023-06-01 20:41:15 +08:00
chenxi
706f50f93c 编译 2023-06-01 20:39:23 +08:00
chenxi
32b2a1294b 资源自动处理 2023-06-01 20:37:50 +08:00
d6ede6292e Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-01 18:40:32 +08:00
3b92b3add0 1 2023-06-01 18:40:16 +08:00
chenxi
87f205878b Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-01 18:34:07 +08:00
chenxi
38d123eb73 英雄界面滑动区域 2023-06-01 18:34:03 +08:00
b035abcb9f Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-01 18:29:08 +08:00