Fix arena for 2018

4 年前 · c870270b
--- a/Project/Assets/ML-Agents/Examples/CubeWars/Meshes/ArenaWalls.fbx.meta
+++ b/Project/Assets/ML-Agents/Examples/CubeWars/Meshes/ArenaWalls.fbx.meta
 fileFormatVersion: 2
 guid: 8c40fb8b2e877464087ee4920444a812
 ModelImporter:
-  serializedVersion: 26
-  internalIDToNameTable: []
+  serializedVersion: 23
+  fileIDToRecycleName:
+    100000: //RootNode
+    400000: //RootNode
+    2100000: No Name
+    2300000: //RootNode
+    3300000: //RootNode
+    4300000: Circle Arena.002
  externalObjects: {}
  materials:
    importMaterials: 1
    meshCompression: 0
    addColliders: 0
    useSRGBMaterialColor: 1
-    sortHierarchyByName: 1
    importVisibility: 1
    importBlendShapes: 1
    importCameras: 1
    useFileUnits: 1
+    optimizeMeshForGPU: 1
-    skinWeightsMode: 0
-    maxBonesPerVertex: 4
-    minBoneWeight: 0.001
-    meshOptimizationFlags: -1
    indexFormat: 0
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
+    previousCalculatedGlobalScale: 1
+    hasPreviousCalculatedGlobalScale: 0
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    blendShapeNormalImportMode: 1
    normalSmoothingSource: 0
-  referencedClips: []
-    serializedVersion: 3
+    serializedVersion: 2
    human: []
    skeleton: []
    armTwist: 0.5
    armStretch: 0.05
    legStretch: 0.05
    feetSpacing: 0
-    globalScale: 1
    rootMotionBoneName: 
    hasTranslationDoF: 0
    hasExtraRoot: 0
--- a/Project/Assets/ML-Agents/Examples/CubeWars/Prefabs/CubeWarArea.prefab
+++ b/Project/Assets/ML-Agents/Examples/CubeWars/Prefabs/CubeWarArea.prefab
  m_ProbeAnchor: {fileID: 0}
  m_LightProbeVolumeOverride: {fileID: 0}
  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
  m_PreserveUVs: 0
  m_IgnoreNormalsForChartDetection: 0
  m_ImportantGI: 0
  - {fileID: 4430881949022472}
  - {fileID: 4534035899647546}
  m_Father: {fileID: 4688212428263696}
-  m_RootOrder: 1
+  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1457179540742082
 GameObject:
  m_ProbeAnchor: {fileID: 0}
  m_LightProbeVolumeOverride: {fileID: 0}
  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
  m_PreserveUVs: 0
  m_IgnoreNormalsForChartDetection: 0
  m_ImportantGI: 0
  m_LocalPosition: {x: 0, y: 12.3, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
-  - {fileID: 7827906445720098920}
+  - {fileID: 3015436747103054322}
  - {fileID: 4419274671784554}
  - {fileID: 5634558950757305706}
  - {fileID: 6276286609035264789}
  - {fileID: 0}
  range: 1
  MaxEnvironmentSteps: 5000
+--- !u!64 &8946967612316098161
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3015436747102959058}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Convex: 0
+  m_CookingOptions: 14
+  m_Mesh: {fileID: 4300000, guid: 8c40fb8b2e877464087ee4920444a812, type: 3}
 --- !u!1 &3952752091333818756
 GameObject:
  m_ObjectHideFlags: 0
  m_ProbeAnchor: {fileID: 0}
  m_LightProbeVolumeOverride: {fileID: 0}
  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
  m_PreserveUVs: 0
  m_IgnoreNormalsForChartDetection: 0
  m_ImportantGI: 0
  - {fileID: 3256731534312223688}
  - {fileID: 3331463254605917318}
  m_Father: {fileID: 4688212428263696}
-  m_RootOrder: 2
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!65 &8758597709486190942
 BoxCollider:
  myLaser: {fileID: 137581301857655464}
  shockwave: {fileID: 8498712796297175102}
  myBody: {fileID: 3253209279871271058}
--- !u!64 &1807569721161141282
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6555295647043807867}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 14
-  m_Mesh: {fileID: 7899092891819194326, guid: 8c40fb8b2e877464087ee4920444a812, type: 3}
 --- !u!1 &8498712796297175102
 GameObject:
  m_ObjectHideFlags: 0
  m_Father: {fileID: 5561786740530964387}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8776954551934106372
