0.7 human controller release

thedoctormarc · May 21, 2021 · 580ce13 · 580ce13
1 parent 947d44c
commit 580ce13
Show file tree

Hide file tree

Showing 63 changed files with 114 additions and 16 deletions.
diff --git a/...tion Project/Analytics/2021 - 05 - 21 12 29_Human/ Human Character_heatmap.png b/...tion Project/Analytics/2021 - 05 - 21 12 29_Human/ Human Character_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/ Rifler (1)_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/ Rifler (1)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/ Rifler (2)_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/ Rifler (2)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/ Rifler (3)_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/ Rifler (3)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/ Rifler_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/ Rifler_heatmap.png
diff --git a/...ation Project/Analytics/2021 - 05 - 21 12 29_Human/ Shotgunner (1)_heatmap.png b/...ation Project/Analytics/2021 - 05 - 21 12 29_Human/ Shotgunner (1)_heatmap.png
diff --git a/...ation Project/Analytics/2021 - 05 - 21 12 29_Human/ Shotgunner (2)_heatmap.png b/...ation Project/Analytics/2021 - 05 - 21 12 29_Human/ Shotgunner (2)_heatmap.png
diff --git a/...ation Project/Analytics/2021 - 05 - 21 12 29_Human/ Shotgunner (3)_heatmap.png b/...ation Project/Analytics/2021 - 05 - 21 12 29_Human/ Shotgunner (3)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/ Shotgunner_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/ Shotgunner_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/ Sniper (1)_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/ Sniper (1)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/ Sniper (2)_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/ Sniper (2)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/ Sniper (3)_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/ Sniper (3)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/ Sniper_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/ Sniper_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/Pickup Map.png b/Automation Project/Analytics/2021 - 05 - 21 12 29_Human/Pickup Map.png
diff --git a/...tion Project/Analytics/2021 - 05 - 21 14 28_Human/ Human Character_heatmap.png b/...tion Project/Analytics/2021 - 05 - 21 14 28_Human/ Human Character_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/ Rifler (1)_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/ Rifler (1)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/ Rifler (2)_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/ Rifler (2)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/ Rifler (3)_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/ Rifler (3)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/ Rifler_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/ Rifler_heatmap.png
diff --git a/...ation Project/Analytics/2021 - 05 - 21 14 28_Human/ Shotgunner (1)_heatmap.png b/...ation Project/Analytics/2021 - 05 - 21 14 28_Human/ Shotgunner (1)_heatmap.png
diff --git a/...ation Project/Analytics/2021 - 05 - 21 14 28_Human/ Shotgunner (2)_heatmap.png b/...ation Project/Analytics/2021 - 05 - 21 14 28_Human/ Shotgunner (2)_heatmap.png
diff --git a/...ation Project/Analytics/2021 - 05 - 21 14 28_Human/ Shotgunner (3)_heatmap.png b/...ation Project/Analytics/2021 - 05 - 21 14 28_Human/ Shotgunner (3)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/ Shotgunner_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/ Shotgunner_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/ Sniper (1)_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/ Sniper (1)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/ Sniper (2)_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/ Sniper (2)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/ Sniper (3)_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/ Sniper (3)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/ Sniper_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/ Sniper_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/Pickup Map.png b/Automation Project/Analytics/2021 - 05 - 21 14 28_Human/Pickup Map.png
diff --git a/...tion Project/Analytics/2021 - 05 - 21 14 29_Human/ Human Character_heatmap.png b/...tion Project/Analytics/2021 - 05 - 21 14 29_Human/ Human Character_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/ Rifler (1)_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/ Rifler (1)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/ Rifler (2)_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/ Rifler (2)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/ Rifler (3)_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/ Rifler (3)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/ Rifler_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/ Rifler_heatmap.png
diff --git a/...ation Project/Analytics/2021 - 05 - 21 14 29_Human/ Shotgunner (1)_heatmap.png b/...ation Project/Analytics/2021 - 05 - 21 14 29_Human/ Shotgunner (1)_heatmap.png
diff --git a/...ation Project/Analytics/2021 - 05 - 21 14 29_Human/ Shotgunner (2)_heatmap.png b/...ation Project/Analytics/2021 - 05 - 21 14 29_Human/ Shotgunner (2)_heatmap.png
diff --git a/...ation Project/Analytics/2021 - 05 - 21 14 29_Human/ Shotgunner (3)_heatmap.png b/...ation Project/Analytics/2021 - 05 - 21 14 29_Human/ Shotgunner (3)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/ Shotgunner_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/ Shotgunner_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/ Sniper (1)_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/ Sniper (1)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/ Sniper (2)_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/ Sniper (2)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/ Sniper (3)_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/ Sniper (3)_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/ Sniper_heatmap.png b/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/ Sniper_heatmap.png
diff --git a/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/Pickup Map.png b/Automation Project/Analytics/2021 - 05 - 21 14 29_Human/Pickup Map.png
diff --git a/Automation Project/Analytics/21 05 2021 14 25_Human/ Human Character_heatmap.png b/Automation Project/Analytics/21 05 2021 14 25_Human/ Human Character_heatmap.png
diff --git a/Automation Project/Analytics/21 05 2021 14 25_Human/ Rifler (1)_heatmap.png b/Automation Project/Analytics/21 05 2021 14 25_Human/ Rifler (1)_heatmap.png
diff --git a/Automation Project/Analytics/21 05 2021 14 25_Human/ Rifler (2)_heatmap.png b/Automation Project/Analytics/21 05 2021 14 25_Human/ Rifler (2)_heatmap.png
diff --git a/Automation Project/Analytics/21 05 2021 14 25_Human/ Rifler (3)_heatmap.png b/Automation Project/Analytics/21 05 2021 14 25_Human/ Rifler (3)_heatmap.png
diff --git a/Automation Project/Analytics/21 05 2021 14 25_Human/ Rifler_heatmap.png b/Automation Project/Analytics/21 05 2021 14 25_Human/ Rifler_heatmap.png
diff --git a/Automation Project/Analytics/21 05 2021 14 25_Human/ Shotgunner (1)_heatmap.png b/Automation Project/Analytics/21 05 2021 14 25_Human/ Shotgunner (1)_heatmap.png
diff --git a/Automation Project/Analytics/21 05 2021 14 25_Human/ Shotgunner (2)_heatmap.png b/Automation Project/Analytics/21 05 2021 14 25_Human/ Shotgunner (2)_heatmap.png
diff --git a/Automation Project/Analytics/21 05 2021 14 25_Human/ Shotgunner (3)_heatmap.png b/Automation Project/Analytics/21 05 2021 14 25_Human/ Shotgunner (3)_heatmap.png
diff --git a/Automation Project/Analytics/21 05 2021 14 25_Human/ Shotgunner_heatmap.png b/Automation Project/Analytics/21 05 2021 14 25_Human/ Shotgunner_heatmap.png
diff --git a/Automation Project/Analytics/21 05 2021 14 25_Human/ Sniper (1)_heatmap.png b/Automation Project/Analytics/21 05 2021 14 25_Human/ Sniper (1)_heatmap.png
diff --git a/Automation Project/Analytics/21 05 2021 14 25_Human/ Sniper (2)_heatmap.png b/Automation Project/Analytics/21 05 2021 14 25_Human/ Sniper (2)_heatmap.png
diff --git a/Automation Project/Analytics/21 05 2021 14 25_Human/ Sniper (3)_heatmap.png b/Automation Project/Analytics/21 05 2021 14 25_Human/ Sniper (3)_heatmap.png
diff --git a/Automation Project/Analytics/21 05 2021 14 25_Human/ Sniper_heatmap.png b/Automation Project/Analytics/21 05 2021 14 25_Human/ Sniper_heatmap.png
diff --git a/Automation Project/Analytics/21 05 2021 14 25_Human/Pickup Map.png b/Automation Project/Analytics/21 05 2021 14 25_Human/Pickup Map.png
diff --git a/Automation Project/Assets/Character/Prefab/Human/Human Character.prefab b/Automation Project/Assets/Character/Prefab/Human/Human Character.prefab
@@ -3356,6 +3356,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: shotgun
       objectReference: {fileID: 0}
