1611 Commits

Author SHA1 Message Date
3e8ebb2957 1111111 2023-06-03 19:44:38 +08:00
7062f98d05 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-03 19:19:14 +08:00
61555cc6e2 11111 2023-06-03 19:19:02 +08:00
xiekaidong
86180bf126 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-03 19:12:36 +08:00
xiekaidong
e6a28c8acd 修改bug,优化战斗流程逻辑 2023-06-03 19:12:33 +08:00
chenxi
f177b9ea94 资源自动处理 2023-06-03 19:05:02 +08:00
chenxi
67f41623a2 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-03 19:04:30 +08:00
chenxi
25f9a2eba6 spine资源替换 2023-06-03 19:04:23 +08:00
9d9411bf85 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-03 19:00:32 +08:00
e843189a47 11 2023-06-03 19:00:21 +08:00
chenxi
54dc9e8622 战令spine动画 2023-06-03 18:59:59 +08:00
chenxi
e2a21e9164 战斗法阵 2023-06-03 18:50:13 +08:00
chenxi
80fcc5dbd9 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-03 18:48:18 +08:00
chenxi
1ba57376b7 战斗资源上传 2023-06-03 18:48:11 +08:00
xiekaidong
a0ee5ae6f1 更改一下死亡召唤触发时机 2023-06-03 17:47:04 +08:00
DESKTOP-5E92U9B\BigFoot
eecab82367 主角动画修改 2023-06-03 17:36:40 +08:00
749ef57854 111 2023-06-03 17:27:04 +08:00
0778ad36d3 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-03 17:26:10 +08:00
752a36b516 1111 2023-06-03 17:25:58 +08:00
DESKTOP-5E92U9B\BigFoot
d30ed3e216 主角动画添加 2023-06-03 17:14:39 +08:00
xiekaidong
792bcea5f5 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-03 15:49:02 +08:00
xiekaidong
5d7a7b2ded 新增一个战斗用gm命令 2023-06-03 15:48:51 +08:00
chenxi
0daec4cbaa 标题 2023-06-03 15:47:43 +08:00
12cda5d190 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-03 15:06:23 +08:00
d9bdf769eb 11 2023-06-03 15:06:12 +08:00
5d7f87f5b2 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-03 14:41:43 +08:00
ce2c70cc05 换影子 2023-06-03 14:41:35 +08:00
chenxi
1bf9102d37 金猪spine和英雄位置 2023-06-03 11:59:07 +08:00
95fd4a9f95 daxiao 2023-06-03 11:49:14 +08:00
DESKTOP-5E92U9B\BigFoot
5852ab4430 主角动画修改 2023-06-03 11:09:09 +08:00
DESKTOP-5E92U9B\BigFoot
0b7b756805 主角动画修改 2023-06-03 10:34:29 +08:00
xiekaidong
3e84aebb20 层级修改 2023-06-02 22:33:49 +08:00
xiekaidong
b60f9b1ca4 boss机制棋盘效果处理 2023-06-02 22:28:55 +08:00
chenxi
787b54df61 英雄升级特效位置 2023-06-02 22:24:56 +08:00
chenxi
f022d77433 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-02 22:14:44 +08:00
chenxi
5b92d350e6 特效改名 2023-06-02 22:14:35 +08:00
DESKTOP-5E92U9B\BigFoot
e571da8f83 主角动画修改 2023-06-02 22:07:54 +08:00
chenxi
e4d6c5474b Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-02 22:07:07 +08:00
chenxi
c44ef5afba 调整一下资源名 2023-06-02 22:07:00 +08:00
DESKTOP-5E92U9B\BigFoot
e48da49913 boss动作更新 2023-06-02 21:42:56 +08:00
chenxi
52949c0c81 货币顺序调整 2023-06-02 21:31:00 +08:00
chenxi
6b157e671b Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-02 21:23:06 +08:00
chenxi
0270759629 调整界面 2023-06-02 21:23:00 +08:00
DESKTOP-5E92U9B\BigFoot
e399f20043 主角动画修改 2023-06-02 21:09:27 +08:00
chenxi
6c7fecc0ce 英雄icon大小 2023-06-02 21:04:03 +08:00
1c92f87fc3 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-02 20:36:26 +08:00
d44d237be1 111 2023-06-02 20:36:14 +08:00
CloudJ
a698707102 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-02 20:35:39 +08:00
CloudJ
30983ba637 编译 2023-06-02 20:35:37 +08:00
xiekaidong
254a2cde4f Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-02 20:27:54 +08:00