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

10 May, 2024 3 commits
- Merge branch 'main' of git@gitlab.sd-zeus.com:yangzeyu/ShunZhiMazeVR.git · e2524e3c
  杨泽宇 authored May 10, 2024
  
  e2524e3c
- 更新 · 4872e954
  杨泽宇 authored May 10, 2024
  
  4872e954
- 更新 · 34faf4d7
  张璐 authored May 10, 2024
  
  34faf4d7
09 May, 2024 8 commits
- 更新场景3 · e08b861d
  张璐 authored May 09, 2024
  
  e08b861d
- 更新关卡三场景 · a4ed0def
  张璐 authored May 09, 2024
  
  a4ed0def
- Merge branch 'main' of git@gitlab.sd-zeus.com:yangzeyu/ShunZhiMazeVR.git · e998017d
  杨泽宇 authored May 09, 2024
  
  e998017d
- 更新 · c60eaf33
  杨泽宇 authored May 09, 2024
  
  c60eaf33
- Merge branch 'main' of git@gitlab.sd-zeus.com:yangzeyu/ShunZhiMazeVR.git · 5274c083
  温浩丰 authored May 09, 2024
  
  5274c083
- 更新UI · 9436bab3
  温浩丰 authored May 09, 2024
  
  9436bab3
- Merge branch 'main' of git@gitlab.sd-zeus.com:yangzeyu/ShunZhiMazeVR.git · 2b296d35
  杨泽宇 authored May 09, 2024
  
  2b296d35
- 更新 · b29411b9
  杨泽宇 authored May 09, 2024
  
  b29411b9
08 May, 2024 3 commits
- Merge branch 'main' of gitlab.sd-zeus.com:yangzeyu/ShunZhiMazeVR · 09fdb0ad
  张璐 authored May 08, 2024
  
  09fdb0ad
- 更新材质 · 6c926530
  张璐 authored May 08, 2024
  
  6c926530
- 更新UI · dd5b21fb
  温浩丰 authored May 08, 2024
  
  dd5b21fb
06 May, 2024 1 commit
- 更新 · 52916cd6
  杨泽宇 authored May 06, 2024
  
  52916cd6
05 May, 2024 3 commits
- 更新 · 98328425
  杨泽宇 authored May 05, 2024
  
  98328425
- 更新 · 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 2 commits
- 更新UI · e97089a9
  温浩丰 authored Mar 05, 2024
  
  e97089a9
- 更新UI · 5f0a695d
  温浩丰 authored Mar 05, 2024
  
  5f0a695d