+    - target: {fileID: 5120194996455966909, guid: bd1ff08d66d86ec46b672fab2032839d,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5495876522597011975, guid: bd1ff08d66d86ec46b672fab2032839d,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -3489,7 +3494,7 @@ PrefabInstance:
     - target: {fileID: 7804379326222539127, guid: 1bc54fdb82322e74e9fac78a3eb7fdf8,
         type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1bc54fdb82322e74e9fac78a3eb7fdf8, type: 3}

diff --git a/Automation Project/Assets/Scenes/Project.unity b/Automation Project/Assets/Scenes/Project.unity
@@ -604,6 +604,7 @@ Transform:
   - {fileID: 889465181}
   - {fileID: 431419945}
   - {fileID: 542490240}
+  - {fileID: 2098054044}
   m_Father: {fileID: 853511059}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1282,8 +1283,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   simulationSeconds: 180
   pickups: {fileID: 1395444864}
-  gMode: 0
-  gameSimulation: 1
+  gMode: 1
+  gameSimulation: 0
 --- !u!1001 &872989236
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1557,7 +1558,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2c734eef1a5cef941a8ede4c97beb4b1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  pixelRadius: 3
+  pixelRadius: 1
   mapTexture: {fileID: 2800000, guid: f81b5fd80cc684c47b861b9da3420e0e, type: 3}
   positionIntervalSec: 0
 --- !u!1001 &1288516845
@@ -2489,6 +2490,81 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 2074274112}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2098054043
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 229146634}
+    m_Modifications:
+    - target: {fileID: 4886186841083615258, guid: 2f051180f17423441864fbf6c28ca287,
+        type: 3}
+      propertyPath: m_Name
+      value: Human Character
+      objectReference: {fileID: 0}
+    - target: {fileID: 4886186841083615259, guid: 2f051180f17423441864fbf6c28ca287,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -45.86
+      objectReference: {fileID: 0}
+    - target: {fileID: 4886186841083615259, guid: 2f051180f17423441864fbf6c28ca287,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.22
+      objectReference: {fileID: 0}
+    - target: {fileID: 4886186841083615259, guid: 2f051180f17423441864fbf6c28ca287,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4886186841083615259, guid: 2f051180f17423441864fbf6c28ca287,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4886186841083615259, guid: 2f051180f17423441864fbf6c28ca287,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4886186841083615259, guid: 2f051180f17423441864fbf6c28ca287,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4886186841083615259, guid: 2f051180f17423441864fbf6c28ca287,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4886186841083615259, guid: 2f051180f17423441864fbf6c28ca287,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 4886186841083615259, guid: 2f051180f17423441864fbf6c28ca287,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4886186841083615259, guid: 2f051180f17423441864fbf6c28ca287,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4886186841083615259, guid: 2f051180f17423441864fbf6c28ca287,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2f051180f17423441864fbf6c28ca287, type: 3}
+--- !u!4 &2098054044 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4886186841083615259, guid: 2f051180f17423441864fbf6c28ca287,
+    type: 3}
+  m_PrefabInstance: {fileID: 2098054043}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2100198062
 PrefabInstance:
   m_ObjectHideFlags: 0

diff --git a/Automation Project/Assets/Scripts/Anlytics/Analytics.cs b/Automation Project/Assets/Scripts/Anlytics/Analytics.cs
@@ -235,7 +235,7 @@ void SaveTexture (Texture2D tex, string name)
         Destroy(tex);
 
         // Save as an image file
-        string folderName = DateTime.Now.ToString() + "_" + AppManager.instance._gMode().ToString();
+        string folderName =  DateTime.UtcNow.ToString("yyyy - MM - dd HH: mm") + "_" + AppManager.instance._gMode().ToString();
         string folderNameFormated = folderName.Replace("/", " ");
         string folderNameFormated2 = folderNameFormated.Replace(":", " ");
         string path = Application.dataPath + "/../" + "Analytics/" + folderNameFormated2;

diff --git a/Automation Project/Assets/Weapons/shotgun/shotgun.prefab b/Automation Project/Assets/Weapons/shotgun/shotgun.prefab
@@ -302,12 +302,21 @@ MonoBehaviour:
     - serializedVersion: 3
       time: 0
       value: 1
-      inSlope: -3.0900302
-      outSlope: -3.0900302
+      inSlope: -0.1309488
+      outSlope: -0.1309488
       tangentMode: 0
       weightedMode: 0
       inWeight: 0
-      outWeight: 0.0783474
+      outWeight: 0.33087838
+    - serializedVersion: 3
+      time: 0.21775278
+      value: 0.8304047
+      inSlope: -2.5928676
+      outSlope: -2.5928676
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.14998493
+      outWeight: 0.03184495
     - serializedVersion: 3
       time: 1
       value: 0
@@ -323,7 +332,7 @@ MonoBehaviour:
   maxEffectiveDistance: 30
   capacity: 10
   reloadTime: 5
-  spread: 1
+  spread: 0.5
 --- !u!82 &-7428550815158508620
 AudioSource:
   m_ObjectHideFlags: 0

diff --git a/Automation Project/Packages/manifest.json b/Automation Project/Packages/manifest.json
@@ -5,7 +5,7 @@
     "com.unity.ide.rider": "1.2.1",
     "com.unity.ide.visualstudio": "2.0.2",
     "com.unity.ide.vscode": "1.2.3",
-    "com.unity.simulation.games": "0.4.4-preview.4",
+    "com.unity.simulation.games": "0.4.7-preview.1",
     "com.unity.test-framework": "1.1.19",
     "com.unity.textmeshpro": "3.0.1",
     "com.unity.timeline": "1.2.17",

diff --git a/Automation Project/Packages/packages-lock.json b/Automation Project/Packages/packages-lock.json
@@ -70,6 +70,13 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.settings-manager": {
+      "version": "1.0.3",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.simulation.core": {
       "version": "0.0.10-preview.18",
       "depth": 1,
@@ -78,12 +85,13 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.simulation.games": {
-      "version": "0.4.4-preview.4",
+      "version": "0.4.7-preview.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.remote-config": "1.4.0-preview.1",
-        "com.unity.simulation.core": "0.0.10-preview.18"
+        "com.unity.simulation.core": "0.0.10-preview.18",
+        "com.unity.settings-manager": "1.0.3"
       },
       "url": "https://packages.unity.com"
     },

diff --git a/Automation Project/ProjectSettings/ProjectSettings.asset b/Automation Project/ProjectSettings/ProjectSettings.asset
@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: Marc Doctor Pedrosa
-  productName: Automation Project
+  productName: Automated Playtesting v0.7
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -93,7 +93,7 @@ PlayerSettings:
   xboxEnableFitness: 0
   visibleInBackground: 1
   allowFullscreenSwitch: 1
-  fullscreenMode: 3
+  fullscreenMode: 1
   xboxSpeechDB: 0
   xboxEnableHeadOrientation: 0
   xboxEnableGuest: 0
@@ -126,7 +126,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.1
+  bundleVersion: 0.7
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -582,7 +582,7 @@ PlayerSettings:
   webGLThreadsSupport: 0
   webGLDecompressionFallback: 0
   scriptingDefineSymbols:
-    1: 
+    1: UNITY_GAME_SIMULATION
   platformArchitecture: {}
   scriptingBackend: {}
   il2cppCompilerConfiguration: {}