1092 Commits

Author SHA1 Message Date
9e4816b76c 28,29小怪加move 2023-05-30 15:56:53 +08:00
0ac2c06170 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-05-30 15:51:50 +08:00
chenxi
20151c0db0 编译 2023-05-30 15:51:17 +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
70d975ceb2 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-05-30 15:34:00 +08:00
chenxi
f299f60b49 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-05-30 15:33:53 +08:00
chenxi
7af6800ea0 功能解锁弹窗 2023-05-30 15:33:46 +08:00
e25f79dd83 小怪45.46死亡 2023-05-30 15:33:43 +08:00
xiekaidong
09f4c247c8 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-05-30 15:33:23 +08:00
xiekaidong
12135088dd 修改下提示 2023-05-30 15:33:09 +08:00
c761680469 30,31小怪加move 2023-05-30 15:24:19 +08:00
xiekaidong
cd99e669cb 更新配置 2023-05-30 15:08:30 +08:00
CloudJ
cb84260a15 编译 2023-05-30 14:50:15 +08:00
CloudJ
7a786d8729 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-05-30 14:49:59 +08:00
CloudJ
580d184f17 prefab 2023-05-30 14:49:56 +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
xiekaidong
0ca0434498 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-05-30 14:16:31 +08:00
xiekaidong
ca8109cd8d buff描述 2023-05-30 14:16:28 +08:00
chenxi
59dd6a25c8 英雄解锁 2023-05-30 14:11:18 +08:00
chenxi
02b776eaf9 英雄解锁 2023-05-30 12:17:31 +08:00
xiekaidong
4ff60e7b0c 资源 2023-05-30 11:59:38 +08:00
xiekaidong
58420e7397 容错 2023-05-30 11:55:26 +08:00
chenxi
12044a354e 容错 2023-05-30 11:53:05 +08:00
chenxi
2fbe01e673 每日挑战 2023-05-30 11:45:27 +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
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