shurongsen/Cute_demon_attacks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
767 Commits 1 Branch 0 Tags 3.7 GiB
a90addfc75
Commit Graph

741 Commits

Author SHA1 Message Date
liuliang
9909cc6604 bug的修改以及tmp字体的shader 2024-12-26 04:16:29 +08:00
liuliang
a52aa4d956 商店脚本的编写 2024-12-25 23:45:44 +08:00
liuliang
4abf452540 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 23:35:45 +08:00
liuliang
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
liuliang
95b25b0d48 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 21:48:57 +08:00
liuliang
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
liuliang
71d6289919 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 17:34:05 +08:00
liuliang
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
liuliang
e9a9cd6509 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 15:20:51 +08:00
liuliang
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
liuliang
587f8bf66c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 12:02:25 +08:00
liuliang
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
liuliang
957565017a Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-24 21:12:53 +08:00
liuliang
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
liuliang
20c42d81e1 config移动位置 2024-12-24 17:48:49 +08:00
liuliang
c024a18a71 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-24 17:44:10 +08:00
liuliang
1ff1a9ed63 养成bug的修改 2024-12-24 17:44:00 +08:00
GL
312ed20f77 改层级，难受 2024-12-24 17:40:42 +08:00
liuliang
3eaab4218d Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-24 17:03:58 +08:00
liuliang
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
liuliang
9d7a4b2338 合并 2024-12-24 15:41:18 +08:00
liuliang
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
liuliang
b8df4797e3 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-24 10:56:15 +08:00
liuliang
f4e3330f78 生态树图片的切换 2024-12-24 10:56:07 +08:00
GL
7f50422c4b 眩晕实现 2024-12-24 10:30:29 +08:00
GL
bb8e70f159 修改 2024-12-23 22:36:17 +08:00
liuliang
c0e9f2e103 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-23 22:33:19 +08:00
liuliang
c45b92cea7 生态书团队水滴的修改 2024-12-23 22:33:13 +08:00
wulongxiao
b4f0275d5b Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-23 22:32:51 +08:00
wulongxiao
f361545e30 眩晕技能 2024-12-23 22:32:40 +08:00
liuliang
2f7b63c3db Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-23 21:16:42 +08:00
liuliang
7940d15c23 萌妖图鉴按钮的切换以及水滴bug的修复 2024-12-23 21:16:37 +08:00
wulongxiao
bc1bd4b4f7 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-23 20:01:08 +08:00
wulongxiao
2715420564 技能 2024-12-23 20:00:58 +08:00
liuliang
ebbf5af50c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-23 17:53:30 +08:00
liuliang
f1364c9fd5 接口bug的修复 2024-12-23 17:53:25 +08:00
wulongxiao
e5867b8d48 技能测试 2024-12-23 16:59:06 +08:00
GL
f2c3d40985 萌妖数据读取 2024-12-23 16:58:00 +08:00
GL
642916d6ca Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-23 14:28:52 +08:00
GL
902adeb497 改了动画化参数 2024-12-23 14:28:31 +08:00
wulongxiao
85c3d81518 萌妖技能 2024-12-23 14:28:09 +08:00
liuliang
7b504541c4 安卓复制粘贴剪切板的脚本 2024-12-23 14:26:13 +08:00
liuliang
d87fc5db56 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-23 14:02:36 +08:00
liuliang
eae8f1c465 验证码模块跟用户模块bug的修改完成 2024-12-23 14:02:30 +08:00
wulongxiao
e3c5aa6d46 技能 2024-12-23 14:01:19 +08:00
liuliang
4dec19aa1f Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-23 10:12:56 +08:00
liuliang
8631b458c5 接口问题的修改 2024-12-23 10:12:46 +08:00
wulongxiao
1a80bc783d 修改了资产的图标 2024-12-23 10:10:42 +08:00
wulongxiao
e1045eb00a 解决冲突 2024-12-20 22:28:06 +08:00
wulongxiao
4d3aea9f99 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 
# Conflicts:
#	meng_yao/Assets/Scenes/scene_Main.unity
#	meng_yao/Assets/script/scene_Main/ManurePanel.cs.meta
 2024-12-20 22:18:33 +08:00
wulongxiao
31158c5cbd 打包版本 2024-12-20 22:17:52 +08:00
GL
e2fbb81bb5 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-20 21:42:15 +08:00
GL
6fa9e38562 冰 2024-12-20 21:42:02 +08:00
liuliang
41645a34d9 收集水滴动画的修改 2024-12-20 21:33:49 +08:00
liuliang
593a412bca 团队bug的修改 2024-12-20 21:13:14 +08:00
liuliang
b563233d2f 收集水滴接口的接入 2024-12-20 21:03:36 +08:00
GL
e6f69939e9 火 2024-12-20 18:02:18 +08:00
GL
069fd83170 火炎 2024-12-20 17:40:13 +08:00
GL
58b9e729cf Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-20 16:29:19 +08:00
GL
2c18c592bb 攻击特效 2024-12-20 16:29:02 +08:00
wulongxiao
805e92e1b5 修bug 2024-12-20 16:01:29 +08:00
liuliang
7ac2f8714f Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-20 15:59:37 +08:00
liuliang
981a99f2c2 界面的切换以及收集水滴接口的接入 2024-12-20 15:59:27 +08:00
wulongxiao
1c0de36011 数量增加 2024-12-20 15:56:43 +08:00
wulongxiao
213ad38d7b Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-20 12:03:38 +08:00