Commits · fbdb8c4e944b1c4545ddae6d39e4eaf71ca5ce0a · 测试练习 / GitTestMainProject

22 Nov, 2018 32 commits
- 修改位置 · fbdb8c4e
  梁璟强 authored Nov 22, 2018
  
  fbdb8c4e
- Merge branch 'master' of gitlab.sd-zeus.com:linyanghuan/git_test · 66aad9b4
  林杨欢 authored Nov 22, 2018
```
# Conflicts:
#	UnityGitTest/Assets/_Scene/场景测试.unity
```
  66aad9b4
- 保存 · d1801688
  林杨欢 authored Nov 22, 2018
  
  d1801688
- 测试移动目录 · fc4a1e8c
  梁璟强 authored Nov 22, 2018
  
  fc4a1e8c
- 添加材质到空文件夹 · 9c15e061
  梁璟强 authored Nov 22, 2018
  
  9c15e061
- 添加回meta · c5eb8ecf
  梁璟强 authored Nov 22, 2018
  
  c5eb8ecf
- 删除确实meta文件 · 02d44a87
  林杨欢 authored Nov 22, 2018
  
  02d44a87
- 间空文件夹 · 4e2d8e71
  梁璟强 authored Nov 22, 2018
  
  4e2d8e71
- Merge branch 'master' of gitlab.sd-zeus.com:linyanghuan/git_test · 9e19475c
  林杨欢 authored Nov 22, 2018
  
  9e19475c
- 恢复材质 · d07cff2e
  梁璟强 authored Nov 22, 2018
  
  d07cff2e
- Merge branch 'master' of gitlab.sd-zeus.com:linyanghuan/git_test · a3b4a98e
  林杨欢 authored Nov 22, 2018
```
# Conflicts:
#	UnityGitTest/Assets/_Scene/场景测试.unity
```
  a3b4a98e
- 只改母子物体 · 076ac73f
  林杨欢 authored Nov 22, 2018
  
  076ac73f
- 只改父子物体 · 3a5cb884
  梁璟强 authored Nov 22, 2018
  
  3a5cb884
- Merge branch 'master' of gitlab.sd-zeus.com:linyanghuan/git_test · a8849d37
  林杨欢 authored Nov 22, 2018
```
# Conflicts:
#	UnityGitTest/Assets/_Scene/场景测试.unity
```
  a8849d37
- 保留参数 · 50bb0feb
  林杨欢 authored Nov 22, 2018
  
  50bb0feb
- 修改层级 · 0942f906
  梁璟强 authored Nov 22, 2018
  
  0942f906
- Merge branch 'master' of gitlab.sd-zeus.com:linyanghuan/git_test · b2f34a1f
  林杨欢 authored Nov 22, 2018
```
# Conflicts:
#	UnityGitTest/Assets/_Scene/场景测试.unity
```
  b2f34a1f
- 保存层级修改 · 930c5574
  梁璟强 authored Nov 22, 2018
  
  930c5574
- 保存数据修改 · b7d1079f
  林杨欢 authored Nov 22, 2018
  
  b7d1079f
- Merge branch 'master' of gitlab.sd-zeus.com:linyanghuan/git_test · dc440b6b
  林杨欢 authored Nov 22, 2018
```
# Conflicts:
#	UnityGitTest/Assets/_Scene/场景测试.unity
```
  dc440b6b
- 保存参数修改，不保存层级 · 61e0c443
  林杨欢 authored Nov 22, 2018
  
  61e0c443
- 保存层级不保存参数修改 · 453f0d15
  梁璟强 authored Nov 22, 2018
  
  453f0d15
- Merge branch 'master' of gitlab.sd-zeus.com:linyanghuan/git_test · 1a85fb91
  梁璟强 authored Nov 22, 2018
```
# Conflicts:
#	UnityGitTest/Assets/_Scene/场景测试.unity
```
  1a85fb91
- 保存参数修改不保存层级 · 8907ad58
  林杨欢 authored Nov 22, 2018
  
  8907ad58
- 保存层级结构，不保存参数修改 · 2984cd37
  梁璟强 authored Nov 22, 2018
  
  2984cd37
- Merge branch 'master' of gitlab.sd-zeus.com:linyanghuan/git_test · c1383c4a
  林杨欢 authored Nov 22, 2018
```
# Conflicts:
#	UnityGitTest/Assets/_Scene/场景测试.unity
```
  c1383c4a
- 修改4 · 76ebe049
  林杨欢 authored Nov 22, 2018
  
  76ebe049
- 层级3 · c564a000
  梁璟强 authored Nov 22, 2018
  
  c564a000
- Merge branch 'master' of gitlab.sd-zeus.com:linyanghuan/git_test · 5c4b438f
  林杨欢 authored Nov 22, 2018
```
# Conflicts:
#	UnityGitTest/Assets/_Scene/场景测试.unity
```
  5c4b438f
- 修改层级结构2 · 21481416
  梁璟强 authored Nov 22, 2018
  
  21481416
- 修改层级结构 · 649b2030
  林杨欢 authored Nov 22, 2018
  
  649b2030
- 添加UnityGit测试项目 · e0da353c
  林杨欢 authored Nov 22, 2018
  
  e0da353c
25 Aug, 2018 2 commits
- Merge branch '3-测试win和mac的更新' into 'master' · 629a39e5
  林杨欢 authored Aug 25, 2018
```
3 测试win和mac的更新

See merge request linyanghuan/git_test!8
```
  629a39e5
- mac更新 · 51e03fb8
  林杨欢 authored Aug 25, 2018
  
  51e03fb8
04 Dec, 2017 6 commits
- 第四次修改 · 7fc10bbf
  林杨欢 authored Dec 04, 2017
  
  7fc10bbf
- Merge branch '2-test-merg' into 'master' · 5e3652b4
  林杨欢 authored Dec 04, 2017
```
第三次修改

See merge request linyanghuan/git_test!6
```
  5e3652b4
- Merge branch '2-test-merg' into 'master' · efae78e8
  林杨欢 authored Dec 04, 2017
```
2 test merg

See merge request linyanghuan/git_test!5
```
  efae78e8
- Merge branch '1-reopen' into 'master' · 9dd230b6
  林杨欢 authored Dec 04, 2017
```
更换主机测试

Closes #1

See merge request linyanghuan/git_test!4
```
  9dd230b6
- 第三次修改 · 9f510522
  林杨欢 authored Dec 04, 2017
  
  9f510522
- 第二次修改 · 12b4ed8b
  林杨欢 authored Dec 04, 2017
  
  12b4ed8b