Commit Graph

1044 Commits

Author SHA1 Message Date
wulongxiao
4302cd5d56 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-27 18:14:33 +08:00
wulongxiao
5468f3f1e5 伤害 2024-12-27 18:13:52 +08:00
GL
0d04d13c7e 攻击 2024-12-27 18:13:35 +08:00
GL
ae5c74f487 人头统计,伤害统计 2024-12-27 17:13:20 +08:00
GL
7a00470469 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-27 16:50:46 +08:00
GL
7ed11a4406 攻击持续时间的修改 2024-12-27 16:50:35 +08:00
wulongxiao
39258abef0 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-27 15:36:46 +08:00
wulongxiao
a3f236504a 伤害统计 2024-12-27 15:36:35 +08:00
GL
634435716a 火焰长度修改 2024-12-27 11:39:11 +08:00
GL
3cb3594571 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-27 09:37:43 +08:00
wulongxiao
5b54ff7095 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-27 09:36:53 +08:00
wulongxiao
0e6bde98e7 修改预制体 2024-12-27 09:35:54 +08:00
GL
b9cf94506e Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-26 23:02:38 +08:00
GL
4eb3e334b4 攻击范围修改 2024-12-26 23:01:40 +08:00
62f0f7de79 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-26 22:59:12 +08:00
d9f6b7e392 bug的修改以及岛跟矿的遮罩,还有公告接口脚本的编写 2024-12-26 22:59:03 +08:00
wulongxiao
6986f0f0d4 通关的ui修改 2024-12-26 22:57:21 +08:00
wulongxiao
d0572266b6 挑战总结 2024-12-26 21:52:01 +08:00
GL
e10bad5975 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-26 18:13:42 +08:00
GL
de04550028 攻击范围修改 2024-12-26 18:12:56 +08:00
wulongxiao
0267479f6f Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-26 18:07:14 +08:00
wulongxiao
b001b7a30d 改了战斗结算 2024-12-26 18:07:00 +08:00
9b2911d3e9 bug的修改 2024-12-26 18:02:11 +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