Round Info fully working

Displays random stuff before the first round starts atm. not a big deal but not perfect.
mariuskilian · May 5, 2020 · a3c5b03 · a3c5b03
1 parent 6043834
commit a3c5b03
Show file tree

Hide file tree

Showing 59 changed files with 474 additions and 37 deletions.
diff --git a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll
diff --git a/Assets/Photon/PhotonBolt/project.json b/Assets/Photon/PhotonBolt/project.json
@@ -886,6 +886,179 @@
       "Name": "PlayerBag",
       "Guid": "ca16b4a9-825f-40a9-b7ea-12b62ec52af6",
       "Groups": []
+    },
+    {
+      "$type": "Bolt.Compiler.StateDefinition, bolt.compiler",
+      "Properties": [
+        {
+          "Name": "RoundInfo",
+          "Enabled": true,
+          "Expanded": true,
+          "ReplicationMode": 1,
+          "Priority": 1,
+          "PropertyType": {
+            "$type": "Bolt.Compiler.PropertyTypeObject, bolt.compiler",
+            "StructGuid": "60f899c6-0e4c-4d84-88b3-656895763443"
+          },
+          "AssetSettings": {
+            "$type": "Bolt.Compiler.PropertyStateSettings, bolt.compiler",
+            "ExtrapolationErrorTolerance": 0.25,
+            "_ExtrapolationCorrectionFrames": 6,
+            "ExtrapolationMaxFrames": 9,
+            "SnapMagnitude": 10.0
+          }
+        }
+      ],
+      "PacketMaxBits": 512,
+      "PacketMaxProperties": 16,
+      "InitialPositionCompression": {
+        "Compression": [
+          {
+            "MinValue": -1024,
+            "MaxValue": 1024,
+            "Accuracy": 0.01,
+            "Pack": 100.0,
+            "Read": 0.01,
+            "Shift": 1024.0,
+            "BitsRequired": 18
+          },
+          {
+            "MinValue": -1024,
+            "MaxValue": 1024,
+            "Accuracy": 0.01,
+            "Pack": 100.0,
+            "Read": 0.01,
+            "Shift": 1024.0,
+            "BitsRequired": 18
+          },
+          {
+            "MinValue": -1024,
+            "MaxValue": 1024,
+            "Accuracy": 0.01,
+            "Pack": 100.0,
+            "Read": 0.01,
+            "Shift": 1024.0,
+            "BitsRequired": 18
+          }
+        ]
+      },
+      "InitialRotationCompression": {
+        "EulerCompression": [
+          {
+            "MaxValue": 360,
+            "Accuracy": 1.0,
+            "Pack": 1.0,
+            "Read": 1.0,
+            "BitsRequired": 9
+          },
+          {
+            "MaxValue": 360,
+            "Accuracy": 1.0,
+            "Pack": 1.0,
+            "Read": 1.0,
+            "BitsRequired": 9
+          },
+          {
+            "MaxValue": 360,
+            "Accuracy": 1.0,
+            "Pack": 1.0,
+            "Read": 1.0,
+            "BitsRequired": 9
+          }
+        ],
+        "QuaternionCompression": {
+          "MinValue": -1,
+          "MaxValue": 1,
+          "Accuracy": 0.01,
+          "Pack": 100.0,
+          "Read": 0.01,
+          "Shift": 1.0,
+          "BitsRequired": 8
+        }
+      },
+      "Name": "RoundState",
+      "Guid": "1fd2739a-676b-472d-850e-1b1fc75e478e",
+      "Groups": []
+    },
+    {
+      "$type": "Bolt.Compiler.ObjectDefinition, bolt.compiler",
+      "Properties": [
+        {
+          "Name": "Stage",
+          "Enabled": true,
+          "Expanded": true,
+          "ReplicationMode": 1,
+          "Priority": 1,
+          "PropertyType": {
+            "$type": "Bolt.Compiler.PropertyTypeInteger, bolt.compiler",
+            "MaxValue": 255
+          },
+          "AssetSettings": {
+            "$type": "Bolt.Compiler.PropertyStateSettings, bolt.compiler",
+            "ExtrapolationErrorTolerance": 0.25,
+            "_ExtrapolationCorrectionFrames": 6,
+            "ExtrapolationMaxFrames": 9,
+            "SnapMagnitude": 10.0
+          }
+        },
+        {
+          "Name": "Round",
+          "Enabled": true,
+          "Expanded": true,
+          "ReplicationMode": 1,
+          "Priority": 1,
+          "PropertyType": {
+            "$type": "Bolt.Compiler.PropertyTypeInteger, bolt.compiler",
+            "MaxValue": 255
+          },
+          "AssetSettings": {
+            "$type": "Bolt.Compiler.PropertyStateSettings, bolt.compiler",
+            "ExtrapolationErrorTolerance": 0.25,
+            "_ExtrapolationCorrectionFrames": 6,
+            "ExtrapolationMaxFrames": 9,
+            "SnapMagnitude": 10.0
+          }
+        },
+        {
+          "Name": "PhaseID",
+          "Enabled": true,
+          "Expanded": true,
+          "ReplicationMode": 1,
+          "Priority": 1,
+          "PropertyType": {
+            "$type": "Bolt.Compiler.PropertyTypeInteger, bolt.compiler",
+            "MaxValue": 255
+          },
+          "AssetSettings": {
+            "$type": "Bolt.Compiler.PropertyStateSettings, bolt.compiler",
+            "ExtrapolationErrorTolerance": 0.25,
+            "_ExtrapolationCorrectionFrames": 6,
+            "ExtrapolationMaxFrames": 9,
+            "SnapMagnitude": 10.0
+          }
+        },
+        {
+          "Name": "Time",
+          "Enabled": true,
+          "Expanded": true,
+          "ReplicationMode": 1,
+          "Priority": 1,
+          "PropertyType": {
+            "$type": "Bolt.Compiler.PropertyTypeInteger, bolt.compiler",
+            "MaxValue": 255
+          },
+          "AssetSettings": {
+            "$type": "Bolt.Compiler.PropertyStateSettings, bolt.compiler",
+            "ExtrapolationErrorTolerance": 0.25,
+            "_ExtrapolationCorrectionFrames": 6,
+            "ExtrapolationMaxFrames": 9,
+            "SnapMagnitude": 10.0
+          }
+        }
+      ],
+      "Name": "RoundInfo",
+      "Guid": "60f899c6-0e4c-4d84-88b3-656895763443",
+      "Groups": []
     }
   ],
   "ActiveGroup": "Everything"

