Merge branch 'main' of git@gitlab.sd-zeus.com:yangzeyu/ShunZhiMazeVR.git
# Conflicts: # Assets/_Scenes/2_Maze2.unity # Assets/_美术资源/5_动画/Animation/迷宫2/箭靶倒下.meta # Assets/_美术资源/5_动画/Animation/迷宫2/箭靶倒下/箭靶.controller # Assets/_美术资源/5_动画/Animation/迷宫2/箭靶倒下/箭靶倒下.anim
Showing
This diff is collapsed.
Assets/_Scenes/2_Maze2.meta
0 → 100644
This diff is collapsed.
File added
File added
File added
Assets/_Scripts/VR人物设置.meta
0 → 100644
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
Assets/_Scripts/寻找钥匙小游戏.meta
0 → 100644
File moved
Assets/_Scripts/射箭小游戏.meta
0 → 100644
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
Assets/_Scripts/游戏管理器.meta
0 → 100644
File moved
File moved
File moved
Assets/_Scripts/滑动解锁小游戏.meta
0 → 100644
File moved
File moved
Assets/_Scripts/视频播放.meta
0 → 100644
File moved
File moved
Assets/_Scripts/计算小游戏.meta
0 → 100644
File moved
Assets/_Scripts/通用脚本.meta
0 → 100644
File moved
File moved
File moved
File moved
File moved
File moved
Assets/_美术资源/11_声音/拿出道具.mp3
0 → 100644
File added
Assets/_美术资源/11_声音/石门.mp3
0 → 100644
File added
File added
Assets/_美术资源/14_视频/第二关.mp4
0 → 100644
File added
This diff is collapsed.
Please
register
or
sign in
to comment