Commits · ebe2160191c43a1b5d666236e57ce6bb53058c76 · 杨泽宇 / 顺职VR迷宫游戏教学

05 May, 2024 2 commits
- 更新 · ebe21601
  杨泽宇 authored May 05, 2024
  
  ebe21601
- 更新 · 201e04b1
  杨泽宇 authored May 05, 2024
  
  201e04b1
09 Mar, 2024 7 commits
- Merge branch 'main' of git@gitlab.sd-zeus.com:yangzeyu/ShunZhiMazeVR.git · b4eed4fc
  杨泽宇 authored Mar 09, 2024
  
  b4eed4fc
- 更新 · 33a8cba7
  杨泽宇 authored Mar 09, 2024
  
  33a8cba7
- 更新修改门材质 · f4516997
  张英美 authored Mar 09, 2024
  
  f4516997
- 分类整理文件位置 · 07f626b8
  张英美 authored Mar 09, 2024
  
  07f626b8
- Merge branch 'main' of git@gitlab.sd-zeus.com:yangzeyu/ShunZhiMazeVR.git · 15972ca6
  张英美 authored Mar 09, 2024
  
  15972ca6
- 更新 · 91a6f3b1
  张英美 authored Mar 09, 2024
  
  91a6f3b1
- 更新 · 783ce838
  杨泽宇 authored Mar 09, 2024
  
  783ce838
08 Mar, 2024 4 commits
- 更新 · 8b164dae
  杨泽宇 authored Mar 08, 2024
  
  8b164dae
- 更新 · 18571cb2
  杨泽宇 authored Mar 08, 2024
  
  18571cb2
- 更新 · 47d6a849
  杨泽宇 authored Mar 08, 2024
  
  47d6a849
- 更新UI · 5bf455ca
  温浩丰 authored Mar 08, 2024
  
  5bf455ca
07 Mar, 2024 7 commits
- 更新 · 1f4f9a84
  杨泽宇 authored Mar 07, 2024
  
  1f4f9a84
- 加入传送阵、寻路轨迹，扩大营地面积 · d3cbc3b6
  张英美 authored Mar 07, 2024
  
  d3cbc3b6
- Merge branch 'main' of git@gitlab.sd-zeus.com:yangzeyu/ShunZhiMazeVR.git · 1525977c
  张英美 authored Mar 07, 2024
```
# Conflicts:
#	Assets/_Scenes/2_Maze2.unity
#	Assets/_美术资源/5_动画/Animation/迷宫2/箭靶倒下.meta
#	Assets/_美术资源/5_动画/Animation/迷宫2/箭靶倒下/箭靶.controller
#	Assets/_美术资源/5_动画/Animation/迷宫2/箭靶倒下/箭靶倒下.anim
```
  1525977c
- 更新 · b37f592b
  张英美 authored Mar 07, 2024
  
  b37f592b
- 更新 · bc5307d0
  杨泽宇 authored Mar 07, 2024
  
  bc5307d0
- 更新 · c83631f1
  杨泽宇 authored Mar 07, 2024
  
  c83631f1
- 更新 · ffa1abd5
  杨泽宇 authored Mar 07, 2024
  
  ffa1abd5
06 Mar, 2024 2 commits
- 更新 · 6438e39b
  杨泽宇 authored Mar 06, 2024
  
  6438e39b
- 更新UI · 654fd35e
  温浩丰 authored Mar 06, 2024
  
  654fd35e
05 Mar, 2024 15 commits
- 更新UI · e97089a9
  温浩丰 authored Mar 05, 2024
  
  e97089a9
- 更新UI · 5f0a695d
  温浩丰 authored Mar 05, 2024
  
  5f0a695d
- Merge branch 'main' of git@gitlab.sd-zeus.com:yangzeyu/ShunZhiMazeVR.git · 2d622916
  温浩丰 authored Mar 05, 2024
  
  2d622916
- 更新UI · 07f010dc
  温浩丰 authored Mar 05, 2024
  
  07f010dc
- 更新 · a835ef8f
  杨泽宇 authored Mar 05, 2024
  
  a835ef8f
- 更新 · a4349d42
  杨泽宇 authored Mar 05, 2024
  
  a4349d42
- 增加碰撞体、修改开关门动画 · 00cab958
  张英美 authored Mar 05, 2024
  
  00cab958
- 修改材质 · 130e0f22
  张英美 authored Mar 05, 2024
  
  130e0f22
- 上传新障碍门、修改进出口动画、统一画风 · 451f2e13
  张英美 authored Mar 05, 2024
  
  451f2e13
- 更新 · cc34e576
  杨泽宇 authored Mar 05, 2024
  
  cc34e576
- Merge branch 'main' of git@gitlab.sd-zeus.com:yangzeyu/ShunZhiMazeVR.git · ebdccfc0
  杨泽宇 authored Mar 05, 2024
  
  ebdccfc0
- 更新 · c4655a5e
  杨泽宇 authored Mar 05, 2024
  
  c4655a5e
- Merge branch 'main' of git@gitlab.sd-zeus.com:yangzeyu/ShunZhiMazeVR.git · 75299869
  张英美 authored Mar 05, 2024
```
# Conflicts:
#	Assets/_Scenes/1_Maze1.unity
#	Assets/_Scenes/2_Maze2.unity
```
  75299869
- 更新 · 2c04f046
  张英美 authored Mar 05, 2024
  
  2c04f046
- 更新 · 333bd93d
  杨泽宇 authored Mar 05, 2024
  
  333bd93d
04 Mar, 2024 2 commits
- 更新 · 7fd5302d
  杨泽宇 authored Mar 04, 2024
  
  7fd5302d
- 更新 · e02993a8
  杨泽宇 authored Mar 04, 2024
  
  e02993a8
02 Mar, 2024 1 commit
- Merge branch 'main' of git@gitlab.sd-zeus.com:yangzeyu/ShunZhiMazeVR.git · 422872f7
  张英美 authored Mar 02, 2024
```
# Conflicts:
#	Assets/_Scenes/2_Maze2.unity
#	Assets/_美术资源/1_模型/道具/锁.prefab
```
  422872f7