diff --git a/Assets/Photon/PhotonBolt/resources/BoltPrefabDatabase.asset b/Assets/Photon/PhotonBolt/resources/BoltPrefabDatabase.asset
@@ -17,6 +17,7 @@ MonoBehaviour:
   - {fileID: 0}
   - {fileID: 7401875031846788002, guid: 70667ff7d5645254cbf4a6d2ed596a35, type: 3}
   - {fileID: 1660498949091557802, guid: 6ab69fe50fb31d741a467649f69a831f, type: 3}
+  - {fileID: 6591437379154572024, guid: 692aab8f52452ce4b8036dcf5688666e, type: 3}
   - {fileID: 1646739649162652517, guid: 33b3ae723fc43c14e9f3bf32f9533ad3, type: 3}
   - {fileID: 4127740652721783343, guid: 34e861ab1a27b11428ad6121e5e3b038, type: 3}
   - {fileID: 6616770131647625879, guid: 5791136e908602248a859d45780aeda5, type: 3}

diff --git a/Assets/Prefabs/Round.prefab b/Assets/Prefabs/Round.prefab
@@ -0,0 +1,75 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6591437379154572024
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6591437379154572025}
+  - component: {fileID: 7005719119090568224}
+  - component: {fileID: 6591437379154572026}
+  m_Layer: 0
+  m_Name: Round
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6591437379154572025
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6591437379154572024}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7005719119090568224
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6591437379154572024}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2264b0bfc40164940ac822ed9a2bc272, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &6591437379154572026
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6591437379154572024}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -36112512, guid: 5b00bf8b25851d440940a40ec23344f4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _sceneGuid: 
+  _serializerGuid: 1fd2739a-676b-472d-850e-1b1fc75e478e
+  _prefabId: 3
+  _updateRate: 1
+  _autoFreezeProxyFrames: 0
+  _clientPredicted: 1
+  _allowInstantiateOnClient: 1
+  _persistThroughSceneLoads: 0
+  _sceneObjectDestroyOnDetach: 1
+  _sceneObjectAutoAttach: 1
+  _alwaysProxy: 0
+  _detachOnDisable: 1
+  _allowFirstReplicationWhenFrozen: 0
+  _autoRemoveChildEntities: 0
+  _entityBehaviourQueryOption: 0
+  _entityPriorityCalculatorQueryOption: 0
+  _entityReplicationFilterQueryOption: 0
diff --git a/Assets/Prefabs/Round.prefab.meta b/Assets/Prefabs/Round.prefab.meta
diff --git a/Assets/Prefabs/StoreUnits/001BulbasaurStore.prefab b/Assets/Prefabs/StoreUnits/001BulbasaurStore.prefab
@@ -422,7 +422,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _sceneGuid: 
   _serializerGuid: 54999bf8-0394-442d-acfc-ddf1e16e8eeb
-  _prefabId: 3
+  _prefabId: 4
   _updateRate: 1
   _autoFreezeProxyFrames: 0
   _clientPredicted: 1

diff --git a/Assets/Prefabs/StoreUnits/004CharmanderStore.prefab b/Assets/Prefabs/StoreUnits/004CharmanderStore.prefab
@@ -926,7 +926,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _sceneGuid: 
   _serializerGuid: 54999bf8-0394-442d-acfc-ddf1e16e8eeb
-  _prefabId: 4
+  _prefabId: 5
   _updateRate: 1
   _autoFreezeProxyFrames: 0
   _clientPredicted: 1

diff --git a/Assets/Prefabs/StoreUnits/007SquirtleStore.prefab b/Assets/Prefabs/StoreUnits/007SquirtleStore.prefab
@@ -1189,7 +1189,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _sceneGuid: 
   _serializerGuid: 54999bf8-0394-442d-acfc-ddf1e16e8eeb
