比较提交

...
此合并请求有变更与目标分支冲突。
/Project/Packages/manifest.json
/Project/ProjectSettings/ProjectVersion.txt
/Project/Assets/ML-Agents/Examples/3DBall/Demos/Expert3DBall.demo.meta
/Project/Assets/ML-Agents/Examples/3DBall/Demos/Expert3DBallHard.demo.meta
/Project/Assets/ML-Agents/Examples/GridWorld/Demos/ExpertGrid.demo.meta
/Project/Assets/ML-Agents/Examples/Hallway/Demos/ExpertHallway.demo.meta
/Project/Assets/ML-Agents/Examples/PushBlock/Demos/ExpertPush.demo.meta
/Project/Assets/ML-Agents/Examples/Pyramids/Demos/ExpertPyramid.demo.meta
/Project/Assets/ML-Agents/Examples/Basic/Demos/ExpertBasic.demo.meta
/Project/Assets/ML-Agents/Examples/Bouncer/Demos/ExpertBouncer.demo.meta
/Project/Assets/ML-Agents/Examples/Crawler/Demos/ExpertCrawlerDyn.demo.meta
/Project/Assets/ML-Agents/Examples/Crawler/Demos/ExpertCrawlerSta.demo.meta
/Project/Assets/ML-Agents/Examples/FoodCollector/Demos/ExpertFood.demo.meta
/Project/Assets/ML-Agents/Examples/Reacher/Demos/ExpertReacher.demo.meta
/Project/Assets/ML-Agents/Examples/Tennis/Demos/ExpertTennis.demo.meta
/Project/Assets/ML-Agents/Examples/Walker/Demos/ExpertWalker.demo.meta

1 次代码提交

作者 SHA1 备注 提交日期
Christopher Goy a6b472a8 Upgrade project to 2019.3.0f6. 5 年前
共有 17 个文件被更改,包括 101 次插入37 次删除
  1. 7
      Project/Assets/ML-Agents/Examples/3DBall/Demos/Expert3DBall.demo.meta
  2. 7
      Project/Assets/ML-Agents/Examples/3DBall/Demos/Expert3DBallHard.demo.meta
  3. 7
      Project/Assets/ML-Agents/Examples/Basic/Demos/ExpertBasic.demo.meta
  4. 7
      Project/Assets/ML-Agents/Examples/Bouncer/Demos/ExpertBouncer.demo.meta
  5. 7
      Project/Assets/ML-Agents/Examples/Crawler/Demos/ExpertCrawlerDyn.demo.meta
  6. 7
      Project/Assets/ML-Agents/Examples/Crawler/Demos/ExpertCrawlerSta.demo.meta
  7. 7
      Project/Assets/ML-Agents/Examples/FoodCollector/Demos/ExpertFood.demo.meta
  8. 7
      Project/Assets/ML-Agents/Examples/GridWorld/Demos/ExpertGrid.demo.meta
  9. 7
      Project/Assets/ML-Agents/Examples/Hallway/Demos/ExpertHallway.demo.meta
  10. 7
      Project/Assets/ML-Agents/Examples/PushBlock/Demos/ExpertPush.demo.meta
  11. 7
      Project/Assets/ML-Agents/Examples/Pyramids/Demos/ExpertPyramid.demo.meta
  12. 7
      Project/Assets/ML-Agents/Examples/Reacher/Demos/ExpertReacher.demo.meta
  13. 7
      Project/Assets/ML-Agents/Examples/Tennis/Demos/ExpertTennis.demo.meta
  14. 7
      Project/Assets/ML-Agents/Examples/Walker/Demos/ExpertWalker.demo.meta
  15. 21
      Project/Packages/manifest.json
  16. 16
      Project/ProjectSettings/EditorSettings.asset
  17. 3
      Project/ProjectSettings/ProjectVersion.txt

7
Project/Assets/ML-Agents/Examples/3DBall/Demos/Expert3DBall.demo.meta


fileFormatVersion: 2
guid: bbf6756da134740eaa002a1b84f655cb
ScriptedImporter:
fileIDToRecycleName:
11400000: Assets/ML-Agents/Examples/3DBall/Demos/Expert3DBall.demo
internalIDToNameTable:
- first:
114: 11400000
second: Assets/ML-Agents/Examples/3DBall/Demos/Expert3DBall.demo
serializedVersion: 2
userData: ' (MLAgents.Demonstration)'
assetBundleName:
assetBundleVariant:

7
Project/Assets/ML-Agents/Examples/3DBall/Demos/Expert3DBallHard.demo.meta


fileFormatVersion: 2
guid: 6942431e411b146be9a597663eca89af
ScriptedImporter:
fileIDToRecycleName:
11400000: Assets/ML-Agents/Examples/3DBall/Demos/Expert3DBallHard.demo
internalIDToNameTable:
- first:
114: 11400000
second: Assets/ML-Agents/Examples/3DBall/Demos/Expert3DBallHard.demo
serializedVersion: 2
userData: ' (MLAgents.Demonstration)'
assetBundleName:
assetBundleVariant:

