Cleanup various things, including a new, 0-FF including font asset

This commit is contained in:
Jens Pitkänen 2020-08-09 22:18:26 +03:00
parent 44f149c16d
commit f4303677a4
6 changed files with 4519 additions and 1204 deletions

View File

@ -238,7 +238,8 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
DisableInput: 0 DisableInput: 0
FullSyncFrequency: 1 SyncInterval: 0.5
MovementUpdateInterval: 0.03
--- !u!1 &8414821799312552490 --- !u!1 &8414821799312552490
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -680,6 +681,10 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: LocalPlayer value: LocalPlayer
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7391558912774766599, guid: 0bffd92c46c257840806f5e957954800, type: 3}
propertyPath: m_TagString
value: Player
objectReference: {fileID: 0}
- target: {fileID: 7391558912774766616, guid: 0bffd92c46c257840806f5e957954800, type: 3} - target: {fileID: 7391558912774766616, guid: 0bffd92c46c257840806f5e957954800, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 0 value: 0
@ -732,6 +737,10 @@ PrefabInstance:
propertyPath: m_Layer propertyPath: m_Layer
value: 10 value: 10
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8393781323051440261, guid: 0bffd92c46c257840806f5e957954800, type: 3}
propertyPath: GunGluedToHand
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8529773351693659210, guid: 0bffd92c46c257840806f5e957954800, type: 3} - target: {fileID: 8529773351693659210, guid: 0bffd92c46c257840806f5e957954800, type: 3}
propertyPath: m_Layer propertyPath: m_Layer
value: 10 value: 10

View File

@ -485,7 +485,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
CoyoteTime: 0.2 CoyoteTime: 0.2
PingBias: 0 PingBias: 0
UpdateFrequency: 30 MovementUpdateInterval: 0.03
MoveStyles: MoveStyles:
- {fileID: 11400000, guid: 550df8ac62d76a64a8c621ea6b32398f, type: 2} - {fileID: 11400000, guid: 550df8ac62d76a64a8c621ea6b32398f, type: 2}
- {fileID: 11400000, guid: 2d9739d3745581a41ae0ed6a569766d5, type: 2} - {fileID: 11400000, guid: 2d9739d3745581a41ae0ed6a569766d5, type: 2}

File diff suppressed because one or more lines are too long

View File

@ -9,7 +9,8 @@ namespace NeonTea.Quakeball.Players {
[RequireComponent(typeof(Player))] [RequireComponent(typeof(Player))]
public class LocalPlayer : MonoBehaviour { public class LocalPlayer : MonoBehaviour {
public int DisableInput; public int DisableInput;
public float FullSyncFrequency = 1; public float SyncInterval = 1;
public float MovementUpdateInterval = 1f;
public Player Player { private set; get; } public Player Player { private set; get; }
public InputAction LookAction { private set; get; } public InputAction LookAction { private set; get; }
@ -87,7 +88,7 @@ namespace NeonTea.Quakeball.Players {
Player.Pitch = Mathf.Clamp(Player.Pitch - LookInput.y * (Opts.InvertVerticalLook ? -1 : 1), -90, 90); Player.Pitch = Mathf.Clamp(Player.Pitch - LookInput.y * (Opts.InvertVerticalLook ? -1 : 1), -90, 90);
Player.Yaw += LookInput.x; Player.Yaw += LookInput.x;
if (Time.time - PreviousPlayerUpdate >= 1f / Player.UpdateFrequency) { if (Time.time - PreviousPlayerUpdate >= MovementUpdateInterval) {
PreviousPlayerUpdate = Time.time; PreviousPlayerUpdate = Time.time;
if (Player.IsDead) { if (Player.IsDead) {
return; return;
@ -111,7 +112,7 @@ namespace NeonTea.Quakeball.Players {
WantsToJump = false; WantsToJump = false;
} }
if (Time.time - PreviousPlayerFullSync >= 1f / FullSyncFrequency) { if (Time.time - PreviousPlayerFullSync >= SyncInterval) {
PreviousPlayerFullSync = Time.time; PreviousPlayerFullSync = Time.time;
if (Networking.Net.Singleton.Instance != null) { if (Networking.Net.Singleton.Instance != null) {
Networking.Net.Singleton.Instance.SendPlayerSync(); Networking.Net.Singleton.Instance.SendPlayerSync();

View File

@ -16,9 +16,6 @@ namespace NeonTea.Quakeball.Players {
public float CoyoteTime; public float CoyoteTime;
public float PingBias; public float PingBias;
/// <summary>How often should the player's movement be updated? Used by Local and Remote -Player classes.</summary>
public float UpdateFrequency = 1f;
public MoveStyle[] MoveStyles; public MoveStyle[] MoveStyles;
public Transform Gun; public Transform Gun;
public Animator GunBobber; public Animator GunBobber;

View File

@ -8,8 +8,6 @@ TagManager:
- RemotePlayer - RemotePlayer
- Net - Net
- DeadScreen - DeadScreen
- PlayerTorso
- PlayerHead
layers: layers:
- Default - Default
- TransparentFX - TransparentFX