-  _prefabId: 5
+  _prefabId: 6
   _updateRate: 1
   _autoFreezeProxyFrames: 0
   _clientPredicted: 1

diff --git a/Assets/Prefabs/Units/001 Bulbasaur/001Bulbasaur.prefab b/Assets/Prefabs/Units/001 Bulbasaur/001Bulbasaur.prefab
@@ -439,7 +439,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _sceneGuid: 
   _serializerGuid: e58168f2-d05b-4999-aa0b-172ceb89fcbc
-  _prefabId: 6
+  _prefabId: 7
   _updateRate: 1
   _autoFreezeProxyFrames: 0
   _clientPredicted: 1

diff --git a/Assets/Prefabs/Units/001 Bulbasaur/002Ivysaur.prefab b/Assets/Prefabs/Units/001 Bulbasaur/002Ivysaur.prefab
@@ -221,7 +221,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _sceneGuid: 
   _serializerGuid: e58168f2-d05b-4999-aa0b-172ceb89fcbc
-  _prefabId: 7
+  _prefabId: 8
   _updateRate: 1
   _autoFreezeProxyFrames: 0
   _clientPredicted: 1

diff --git a/Assets/Prefabs/Units/001 Bulbasaur/003Venusaur.prefab b/Assets/Prefabs/Units/001 Bulbasaur/003Venusaur.prefab
@@ -1745,7 +1745,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _sceneGuid: 
   _serializerGuid: e58168f2-d05b-4999-aa0b-172ceb89fcbc
-  _prefabId: 8
+  _prefabId: 9
   _updateRate: 1
   _autoFreezeProxyFrames: 0
   _clientPredicted: 1

diff --git a/Assets/Prefabs/Units/001 Bulbasaur/003VenusaurF.prefab b/Assets/Prefabs/Units/001 Bulbasaur/003VenusaurF.prefab
@@ -1910,7 +1910,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _sceneGuid: 
   _serializerGuid: e58168f2-d05b-4999-aa0b-172ceb89fcbc
-  _prefabId: 9
+  _prefabId: 10
   _updateRate: 1
   _autoFreezeProxyFrames: 0
   _clientPredicted: 1

diff --git a/Assets/Prefabs/Units/004 Charmander/004Charmander.prefab b/Assets/Prefabs/Units/004 Charmander/004Charmander.prefab
@@ -943,7 +943,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _sceneGuid: 
   _serializerGuid: e58168f2-d05b-4999-aa0b-172ceb89fcbc
-  _prefabId: 10
+  _prefabId: 11
   _updateRate: 1
   _autoFreezeProxyFrames: 0
   _clientPredicted: 1

diff --git a/Assets/Prefabs/Units/004 Charmander/005Charmeleon.prefab b/Assets/Prefabs/Units/004 Charmander/005Charmeleon.prefab
@@ -727,7 +727,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _sceneGuid: 
   _serializerGuid: e58168f2-d05b-4999-aa0b-172ceb89fcbc
-  _prefabId: 11
+  _prefabId: 12
   _updateRate: 1
   _autoFreezeProxyFrames: 0
   _clientPredicted: 1

diff --git a/Assets/Prefabs/Units/004 Charmander/006Charizard.prefab b/Assets/Prefabs/Units/004 Charmander/006Charizard.prefab
@@ -1154,7 +1154,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _sceneGuid: 
   _serializerGuid: e58168f2-d05b-4999-aa0b-172ceb89fcbc
-  _prefabId: 12
+  _prefabId: 13
   _updateRate: 1
   _autoFreezeProxyFrames: 0
   _clientPredicted: 1

diff --git a/Assets/Prefabs/Units/007 Squirtle/007Squirtle.prefab b/Assets/Prefabs/Units/007 Squirtle/007Squirtle.prefab
@@ -1206,7 +1206,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _sceneGuid: 
   _serializerGuid: e58168f2-d05b-4999-aa0b-172ceb89fcbc
-  _prefabId: 13
+  _prefabId: 14
   _updateRate: 1
   _autoFreezeProxyFrames: 0
   _clientPredicted: 1

diff --git a/Assets/Prefabs/Units/007 Squirtle/008Wartortle.prefab b/Assets/Prefabs/Units/007 Squirtle/008Wartortle.prefab
@@ -772,7 +772,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _sceneGuid: 
   _serializerGuid: e58168f2-d05b-4999-aa0b-172ceb89fcbc
-  _prefabId: 14
+  _prefabId: 15
   _updateRate: 1
   _autoFreezeProxyFrames: 0
   _clientPredicted: 1

diff --git a/Assets/Prefabs/Units/007 Squirtle/009Blastoise.prefab b/Assets/Prefabs/Units/007 Squirtle/009Blastoise.prefab
@@ -994,7 +994,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _sceneGuid: 
   _serializerGuid: e58168f2-d05b-4999-aa0b-172ceb89fcbc
-  _prefabId: 15
+  _prefabId: 16
   _updateRate: 1
   _autoFreezeProxyFrames: 0
   _clientPredicted: 1