7
Project/Assets/ML-Agents/Examples/Basic/Demos/ExpertBasic.demo.meta


fileFormatVersion: 2
guid: 414224ce8b3e247ad936b17f574b10ab
ScriptedImporter:
fileIDToRecycleName:
11400000: Assets/ML-Agents/Examples/Basic/Demos/ExpertBasic.demo
internalIDToNameTable:
- first:
114: 11400000
second: Assets/ML-Agents/Examples/Basic/Demos/ExpertBasic.demo
serializedVersion: 2
userData: ' (MLAgents.Demonstration)'
assetBundleName:
assetBundleVariant:

7
Project/Assets/ML-Agents/Examples/Bouncer/Demos/ExpertBouncer.demo.meta


fileFormatVersion: 2
guid: 6285af622c80e493b906f26cf5b2327f
ScriptedImporter:
fileIDToRecycleName:
11400000: Assets/ML-Agents/Examples/Bouncer/Demos/ExpertBouncer.demo
internalIDToNameTable:
- first:
114: 11400000
second: Assets/ML-Agents/Examples/Bouncer/Demos/ExpertBouncer.demo
serializedVersion: 2
userData: ' (MLAgents.Demonstration)'
assetBundleName:
assetBundleVariant:

7
Project/Assets/ML-Agents/Examples/Crawler/Demos/ExpertCrawlerDyn.demo.meta


fileFormatVersion: 2
guid: 557283e524ca0493ebc67c7b475304fe
ScriptedImporter:
fileIDToRecycleName:
11400000: Assets/ML-Agents/Examples/Crawler/Demos/ExpertCrawlerDyn.demo
internalIDToNameTable:
- first:
114: 11400000
second: Assets/ML-Agents/Examples/Crawler/Demos/ExpertCrawlerDyn.demo
serializedVersion: 2
userData: ' (MLAgents.Demonstration)'
assetBundleName:
assetBundleVariant:

7
Project/Assets/ML-Agents/Examples/Crawler/Demos/ExpertCrawlerSta.demo.meta


fileFormatVersion: 2
guid: 4975695b6ea23446a94c9be3b5d21731
ScriptedImporter:
fileIDToRecycleName:
11400000: Assets/ML-Agents/Examples/Crawler/Demos/ExpertCrawlerSta.demo
internalIDToNameTable:
- first:
114: 11400000
second: Assets/ML-Agents/Examples/Crawler/Demos/ExpertCrawlerSta.demo
serializedVersion: 2
userData: ' (MLAgents.Demonstration)'
assetBundleName:
assetBundleVariant:

7
Project/Assets/ML-Agents/Examples/FoodCollector/Demos/ExpertFood.demo.meta


fileFormatVersion: 2
guid: 95285c32be79a4c77a5ac225e671e4b5
ScriptedImporter:
fileIDToRecycleName:
11400000: Assets/ML-Agents/Examples/FoodCollector/Demos/ExpertFood.demo
internalIDToNameTable:
- first:
114: 11400000
second: Assets/ML-Agents/Examples/FoodCollector/Demos/ExpertFood.demo
serializedVersion: 2
userData: ' (MLAgents.Demonstration)'
assetBundleName:
assetBundleVariant:

7
Project/Assets/ML-Agents/Examples/GridWorld/Demos/ExpertGrid.demo.meta


fileFormatVersion: 2
guid: 3938e0ee1f99e473db8e45d334dfa329
ScriptedImporter:
fileIDToRecycleName:
11400000: Assets/ML-Agents/Examples/GridWorld/Demos/ExpertGrid.demo
internalIDToNameTable:
- first:
114: 11400000
second: Assets/ML-Agents/Examples/GridWorld/Demos/ExpertGrid.demo
serializedVersion: 2
userData: ' (MLAgents.Demonstration)'
assetBundleName:
assetBundleVariant:

7
Project/Assets/ML-Agents/Examples/Hallway/Demos/ExpertHallway.demo.meta


fileFormatVersion: 2
guid: 41c6af18564fe425fa1c047d603ee34e
ScriptedImporter:
fileIDToRecycleName:
11400000: Assets/ML-Agents/Examples/Hallway/Demos/ExpertHallway.demo
internalIDToNameTable:
- first:
114: 11400000
second: Assets/ML-Agents/Examples/Hallway/Demos/ExpertHallway.demo
serializedVersion: 2
userData: ' (MLAgents.Demonstration)'
assetBundleName:
assetBundleVariant:

7
Project/Assets/ML-Agents/Examples/PushBlock/Demos/ExpertPush.demo.meta


fileFormatVersion: 2
guid: 7f11f35191533404c9957443a681aaee
ScriptedImporter:
fileIDToRecycleName:
11400000: Assets/ML-Agents/Examples/PushBlock/Demos/ExpertPush.demo
internalIDToNameTable:
- first:
114: 11400000
second: Assets/ML-Agents/Examples/PushBlock/Demos/ExpertPush.demo
serializedVersion: 2
userData: ' (MLAgents.Demonstration)'
assetBundleName:
assetBundleVariant:

