浏览代码

Bump the official supported Unity version to 18.4. Fixes MLA-23 (#3121)

/asymm-envs
GitHub 5 年前
当前提交
5e42ca24
共有 31 个文件被更改,包括 152 次插入29 次删除
  1. 2
      .gitignore
  2. 4
      .yamato/csharp-tests.yml
  3. 4
      .yamato/standalone-build-test.yml
  4. 2
      UnitySDK/Assets/ML-Agents/Editor/Tests/StandaloneBuildTest.cs
  5. 3
      UnitySDK/Assets/ML-Agents/Examples/3DBall/TFModels/3DBall.nn.meta
  6. 3
      UnitySDK/Assets/ML-Agents/Examples/3DBall/TFModels/3DBallHard.nn.meta
  7. 3
      UnitySDK/Assets/ML-Agents/Examples/Basic/TFModels/Basic.nn.meta
  8. 3
      UnitySDK/Assets/ML-Agents/Examples/Bouncer/TFModels/Bouncer.nn.meta
  9. 3
      UnitySDK/Assets/ML-Agents/Examples/Crawler/TFModels/CrawlerDynamic.nn.meta
  10. 3
      UnitySDK/Assets/ML-Agents/Examples/Crawler/TFModels/CrawlerStatic.nn.meta
  11. 3
      UnitySDK/Assets/ML-Agents/Examples/FoodCollector/TFModels/FoodCollector.nn.meta
  12. 3
      UnitySDK/Assets/ML-Agents/Examples/GridWorld/TFModels/GridWorld.nn.meta
  13. 3
      UnitySDK/Assets/ML-Agents/Examples/Hallway/TFModels/Hallway.nn.meta
  14. 3
      UnitySDK/Assets/ML-Agents/Examples/PushBlock/TFModels/PushBlock.nn.meta
  15. 3
      UnitySDK/Assets/ML-Agents/Examples/Pyramids/TFModels/Pyramids.nn.meta
  16. 3
      UnitySDK/Assets/ML-Agents/Examples/Reacher/TFModels/Reacher.nn.meta
  17. 27
      UnitySDK/Assets/ML-Agents/Examples/SharedAssets/Materials/Textures/LogoCube.png.meta
  18. 27
      UnitySDK/Assets/ML-Agents/Examples/SharedAssets/Materials/Textures/UnityLogo.png.meta
  19. 3
      UnitySDK/Assets/ML-Agents/Examples/Tennis/TFModels/Tennis.nn.meta
  20. 3
      UnitySDK/Assets/ML-Agents/Examples/Walker/TFModels/Walker.nn.meta
  21. 3
      UnitySDK/Assets/ML-Agents/Examples/WallJump/TFModels/BigWallJump.nn.meta
  22. 3
      UnitySDK/Assets/ML-Agents/Examples/WallJump/TFModels/SmallWallJump.nn.meta
  23. 2
      UnitySDK/ProjectSettings/ProjectVersion.txt
  24. 6
      docs/Installation.md
  25. 1
      docs/Migrating.md
  26. 4
      docs/localized/KR/docs/Installation.md
  27. 2
      run-tests-editmode-osx-editor.sh
  28. 11
      UnitySDK/ProjectSettings/VFXManager.asset
  29. 41
      UnitySDK/Packages/manifest.json

2
.gitignore


/UnitySDK/[Ll]ibrary/
/UnitySDK/Logs/
/UnitySDK/[Pp]ackages/
/UnitySDK/Assets/AssetStoreTools*
/UnitySDK/Assets/Plugins*
/UnitySDK/Assets/Demonstrations*

4
.yamato/csharp-tests.yml


test_editors:
- version: 2017.4
- version: 2018.4
- version: 2019.3
---

agent:
type: Unity::VM::osx
image: ml-agents/ml-agents-bokken-mac:v0.1.2-440635
image: ml-agents/ml-agents-bokken-mac:v0.1.3-475350
flavor: i1.small
variables:
UNITY_VERSION: {{ editor.version }}

pull_requests:
- targets:
only:
- "develop"
- "master"
- "/release-.*/"
- "/hotfix-.*/"

4
.yamato/standalone-build-test.yml


test_editors:
- version: 2017.4
- version: 2018.4
- version: 2019.3
---

agent:
type: Unity::VM::osx
image: ml-agents/ml-agents-bokken-mac:v0.1.2-440635
image: ml-agents/ml-agents-bokken-mac:v0.1.3-475350
flavor: i1.small
variables:
UNITY_VERSION: {{ editor.version }}

pull_requests:
- targets:
only:
- "develop"
- "master"
- "/release-.*/"
- "/hotfix-.*/"

2
UnitySDK/Assets/ML-Agents/Editor/Tests/StandaloneBuildTest.cs


{
public class StandaloneBuildTest
{
static void BuildStandalonePlayerOSX()
public static void BuildStandalonePlayerOSX()
{
string[] scenes = { "Assets/ML-Agents/Examples/3DBall/Scenes/3DBall.unity" };
var buildResult = BuildPipeline.BuildPlayer(scenes, "testPlayer", BuildTarget.StandaloneOSX, BuildOptions.None);

3
UnitySDK/Assets/ML-Agents/Examples/3DBall/TFModels/3DBall.nn.meta


fileFormatVersion: 2
guid: 20a7b83be6b0c493d9271c65c897eb9b
ScriptedImporter:
fileIDToRecycleName:
11400000: main obj
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
UnitySDK/Assets/ML-Agents/Examples/3DBall/TFModels/3DBallHard.nn.meta


fileFormatVersion: 2
guid: 27d49984757ed46b181090a532ef48e5
ScriptedImporter:
fileIDToRecycleName:
11400000: main obj
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
UnitySDK/Assets/ML-Agents/Examples/Basic/TFModels/Basic.nn.meta


fileFormatVersion: 2
guid: 468c183196f1844f69e125c99dd135a1
ScriptedImporter:
fileIDToRecycleName:
11400000: main obj
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
UnitySDK/Assets/ML-Agents/Examples/Bouncer/TFModels/Bouncer.nn.meta


fileFormatVersion: 2
guid: 6c4ee6ab37d9b49b492a5cc49ed47ca0
ScriptedImporter:
fileIDToRecycleName:
11400000: main obj
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
UnitySDK/Assets/ML-Agents/Examples/Crawler/TFModels/CrawlerDynamic.nn.meta


fileFormatVersion: 2
guid: 039557e683d584183a2a82cf8b1904c0
ScriptedImporter:
fileIDToRecycleName:
11400000: main obj
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
UnitySDK/Assets/ML-Agents/Examples/Crawler/TFModels/CrawlerStatic.nn.meta


fileFormatVersion: 2
guid: ac4a23ff4713140198629ae0844926ee
ScriptedImporter:
fileIDToRecycleName:
11400000: main obj
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
UnitySDK/Assets/ML-Agents/Examples/FoodCollector/TFModels/FoodCollector.nn.meta


fileFormatVersion: 2
guid: 36ab3e93020504f48858d0856f939685
ScriptedImporter:
fileIDToRecycleName:
11400000: main obj
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
UnitySDK/Assets/ML-Agents/Examples/GridWorld/TFModels/GridWorld.nn.meta


fileFormatVersion: 2
guid: a812f1ce7763a4a0c912717f3594fe20
ScriptedImporter:
fileIDToRecycleName:
11400000: main obj
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
UnitySDK/Assets/ML-Agents/Examples/Hallway/TFModels/Hallway.nn.meta


fileFormatVersion: 2
guid: 317f4f8da7e4846b3aae0969781824a2
ScriptedImporter:
fileIDToRecycleName:
11400000: main obj
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
UnitySDK/Assets/ML-Agents/Examples/PushBlock/TFModels/PushBlock.nn.meta


fileFormatVersion: 2
guid: 70db47ab276e44fe0beb677ff8d69382
ScriptedImporter:
fileIDToRecycleName:
11400000: main obj
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
UnitySDK/Assets/ML-Agents/Examples/Pyramids/TFModels/Pyramids.nn.meta


fileFormatVersion: 2
guid: aa3fa19a09ec44a41be3da037783ad41
ScriptedImporter:
fileIDToRecycleName:
11400000: main obj
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
UnitySDK/Assets/ML-Agents/Examples/Reacher/TFModels/Reacher.nn.meta


fileFormatVersion: 2
guid: d7bdb6a78154f4cf99437d67e4a569a8
ScriptedImporter:
fileIDToRecycleName:
11400000: main obj
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

27
UnitySDK/Assets/ML-Agents/Examples/SharedAssets/Materials/Textures/LogoCube.png.meta


TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 4
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0

heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0

serializedVersion: 2
filterMode: 1
aniso: -1
mipBias: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1

spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
- buildTarget: DefaultTexturePlatform
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 1
textureFormat: -1

allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- buildTarget: Standalone
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 1
textureFormat: -1

allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- buildTarget: iPhone
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 1
textureFormat: -1

allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- buildTarget: Android
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 1
textureFormat: -1

sprites: []
outline: []
physicsShape: []
bones: []
spriteID: a3ff174ca5d764281aae23e2c354baca
vertices: []
indices:
edges: []
weights: []
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

27
UnitySDK/Assets/ML-Agents/Examples/SharedAssets/Materials/Textures/UnityLogo.png.meta


TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 4
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0

heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0

serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1

spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
- buildTarget: DefaultTexturePlatform
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1

allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- buildTarget: Standalone
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1

allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- buildTarget: iPhone
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1

allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- buildTarget: Android
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1

sprites: []
outline: []
physicsShape: []
bones: []
spriteID: b33f877521c6d4d8782f018141dc1d6a
vertices: []
indices:
edges: []
weights: []
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

3
UnitySDK/Assets/ML-Agents/Examples/Tennis/TFModels/Tennis.nn.meta


fileFormatVersion: 2
guid: d6c5e749e4ceb4cf79640a5955706d3d
ScriptedImporter:
fileIDToRecycleName:
11400000: main obj
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
UnitySDK/Assets/ML-Agents/Examples/Walker/TFModels/Walker.nn.meta


fileFormatVersion: 2
guid: 4e86a19e012da43bfa5ab97ae8089b98
ScriptedImporter:
fileIDToRecycleName:
11400000: main obj
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
UnitySDK/Assets/ML-Agents/Examples/WallJump/TFModels/BigWallJump.nn.meta


fileFormatVersion: 2
guid: 0468bf44b1efd4992b6bf22cadb50d89
ScriptedImporter:
fileIDToRecycleName:
11400000: main obj
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
UnitySDK/Assets/ML-Agents/Examples/WallJump/TFModels/SmallWallJump.nn.meta


fileFormatVersion: 2
guid: fb2ce36eb40b6480e94ea0b5d7573e47
ScriptedImporter:
fileIDToRecycleName:
11400000: main obj
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
UnitySDK/ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2017.4.33f1
m_EditorVersion: 2018.4.14f1

6
docs/Installation.md


install Python with additional dependencies. Each of the subsections below
overviews each step, in addition to a Docker set-up.
## Install **Unity 2017.4** or Later
## Install **Unity 2018.4** or Later
[Download](https://store.unity.com/download) and install Unity. If you would
like to use our Docker set-up (introduced later), make sure to select the _Linux

If you intend to copy the `UnitySDK` folder in to your project, ensure that
you have the [Barracuda preview package](https://docs.unity3d.com/Packages/com.unity.barracuda@0.3/manual/index.html) installed.
To install the Barracuda package in Unity **2017.4.x**, you will have to copy the
`UnityPackageManager` folder under the `UnitySDK` folder to the root directory of your
project.
To install the Barrcuda package in later versions of Unity, navigate to the Package
Manager window by navigating to the menu `Window` -> `Package Manager`. Click on the

1
docs/Migrating.md


* Offline Behavioral Cloning has been removed. To learn from demonstrations, use the GAIL and
Behavioral Cloning features with either PPO or SAC. See [Imitation Learning](Training-Imitation-Learning.md) for more information.
* `mlagents.envs` was renamed to `mlagents_envs`. The previous repo layout depended on [PEP420](https://www.python.org/dev/peps/pep-0420/), which caused problems with some of our tooling such as mypy and pylint.
* The official version of Unity ML-Agents supports is now 2018.4 LTS. If you run into issues, please consider deleting your library folder and reponening your projects. You will need to install the Barracuda package into your project in order to ML-Agents to compile correctly.
### Steps to Migrate
* If you had a custom `Training Configuration` in the Academy inspector, you will need to pass your custom configuration at every training run using the new command line arguments `--width`, `--height`, `--quality-level`, `--time-scale` and `--target-frame-rate`.

4
docs/localized/KR/docs/Installation.md


Clone(복제)하고 추가종속성을 가지는 Python(파이썬)을 설치해야합니다. 아래 Subsection(하위섹션)에서는 Docker(도커) 설정 외에도
각 단계를 개괄적으로 설명합니다.
## **Unity 2017.4** 또는 이후의 버전을 설치하십시오.
## **Unity 2018.4** 또는 이후의 버전을 설치하십시오.
[다운로드](https://store.unity.com/kr/download)하고 설치하십시오. 만약 저희의 도커 설정(차후에 소개할)을 사용하고 싶다면,
유니티를 설치할 때, Linux Build Support를 설정하십시오.

## 한글 번역
해당 문서의 한글 번역은 [장현준 (Hyeonjun Jang)]([https://github.com/janghyeonjun](https://github.com/janghyeonjun))에 의해 진행되었습니다. 내용상 오류나 오탈자가 있는 경우 totok682@naver.com 으로 연락주시면 감사드리겠습니다.
해당 문서의 한글 번역은 [장현준 (Hyeonjun Jang)]([https://github.com/janghyeonjun](https://github.com/janghyeonjun))에 의해 진행되었습니다. 내용상 오류나 오탈자가 있는 경우 totok682@naver.com 으로 연락주시면 감사드리겠습니다.

2
run-tests-editmode-osx-editor.sh


echo "Starting tests via $UNITY"
CMD_LINE="$UNITY -runTests -logfile - -projectPath $BASETPATH/UnitySDK -testResults $BASETPATH/results.xml -testPlatform editmode"
CMD_LINE="$UNITY -batchmode -runTests -logfile - -projectPath $BASETPATH/UnitySDK -testResults $BASETPATH/results.xml -testPlatform editmode"
echo "$CMD_LINE ..."

11
UnitySDK/ProjectSettings/VFXManager.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!937362698 &1
VFXManager:
m_ObjectHideFlags: 0
m_IndirectShader: {fileID: 0}
m_CopyBufferShader: {fileID: 0}
m_SortShader: {fileID: 0}
m_RenderPipeSettingsPath:
m_FixedTimeStep: 0.016666668
m_MaxDeltaTime: 0.05

41
UnitySDK/Packages/manifest.json


{
"dependencies": {
"com.unity.ads": "2.0.8",
"com.unity.analytics": "3.2.2",
"com.unity.collab-proxy": "1.2.15",
"com.unity.package-manager-ui": "2.0.8",
"com.unity.purchasing": "2.0.3",
"com.unity.textmeshpro": "1.4.1",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.cloth": "1.0.0",
"com.unity.modules.director": "1.0.0",
"com.unity.modules.imageconversion": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.particlesystem": "1.0.0",
"com.unity.modules.physics": "1.0.0",
"com.unity.modules.physics2d": "1.0.0",
"com.unity.modules.screencapture": "1.0.0",
"com.unity.modules.terrain": "1.0.0",
"com.unity.modules.terrainphysics": "1.0.0",
"com.unity.modules.tilemap": "1.0.0",
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.uielements": "1.0.0",
"com.unity.modules.umbra": "1.0.0",
"com.unity.modules.unityanalytics": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
"com.unity.modules.unitywebrequestaudio": "1.0.0",
"com.unity.modules.unitywebrequesttexture": "1.0.0",
"com.unity.modules.unitywebrequestwww": "1.0.0",
"com.unity.modules.vehicles": "1.0.0",
"com.unity.modules.video": "1.0.0",
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.wind": "1.0.0",
"com.unity.modules.xr": "1.0.0",
"com.unity.barracuda": "0.3.2-preview"
}
}
正在加载...
取消
保存