浏览代码

preparing to rebase onto cc

/soccer-comms/disc
Andrew Cohen 4 年前
当前提交
f67267b8
共有 8 个文件被更改,包括 75 次插入11 次删除
  1. 12
      Project/Assets/ML-Agents/Examples/Soccer/Scripts/AgentSoccerCollab.cs
  2. 21
      Project/Packages/manifest.json
  3. 6
      Project/ProjectSettings/DynamicsManager.asset
  4. 3
      Project/ProjectSettings/ProjectVersion.txt
  5. 4
      Project/ProjectSettings/TagManager.asset
  6. 15
      Project/ProjectSettings/BurstAotSettings_StandaloneLinux64.json
  7. 15
      Project/ProjectSettings/BurstAotSettings_StandaloneOSX.json
  8. 10
      Project/ProjectSettings/XRSettings.asset

12
Project/Assets/ML-Agents/Examples/Soccer/Scripts/AgentSoccerCollab.cs


{
base.OnActionReceived(actionBuffers);
//if (team == Team.Blue && tester == 1)
//if (team == Team.Blue && tester == 0)
// Debug.Log("cont");
// Debug.Log(actionBuffers.ContinuousActions[2]);
//}
//else if (team == Team.Blue && tester == 1)
//{
// Debug.Log("mess");
// Debug.Log(actionBuffers.DiscreteActions[0]);
//}
teammate.tellAgent(actionBuffers.DiscreteActions[0]);

public void tellAgent(int message)
{
m_Message[m_Previous] = 0f;
//if (team == Team.Purple)
//{
// message = Random.Range(0, 2);
//}
m_Message[message] = 1f;
m_Previous = message;
}

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.3",
"com.unity.collab-proxy": "1.2.15",
"com.unity.analytics": "3.3.2",
"com.unity.collab-proxy": "1.2.16",
"com.unity.ext.nunit": "1.0.0",
"com.unity.ide.rider": "1.1.0",
"com.unity.ide.vscode": "1.0.7",
"com.unity.package-manager-ui": "2.0.8",
"com.unity.purchasing": "2.0.3",
"com.unity.textmeshpro": "1.4.1",
"com.unity.multiplayer-hlapi": "1.0.2",
"com.unity.package-manager-ui": "2.2.0",
"com.unity.purchasing": "2.0.6",
"com.unity.test-framework": "1.0.13",
"com.unity.textmeshpro": "2.0.1",
"com.unity.timeline": "1.1.0",
"com.unity.ugui": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.0.2",
"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",

6
Project/ProjectSettings/DynamicsManager.asset


--- !u!55 &1
PhysicsManager:
m_ObjectHideFlags: 0
serializedVersion: 10
serializedVersion: 13
m_Gravity: {x: 0, y: -9.81, z: 0}
m_DefaultMaterial: {fileID: 0}
m_BounceThreshold: 2

m_ClothInterCollisionDistance: 0
m_ClothInterCollisionStiffness: 0
m_ContactsGeneration: 1
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffebffffffddffffffeffffffff5fffffffbffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffdfffffffeffffffff5fffffffbffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_ClothGravity: {x: 0, y: -9.81, z: 0}
m_ContactPairsMode: 0
m_BroadphaseType: 0
m_WorldBounds:

m_FrictionType: 0
m_EnableEnhancedDeterminism: 1
m_EnableUnifiedHeightmaps: 1
m_DefaultMaxAngularSpeed: 7

3
Project/ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2018.4.24f1
m_EditorVersion: 2019.2.2f1
m_EditorVersionWithRevision: 2019.2.2f1 (ab112815d860)

4
Project/ProjectSettings/TagManager.asset


-
-
- invisible
-
-
- soccerball
- wallgoal
-
-
-

15
Project/ProjectSettings/BurstAotSettings_StandaloneLinux64.json


{
"MonoBehaviour": {
"Version": 3,
"EnableBurstCompilation": true,
"EnableOptimisations": true,
"EnableSafetyChecks": false,
"EnableDebugInAllBuilds": false,
"UsePlatformSDKLinker": false,
"CpuMinTargetX32": 0,
"CpuMaxTargetX32": 0,
"CpuMinTargetX64": 0,
"CpuMaxTargetX64": 0,
"CpuTargetsX64": 72
}
}

15
Project/ProjectSettings/BurstAotSettings_StandaloneOSX.json


{
"MonoBehaviour": {
"Version": 3,
"EnableBurstCompilation": true,
"EnableOptimisations": true,
"EnableSafetyChecks": false,
"EnableDebugInAllBuilds": false,
"UsePlatformSDKLinker": false,
"CpuMinTargetX32": 0,
"CpuMaxTargetX32": 0,
"CpuMinTargetX64": 0,
"CpuMaxTargetX64": 0,
"CpuTargetsX64": 72
}
}

10
Project/ProjectSettings/XRSettings.asset


{
"m_SettingKeys": [
"VR Device Disabled",
"VR Device User Alert"
],
"m_SettingValues": [
"False",
"False"
]
}
正在加载...
取消
保存