7
Project/Assets/ML-Agents/Examples/Pyramids/Demos/ExpertPyramid.demo.meta


fileFormatVersion: 2
guid: 2f9d53c90f11846d7a6499ce0f1dfebb
ScriptedImporter:
fileIDToRecycleName:
11400000: Assets/ML-Agents/Examples/Pyramids/Demos/ExpertPyramid.demo
internalIDToNameTable:
- first:
114: 11400000
second: Assets/ML-Agents/Examples/Pyramids/Demos/ExpertPyramid.demo
serializedVersion: 2
userData: ' (MLAgents.Demonstration)'
assetBundleName:
assetBundleVariant:

7
Project/Assets/ML-Agents/Examples/Reacher/Demos/ExpertReacher.demo.meta


fileFormatVersion: 2
guid: 4f14b17d2835e482097c88301323e587
ScriptedImporter:
fileIDToRecycleName:
11400000: Assets/ML-Agents/Examples/Reacher/Demos/ExpertReacher.demo
internalIDToNameTable:
- first:
114: 11400000
second: Assets/ML-Agents/Examples/Reacher/Demos/ExpertReacher.demo
serializedVersion: 2
userData: ' (MLAgents.Demonstration)'
assetBundleName:
assetBundleVariant:

7
Project/Assets/ML-Agents/Examples/Tennis/Demos/ExpertTennis.demo.meta


fileFormatVersion: 2
guid: 9676a67fc4a8d420aab12eb513a845a8
ScriptedImporter:
fileIDToRecycleName:
11400000: Assets/ML-Agents/Examples/Tennis/Demos/ExpertTennis.demo
internalIDToNameTable:
- first:
114: 11400000
second: Assets/ML-Agents/Examples/Tennis/Demos/ExpertTennis.demo
serializedVersion: 2
userData: ' (MLAgents.Demonstration)'
assetBundleName:
assetBundleVariant:

7
Project/Assets/ML-Agents/Examples/Walker/Demos/ExpertWalker.demo.meta


fileFormatVersion: 2
guid: d75254c9e8cb8402d98eede161c74a60
ScriptedImporter:
fileIDToRecycleName:
11400000: Assets/ML-Agents/Examples/Walker/Demos/ExpertWalker.demo
internalIDToNameTable:
- first:
114: 11400000
second: Assets/ML-Agents/Examples/Walker/Demos/ExpertWalker.demo
serializedVersion: 2
userData: ' (MLAgents.Demonstration)'
assetBundleName:
assetBundleVariant:

21
Project/Packages/manifest.json


{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.analytics": "3.2.2",
"com.unity.collab-proxy": "1.2.15",
"com.unity.analytics": "3.3.5",
"com.unity.collab-proxy": "1.2.16",
"com.unity.ide.rider": "1.1.4",
"com.unity.ide.vscode": "1.1.4",
"com.unity.package-manager-ui": "2.0.8",
"com.unity.multiplayer-hlapi": "1.0.4",
"com.unity.purchasing": "2.0.3",
"com.unity.textmeshpro": "1.4.1",
"com.unity.purchasing": "2.0.6",
"com.unity.test-framework": "1.1.9",
"com.unity.textmeshpro": "2.0.1",
"com.unity.timeline": "1.2.10",
"com.unity.ugui": "1.0.0",
"com.unity.xr.legacyinputhelpers": "1.3.8",
"com.unity.modules.androidjni": "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.wind": "1.0.0",
"com.unity.modules.xr": "1.0.0"
},
"testables" : [
"testables": [
"com.unity.ml-agents"
]
}

16
Project/ProjectSettings/EditorSettings.asset


--- !u!159 &1
EditorSettings:
m_ObjectHideFlags: 0
serializedVersion: 7
serializedVersion: 9
m_ExternalVersionControlSupport: Hidden Meta Files
m_SerializationMode: 2
m_LineEndingsForNewScripts: 1

m_EtcTextureFastCompressor: 1
m_EtcTextureNormalCompressor: 2
m_EtcTextureBestCompressor: 4
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp;asmref
m_EnableTextureStreamingInEditMode: 1
m_AsyncShaderCompilation: 1
m_EnterPlayModeOptionsEnabled: 0
m_EnterPlayModeOptions: 3
m_ShowLightmapResolutionOverlay: 1
m_UseLegacyProbeSampleCount: 1
m_AssetPipelineMode: 1
m_CacheServerMode: 0
m_CacheServerEndpoint:
m_CacheServerNamespacePrefix: default
m_CacheServerEnableDownload: 1
m_CacheServerEnableUpload: 1

3
Project/ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2018.4.14f1
m_EditorVersion: 2019.3.0f6
m_EditorVersionWithRevision: 2019.3.0f6 (27ab2135bccf)
正在加载...
取消
保存