+--- !u!1 &8981778161235863411
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_Component:
-  - component: {fileID: 6300367493673524447}
-  - component: {fileID: 5160720440466408329}
-  - component: {fileID: 8353323014505377600}
-  - component: {fileID: 5496980372163301799}
+  - component: {fileID: 6477922581609749249}
+  - component: {fileID: 7412321159628423621}
+  - component: {fileID: 8678370021274080018}
+  - component: {fileID: 4082324733063531241}
-  m_TagString: ground
+  m_TagString: Untagged
--- !u!4 &6300367493673524447
+--- !u!4 &6477922581609749249
-  m_GameObject: {fileID: 8776954551934106372}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -0.061, z: 0}
+  m_GameObject: {fileID: 8981778161235863411}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_Father: {fileID: 7827906445720098920}
+  m_Father: {fileID: 3015436747103054322}
--- !u!33 &5160720440466408329
+--- !u!33 &7412321159628423621
-  m_GameObject: {fileID: 8776954551934106372}
+  m_GameObject: {fileID: 8981778161235863411}
--- !u!23 &8353323014505377600
+--- !u!23 &8678370021274080018
-  m_GameObject: {fileID: 8776954551934106372}
+  m_GameObject: {fileID: 8981778161235863411}
  m_Enabled: 1
  m_CastShadows: 1
  m_ReceiveShadows: 1
  m_ProbeAnchor: {fileID: 0}
  m_LightProbeVolumeOverride: {fileID: 0}
  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_StitchLightmapSeams: 1
+  m_StitchLightmapSeams: 0
  m_SelectedEditorRenderState: 3
  m_MinimumChartSize: 4
  m_AutoUVMaxDistance: 0.5
  m_SortingLayer: 0
  m_SortingOrder: 0
--- !u!64 &5496980372163301799
-MeshCollider:
+--- !u!65 &4082324733063531241
+BoxCollider:
-  m_GameObject: {fileID: 8776954551934106372}
+  m_GameObject: {fileID: 8981778161235863411}
-  serializedVersion: 3
-  m_Convex: 1
-  m_CookingOptions: 14
-  m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
+  serializedVersion: 2
+  m_Size: {x: 1.0000002, y: 1.9999999, z: 1.0000004}
+  m_Center: {x: 0.00000005960465, y: 0, z: -0.00000008940698}
 --- !u!1001 &26445713038023263
 PrefabInstance:
  m_ObjectHideFlags: 0
  m_Modification:
    m_TransformParent: {fileID: 4688212428263696}
    m_Modifications:
+    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
+        type: 3}
+      propertyPath: area
+      value: 
+      objectReference: {fileID: 1819751139121548}
+    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
+        type: 3}
+      propertyPath: largeAgent
+      value: 
+      objectReference: {fileID: 5707177387575911509}
+    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
+        type: 3}
+      propertyPath: role
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
+        type: 3}
+      propertyPath: MaxStep
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 8081094897351109481, guid: 4dd35c7381e7445c99133a34a83e21db,
        type: 3}
      propertyPath: m_LocalPosition.x
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
-        type: 3}
-      propertyPath: area
-      value: 
-      objectReference: {fileID: 1819751139121548}
-    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
-        type: 3}
-      propertyPath: largeAgent
-      value: 
-      objectReference: {fileID: 5707177387575911509}
-    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
-        type: 3}
-      propertyPath: role
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
-        type: 3}
-      propertyPath: MaxStep
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8195483629779642977, guid: 4dd35c7381e7445c99133a34a83e21db,
-        type: 3}
-      propertyPath: m_Model
-      value: 
-      objectReference: {fileID: 5022602860645237092, guid: 4295d3fcd852848f0ac0b99643e68b49,
-        type: 3}
+    - target: {fileID: 8195483629779642977, guid: 4dd35c7381e7445c99133a34a83e21db,
+        type: 3}
+      propertyPath: m_Model
+      value: 
+      objectReference: {fileID: 11400000, guid: 551d0363b1f054571bf47ab1fadceb56,
+        type: 3}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 4dd35c7381e7445c99133a34a83e21db, type: 3}
 --- !u!4 &6276286609035264789 stripped
  m_Modification:
    m_TransformParent: {fileID: 4688212428263696}
    m_Modifications:
-    - target: {fileID: -927199367670048503, guid: 8c40fb8b2e877464087ee4920444a812,
-        type: 3}
-      propertyPath: m_Name
-      value: ArenaWalls
-      objectReference: {fileID: 0}
-    - target: {fileID: -927199367670048503, guid: 8c40fb8b2e877464087ee4920444a812,
-        type: 3}
-      propertyPath: m_TagString
-      value: wall
-      objectReference: {fileID: 0}
-    - target: {fileID: -927199367670048503, guid: 8c40fb8b2e877464087ee4920444a812,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
    - target: {fileID: -4216859302048453862, guid: 8c40fb8b2e877464087ee4920444a812,
        type: 3}
      propertyPath: m_LocalPosition.x
      propertyPath: m_Materials.Array.data[0]
      value: 
      objectReference: {fileID: 2100000, guid: 66163cf35956a4be08e801b750c26f33, type: 2}
+    - target: {fileID: -927199367670048503, guid: 8c40fb8b2e877464087ee4920444a812,
+        type: 3}
+      propertyPath: m_Name
+      value: ArenaWalls
+      objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: 8c40fb8b2e877464087ee4920444a812,
+        type: 3}
+      propertyPath: m_TagString
+      value: wall
+      objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: 8c40fb8b2e877464087ee4920444a812,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 8c40fb8b2e877464087ee4920444a812, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 8c40fb8b2e877464087ee4920444a812, type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 8c40fb8b2e877464087ee4920444a812, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 8c40fb8b2e877464087ee4920444a812, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 8c40fb8b2e877464087ee4920444a812, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 60
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 8c40fb8b2e877464087ee4920444a812, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 40
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 8c40fb8b2e877464087ee4920444a812, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 60
+      objectReference: {fileID: 0}
+    - target: {fileID: 2300000, guid: 8c40fb8b2e877464087ee4920444a812, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 66163cf35956a4be08e801b750c26f33, type: 2}
--- !u!4 &7827906445720098920 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 8c40fb8b2e877464087ee4920444a812,
+--- !u!1 &3015436747102959058 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 100000, guid: 8c40fb8b2e877464087ee4920444a812,
--- !u!1 &6555295647043807867 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 8c40fb8b2e877464087ee4920444a812,
+--- !u!4 &3015436747103054322 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 400000, guid: 8c40fb8b2e877464087ee4920444a812,
    type: 3}
  m_PrefabInstance: {fileID: 3015436747102925682}
  m_PrefabAsset: {fileID: 0}
  m_Modification:
    m_TransformParent: {fileID: 4688212428263696}
    m_Modifications:
