Commit Graph

722 Commits

Author SHA1 Message Date
wulongxiao
b001b7a30d 改了战斗结算 2024-12-26 18:07:00 +08:00
wulongxiao
9244e767ac Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-26 14:10:37 +08:00
wulongxiao
33db66b2c9 修bug 2024-12-26 14:10:26 +08:00
GL
1f070568de 修复BUG,火焰分叉效果 2024-12-26 11:20:11 +08:00
GL
64bb3a3dd4 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-26 09:12:37 +08:00
9909cc6604 bug的修改以及tmp字体的shader 2024-12-26 04:16:29 +08:00
a52aa4d956 商店脚本的编写 2024-12-25 23:45:44 +08:00
4abf452540 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 23:35:45 +08:00
4b921df030 bug的修改 2024-12-25 23:35:36 +08:00
wulongxiao
f19bd5e151 技能实现 2024-12-25 23:34:08 +08:00
GL
bf9940a02a Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 23:10:41 +08:00
wulongxiao
c9fcb56061 有bug 2024-12-25 23:08:29 +08:00
GL
d0150783cf bug修复 2024-12-25 21:49:36 +08:00
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