Commit Graph

859 Commits

Author SHA1 Message Date
95b25b0d48 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 21:48:57 +08:00
abe0d8f79b 宠物之家显示的修改 2024-12-25 21:48:50 +08:00
wulongxiao
e110860a44 技能应用 2024-12-25 21:42:57 +08:00
wulongxiao
ad38b86cb6 解决差异 2024-12-25 18:45:00 +08:00
wulongxiao
3392e8b448 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
# Conflicts:
#	meng_yao/Assets/Prefabs/charatar/enemy/wood_min.prefab
2024-12-25 18:00:13 +08:00
wulongxiao
0c94ce0a10 版本同步 2024-12-25 17:59:45 +08:00
GL
83f8170a05 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 17:48:17 +08:00
GL
d046107f05 眩晕修改 2024-12-25 17:47:54 +08:00
71d6289919 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 17:34:05 +08:00
7cf9324de3 宠物的更新与宠物之家图片的显示 2024-12-25 17:33:42 +08:00
GL
479586056a 眩晕效果 2024-12-25 16:38:41 +08:00
GL
08a40c3ea1 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 15:47:59 +08:00
GL
98dca6822e 玩家受伤屏幕变红色 2024-12-25 15:39:40 +08:00
e9a9cd6509 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 15:20:51 +08:00
0e6609ede6 bug的修改 2024-12-25 15:20:43 +08:00
wulongxiao
1b6106196f Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 15:18:53 +08:00
wulongxiao
e89ae17d9f 技能加上了 2024-12-25 15:18:47 +08:00
GL
77f007ee57 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 14:54:18 +08:00
GL
19f6a980d0 萌妖层级修改 2024-12-25 14:54:06 +08:00
wulongxiao
02e12aa1fb 技能完成 2024-12-25 14:50:58 +08:00
587f8bf66c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 12:02:25 +08:00
8048a0c9ec 一些bug的修改 2024-12-25 12:02:14 +08:00
wulongxiao
afbd172776 技能修改 2024-12-25 12:01:36 +08:00
wulongxiao
667bad693f 减速bug 2024-12-25 11:26:26 +08:00
wulongxiao
f69a20cbd2 减速buff 2024-12-25 11:23:00 +08:00
GL
a11428678c 修复敌人生成的Bug 2024-12-25 11:14:21 +08:00
957565017a Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-24 21:12:53 +08:00
df9ae2ba0f bug的修改 2024-12-24 21:12:43 +08:00
GL
41b7f585c1 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-24 18:02:59 +08:00
GL
ad0b0d64fc 层级,有点说法 2024-12-24 18:02:36 +08:00
wulongxiao
315cc2cbd6 修bug 2024-12-24 17:58:06 +08:00
20c42d81e1 config移动位置 2024-12-24 17:48:49 +08:00
c024a18a71 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-24 17:44:10 +08:00
1ff1a9ed63 养成bug的修改 2024-12-24 17:44:00 +08:00
GL
312ed20f77 改层级,难受 2024-12-24 17:40:42 +08:00
3eaab4218d Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-24 17:03:58 +08:00
c082001241 免登录的修改以及商店UI的添加 2024-12-24 17:03:50 +08:00
wulongxiao
3aa896198e Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-24 16:44:12 +08:00
wulongxiao
175b4e6e56 技能成功升级和使用 2024-12-24 16:44:04 +08:00
9d7a4b2338 合并 2024-12-24 15:41:18 +08:00
b0841e05f8 bug的修改 2024-12-24 15:39:13 +08:00
wulongxiao
63134db4eb 萌妖技能 2024-12-24 15:38:28 +08:00
wulongxiao
dc0c8b9538 修bug 2024-12-24 14:35:02 +08:00
wulongxiao
7f934a7245 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-24 14:12:23 +08:00
wulongxiao
9a5235d576 AddExperience 2024-12-24 14:12:18 +08:00
GL
97b16ea4ad Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-24 14:11:02 +08:00
GL
0b8743f9ee 减速、冰块随机 2024-12-24 14:10:47 +08:00
wulongxiao
43ab8bfbd4 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-24 12:02:42 +08:00
wulongxiao
bf50ed51ad 技能读取 2024-12-24 12:02:32 +08:00
b8df4797e3 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-24 10:56:15 +08:00