+    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
+        type: 3}
+      propertyPath: largeAgent
+      value: 
+      objectReference: {fileID: 5707177387575911509}
+    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
+        type: 3}
+      propertyPath: area
+      value: 
+      objectReference: {fileID: 1819751139121548}
+    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
+        type: 3}
+      propertyPath: role
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
+        type: 3}
+      propertyPath: MaxStep
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 8081094897351109481, guid: 4dd35c7381e7445c99133a34a83e21db,
        type: 3}
      propertyPath: m_LocalPosition.x
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
-        type: 3}
-      propertyPath: largeAgent
-      value: 
-      objectReference: {fileID: 5707177387575911509}
-    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
-        type: 3}
-      propertyPath: area
-      value: 
-      objectReference: {fileID: 1819751139121548}
-    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
-        type: 3}
-      propertyPath: role
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
-        type: 3}
-      propertyPath: MaxStep
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8195483629779642977, guid: 4dd35c7381e7445c99133a34a83e21db,
-        type: 3}
-      propertyPath: m_Model
-      value: 
-      objectReference: {fileID: 5022602860645237092, guid: 4295d3fcd852848f0ac0b99643e68b49,
-        type: 3}
+    - target: {fileID: 8195483629779642977, guid: 4dd35c7381e7445c99133a34a83e21db,
+        type: 3}
+      propertyPath: m_Model
+      value: 
+      objectReference: {fileID: 11400000, guid: 551d0363b1f054571bf47ab1fadceb56,
+        type: 3}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 4dd35c7381e7445c99133a34a83e21db, type: 3}
 --- !u!4 &5634558950757305706 stripped
  m_Modification:
    m_TransformParent: {fileID: 4688212428263696}
    m_Modifications:
+    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
+        type: 3}
+      propertyPath: area
+      value: 
+      objectReference: {fileID: 1819751139121548}
+    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
+        type: 3}
+      propertyPath: largeAgent
+      value: 
+      objectReference: {fileID: 5707177387575911509}
+    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
+        type: 3}
+      propertyPath: MaxStep
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 8081094897351109481, guid: 4dd35c7381e7445c99133a34a83e21db,
        type: 3}
      propertyPath: m_LocalPosition.x
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
-        type: 3}
-      propertyPath: area
-      value: 
-      objectReference: {fileID: 1819751139121548}
-    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
-        type: 3}
-      propertyPath: largeAgent
-      value: 
-      objectReference: {fileID: 5707177387575911509}
-    - target: {fileID: 5940168890073970201, guid: 4dd35c7381e7445c99133a34a83e21db,
-        type: 3}
-      propertyPath: MaxStep
-      value: 0
-      objectReference: {fileID: 0}
+    - target: {fileID: 8136121708948342693, guid: 4dd35c7381e7445c99133a34a83e21db,
+        type: 3}
+      propertyPath: m_Constraints
+      value: 112
+      objectReference: {fileID: 0}
-      objectReference: {fileID: 5022602860645237092, guid: 4295d3fcd852848f0ac0b99643e68b49,
+      objectReference: {fileID: 11400000, guid: 551d0363b1f054571bf47ab1fadceb56,
        type: 3}
    - target: {fileID: 8705827100738960883, guid: 4dd35c7381e7445c99133a34a83e21db,
        type: 3}
      propertyPath: m_Materials.Array.data[0]
      value: 
      objectReference: {fileID: 2100000, guid: 07bc6a1dce9694cc49527eb9bc3f0345, type: 2}
-    - target: {fileID: 8136121708948342693, guid: 4dd35c7381e7445c99133a34a83e21db,
-        type: 3}
-      propertyPath: m_Constraints
-      value: 112
-      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 4dd35c7381e7445c99133a34a83e21db, type: 3}
 --- !u!4 &4419274671784554 stripped