Did some more networking, also updated engine version to 2021.3.3f1

This commit is contained in:
Mikolaj 2022-05-20 19:29:38 +02:00
parent 5ad5751298
commit 5adf4776c1
65 changed files with 10317 additions and 4418 deletions

View file

@ -1,32 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Cinemachine;
namespace TTTSC.Player.Character.Controller
{
public class CameraControler : MonoBehaviour
{
private Transform _cameraTransfrom;
[SerializeField]
private Transform _cameraAnchor;
private GameObject _cinemachineCamera;
private CinemachineVirtualCamera _virtualCamera;
private CinemachineObjectRotator _objectRotator;
// Start is called before the first frame update
void Start()
{
_cameraTransfrom = GameObject.FindGameObjectWithTag("MainCamera").GetComponent<Transform>();
_cinemachineCamera = GameObject.FindGameObjectWithTag("CinemachineMainCamera");
_virtualCamera = _cinemachineCamera.GetComponent<CinemachineVirtualCamera>();
_objectRotator = _cinemachineCamera.GetComponent<CinemachineObjectRotator>();
_virtualCamera.Follow = _cameraAnchor;
_objectRotator.cameraTransform = _cameraTransfrom;
_objectRotator.horizontalRotationTargets.Add(transform);
}
}
}

View file

@ -1,282 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6062496430592583549
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6062496430592583550}
m_Layer: 3
m_Name: PlayerCameraAnchor
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6062496430592583550
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6062496430592583549}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.03, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6062496430999171079}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6062496430727984388
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6062496430727984391}
- component: {fileID: 6062496430727984390}
- component: {fileID: 6062496430727984389}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6062496430727984391
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6062496430727984388}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 25, y: -2.583, z: 20.885}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6062496430999171079}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6062496430727984390
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6062496430727984388}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!114 &6062496430727984389
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6062496430727984388}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
m_Name:
m_EditorClassIdentifier:
m_MoveRepeatDelay: 0.5
m_MoveRepeatRate: 0.1
m_XRTrackingOrigin: {fileID: 0}
m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_DeselectOnBackgroundClick: 1
m_PointerBehavior: 0
--- !u!1 &6062496430999171099
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6062496430999171079}
- component: {fileID: 6062496430999171084}
- component: {fileID: 6062496430999171073}
- component: {fileID: 6062496430999171076}
- component: {fileID: 6062496430999171074}
- component: {fileID: 6062496430999171072}
- component: {fileID: 6062496430999171086}
- component: {fileID: 9200296088039977358}
- component: {fileID: 3186146282381019070}
m_Layer: 3
m_Name: Player_Ghost
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6062496430999171079
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6062496430999171099}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -25, y: 2.583, z: -20.885}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6062496430727984391}
- {fileID: 6062496430592583550}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6062496430999171084
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6062496430999171099}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 495cd3a0a3a33904ab3473618f482aa4, type: 3}
m_Name:
m_EditorClassIdentifier:
characterRigidbody: {fileID: 6062496430999171072}
cameraTransform: {fileID: 0}
playerInfoData: {fileID: 0}
playerStateEnforcrer: {fileID: 6062496430999171074}
playerStateMachine: {fileID: 6062496430999171073}
playerInputReceiver: {fileID: 6062496430999171076}
gameManager: {fileID: 0}
roundSystem: {fileID: 0}
--- !u!114 &6062496430999171073
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6062496430999171099}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: abe7058362b44e043b66c7ddc42a22c2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &6062496430999171076
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6062496430999171099}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 777675542a674f346bb9629fd1eb84bc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &6062496430999171074
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6062496430999171099}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 293f9b619cc75c24f93ceaf1ed5d04de, type: 3}
m_Name:
m_EditorClassIdentifier:
_playerGhostReffrenceHub: {fileID: 6062496430999171084}
_playerInfoData: {fileID: 0}
_aliveBodyPrefab: {fileID: 6167160771052314074, guid: 0c51ca6cd6963b14eaa25c9a60dc3c30,
type: 3}
_spectatorBodyPrefab: {fileID: 1135382073684329176, guid: b615186e864b86245a99d5258f67ae27,
type: 3}
--- !u!54 &6062496430999171072
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6062496430999171099}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 3
--- !u!114 &6062496430999171086
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6062496430999171099}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8e19d2cb639d0254b858f57d281e6005, type: 3}
m_Name:
m_EditorClassIdentifier:
_playerInfoData: {fileID: 0}
--- !u!114 &9200296088039977358
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6062496430999171099}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
m_Name:
m_EditorClassIdentifier:
sceneId: 0
serverOnly: 0
visible: 0
m_AssetId: 4b8299fb26d528c4a96049468544b48f
hasSpawned: 0
--- !u!114 &3186146282381019070
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6062496430999171099}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2c819d953c83aeb4296690c8564ca0d9, type: 3}
m_Name:
m_EditorClassIdentifier:
_cameraAnchor: {fileID: 6062496430592583550}

File diff suppressed because it is too large Load diff

View file

@ -16,7 +16,7 @@ MonoBehaviour:
- valueName: presence_state - valueName: presence_state
valueType: 1 valueType: 1
returnBool: 0 returnBool: 0
returnString: InGame returnString: presence_InGame
returnInt: 0 returnInt: 0
returnFloat: 0 returnFloat: 0
returnVector2: {x: 0, y: 0} returnVector2: {x: 0, y: 0}
@ -24,7 +24,7 @@ MonoBehaviour:
- valueName: presence_gamemode - valueName: presence_gamemode
valueType: 1 valueType: 1
returnBool: 0 returnBool: 0
returnString: returnString: Classic
returnInt: 0 returnInt: 0
returnFloat: 0 returnFloat: 0
returnVector2: {x: 0, y: 0} returnVector2: {x: 0, y: 0}
@ -32,7 +32,7 @@ MonoBehaviour:
- valueName: presence_map - valueName: presence_map
valueType: 1 valueType: 1
returnBool: 0 returnBool: 0
returnString: returnString: MovementTesting
returnInt: 0 returnInt: 0
returnFloat: 0 returnFloat: 0
returnVector2: {x: 0, y: 0} returnVector2: {x: 0, y: 0}
@ -40,7 +40,7 @@ MonoBehaviour:
- valueName: presence_playersInGame - valueName: presence_playersInGame
valueType: 1 valueType: 1
returnBool: 0 returnBool: 0
returnString: returnString: 1
returnInt: 0 returnInt: 0
returnFloat: 0 returnFloat: 0
returnVector2: {x: 0, y: 0} returnVector2: {x: 0, y: 0}
@ -48,7 +48,7 @@ MonoBehaviour:
- valueName: presence_maxPlayersInGame - valueName: presence_maxPlayersInGame
valueType: 1 valueType: 1
returnBool: 0 returnBool: 0
returnString: returnString: 16
returnInt: 0 returnInt: 0
returnFloat: 0 returnFloat: 0
returnVector2: {x: 0, y: 0} returnVector2: {x: 0, y: 0}

View file

@ -1,88 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &3885499876722181973
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5429721515539534958}
- component: {fileID: 7173409224924704036}
- component: {fileID: 5956199134083320240}
m_Layer: 0
m_Name: default
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5429721515539534958
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3885499876722181973}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -1.2, z: 0}
m_LocalScale: {x: 0.0105, y: 0.0105, z: 0.0105}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6167160769597586689}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &7173409224924704036
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3885499876722181973}
m_Mesh: {fileID: -2432090755550338912, guid: bebba2dc633311443b65d5c0bcb4a50b, type: 3}
--- !u!23 &5956199134083320240
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3885499876722181973}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 53b44c714c1a3374fb5060362127be8a, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &6167160769597586702 --- !u!1 &6167160769597586702
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -111,7 +28,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 5429721515539534958} - {fileID: 3079580827464764897}
m_Father: {fileID: 6167160770562624853} m_Father: {fileID: 6167160770562624853}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -124,7 +41,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 6167160769853445097} - component: {fileID: 6167160769853445097}
- component: {fileID: 6167160769853445096} - component: {fileID: 6148193225872006573}
m_Layer: 3 m_Layer: 3
m_Name: EnviormentCollider m_Name: EnviormentCollider
m_TagString: Untagged m_TagString: Untagged
@ -140,15 +57,15 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6167160769853445014} m_GameObject: {fileID: 6167160769853445014}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0.15, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.4, y: 0.5, z: 0.4}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 6167160770361228125} m_Father: {fileID: 6167160770361228125}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!136 &6167160769853445096 --- !u!64 &6148193225872006573
CapsuleCollider: MeshCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@ -157,10 +74,10 @@ CapsuleCollider:
m_Material: {fileID: 13400000, guid: c67f223e1c1ff6d44956ef766851951c, type: 2} m_Material: {fileID: 13400000, guid: c67f223e1c1ff6d44956ef766851951c, type: 2}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
m_Radius: 0.4 serializedVersion: 4
m_Height: 1.6 m_Convex: 1
m_Direction: 1 m_CookingOptions: 30
m_Center: {x: 0, y: 0.2, z: 0} m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &6167160770361228122 --- !u!1 &6167160770361228122
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -243,6 +160,7 @@ GameObject:
- component: {fileID: 7564652410562457444} - component: {fileID: 7564652410562457444}
- component: {fileID: 6167160771052314067} - component: {fileID: 6167160771052314067}
- component: {fileID: 2107300539136967592} - component: {fileID: 2107300539136967592}
- component: {fileID: 501103313315302667}
m_Layer: 3 m_Layer: 3
m_Name: Alive m_Name: Alive
m_TagString: Untagged m_TagString: Untagged
@ -264,7 +182,6 @@ Transform:
m_Children: m_Children:
- {fileID: 6167160770562624853} - {fileID: 6167160770562624853}
- {fileID: 6167160771733069505} - {fileID: 6167160771733069505}
- {fileID: 6833566207558323707}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -280,6 +197,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4a3c4a8867cd2f64e9f17bd9abc1f72a, type: 3} m_Script: {fileID: 11500000, guid: 4a3c4a8867cd2f64e9f17bd9abc1f72a, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
aliveNetworkIdentity: {fileID: 501103313315302667}
characterMovementConfig: {fileID: 6167160771052314065} characterMovementConfig: {fileID: 6167160771052314065}
characterStateMachine: {fileID: 6167160771052314076} characterStateMachine: {fileID: 6167160771052314076}
characterHover: {fileID: 7564652410562457444} characterHover: {fileID: 7564652410562457444}
@ -296,10 +214,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 11afecc1cbbd8e8449477483a5577cb0, type: 3} m_Script: {fileID: 11500000, guid: 11afecc1cbbd8e8449477483a5577cb0, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1
characterState: 1 characterState: 1
movementStates: 0 movementState: 0
ceilingDetected: 0 ceilingDetected: 0
eligibleForStep: 0
onLadder: 0 onLadder: 0
topOnLadder: 0 topOnLadder: 0
bottomOnLadder: 0 bottomOnLadder: 0
@ -324,13 +243,15 @@ MonoBehaviour:
sprintMoveForce: 0.7 sprintMoveForce: 0.7
ladderClimbingForce: 0 ladderClimbingForce: 0
desieredHoverHight: 1.2 desieredHoverHight: 1.2
crouchHeight: 0.7 crouchHeight: 0.6
allowSprint: 0 allowSprint: 0
jumpForce: 3 jumpForce: 3
standingColliderPosition: 0.2 standingColliderPosition: 0.07
standingColliderHight: 1.6 standingColliderHight: 0.6
crouchedColliderPosition: 0.3 standingColliderRadius: 0.4
crouchedColliderHight: 1.4 crouchedColliderPosition: 0.24
crouchedColliderHight: 0.4
crouchedColliderRadius: 0.4
idleDrag: 10 idleDrag: 10
moveDrag: 5 moveDrag: 5
inAirDrag: 1 inAirDrag: 1
@ -355,7 +276,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 948a89cb4226cc044872eaa020bb8b57, type: 3} m_Script: {fileID: 11500000, guid: 948a89cb4226cc044872eaa020bb8b57, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1
_playerGhostReffrenceHub: {fileID: 0} _playerGhostReffrenceHub: {fileID: 0}
_networkIdentity: {fileID: 501103313315302667}
_aliveReffrenceHub: {fileID: 7564652410562457451} _aliveReffrenceHub: {fileID: 7564652410562457451}
_autoB_Hop: 0 _autoB_Hop: 0
_hoverForceMode: 3 _hoverForceMode: 3
@ -374,7 +298,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_aliveReffrenceHub: {fileID: 0} _aliveReffrenceHub: {fileID: 0}
_characterEnviormentCollider: {fileID: 6167160769853445096} _characterEnviormentCollider: {fileID: 6167160769853445097}
--- !u!114 &7564652410562457444 --- !u!114 &7564652410562457444
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -408,10 +332,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 11afecc1cbbd8e8449477483a5577cb0, type: 3} m_Script: {fileID: 11500000, guid: 11afecc1cbbd8e8449477483a5577cb0, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1
characterState: 0 characterState: 0
movementStates: 0 movementState: 0
ceilingDetected: 0 ceilingDetected: 0
eligibleForStep: 0
onLadder: 0 onLadder: 0
topOnLadder: 0 topOnLadder: 0
bottomOnLadder: 0 bottomOnLadder: 0
@ -431,6 +356,25 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1b1224eb420c67a48aa00d1fc76c7662, type: 3} m_Script: {fileID: 11500000, guid: 1b1224eb420c67a48aa00d1fc76c7662, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1
--- !u!114 &501103313315302667
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6167160771052314074}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
m_Name:
m_EditorClassIdentifier:
sceneId: 0
serverOnly: 0
visible: 0
m_AssetId: 0c51ca6cd6963b14eaa25c9a60dc3c30
hasSpawned: 0
--- !u!1 &6167160771733069518 --- !u!1 &6167160771733069518
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -462,143 +406,108 @@ Transform:
m_Father: {fileID: 6167160771052314077} m_Father: {fileID: 6167160771052314077}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2920374086812588964 --- !u!1001 &3257904695655098890
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 6167160771052314077} m_TransformParent: {fileID: 6167160769597586689}
m_Modifications: m_Modifications:
- target: {fileID: 8526145877325763410, guid: 229adc495d0d8174a88d12a34d63e9e5, - target: {fileID: -8679921383154817045, guid: 4d9e397e45100424da6813c0d2e59d99,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8526145877691622863, guid: 229adc495d0d8174a88d12a34d63e9e5,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8526145877715668853, guid: 229adc495d0d8174a88d12a34d63e9e5,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8526145878801045084, guid: 229adc495d0d8174a88d12a34d63e9e5,
type: 3}
propertyPath: m_Name
value: UI
objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5,
type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5,
type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5,
type: 3}
propertyPath: m_AnchorMax.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5, - target: {fileID: -8679921383154817045, guid: 4d9e397e45100424da6813c0d2e59d99,
type: 3} type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_LocalScale.x
value: 0 value: 0.0105
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5, - target: {fileID: -8679921383154817045, guid: 4d9e397e45100424da6813c0d2e59d99,
type: 3} type: 3}
propertyPath: m_AnchorMin.x propertyPath: m_LocalScale.y
value: 0 value: 0.0105
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5, - target: {fileID: -8679921383154817045, guid: 4d9e397e45100424da6813c0d2e59d99,
type: 3} type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_LocalScale.z
value: 0 value: 0.0105
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5, - target: {fileID: -8679921383154817045, guid: 4d9e397e45100424da6813c0d2e59d99,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5, - target: {fileID: -8679921383154817045, guid: 4d9e397e45100424da6813c0d2e59d99,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: -1.2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5, - target: {fileID: -8679921383154817045, guid: 4d9e397e45100424da6813c0d2e59d99,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5, - target: {fileID: -8679921383154817045, guid: 4d9e397e45100424da6813c0d2e59d99,
type: 3} type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5, - target: {fileID: -8679921383154817045, guid: 4d9e397e45100424da6813c0d2e59d99,
type: 3} type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5, - target: {fileID: -8679921383154817045, guid: 4d9e397e45100424da6813c0d2e59d99,
type: 3} type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5, - target: {fileID: -8679921383154817045, guid: 4d9e397e45100424da6813c0d2e59d99,
type: 3} type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5, - target: {fileID: -8679921383154817045, guid: 4d9e397e45100424da6813c0d2e59d99,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5,
type: 3} type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5, - target: {fileID: -8679921383154817045, guid: 4d9e397e45100424da6813c0d2e59d99,
type: 3} type: 3}
propertyPath: m_LocalEulerAnglesHint.y propertyPath: m_LocalEulerAnglesHint.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5, - target: {fileID: -8679921383154817045, guid: 4d9e397e45100424da6813c0d2e59d99,
type: 3} type: 3}
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] - target: {fileID: -1965380925529765557, guid: 4d9e397e45100424da6813c0d2e59d99,
m_SourcePrefab: {fileID: 100100000, guid: 229adc495d0d8174a88d12a34d63e9e5, type: 3}
--- !u!224 &6833566207558323707 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8526145878801045087, guid: 229adc495d0d8174a88d12a34d63e9e5,
type: 3} type: 3}
m_PrefabInstance: {fileID: 2920374086812588964} propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 715611034873569624, guid: 4d9e397e45100424da6813c0d2e59d99,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 4d9e397e45100424da6813c0d2e59d99,
type: 3}
propertyPath: m_Name
value: dude
objectReference: {fileID: 0}
- target: {fileID: 6830574981181655386, guid: 4d9e397e45100424da6813c0d2e59d99,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4d9e397e45100424da6813c0d2e59d99, type: 3}
--- !u!4 &3079580827464764897 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4d9e397e45100424da6813c0d2e59d99,
type: 3}
m_PrefabInstance: {fileID: 3257904695655098890}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1eabcf480eba51248b4895b7c90e4b1b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,216 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2694535814656859366
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2694535814656859386}
- component: {fileID: 2694535814656859377}
- component: {fileID: 2694535814656859388}
- component: {fileID: 2694535814656859385}
- component: {fileID: 2665031141030828950}
- component: {fileID: 2694535814656859389}
- component: {fileID: 1074318405156085107}
- component: {fileID: 6733388625091193667}
- component: {fileID: 8276864428184017328}
m_Layer: 3
m_Name: NetworkPlayerGhost
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2694535814656859386
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2694535814656859366}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -11.053974, y: 0, z: -35.997883}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2694535815064488835}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2694535814656859377
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2694535814656859366}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 495cd3a0a3a33904ab3473618f482aa4, type: 3}
m_Name:
m_EditorClassIdentifier:
characterRigidbody: {fileID: 2694535814656859389}
cameraTransform: {fileID: 0}
playerInfoData: {fileID: 0}
playerStateEnforcrer: {fileID: 0}
playerStateMachine: {fileID: 2694535814656859388}
playerInputReceiver: {fileID: 2694535814656859385}
gameManager: {fileID: 0}
roundSystem: {fileID: 0}
--- !u!114 &2694535814656859388
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2694535814656859366}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: abe7058362b44e043b66c7ddc42a22c2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &2694535814656859385
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2694535814656859366}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 777675542a674f346bb9629fd1eb84bc, type: 3}
m_Name:
m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1
--- !u!114 &2665031141030828950
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2694535814656859366}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2b9bd3cdb37f0f14e8da51bb08989060, type: 3}
m_Name:
m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1
_playerGhostReffrenceHub: {fileID: 2694535814656859377}
_playerInfoData: {fileID: 0}
_aliveBodyPrefab: {fileID: 2012543120969203556, guid: d657db29cb7fd7c49a774f0d99fefb78,
type: 3}
_spectatorBodyPrefab: {fileID: 1135382073684329176, guid: b615186e864b86245a99d5258f67ae27,
type: 3}
--- !u!54 &2694535814656859389
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2694535814656859366}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 3
--- !u!114 &1074318405156085107
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2694535814656859366}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
m_Name:
m_EditorClassIdentifier:
sceneId: 0
serverOnly: 0
visible: 0
m_AssetId: 5e378acc86a2c2f4dabdd67fba6fc941
hasSpawned: 0
--- !u!114 &6733388625091193667
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2694535814656859366}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2c819d953c83aeb4296690c8564ca0d9, type: 3}
m_Name:
m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1
_cameraAnchor: {fileID: 2694535815064488835}
--- !u!114 &8276864428184017328
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2694535814656859366}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2f74aedd71d9a4f55b3ce499326d45fb, type: 3}
m_Name:
m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1
clientAuthority: 1
sendInterval: 0.05
syncPosition: 1
syncRotation: 1
syncScale: 0
interpolatePosition: 1
interpolateRotation: 1
interpolateScale: 1
bufferTimeMultiplier: 3
bufferSizeLimit: 64
catchupThreshold: 6
catchupMultiplier: 0.1
showGizmos: 0
showOverlay: 0
overlayColor: {r: 0, g: 0, b: 0, a: 0.5}
--- !u!1 &2694535815064488832
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2694535815064488835}
m_Layer: 3
m_Name: PlayerCameraAnchor
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2694535815064488835
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2694535815064488832}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.03, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2694535814656859386}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 229adc495d0d8174a88d12a34d63e9e5 guid: 5e378acc86a2c2f4dabdd67fba6fc941
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: db0d1e5a0697e3c40b7f932deae9a5dc guid: d657db29cb7fd7c49a774f0d99fefb78
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View file

@ -13,6 +13,7 @@ GameObject:
- component: {fileID: 1135382073684329172} - component: {fileID: 1135382073684329172}
- component: {fileID: 1135382073684329179} - component: {fileID: 1135382073684329179}
- component: {fileID: 1135382073684329178} - component: {fileID: 1135382073684329178}
- component: {fileID: 8904123632460323566}
m_Layer: 3 m_Layer: 3
m_Name: Spectator m_Name: Spectator
m_TagString: Untagged m_TagString: Untagged
@ -103,6 +104,23 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1b1224eb420c67a48aa00d1fc76c7662, type: 3} m_Script: {fileID: 11500000, guid: 1b1224eb420c67a48aa00d1fc76c7662, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!114 &8904123632460323566
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1135382073684329176}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
m_Name:
m_EditorClassIdentifier:
sceneId: 0
serverOnly: 0
visible: 0
m_AssetId: b615186e864b86245a99d5258f67ae27
hasSpawned: 0
--- !u!1 &1135382074330079443 --- !u!1 &1135382074330079443
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

Binary file not shown.

View file

@ -0,0 +1,959 @@
fileFormatVersion: 2
guid: 4d9e397e45100424da6813c0d2e59d99
ModelImporter:
serializedVersion: 21202
internalIDToNameTable:
- first:
74: -4791504522942941401
second: Armature|Armature|mixamo.com|Layer0
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: PackedMaterial0
second: {fileID: 2100000, guid: 53b44c714c1a3374fb5060362127be8a, type: 2}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 1
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human:
- boneName: mixamorig:Hips
humanName: Hips
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftUpLeg
humanName: LeftUpperLeg
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightUpLeg
humanName: RightUpperLeg
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftLeg
humanName: LeftLowerLeg
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightLeg
humanName: RightLowerLeg
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftFoot
humanName: LeftFoot
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightFoot
humanName: RightFoot
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:Spine
humanName: Spine
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:Spine1
humanName: Chest
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:Neck
humanName: Neck
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:Head
humanName: Head
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftShoulder
humanName: LeftShoulder
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightShoulder
humanName: RightShoulder
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftArm
humanName: LeftUpperArm
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightArm
humanName: RightUpperArm
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftForeArm
humanName: LeftLowerArm
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightForeArm
humanName: RightLowerArm
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftHand
humanName: LeftHand
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightHand
humanName: RightHand
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftToeBase
humanName: LeftToes
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightToeBase
humanName: RightToes
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftHandThumb1
humanName: Left Thumb Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftHandThumb2
humanName: Left Thumb Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftHandThumb3
humanName: Left Thumb Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftHandIndex1
humanName: Left Index Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftHandIndex2
humanName: Left Index Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftHandIndex3
humanName: Left Index Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftHandMiddle1
humanName: Left Middle Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftHandMiddle2
humanName: Left Middle Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftHandMiddle3
humanName: Left Middle Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftHandRing1
humanName: Left Ring Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftHandRing2
humanName: Left Ring Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftHandRing3
humanName: Left Ring Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftHandPinky1
humanName: Left Little Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftHandPinky2
humanName: Left Little Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:LeftHandPinky3
humanName: Left Little Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightHandThumb1
humanName: Right Thumb Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightHandThumb2
humanName: Right Thumb Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightHandThumb3
humanName: Right Thumb Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightHandIndex1
humanName: Right Index Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightHandIndex2
humanName: Right Index Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightHandIndex3
humanName: Right Index Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightHandMiddle1
humanName: Right Middle Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightHandMiddle2
humanName: Right Middle Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightHandMiddle3
humanName: Right Middle Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightHandRing1
humanName: Right Ring Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightHandRing2
humanName: Right Ring Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightHandRing3
humanName: Right Ring Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightHandPinky1
humanName: Right Little Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightHandPinky2
humanName: Right Little Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:RightHandPinky3
humanName: Right Little Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig:Spine2
humanName: UpperChest
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
skeleton:
- name: dude(Clone)
parentName:
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Armature
parentName: dude(Clone)
position: {x: -0, y: 0, z: 0}
rotation: {x: 0.00000008146034, y: -0, z: -0, w: 1}
scale: {x: 9476.339, y: 9476.339, z: 9476.339}
- name: mixamorig:Hips
parentName: Armature
position: {x: 0.00000034557073, y: 0.009873434, z: -0.000025498726}
rotation: {x: 0.0000062265867, y: 0.00001926613, z: -0.00027640988, w: 1}
scale: {x: 0.9999999, y: 0.9999999, z: 1}
- name: mixamorig:Spine
parentName: mixamorig:Hips
position: {x: -6.895107e-13, y: 0.0011294265, z: -0.00015027469}
rotation: {x: -0.066096626, y: -0.000037491904, z: 0.0002745321, w: 0.9978132}
scale: {x: 0.9999999, y: 1, z: 1.0000001}
- name: mixamorig:Spine1
parentName: mixamorig:Spine
position: {x: -1.7124287e-14, y: 0.001329273, z: -1.1175846e-10}
rotation: {x: 0.00000004470349, y: 2.5246045e-11, z: -3.8248302e-10, w: 1}
scale: {x: 1, y: 0.99999994, z: 0.99999994}
- name: mixamorig:Spine2
parentName: mixamorig:Spine1
position: {x: -3.642855e-14, y: 0.0015191726, z: 7.450611e-11}
rotation: {x: 0.00000009685755, y: -4.8592293e-11, z: 7.336334e-10, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig:Neck
parentName: mixamorig:Spine2
position: {x: 1.3439385e-13, y: 0.0017090708, z: -7.45056e-11}
rotation: {x: 0.06609026, y: 2.7525462e-14, z: -3.5101813e-10, w: 0.99781364}
scale: {x: 1, y: 0.99999994, z: 1}
- name: mixamorig:Head
parentName: mixamorig:Neck
position: {x: -1.4284597e-14, y: 0.00064026355, z: 0.00031439326}
rotation: {x: 0.000000007450581, y: 1.3454272e-17, z: 2.8966674e-17, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig:HeadTop_End
parentName: mixamorig:Head
position: {x: -5.5420546e-14, y: 0.0022829294, z: 0.0011210033}
rotation: {x: -4.5102143e-16, y: 1.3030755e-17, z: -3.179921e-18, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig:HeadTop_End_end
parentName: mixamorig:HeadTop_End
position: {x: -0, y: 0.0025433062, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig:LeftShoulder
parentName: mixamorig:Spine2
position: {x: -0.0006548262, y: 0.0014994057, z: -0.000025683492}
rotation: {x: 0.55855054, y: -0.42687273, z: 0.5803813, w: 0.41104585}
scale: {x: 1.0000002, y: 1.0000002, z: 1.0000001}
- name: mixamorig:LeftArm
parentName: mixamorig:LeftShoulder
position: {x: 6.519258e-11, y: 0.0013473466, z: 2.4214386e-10}
rotation: {x: -0.1505692, y: -0.006221536, z: -0.018338228, w: 0.9884098}
scale: {x: 0.9999999, y: 1.0000001, z: 1.0000001}
- name: mixamorig:LeftForeArm
parentName: mixamorig:LeftArm
position: {x: -1.7586708e-10, y: 0.0024226182, z: 0.000000001633592}
rotation: {x: -0.00000060492937, y: 0.0036797407, z: -0.0000001878666, w: 0.99999326}
scale: {x: 0.9999999, y: 0.9999999, z: 0.99999994}
- name: mixamorig:LeftHand
parentName: mixamorig:LeftForeArm
position: {x: 8.1968494e-11, y: 0.0023806146, z: -4.2658313e-10}
rotation: {x: -0.00052390335, y: -0.07156719, z: 0.035159446, w: 0.9968158}
scale: {x: 1.0000001, y: 1, z: 0.99999994}
- name: mixamorig:LeftHandThumb1
parentName: mixamorig:LeftHand
position: {x: 0.00029800582, y: 0.0004301606, z: 0.00016476683}
rotation: {x: 0.07198904, y: 0.010710049, z: -0.3380866, w: 0.9382965}
scale: {x: 1, y: 1, z: 0.99999994}
- name: mixamorig:LeftHandThumb2
parentName: mixamorig:LeftHandThumb1
position: {x: 0.00004007209, y: 0.00043707047, z: -3.259629e-11}
rotation: {x: 0.000079490674, y: 0.0020993445, z: -0.05350764, w: 0.99856526}
scale: {x: 1.0000001, y: 0.9999999, z: 1.0000001}
- name: mixamorig:LeftHandThumb3
parentName: mixamorig:LeftHandThumb2
position: {x: -0.0000056685135, y: 0.00037951526, z: 3.5623088e-10}
rotation: {x: -0.000034307872, y: 0.0005048597, z: -0.04984752, w: 0.9987567}
scale: {x: 0.99999994, y: 1, z: 0.99999994}
- name: mixamorig:LeftHandThumb4
parentName: mixamorig:LeftHandThumb3
position: {x: -0.000034404733, y: 0.00029296108, z: 5.944457e-10}
rotation: {x: -2.220446e-16, y: 0.00000005029142, z: 0.000000008381905, w: 1}
scale: {x: 0.9999999, y: 1, z: 1.0000001}
- name: mixamorig:LeftHandThumb4_end
parentName: mixamorig:LeftHandThumb4
position: {x: -0, y: 0.00029497367, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig:LeftHandIndex1
parentName: mixamorig:LeftHand
position: {x: 0.00032892055, y: 0.0011727134, z: -0.000011251692}
rotation: {x: -0.0019413502, y: 0.0015216055, z: -0.03510965, w: 0.99938047}
scale: {x: 1, y: 1, z: 0.9999999}
- name: mixamorig:LeftHandIndex2
parentName: mixamorig:LeftHandIndex1
position: {x: 0.0000004049175, y: 0.0003583698, z: -9.218128e-10}
rotation: {x: -0.0000008415743, y: -0.000031443622, z: -0.0015244947, w: 0.99999887}
scale: {x: 1, y: 1, z: 0.9999999}
- name: mixamorig:LeftHandIndex3
parentName: mixamorig:LeftHandIndex2
position: {x: -0.00000051707957, y: 0.00032833102, z: 9.0230856e-10}
rotation: {x: 0.00000016860179, y: 0.000017006298, z: 0.0015244385, w: 0.99999887}
scale: {x: 1, y: 1, z: 0.99999994}
- name: mixamorig:LeftHandIndex4
parentName: mixamorig:LeftHandIndex3
position: {x: 0.00000011233241, y: 0.00028004014, z: -4.805747e-10}
rotation: {x: -0.000000008967069, y: -0.00000005599587, z: -0.0000000023183253,
w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig:LeftHandIndex4_end
parentName: mixamorig:LeftHandIndex4
position: {x: -0, y: 0.00028004067, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig:LeftHandMiddle1
parentName: mixamorig:LeftHand
position: {x: 0.00008790871, y: 0.0012508472, z: -0.0000050654085}
rotation: {x: -0.0019934797, y: 0.000060758237, z: -0.032275707, w: 0.999477}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig:LeftHandMiddle2
parentName: mixamorig:LeftHandMiddle1
position: {x: 0.0000020082155, y: 0.00035319163, z: 0.0000000024523592}
rotation: {x: 0.00000012794413, y: 0.00014632585, z: -0.0028327513, w: 0.999996}
scale: {x: 1, y: 1, z: 0.9999999}
- name: mixamorig:LeftHandMiddle3
parentName: mixamorig:LeftHandMiddle2
position: {x: -0.000000004972603, y: 0.00034298268, z: -0.0000000015808643}
rotation: {x: 0.0000011912244, y: -0.00022379367, z: -0.00344821, w: 0.99999404}
scale: {x: 0.9999998, y: 0.99999994, z: 1.0000001}
- name: mixamorig:LeftHandMiddle4
parentName: mixamorig:LeftHandMiddle3
position: {x: -0.0000020033353, y: 0.0002898711, z: 6.358277e-11}
rotation: {x: -0.0000000034513055, y: -0.0000000033581609, z: 5.796039e-10,
w: 1}
scale: {x: 1, y: 0.99999994, z: 0.9999999}
- name: mixamorig:LeftHandMiddle4_end
parentName: mixamorig:LeftHandMiddle4
position: {x: -0, y: 0.0002898778, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig:LeftHandRing1
parentName: mixamorig:LeftHand
position: {x: -0.00010100115, y: 0.0012587453, z: -0.0000025848287}
rotation: {x: -0.0019997922, y: -0.00014288575, z: -0.03209644, w: 0.9994828}
scale: {x: 1, y: 0.99999994, z: 0.99999994}
- name: mixamorig:LeftHandRing2
parentName: mixamorig:LeftHandRing1
position: {x: 0.0000020088721, y: 0.0003318827, z: 8.42856e-10}
rotation: {x: 0.0000016178844, y: 0.00017503068, z: -0.0014146126, w: 0.999999}
scale: {x: 0.99999994, y: 1, z: 1}
- name: mixamorig:LeftHandRing3
parentName: mixamorig:LeftHandRing2
position: {x: 0.0000005633454, y: 0.0003129011, z: -0.0000000017678212}
rotation: {x: -0.0000003596317, y: -0.00039875475, z: -0.0071527767, w: 0.99997437}
scale: {x: 1, y: 0.99999994, z: 0.9999999}
- name: mixamorig:LeftHandRing4
parentName: mixamorig:LeftHandRing3
position: {x: -0.000002572229, y: 0.0002701953, z: 0.0000000021635644}
rotation: {x: 0.000000013025371, y: -0.000000078893386, z: 0.0000000022245956,
w: 1}
scale: {x: 0.99999994, y: 0.99999994, z: 1.0000001}
- name: mixamorig:LeftHandRing4_end
parentName: mixamorig:LeftHandRing4
position: {x: -0, y: 0.00027020666, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig:LeftHandPinky1
parentName: mixamorig:LeftHand
position: {x: -0.00031582758, y: 0.0010812855, z: -0.0000039967344}
rotation: {x: -0.001966218, y: 0.0008084636, z: -0.035107996, w: 0.9993813}
scale: {x: 1, y: 0.9999998, z: 0.99999994}
- name: mixamorig:LeftHandPinky2
parentName: mixamorig:LeftHandPinky1
position: {x: 0.00000028016282, y: 0.0003656792, z: -0.0000000012717055}
rotation: {x: -0.0000009801101, y: -0.00003402336, z: 0.0016610668, w: 0.9999986}
scale: {x: 0.9999999, y: 0.99999964, z: 0.9999998}
- name: mixamorig:LeftHandPinky3
parentName: mixamorig:LeftHandPinky2
position: {x: 0.0000009429967, y: 0.0003006329, z: -5.0284027e-10}
rotation: {x: -0.000000069008024, y: -0.000018506753, z: -0.0035917133, w: 0.99999356}
scale: {x: 1.0000001, y: 0.9999999, z: 1}
- name: mixamorig:LeftHandPinky4
parentName: mixamorig:LeftHandPinky3
position: {x: -0.0000012234062, y: 0.00025927738, z: 7.819051e-10}
rotation: {x: -0.000000006505275, y: -0.000000003794237, z: -0.0000000038882324,
w: 1}
scale: {x: 0.9999999, y: 0.9999999, z: 1}
- name: mixamorig:LeftHandPinky4_end
parentName: mixamorig:LeftHandPinky4
position: {x: -0, y: 0.00025928149, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig:RightShoulder
parentName: mixamorig:Spine2
position: {x: 0.00065482606, y: 0.0014999845, z: -0.000030032917}
rotation: {x: -0.5564632, y: -0.42842555, z: 0.5821639, w: -0.40973836}
scale: {x: 0.9999997, y: 1, z: 1}
- name: mixamorig:RightArm
parentName: mixamorig:RightShoulder
position: {x: 1.7695129e-10, y: 0.0013473475, z: 4.842877e-10}
rotation: {x: -0.15026008, y: 0.0049014916, z: 0.021981409, w: 0.98838997}
scale: {x: 1, y: 0.9999998, z: 1}
- name: mixamorig:RightForeArm
parentName: mixamorig:RightArm
position: {x: -6.53435e-11, y: 0.0024216599, z: 3.5804533e-11}
rotation: {x: -0.0000006989388, y: -0.0034189762, z: -0.00000021455041, w: 0.99999416}
scale: {x: 0.9999999, y: 0.99999994, z: 0.9999999}
- name: mixamorig:RightHand
parentName: mixamorig:RightForeArm
position: {x: -6.608274e-11, y: 0.002379826, z: 9.689529e-10}
rotation: {x: 0.003230234, y: 0.07526632, z: -0.03725213, w: 0.99646217}
scale: {x: 0.99999994, y: 1, z: 1.0000001}
- name: mixamorig:RightHandThumb1
parentName: mixamorig:RightHand
position: {x: -0.0002902353, y: 0.00045765765, z: 0.00018112532}
rotation: {x: 0.06877543, y: -0.015844919, z: 0.3561675, w: 0.931753}
scale: {x: 0.9999999, y: 1, z: 1}
- name: mixamorig:RightHandThumb2
parentName: mixamorig:RightHandThumb1
position: {x: -0.000025808364, y: 0.00045638642, z: 1.8626451e-11}
rotation: {x: 0.00000038431835, y: -0.00001187615, z: 0.05647939, w: 0.9984038}
scale: {x: 0.99999994, y: 0.9999997, z: 1}
- name: mixamorig:RightHandThumb3
parentName: mixamorig:RightHandThumb2
position: {x: 0.00002154191, y: 0.00039237578, z: 0.0000000013434328}
rotation: {x: 0.000012529259, y: 0.00034345587, z: -0.021760957, w: 0.99976313}
scale: {x: 1, y: 0.99999994, z: 0.99999976}
- name: mixamorig:RightHandThumb4
parentName: mixamorig:RightHandThumb3
position: {x: 0.000004265549, y: 0.0003187947, z: -0.0000000011239899}
rotation: {x: -0.000000001862645, y: 0.00000005261971, z: -0.000000024680045,
w: 1}
scale: {x: 1.0000001, y: 1.0000001, z: 1.0000004}
- name: mixamorig:RightHandThumb4_end
parentName: mixamorig:RightHandThumb4
position: {x: -0, y: 0.00031882327, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig:RightHandIndex1
parentName: mixamorig:RightHand
position: {x: -0.00032722397, y: 0.0012552128, z: 0.000015639305}
rotation: {x: -0.0060017994, y: -0.00065980904, z: 0.035479724, w: 0.99935216}
scale: {x: 0.9999997, y: 0.9999999, z: 0.99999976}
- name: mixamorig:RightHandIndex2
parentName: mixamorig:RightHandIndex1
position: {x: -0.0000012548012, y: 0.00034985202, z: -1.73236e-10}
rotation: {x: 0.0000004319058, y: 0.0000063310813, z: 0.003015636, w: 0.99999547}
scale: {x: 1.0000001, y: 0.99999994, z: 1.0000001}
- name: mixamorig:RightHandIndex3
parentName: mixamorig:RightHandIndex2
position: {x: 0.0000009428919, y: 0.00031527664, z: -7.4312084e-10}
rotation: {x: 0.00000055106034, y: -0.00001892422, z: -0.0015873387, w: 0.99999875}
scale: {x: 0.9999998, y: 0.9999998, z: 0.9999998}
- name: mixamorig:RightHandIndex4
parentName: mixamorig:RightHandIndex3
position: {x: 0.0000003118556, y: 0.0002770591, z: 2.484512e-10}
rotation: {x: -0.0000000016719073, y: 0.0000000600707, z: 0.000000033220623,
w: 1}
scale: {x: 1.0000001, y: 1, z: 1}
- name: mixamorig:RightHandIndex4_end
parentName: mixamorig:RightHandIndex4
position: {x: -0, y: 0.00027705941, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig:RightHandMiddle1
parentName: mixamorig:RightHand
position: {x: -0.00009835613, y: 0.0013245424, z: -0.000016148773}
rotation: {x: -0.0060228147, y: -0.000096698, z: 0.03690392, w: 0.99930066}
scale: {x: 0.99999994, y: 0.99999994, z: 0.9999996}
- name: mixamorig:RightHandMiddle2
parentName: mixamorig:RightHandMiddle1
position: {x: -0.00000010415354, y: 0.0003550044, z: -8.83424e-10}
rotation: {x: 0.0000011169708, y: 0.00002404274, z: 0.0015104441, w: 0.99999887}
scale: {x: 0.99999994, y: 1.0000001, z: 1.0000001}
- name: mixamorig:RightHandMiddle3
parentName: mixamorig:RightHandMiddle2
position: {x: 0.00000074042237, y: 0.00033137068, z: -0.0000000022197035}
rotation: {x: -0.00000061991597, y: 0.000006575523, z: -0.003258717, w: 0.9999947}
scale: {x: 0.99999994, y: 0.9999998, z: 0.9999999}
- name: mixamorig:RightHandMiddle4
parentName: mixamorig:RightHandMiddle3
position: {x: -0.0000006366474, y: 0.0002859847, z: 6.606069e-10}
rotation: {x: -0.000000013695056, y: 0.0000000076527105, z: 3.8934897e-10, w: 1}
scale: {x: 1, y: 1.0000001, z: 1.0000001}
- name: mixamorig:RightHandMiddle4_end
parentName: mixamorig:RightHandMiddle4
position: {x: -0, y: 0.00028598428, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig:RightHandRing1
parentName: mixamorig:RightHand
position: {x: 0.00010319883, y: 0.0013168132, z: -0.00000879717}
rotation: {x: -0.0060477825, y: 0.00056061003, z: 0.035394736, w: 0.99935496}
scale: {x: 0.9999999, y: 0.99999994, z: 0.99999964}
- name: mixamorig:RightHandRing2
parentName: mixamorig:RightHandRing1
position: {x: -0.00000055412295, y: 0.00033180733, z: -8.3589835e-10}
rotation: {x: 0.0000005920372, y: -0.000011112907, z: 0.0015061717, w: 0.99999887}
scale: {x: 0.9999999, y: 0.99999994, z: 1}
- name: mixamorig:RightHandRing3
parentName: mixamorig:RightHandRing2
position: {x: -0.00000015029481, y: 0.00030701532, z: 9.425503e-10}
rotation: {x: -0.0000018896772, y: 0.000035933186, z: 0.0018520253, w: 0.9999983}
scale: {x: 1.0000001, y: 1.0000001, z: 1}
- name: mixamorig:RightHandRing4
parentName: mixamorig:RightHandRing3
position: {x: 0.0000007043779, y: 0.00026988192, z: -2.7575425e-10}
rotation: {x: -0.0000000029715463, y: 0.000000007454164, z: -4.1069363e-11,
w: 1}
scale: {x: 1.0000001, y: 1, z: 1.0000001}
- name: mixamorig:RightHandRing4_end
parentName: mixamorig:RightHandRing4
position: {x: -0, y: 0.0002698842, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig:RightHandPinky1
parentName: mixamorig:RightHand
position: {x: 0.00032238106, y: 0.0011747525, z: 0.000024236524}
rotation: {x: -0.006034727, y: 0.00021132821, z: 0.03541052, w: 0.9993546}
scale: {x: 0.99999976, y: 0.9999999, z: 0.9999999}
- name: mixamorig:RightHandPinky2
parentName: mixamorig:RightHandPinky1
position: {x: -0.0000012546451, y: 0.00033473785, z: -1.6423655e-10}
rotation: {x: -0.0000003000248, y: 0.00002814364, z: -0.00027405706, w: 1}
scale: {x: 0.99999994, y: 1.0000001, z: 0.99999994}
- name: mixamorig:RightHandPinky3
parentName: mixamorig:RightHandPinky2
position: {x: -0.000001466053, y: 0.0002834198, z: -2.6582256e-10}
rotation: {x: 0.0000005379602, y: 0.00044914588, z: 0.007914023, w: 0.9999686}
scale: {x: 0.99999994, y: 0.99999976, z: 0.9999999}
- name: mixamorig:RightHandPinky4
parentName: mixamorig:RightHandPinky3
position: {x: 0.0000027208403, y: 0.00024448877, z: -5.941501e-10}
rotation: {x: 0.0000000054934617, y: -0.000000005705609, z: 0.000000002256229,
w: 1}
scale: {x: 1, y: 1, z: 0.99999994}
- name: mixamorig:RightHandPinky4_end
parentName: mixamorig:RightHandPinky4
position: {x: -0, y: 0.0002445031, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig:LeftUpLeg
parentName: mixamorig:Hips
position: {x: -0.0009101133, y: -0.0006271676, z: -0.0000009861498}
rotation: {x: -0.00010307981, y: 0.033699572, z: 0.9993844, w: 0.009758694}
scale: {x: 0.99999964, y: 0.9999994, z: 0.9999921}
- name: mixamorig:LeftLeg
parentName: mixamorig:LeftUpLeg
position: {x: 1.8633727e-10, y: 0.0044346983, z: 2.2882887e-11}
rotation: {x: -0.10423647, y: -0.000050966686, z: 0.021688247, w: 0.99431604}
scale: {x: 0.9999999, y: 1, z: 0.99999994}
- name: mixamorig:LeftFoot
parentName: mixamorig:LeftLeg
position: {x: -3.7980497e-11, y: 0.003793658, z: 5.4133125e-11}
rotation: {x: 0.55708903, y: 0.017183527, z: -0.010569408, w: 0.8302077}
scale: {x: 1, y: 1, z: 0.9999998}
- name: mixamorig:LeftToeBase
parentName: mixamorig:LeftFoot
position: {x: -2.910383e-11, y: 0.001973361, z: -1.5832484e-10}
rotation: {x: 0.27040583, y: 0.07213528, z: -0.02032226, w: 0.9598251}
scale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
- name: mixamorig:LeftToe_End
parentName: mixamorig:LeftToeBase
position: {x: -5.3551046e-11, y: 0.0008761024, z: 9.3132255e-12}
rotation: {x: 0.000000015133992, y: -0.000000016065314, z: 0.000000007450581,
w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig:LeftToe_End_end
parentName: mixamorig:LeftToe_End
position: {x: -0, y: 0.0008760955, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig:RightUpLeg
parentName: mixamorig:Hips
position: {x: 0.00091011333, y: -0.0006271676, z: 0.000039550796}
rotation: {x: 0.000029579065, y: 0.03511436, z: 0.9993308, w: -0.0102442335}
scale: {x: 1.0000002, y: 1.0000005, z: 1.0000044}
- name: mixamorig:RightLeg
parentName: mixamorig:RightUpLeg
position: {x: -5.875336e-12, y: 0.0044425908, z: -1.2114469e-11}
rotation: {x: -0.11285142, y: 0.000041606854, z: -0.021555435, w: 0.99337804}
scale: {x: 0.9999998, y: 0.9999998, z: 1}
- name: mixamorig:RightFoot
parentName: mixamorig:RightLeg
position: {x: 7.494236e-12, y: 0.0037938645, z: 7.254129e-11}
rotation: {x: 0.5649141, y: -0.016870806, z: 0.01033195, w: 0.82491255}
scale: {x: 0.9999999, y: 1.0000001, z: 1.0000001}
- name: mixamorig:RightToeBase
parentName: mixamorig:RightFoot
position: {x: 5.0640665e-11, y: 0.0019883085, z: -1.8859282e-10}
rotation: {x: 0.268379, y: -0.07372352, z: 0.020604517, w: 0.9602672}
scale: {x: 1, y: 1.0000002, z: 0.99999994}
- name: mixamorig:RightToe_End
parentName: mixamorig:RightToeBase
position: {x: -3.4924594e-11, y: 0.0008718868, z: -1.8626451e-11}
rotation: {x: 0.000000031897798, y: -0.000000013504177, z: 0.000000004743925,
w: 1}
scale: {x: 0.99999994, y: 1, z: 1.0000001}
- name: mixamorig:RightToe_End_end
parentName: mixamorig:RightToe_End
position: {x: -0, y: 0.00087189063, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Dude_Dude.001
parentName: dude(Clone)
position: {x: -0.00000066191467, y: 0.00000016547868, z: -0.00000007722335}
rotation: {x: 0.7071068, y: 4.939077e-10, z: 0.000000004774449, w: 0.7071067}
scale: {x: 94.76339, y: 94.76339, z: 94.76339}
- name: Dude_Arms_Dude.004
parentName: dude(Clone)
position: {x: 0.00000072810616, y: -0.000003706722, z: -0.0000014120851}
rotation: {x: 0.7071068, y: 0.0000000041982235, z: -0.000000008149489, w: 0.7071067}
scale: {x: 94.76339, y: 94.76339, z: 94.76339}
- name: Dude_NoHead_Dude
parentName: dude(Clone)
position: {x: -0.00000066191467, y: 0.00000016547868, z: -0.00000007722335}
rotation: {x: 0.7071068, y: 4.939077e-10, z: 0.000000004774449, w: 0.7071067}
scale: {x: 94.76339, y: 94.76339, z: 94.76339}
- name: Dude_Head_Dude.003
parentName: dude(Clone)
position: {x: -0, y: 6.9633845e-22, z: -4.2740956e-15}
rotation: {x: 0.7071068, y: 0, z: -0, w: 0.7071067}
scale: {x: 94.76339, y: 94.76339, z: 94.76339}
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 1
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 3
humanoidOversampling: 1
avatarSetup: 1
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View file

@ -133,6 +133,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 104470437} - component: {fileID: 104470437}
- component: {fileID: 104470436} - component: {fileID: 104470436}
- component: {fileID: 104470438}
m_Layer: 0 m_Layer: 0
m_Name: MainMenuManager m_Name: MainMenuManager
m_TagString: Untagged m_TagString: Untagged
@ -152,7 +153,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ee14ed1c53daf04c8dd50095165493a, type: 3} m_Script: {fileID: 11500000, guid: 9ee14ed1c53daf04c8dd50095165493a, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
gameEventManager: {fileID: 1673798133} gameEventManager: {fileID: 0}
--- !u!4 &104470437 --- !u!4 &104470437
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -166,8 +167,38 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 5 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &104470438
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 104470435}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 951fe6b63c12fbd4f9534e38455dd24f, type: 3}
m_Name:
m_EditorClassIdentifier:
GameEvents:
- gameEventName: EnterMainMenu
GameEventSender:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1583779076}
m_TargetAssemblyTypeName: Presance_Manager, Assembly-CSharp
m_MethodName: SetPresence
m_Mode: 2
m_Arguments:
m_ObjectArgument: {fileID: 11400000, guid: f2dee930d6bbe0d448b1617004d5954a,
type: 2}
m_ObjectArgumentAssemblyTypeName: GameEventDataSet, Assembly-CSharp
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &170579985 --- !u!1 &170579985
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -177,10 +208,14 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 170579990} - component: {fileID: 170579990}
- component: {fileID: 170579989} - component: {fileID: 170579997}
- component: {fileID: 170579993} - component: {fileID: 170579998}
- component: {fileID: 170579999}
- component: {fileID: 170579994}
- component: {fileID: 170579992} - component: {fileID: 170579992}
- component: {fileID: 170579991} - component: {fileID: 170579991}
- component: {fileID: 170579995}
- component: {fileID: 170579996}
m_Layer: 0 m_Layer: 0
m_Name: NetworkManager m_Name: NetworkManager
m_TagString: Untagged m_TagString: Untagged
@ -188,36 +223,6 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!114 &170579989
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 170579985}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8aab4c8111b7c411b9b92cf3dbc5bd4e, type: 3}
m_Name:
m_EditorClassIdentifier:
dontDestroyOnLoad: 1
PersistNetworkManagerToOfflineScene: 0
runInBackground: 1
autoStartServerBuild: 1
serverTickRate: 30
offlineScene: Assets/Scenes/MainMenu.unity
onlineScene: Assets/Scenes/MovementTesting.unity
transport: {fileID: 170579993}
networkAddress: localhost
maxConnections: 16
disconnectInactiveConnections: 0
disconnectInactiveTimeout: 60
authenticator: {fileID: 0}
playerPrefab: {fileID: 6062496430999171099, guid: 4b8299fb26d528c4a96049468544b48f,
type: 3}
autoCreatePlayer: 1
playerSpawnMethod: 0
spawnPrefabs: []
--- !u!4 &170579990 --- !u!4 &170579990
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -262,7 +267,7 @@ MonoBehaviour:
serverBroadcastListenPort: 47777 serverBroadcastListenPort: 47777
enableActiveDiscovery: 1 enableActiveDiscovery: 1
ActiveDiscoveryInterval: 3 ActiveDiscoveryInterval: 3
transport: {fileID: 170579993} transport: {fileID: 170579995}
OnServerFound: OnServerFound:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
@ -278,7 +283,39 @@ MonoBehaviour:
m_StringArgument: m_StringArgument:
m_BoolArgument: 0 m_BoolArgument: 0
m_CallState: 2 m_CallState: 2
--- !u!114 &170579993 --- !u!114 &170579994
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 170579985}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5e29de0042841a2409741a96a4b6c818, type: 3}
m_Name:
m_EditorClassIdentifier:
dontDestroyOnLoad: 1
PersistNetworkManagerToOfflineScene: 0
runInBackground: 1
autoStartServerBuild: 1
serverTickRate: 60
offlineScene: Assets/Scenes/MainMenu.unity
onlineScene: Assets/Scenes/MovementTesting.unity
transport: {fileID: 170579995}
networkAddress: localhost
maxConnections: 16
disconnectInactiveConnections: 0
disconnectInactiveTimeout: 60
authenticator: {fileID: 0}
playerPrefab: {fileID: 2694535814656859366, guid: 5e378acc86a2c2f4dabdd67fba6fc941,
type: 3}
autoCreatePlayer: 1
playerSpawnMethod: 0
spawnPrefabs:
- {fileID: 2012543120969203556, guid: d657db29cb7fd7c49a774f0d99fefb78, type: 3}
_networkPresenceUtilities: {fileID: 170579999}
--- !u!114 &170579995
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -303,6 +340,98 @@ MonoBehaviour:
debugLog: 0 debugLog: 0
statisticsGUI: 0 statisticsGUI: 0
statisticsLog: 0 statisticsLog: 0
--- !u!114 &170579996
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 170579985}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
m_Name:
m_EditorClassIdentifier:
sceneId: 3568955504
serverOnly: 0
visible: 0
m_AssetId:
hasSpawned: 0
--- !u!114 &170579997
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 170579985}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4493fd577a848724f97327338ae295ac, type: 3}
m_Name:
m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1
--- !u!114 &170579998
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 170579985}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 951fe6b63c12fbd4f9534e38455dd24f, type: 3}
m_Name:
m_EditorClassIdentifier:
GameEvents:
- gameEventName: EnterGame
GameEventSender:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1583779076}
m_TargetAssemblyTypeName: PresanceManager, Assembly-CSharp
m_MethodName: SetPresence
m_Mode: 2
m_Arguments:
m_ObjectArgument: {fileID: 11400000, guid: e653319784592d84e8ab16534bb2346d,
type: 2}
m_ObjectArgumentAssemblyTypeName: GameEventDataSet, Assembly-CSharp
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- gameEventName: UpdatePlayerCount
GameEventSender:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1583779076}
m_TargetAssemblyTypeName: PresanceManager, Assembly-CSharp
m_MethodName: SetPresence
m_Mode: 2
m_Arguments:
m_ObjectArgument: {fileID: 11400000, guid: e653319784592d84e8ab16534bb2346d,
type: 2}
m_ObjectArgumentAssemblyTypeName: GameEventDataSet, Assembly-CSharp
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &170579999
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 170579985}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a77b2fc8580a4eb4d8e781879796473c, type: 3}
m_Name:
m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1
--- !u!1 &248595333 --- !u!1 &248595333
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -783,7 +912,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 7 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &766975939 --- !u!114 &766975939
MonoBehaviour: MonoBehaviour:
@ -919,7 +1048,7 @@ RectTransform:
- {fileID: 2015301923} - {fileID: 2015301923}
- {fileID: 275604910} - {fileID: 275604910}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 6 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
@ -1503,145 +1632,8 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 4 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1673798133 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7721659157930599326, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
m_PrefabInstance: {fileID: 1813964726}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 951fe6b63c12fbd4f9534e38455dd24f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1813964726
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 7721659157930599325, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: m_Name
value: GameEventManager
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599325, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599326, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: GameEvents.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599326, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: GameEvents.Array.data[0].gameEventName
value: EnterMainMenu
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599326, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: GameEvents.Array.data[0].GameEventSender.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599326, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: GameEvents.Array.data[0].GameEventSender.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599326, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: GameEvents.Array.data[0].GameEventSender.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1583779076}
- target: {fileID: 7721659157930599326, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: GameEvents.Array.data[0].GameEventSender.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599326, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: GameEvents.Array.data[0].GameEventSender.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: SetPresence
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599326, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: GameEvents.Array.data[0].GameEventSender.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: Presance_Manager, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599326, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: GameEvents.Array.data[0].GameEventSender.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument
value:
objectReference: {fileID: 11400000, guid: f2dee930d6bbe0d448b1617004d5954a,
type: 2}
- target: {fileID: 7721659157930599326, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: GameEvents.Array.data[0].GameEventSender.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: GameEventDataSet, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599327, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599327, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: m_LocalPosition.x
value: -5.6973567
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599327, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: m_LocalPosition.y
value: -3.0732017
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599327, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: m_LocalPosition.z
value: -6.5618863
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599327, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599327, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599327, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599327, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599327, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599327, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7721659157930599327, guid: 8ddff08131f454045911a3bc0d9aa1d9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8ddff08131f454045911a3bc0d9aa1d9, type: 3}
--- !u!1 &1840533310 --- !u!1 &1840533310
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

File diff suppressed because it is too large Load diff

View file

@ -11,7 +11,7 @@ public class DiscordManager : MonoBehaviour
ActivityManager activityManager; ActivityManager activityManager;
DateTimeOffset dateTimeOffset; DateTimeOffset dateTimeOffset;
private void OnEnable() private void Awake()
{ {
DontDestroyOnLoad(this); DontDestroyOnLoad(this);
dateTimeOffset = DateTime.UtcNow; dateTimeOffset = DateTime.UtcNow;
@ -38,8 +38,42 @@ public class DiscordManager : MonoBehaviour
public void SetPresence(string state, string gamemode, string map, string playersInGame, string maxPlayersInGame) public void SetPresence(string state, string gamemode, string map, string playersInGame, string maxPlayersInGame)
{ {
ClearPresence();
switch (state) switch (state)
{ {
default:
var activityBroken = new Discord.Activity
{
Details = "Someone broke something",
Assets =
{
LargeImage = "tttsc_icon",
#if UNITY_EDITOR
SmallImage = "tttsc_icon_unity",
SmallText = "ah, so someone is playing in the editor",
#endif
},
Timestamps =
{
Start = dateTimeOffset.ToUnixTimeSeconds()
}
};
activityManager.UpdateActivity(activityBroken, (res) =>
{
switch (res)
{
case Result.Ok:
Debug.Log("discord activity has been updated");
break;
default:
Debug.LogError("discord activity failed to update");
break;
}
});
break;
case "presence_InMainMenu": case "presence_InMainMenu":
var activityInMainMenu = new Discord.Activity var activityInMainMenu = new Discord.Activity
{ {
@ -156,10 +190,10 @@ public class DiscordManager : MonoBehaviour
} }
// Start is called before the first frame update void OnApplicationQuit()
void Start()
{ {
ClearPresence();
discord.Dispose();
} }
// Update is called once per frame // Update is called once per frame

View file

@ -9,7 +9,7 @@ public class MainMenuManager : MonoBehaviour
private void OnEnable() private void OnEnable()
{ {
gameEventManager = FindObjectOfType<GameEventManager>(); gameEventManager = GetComponent<GameEventManager>();
} }
// Start is called before the first frame update // Start is called before the first frame update

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8255347aa53eb7146b0076aebefdac2e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,172 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
using Mirror;
public class NetworkPresenceUtilities : NetworkBehaviour
{
TTTSC_NetworkManager _networkManager;
GameEventManager _gameEventManager;
[SerializeField]
GameEventDataSet _gameEventDataSet;
private void Start()
{
_networkManager = GetComponent<TTTSC_NetworkManager>();
_gameEventManager = GetComponent<GameEventManager>();
_gameEventDataSet = Instantiate(new GameEventDataSet());
GameEventData _newEntry = new GameEventData();
}
public void CreateDataSet(GameEventDataSet dataSet, string state, string gamemode, string map, string playersInGame, string maxPlayersInGame)
{
Debug.Log("Checing passed data");
for (int data = 1; data < 5; data++)
{
Debug.Log("there is " + data + " to add");
switch (data)
{
case 1:
GameEventData stateEntry = new GameEventData();
stateEntry.valueName = "presence_state";
if (state == null || state == "null")
{
Debug.LogError("no state was passed");
}
else
{
stateEntry.valueType = GameEventData.returnValueTypeEnum.String;
stateEntry.returnString = state;
Debug.Log("suceessfuly recived state " + state);
dataSet.gameEventData.Add(stateEntry);
}
break;
//
case 2:
GameEventData gamemodeEntry = new GameEventData();
gamemodeEntry.valueName = "presence_gamemode";
if (gamemode == null || gamemode == "null")
{
Debug.Log("no gamemode was passed");
}
else
{
gamemodeEntry.valueType = GameEventData.returnValueTypeEnum.String;
gamemodeEntry.returnString = gamemode;
Debug.Log("suceessfuly recived current gamemode " + gamemode);
dataSet.gameEventData.Add(gamemodeEntry);
}
break;
//
case 3:
GameEventData mapEntry = new GameEventData();
mapEntry.valueName = "presence_map";
if (map == null || map == "null")
{
Debug.LogError("no map was passed");
}
else
{
mapEntry.valueType = GameEventData.returnValueTypeEnum.String;
mapEntry.returnString = map;
Debug.Log("suceessfuly recived map " + map);
dataSet.gameEventData.Add(mapEntry);
}
break;
//
case 4:
GameEventData playersInGameEntry = new GameEventData();
playersInGameEntry.valueName = "presence_playersInGame";
if (playersInGame == null || playersInGame == "null")
{
Debug.LogError("no player amout was passed");
}
else
{
playersInGameEntry.valueType = GameEventData.returnValueTypeEnum.String;
playersInGameEntry.returnString = playersInGame;
Debug.Log("suceessfuly recived the current amout of players " + playersInGame);
dataSet.gameEventData.Add(playersInGameEntry);
}
break;
//
case 5:
GameEventData maxPlayersEntry = new GameEventData();
maxPlayersEntry.valueName = "presence_maxPlayersInGame";
if (maxPlayersInGame == null || maxPlayersInGame == "null")
{
Debug.LogError("no state was passed");
}
else
{
maxPlayersEntry.valueType = GameEventData.returnValueTypeEnum.String;
maxPlayersEntry.returnString = maxPlayersInGame;
Debug.Log("suceessfuly recived the max amout of players " + maxPlayersInGame);
dataSet.gameEventData.Add(maxPlayersEntry);
}
break;
}
}
//await Task.WhenAll(task);
Debug.Log("all data has been successfully edited");
}
public void UpdateDataSetValue(GameEventDataSet dataSet, string valueName, string value)
{
Debug.Log("Checing passed data");
for (int data = 0; data < dataSet.gameEventData.Count; data++)
{
var currentData = dataSet.gameEventData[data];
//task[data] = currentData;
Debug.Log("there is " + dataSet.gameEventData.Count + " data set to check");
if (currentData.valueName == valueName)
{
currentData.returnString = value;
Debug.Log("suceessfuly updated " + valueName + " to " + value);
break;
}
}
}
[Client]
public void ClientEnterGame(string gamemode, string map, string playersInGame, string maxPlayersInGame)
{
Debug.Log("Checing passed data");
CreateDataSet(_gameEventDataSet, "presence_InGame", gamemode, map, playersInGame, maxPlayersInGame);
_gameEventManager.TriggerGameEvent("EnterGame");
}
[Client]
public void ClientUpdatePresence(string valueName, string value)
{
UpdateDataSetValue(_gameEventDataSet, valueName, value);
Debug.Log("Asking clients to update player count");
_gameEventManager.TriggerGameEvent("UpdatePlayerCount");
}
[Client]
public void UpdatePresence(string valueName, string value)
{
UpdateDataSetValue(_gameEventDataSet, valueName, value);
Debug.Log("Asking clients to update player count");
_gameEventManager.TriggerGameEvent("UpdatePlayerCount");
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: a77b2fc8580a4eb4d8e781879796473c
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,23 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Mirror;
public class NetworkingUtilities : NetworkBehaviour
{
//public void SpawnAsChild(GameObject prefabToSpawn, NetworkIdentity parentClient, Quaternion rotation, GameObject parrent)
[ContextMenu("Spawn As Child")]
public void SpawnAsChild()
{
// generate a new unique assetId
//System.Guid newAssetId = System.Guid.NewGuid();
//NetworkServer.Spawn(prefabToSpawn, parentClient.connectionToClient);
// get the spawned object
Debug.Log(NetworkServer.spawned.Count);
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 4493fd577a848724f97327338ae295ac
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -1,11 +1,13 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using Mirror;
namespace TTTSC.Player.Character namespace TTTSC.Player.Character
{ {
public class AliveReffrenceHub : MonoBehaviour public class AliveReffrenceHub : MonoBehaviour
{ {
public NetworkIdentity aliveNetworkIdentity;
public Controller.CharacterMovementConfig characterMovementConfig; public Controller.CharacterMovementConfig characterMovementConfig;
public Controller.CharacterStateMachine characterStateMachine; public Controller.CharacterStateMachine characterStateMachine;
public Controller.GroundCheck characterHover; public Controller.GroundCheck characterHover;

View file

@ -73,10 +73,9 @@ namespace TTTSC.Player.Character.Controller.Alive
} }
//Remember to change jumpPower from 0 to some other number that preferably is in the positives and not negatives //Remember to change jumpPower from 0 to some other number that preferably is in the positives and not negatives
private void JumpInput(bool performed, float stageValue) private void JumpInput(bool performed)
{ {
_jumpInputHeld = performed; _jumpInputHeld = performed;
_jumpStageValue = stageValue;
} }
#endregion #endregion

View file

@ -0,0 +1,42 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Cinemachine;
using Mirror;
namespace TTTSC.Player.Character.Controller
{
public class CameraControler : NetworkBehaviour
{
private Transform _cameraTransfrom;
[SerializeField]
private Transform _cameraAnchor;
private GameObject _cinemachineCamera;
private CinemachineVirtualCamera _virtualCamera;
private CinemachineObjectRotator _objectRotator;
// Start is called before the first frame update
void Start()
{
switch (isLocalPlayer)
{
case true:
_cameraTransfrom = GameObject.FindGameObjectWithTag("MainCamera").GetComponent<Transform>();
_cinemachineCamera = GameObject.FindGameObjectWithTag("CinemachineMainCamera");
_virtualCamera = _cinemachineCamera.GetComponent<CinemachineVirtualCamera>();
_objectRotator = _cinemachineCamera.GetComponent<CinemachineObjectRotator>();
_virtualCamera.Follow = _cameraAnchor;
_objectRotator.cameraTransform = _cameraTransfrom;
_objectRotator.horizontalRotationTargets.Add(transform);
break;
case false:
Debug.Log("Not local player");
break;
}
}
}
}

View file

@ -17,9 +17,11 @@ namespace TTTSC.Player.Character.Controller
[Header("Collider standing")] [Header("Collider standing")]
public float standingColliderPosition; public float standingColliderPosition;
public float standingColliderHight; public float standingColliderHight;
public float standingColliderRadius;
[Header("Collider standing")] [Header("Collider standing")]
public float crouchedColliderPosition; public float crouchedColliderPosition;
public float crouchedColliderHight; public float crouchedColliderHight;
public float crouchedColliderRadius;
[Header("Drag")] [Header("Drag")]
public float idleDrag; public float idleDrag;

View file

@ -28,12 +28,12 @@ namespace TTTSC.Player.Character.Controller
_walkIsPerforming = performing; _walkIsPerforming = performing;
} }
private void Crouch(bool performing, float stageValue) private void Crouch(bool performing)
{ {
_crouchIsHeld = performing; _crouchIsHeld = performing;
} }
private void Sprint(bool held, float stageValue) private void Sprint(bool held)
{ {
_sprintIsPerforming = held; _sprintIsPerforming = held;
} }

View file

@ -10,7 +10,7 @@ namespace TTTSC.Player.Character.Controller
private PlayerGhostReffrenceHub _aliveReffrenceHub; private PlayerGhostReffrenceHub _aliveReffrenceHub;
[SerializeField] [SerializeField]
private CapsuleCollider _characterEnviormentCollider; private Transform _characterEnviormentCollider;
private CharacterMovementConfig _characterMovementConfig; private CharacterMovementConfig _characterMovementConfig;
private GroundCheck _characterHover; private GroundCheck _characterHover;
private CharacterStateMachine _characterStateMachine; private CharacterStateMachine _characterStateMachine;
@ -43,16 +43,16 @@ namespace TTTSC.Player.Character.Controller
{ {
_characterHover.currentHoverHight = _characterMovementConfig.crouchHeight; _characterHover.currentHoverHight = _characterMovementConfig.crouchHeight;
_characterEnviormentCollider.height = _characterMovementConfig.crouchedColliderHight; _characterEnviormentCollider.localScale = new Vector3(_characterMovementConfig.crouchedColliderRadius, _characterMovementConfig.crouchedColliderHight, _characterMovementConfig.crouchedColliderRadius);
_characterEnviormentCollider.center = _characterMovementConfig.crouchedColliderPosition * transform.up; _characterEnviormentCollider.localPosition = _characterMovementConfig.crouchedColliderPosition * transform.up;
} }
private void CharacterDefault() private void CharacterDefault()
{ {
_characterHover.currentHoverHight = _characterMovementConfig.desieredHoverHight; _characterHover.currentHoverHight = _characterMovementConfig.desieredHoverHight;
_characterEnviormentCollider.height = _characterMovementConfig.standingColliderHight; _characterEnviormentCollider.localScale = new Vector3(_characterMovementConfig.standingColliderRadius, _characterMovementConfig.standingColliderHight, _characterMovementConfig.standingColliderRadius);
_characterEnviormentCollider.center = _characterMovementConfig.standingColliderPosition * transform.up; _characterEnviormentCollider.localPosition = _characterMovementConfig.standingColliderPosition * transform.up;
} }
} }

View file

@ -50,9 +50,12 @@ namespace TTTSC.Player.Character.Controller
_virtualCamera.LookAt.rotation = Quaternion.Euler(_virtualCamera.LookAt.up * rotationX); _virtualCamera.LookAt.rotation = Quaternion.Euler(_virtualCamera.LookAt.up * rotationX);
break; break;
case TargetRotationModes.rotateSpecificTargets: case TargetRotationModes.rotateSpecificTargets:
foreach (Transform target in horizontalRotationTargets) if (horizontalRotationTargets.Count > 0)
{ {
target.rotation = Quaternion.Euler(transform.up * rotationX); for (int i = 0; i < horizontalRotationTargets.Count; i++)
{
horizontalRotationTargets[i].rotation = Quaternion.Euler(horizontalRotationTargets[i].up * rotationX);
}
} }
break; break;
} }

View file

@ -1,40 +1,44 @@
using System; using System;
using UnityEngine; using UnityEngine;
using UnityEngine.InputSystem; using UnityEngine.InputSystem;
using Mirror;
namespace TTTSC.Player.Character.Controller namespace TTTSC.Player.Character.Controller
{ {
public class PlayerInputReceiver : MonoBehaviour public class PlayerInputReceiver : NetworkBehaviour
{ {
private NetworkIdentity _networkIdentity;
private float _lookX, _lookY; private float _lookX, _lookY;
bool _sprintIsHeld, _crouchIsHeld, _jumpIsHeld; bool _sprintIsHeld, _crouchIsHeld, _jumpIsHeld;
float _sprintStageValue, _crouchStageValue, _jumpStageValue;
public event Action<Vector2, bool> MoveInputEvent, LookInputEvent; public event Action<Vector2, bool> MoveInputEvent, LookInputEvent;
public event Action<bool, float> SprintInputEvent, CrouchInputEvent, JumpInputEvent; public event Action<bool> SprintInputEvent, CrouchInputEvent, JumpInputEvent;
#region SpectatorControls #region SpectatorControls
public event Action<Vector2, bool> SpectatorScrollSpeedInputEvent; public event Action<Vector2, bool> SpectatorScrollSpeedInputEvent;
public event Action<bool, float> SpectatorSpeedUpInputEvent, SpectatorSlowDownEvent, FlyUpInputEvent, FlyDownInputEvent; public event Action<bool> SpectatorFlyFastInputEvent, SpectatorFlySlowInputEvent, SpectatorFlyUpInputEvent, SpectatorFlyDownInputEvent;
bool _spectatorSpeedUpIsHeld, _spectatorSlowDownIsHeld, _flyUpIsHeld, _flyDownIsHeld; bool _spectatorSpeedUpIsHeld, _spectatorSlowDownIsHeld, _flyUpIsHeld, _flyDownIsHeld;
float _spectatorFlyFastStageValue, _spectatorFlySlowStageValue, _flyUpStageValue, _flyDownStageValue;
#endregion #endregion
public PlayerInputSender playerInputEvents; public PlayerInputSender playerInputEvents;
private void OnEnable() private void Awake()
{ {
playerInputEvents = new PlayerInputSender(); playerInputEvents = new PlayerInputSender();
playerInputEvents.Enable(); playerInputEvents.Enable();
_networkIdentity = GetComponent<NetworkIdentity>();
// //
#region GlobalControls #region GlobalControls
playerInputEvents.GlobalControls.LookX.performed += LookXInputReceiver; playerInputEvents.GlobalControls.LookX.performed += LookXInputReceiver;
playerInputEvents.GlobalControls.LookY.performed += LookYInputReceiver; playerInputEvents.GlobalControls.LookY.started += LookYInputReceiver;
playerInputEvents.GlobalControls.Move.performed += WalkInputReceiver; playerInputEvents.GlobalControls.Move.started += WalkInputReceiver;
#endregion #endregion
@ -42,9 +46,8 @@ namespace TTTSC.Player.Character.Controller
// //
#region AliveControls #region AliveControls
playerInputEvents.AliveControls.Sprint.started += SprintInputReceiver;
playerInputEvents.AliveControls.Sprint.performed += SprintInputReceiver; playerInputEvents.AliveControls.Jump.started += JumpInputReceiver;
playerInputEvents.AliveControls.Jump.performed += JumpInputReceiver;
playerInputEvents.AliveControls.Crouch.performed += CrouchInputReceiver; playerInputEvents.AliveControls.Crouch.performed += CrouchInputReceiver;
#endregion #endregion
@ -53,10 +56,10 @@ namespace TTTSC.Player.Character.Controller
// //
#region SpectatorControls #region SpectatorControls
playerInputEvents.SpectatorControls.FlyFast.performed += SpectatorFlyFast; playerInputEvents.SpectatorControls.FlyFast.started += SpectatorFlyFastInputReceiver;
playerInputEvents.SpectatorControls.FlySlow.performed += SpectatorFlySlow; playerInputEvents.SpectatorControls.FlySlow.started += SpectatorFlySlowInputReceiver;
playerInputEvents.SpectatorControls.FlyUp.performed += SpectatorFlyUp; playerInputEvents.SpectatorControls.FlyUp.started += SpectatorFlyUpInputReceiver;
playerInputEvents.SpectatorControls.FlyDown.performed += SpectatorFlyDown; playerInputEvents.SpectatorControls.FlyDown.performed += SpectatorFlyDownInputReceiver;
#endregion #endregion
} }
@ -69,8 +72,8 @@ namespace TTTSC.Player.Character.Controller
#region GlobalControls #region GlobalControls
playerInputEvents.GlobalControls.LookX.performed -= LookXInputReceiver; playerInputEvents.GlobalControls.LookX.performed -= LookXInputReceiver;
playerInputEvents.GlobalControls.LookY.performed -= LookYInputReceiver; playerInputEvents.GlobalControls.LookY.started -= LookYInputReceiver;
playerInputEvents.GlobalControls.Move.performed -= WalkInputReceiver; playerInputEvents.GlobalControls.Move.started -= WalkInputReceiver;
#endregion #endregion
@ -78,8 +81,9 @@ namespace TTTSC.Player.Character.Controller
// //
#region AliveControls #region AliveControls
playerInputEvents.AliveControls.Sprint.performed -= SprintInputReceiver;
playerInputEvents.AliveControls.Jump.performed -= JumpInputReceiver; playerInputEvents.AliveControls.Sprint.started -= SprintInputReceiver;
playerInputEvents.AliveControls.Jump.started -= JumpInputReceiver;
playerInputEvents.AliveControls.Crouch.performed -= CrouchInputReceiver; playerInputEvents.AliveControls.Crouch.performed -= CrouchInputReceiver;
#endregion #endregion
@ -88,10 +92,10 @@ namespace TTTSC.Player.Character.Controller
// //
#region SpectatorControls #region SpectatorControls
playerInputEvents.SpectatorControls.FlyFast.performed -= SpectatorFlyFast; playerInputEvents.SpectatorControls.FlyFast.started -= SpectatorFlyFastInputReceiver;
playerInputEvents.SpectatorControls.FlySlow.performed -= SpectatorFlySlow; playerInputEvents.SpectatorControls.FlySlow.started -= SpectatorFlySlowInputReceiver;;
playerInputEvents.SpectatorControls.FlyUp.performed -= SpectatorFlyUp; playerInputEvents.SpectatorControls.FlyUp.started -= SpectatorFlyUpInputReceiver;
playerInputEvents.SpectatorControls.FlyDown.performed -= SpectatorFlyDown; playerInputEvents.SpectatorControls.FlyDown.performed -= SpectatorFlyDownInputReceiver;
#endregion #endregion
} }
@ -181,92 +185,53 @@ namespace TTTSC.Player.Character.Controller
} }
#endregion #endregion
private void FixedUpdate()
{
//
#region AliveControls
playerInputEvents.AliveControls.Sprint.started += ctx => _sprintStageValue = 1;
playerInputEvents.AliveControls.Sprint.performed += ctx => _sprintStageValue = 2;
playerInputEvents.AliveControls.Sprint.canceled += ctx => _sprintStageValue = 0;
SprintInputEvent?.Invoke(_sprintIsHeld, _sprintStageValue);
playerInputEvents.AliveControls.Crouch.started += ctx => _crouchStageValue = 1;
playerInputEvents.AliveControls.Crouch.performed += ctx => _crouchStageValue = 2;
playerInputEvents.AliveControls.Crouch.canceled += ctx => _crouchStageValue = 0;
CrouchInputEvent?.Invoke(_crouchIsHeld, _crouchStageValue);
playerInputEvents.AliveControls.Jump.started += ctx => _jumpStageValue = 1;
playerInputEvents.AliveControls.Jump.performed += ctx => _jumpStageValue = 2;
playerInputEvents.AliveControls.Jump.canceled += ctx => _jumpStageValue = 0;
JumpInputEvent?.Invoke(_jumpIsHeld, _jumpStageValue);
#endregion
//
#region SpectatorControls
playerInputEvents.SpectatorControls.FlyFast.started += ctx => _spectatorFlyFastStageValue = 1;
playerInputEvents.SpectatorControls.FlyFast.performed += ctx => _spectatorFlyFastStageValue = 2;
playerInputEvents.SpectatorControls.FlyFast.canceled += ctx => _spectatorFlyFastStageValue = 0;
SpectatorSpeedUpInputEvent?.Invoke(_spectatorSpeedUpIsHeld, _spectatorFlyFastStageValue);
playerInputEvents.SpectatorControls.FlySlow.started += ctx => _spectatorFlySlowStageValue = 1;
playerInputEvents.SpectatorControls.FlySlow.performed += ctx => _spectatorFlySlowStageValue = 2;
playerInputEvents.SpectatorControls.FlySlow.canceled += ctx => _spectatorFlySlowStageValue = 0;
SpectatorSlowDownEvent?.Invoke(_spectatorSlowDownIsHeld, _spectatorFlySlowStageValue);
playerInputEvents.SpectatorControls.FlyUp.started += ctx => _flyUpStageValue = 1;
playerInputEvents.SpectatorControls.FlyUp.performed += ctx => _flyUpStageValue = 2;
playerInputEvents.SpectatorControls.FlyUp.canceled += ctx => _flyUpStageValue = 0;
FlyUpInputEvent?.Invoke(_flyUpIsHeld, _flyUpStageValue);
playerInputEvents.SpectatorControls.FlyDown.started += ctx => _flyDownStageValue = 1;
playerInputEvents.SpectatorControls.FlyDown.performed += ctx => _flyDownStageValue = 2;
playerInputEvents.SpectatorControls.FlyDown.canceled += ctx => _flyDownStageValue = 0;
FlyDownInputEvent?.Invoke(_flyDownIsHeld, _flyDownStageValue);
#endregion
}
#region GlobalControls #region GlobalControls
[Client]
private void LookXInputReceiver(InputAction.CallbackContext ctx) private void LookXInputReceiver(InputAction.CallbackContext ctx)
{ {
var value = ctx.ReadValue<float>(); var value = ctx.ReadValue<float>();
_lookX = value; _lookX = value;
Look(FloatBool(value, "!=", 0)); LookPerformed(FloatBool(value, "!=", 0));
} }
[Client]
private void LookYInputReceiver(InputAction.CallbackContext ctx) private void LookYInputReceiver(InputAction.CallbackContext ctx)
{ {
float value = ctx.ReadValue<float>(); float value = ctx.ReadValue<float>();
_lookY = value; _lookY = value;
Look(FloatBool(value, "!=", 0)); LookPerformed(FloatBool(value, "!=", 0));
} }
private void Look(bool performing) [Client]
private void LookPerformed(bool performing)
{
if (isLocalPlayer)
{ {
var look = new Vector2(_lookX, _lookY); var look = new Vector2(_lookX, _lookY);
LookInputEvent?.Invoke(look, performing); LookInputEvent?.Invoke(look, performing);
} }
}
[Client]
private void WalkInputReceiver(InputAction.CallbackContext ctx) private void WalkInputReceiver(InputAction.CallbackContext ctx)
{ {
var value = ctx.ReadValue<Vector2>(); var value = ctx.ReadValue<Vector2>();
bool performing = !(value == new Vector2(0, 0)); bool performing = !(value == new Vector2(0, 0));
CmdWalkInputReceiver(value, performing);
}
[Command]
private void CmdWalkInputReceiver(Vector2 value, bool performing)
{
MoveInputEvent?.Invoke(value, performing); MoveInputEvent?.Invoke(value, performing);
} }
@ -275,64 +240,153 @@ namespace TTTSC.Player.Character.Controller
#region AliveControls #region AliveControls
#region SprintInputReciver
[Client]
private void SprintInputReceiver(InputAction.CallbackContext ctx) private void SprintInputReceiver(InputAction.CallbackContext ctx)
{ {
float value = ctx.ReadValue<float>(); float value = ctx.ReadValue<float>();
_sprintIsHeld = FloatBool(value, "==", 1); if (isLocalPlayer)
{
CmdSprintInput(FloatBool(value, "==", 1));
}
} }
[Command]
private void CmdSprintInput(bool performed)
{
SprintInputEvent?.Invoke(performed);
}
#endregion
#region CrouchInputReciver
[Client]
private void CrouchInputReceiver(InputAction.CallbackContext ctx) private void CrouchInputReceiver(InputAction.CallbackContext ctx)
{ {
float value = ctx.ReadValue<float>(); float value = ctx.ReadValue<float>();
_crouchIsHeld = FloatBool(value, "==", 1); Debug.Log("CrouchInputReceiver: " + value);
if (isLocalPlayer)
{
Debug.Log("Sending crouch input to server");
CmdCrouchInput(FloatBool(value, "==", 1));
}
} }
[Command]
private void CmdCrouchInput(bool performed)
{
Debug.Log("Crouch input received on server from" + _networkIdentity.netId);
CrouchInputEvent?.Invoke(performed);
}
#endregion
#region JumpInputReciver
[Client]
private void JumpInputReceiver(InputAction.CallbackContext ctx) private void JumpInputReceiver(InputAction.CallbackContext ctx)
{ {
float value = ctx.ReadValue<float>(); float value = ctx.ReadValue<float>();
_jumpIsHeld = FloatBool(value, "==", 1); _jumpIsHeld = FloatBool(value, "==", 1);
if (isLocalPlayer)
{
CmdJumpInput(FloatBool(value, "==", 1));
} }
}
[Command]
private void CmdJumpInput(bool performed)
{
JumpInputEvent?.Invoke(performed);
}
#endregion
#endregion #endregion
#region SpectatorControls #region SpectatorControls
private void SpectatorFlyFast(InputAction.CallbackContext ctx)
#region SpectatorSpeedUp
[Client]
private void SpectatorFlyFastInputReceiver(InputAction.CallbackContext ctx)
{ {
float value = ctx.ReadValue<float>(); float value = ctx.ReadValue<float>();
_spectatorSpeedUpIsHeld = FloatBool(value, "==", 1); if (isLocalPlayer)
{
CmdSpectatorFlyFast(FloatBool(value, "==", 1));
}
} }
private void SpectatorFlySlow(InputAction.CallbackContext ctx) [Command]
private void CmdSpectatorFlyFast(bool performed)
{
SpectatorFlyFastInputEvent?.Invoke(performed);
}
#endregion
#region SpectatorFlySlow
private void SpectatorFlySlowInputReceiver(InputAction.CallbackContext ctx)
{ {
float value = ctx.ReadValue<float>(); float value = ctx.ReadValue<float>();
_spectatorSlowDownIsHeld = FloatBool(value, "==", 1); CmdSpectatorFlySlow(FloatBool(value, "==", 1));
} }
private void SpectatorFlyUp(InputAction.CallbackContext ctx) [Command]
private void CmdSpectatorFlySlow(bool performed)
{
SpectatorFlySlowInputEvent?.Invoke(performed);
}
#endregion
#region SpectatorFlyUp
[Client]
private void SpectatorFlyUpInputReceiver(InputAction.CallbackContext ctx)
{ {
float value = ctx.ReadValue<float>(); float value = ctx.ReadValue<float>();
_flyUpIsHeld = FloatBool(value, "==", 1); CmdSpectatorFlyUp(FloatBool(value, "==", 1));
} }
private void SpectatorFlyDown(InputAction.CallbackContext ctx) [Command]
private void CmdSpectatorFlyUp(bool performed)
{
SpectatorFlyUpInputEvent?.Invoke(performed);
}
#endregion
#region SpectatorFlyDown
private void SpectatorFlyDownInputReceiver(InputAction.CallbackContext ctx)
{ {
float value = ctx.ReadValue<float>(); float value = ctx.ReadValue<float>();
_flyDownIsHeld = FloatBool(value, "==", 1); CmdSpectatorFlyDown(FloatBool(value, "==", 1));
} }
private void CmdSpectatorFlyDown(bool performed)
{
SpectatorFlyDownInputEvent?.Invoke(performed);
}
#endregion
#endregion #endregion
} }
} }

View file

@ -25,26 +25,26 @@ namespace TTTSC.Player.Character.Controller
private void Start() private void Start()
{ {
_playerGhostReffrenceHub = GetComponentInParent<PlayerGhostReffrenceHub>(); _playerGhostReffrenceHub = GetComponentInParent<PlayerGhostReffrenceHub>();
_cameraTransform = _playerGhostReffrenceHub.cameraTransform; _cameraTransform = Camera.main.transform;
_characterRigidbody = _playerGhostReffrenceHub.characterRigidbody; _characterRigidbody = _playerGhostReffrenceHub.characterRigidbody;
_playerInputReceiver = _playerGhostReffrenceHub.playerInputReceiver; _playerInputReceiver = _playerGhostReffrenceHub.playerInputReceiver;
_playerInputReceiver.MoveInputEvent += MoveInput; _playerInputReceiver.MoveInputEvent += MoveInput;
_playerInputReceiver.FlyUpInputEvent += FlyUpInput; _playerInputReceiver.SpectatorFlyUpInputEvent += FlyUpInput;
_playerInputReceiver.FlyDownInputEvent += FlyDownInput; _playerInputReceiver.SpectatorFlyDownInputEvent += FlyDownInput;
} }
private void OnDisable() private void OnDisable()
{ {
_playerInputReceiver.MoveInputEvent -= MoveInput; _playerInputReceiver.MoveInputEvent -= MoveInput;
_playerInputReceiver.FlyUpInputEvent -= FlyUpInput; _playerInputReceiver.SpectatorFlyUpInputEvent -= FlyUpInput;
_playerInputReceiver.FlyDownInputEvent -= FlyDownInput; _playerInputReceiver.SpectatorFlyDownInputEvent -= FlyDownInput;
} }
private void OnDestroy() private void OnDestroy()
{ {
_playerInputReceiver.MoveInputEvent -= MoveInput; _playerInputReceiver.MoveInputEvent -= MoveInput;
_playerInputReceiver.FlyUpInputEvent -= FlyUpInput; _playerInputReceiver.SpectatorFlyUpInputEvent -= FlyUpInput;
_playerInputReceiver.FlyDownInputEvent -= FlyDownInput; _playerInputReceiver.SpectatorFlyDownInputEvent -= FlyDownInput;
} }
// Update is called once per frame // Update is called once per frame
@ -72,12 +72,12 @@ namespace TTTSC.Player.Character.Controller
_moveDirection = new Vector2(moveDirection.x, moveDirection.y); _moveDirection = new Vector2(moveDirection.x, moveDirection.y);
} }
private void FlyUpInput(bool performing, float stageValue) private void FlyUpInput(bool performing)
{ {
_performingFlyUp = performing; _performingFlyUp = performing;
} }
private void FlyDownInput(bool performing, float stageValue) private void FlyDownInput(bool performing)
{ {
_performingFlyDown = performing; _performingFlyDown = performing;
} }

View file

@ -58,7 +58,6 @@ namespace TTTSC.Player.Character
if (_aliveBody == null) if (_aliveBody == null)
{ {
_aliveBody = Instantiate(_aliveBodyPrefab, transform.position, transform.rotation, transform); _aliveBody = Instantiate(_aliveBodyPrefab, transform.position, transform.rotation, transform);
//_aliveBody.transform.SetParent(transform);
} }
} }
@ -73,8 +72,7 @@ namespace TTTSC.Player.Character
if (_spectatorBody == null) if (_spectatorBody == null)
{ {
_spectatorBody = Instantiate(_spectatorBodyPrefab, transform.position, transform.rotation); _spectatorBody = Instantiate(_spectatorBodyPrefab, transform.position, transform.rotation, transform);
_spectatorBody.transform.SetParent(transform);
} }
} }

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5967ce01e802b5d42b86211ba2e9fde9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,18 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class NetworkCharacterHover : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 056c12f3d440f8546b9ac56f7a99ddc5
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,18 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class NetworkCharacterMover : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 46a49060ecbe7a24d94402a041be9c9a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,146 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using TTTSC.Player.Character.Controller;
using TTTSC.Player.Character;
using Mirror;
namespace TTTSC.Player.NetworkedCharacter
{
public class NetworkCharacterStateChanger : NetworkBehaviour
{
private PlayerGhostReffrenceHub _playerGhostReffrenceHub;
private PlayerInputReceiver _playerInputReceiver;
private NetworkCharacterStateMachine _networkCharacterStateMachine;
private bool _walkIsPerforming, _crouchIsHeld, _sprintIsPerforming;
private void Start()
{
_playerGhostReffrenceHub = GetComponentInParent<PlayerGhostReffrenceHub>();
_playerInputReceiver = _playerGhostReffrenceHub.playerInputReceiver;
_networkCharacterStateMachine = GetComponent<NetworkCharacterStateMachine>();
_playerInputReceiver.MoveInputEvent += Walk;
_playerInputReceiver.CrouchInputEvent += Crouch;
_playerInputReceiver.SprintInputEvent += Sprint;
Debug.Log(isLocalPlayer);
}
#region input
private void Walk(Vector2 direction, bool performing)
{
if (isLocalPlayer)
{
_walkIsPerforming = performing;
}
}
private void Crouch(bool performing)
{
if (isLocalPlayer)
{
Debug.Log("Crouch event triggered with status " + performing);
_crouchIsHeld = performing;
}
}
private void Sprint(bool held)
{
if (isLocalPlayer)
{
Debug.Log("Sprint event triggered with status " + held);
_sprintIsPerforming = held;
}
}
#endregion
private void Update()
{
//Debug.Log("Local player is updating");
if (!isLocalPlayer)
{
Debug.LogError("This is not the local player");
return;
}
if (_crouchIsHeld && !_sprintIsPerforming)
{
Debug.Log("asking server to crouch");
CmdCrouch();
}
if (_walkIsPerforming && !_crouchIsHeld && !_sprintIsPerforming)
{
CmdWalk();
}
if (_sprintIsPerforming && !_crouchIsHeld && _walkIsPerforming)
{
CmdSprint();
}
if (!_walkIsPerforming && !_crouchIsHeld && !_sprintIsPerforming)
{
CmdIdle();
}
}
#region client
[Command]
void CmdCrouch()
{
Debug.Log("asking clients to crouch");
RpcCrouch();
}
[Command]
void CmdWalk()
{
RpcWalk();
}
[Command]
void CmdSprint()
{
RpcSprint();
}
[Command]
void CmdIdle()
{
RpcIdle();
}
#endregion
#region server
[ClientRpc]
void RpcCrouch()
{
Debug.Log("crouching");
_networkCharacterStateMachine.movementState = NetworkCharacterStateMachine.MovementStates.Crouching;
}
[ClientRpc]
void RpcWalk()
{
_networkCharacterStateMachine.movementState = NetworkCharacterStateMachine.MovementStates.Walking;
}
[ClientRpc]
void RpcSprint()
{
_networkCharacterStateMachine.movementState = NetworkCharacterStateMachine.MovementStates.Sprinting;
}
[ClientRpc]
void RpcIdle()
{
_networkCharacterStateMachine.movementState = NetworkCharacterStateMachine.MovementStates.Idle;
}
#endregion
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: ece0bc79b10211544962d17c6381cf1c
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,18 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class NetworkCharacterStateEnforcer : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 513aa684d5e83a142bc0c9d18053daaf
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,65 @@
using UnityEngine;
using Mirror;
namespace TTTSC.Player.NetworkedCharacter
{
public class NetworkCharacterStateMachine : NetworkBehaviour
{
public CharacterStates characterState;
[SyncVar(hook = nameof(HandleMovementStateChange))]
public MovementStates movementState;
public bool ceilingDetected;
public bool eligibleForStep;
[Header("Ladder bools")]
public bool onLadder;
public bool topOnLadder;
public bool bottomOnLadder;
public bool enteredLadderFromBottom;
public bool enteredLadderFromTop;
[HideInInspector]
public Transform topLadder;
[HideInInspector]
public Transform bottomLadder;
//Grounded and InAir is currently set by CharacterHover script
public enum CharacterStates
{
Grounded,
InAir,
InWater
}
public enum MovementStates
{
Idle,
Walking,
Crouching,
Sprinting
}
public enum ActionState
{
InCar,
InBoat,
InProp
}
[Command]
private void HandleMovementStateChange(MovementStates oldMovementState, MovementStates newMovementState)
{
RpcSetMovementState(newMovementState);
}
[ClientRpc]
private void RpcSetMovementState(MovementStates newMovementState)
{
movementState = newMovementState;
}
private void HandleCharacterStateChange(CharacterStates oldCharacterState, CharacterStates newCharacterState)
{
}
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: a5cc54e44c2fd3747a35f1e5089efab9
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,95 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using TTTSC.Player.Character;
using TTTSC.Player.Character.PlayerCharacterInfo;
using Mirror;
namespace TTTSC.Player.NetworkedCharacter
{
public class NetworkPlayerStateEnforcer : NetworkBehaviour
{
[SerializeField]
private PlayerGhostReffrenceHub _playerGhostReffrenceHub;
[SerializeField]
private PlayerCharacterInfoData _playerInfoData;
private Rigidbody _characterRigidbody;
[SerializeField]
[Tooltip("assign the 'alive' prefab here")]
private GameObject _aliveBodyPrefab;
[SerializeField]
[Tooltip("assign the 'dead' prefab here")]
private GameObject _spectatorBodyPrefab;
private GameObject _aliveBody;
private GameObject _spectatorBody;
private void Start()
{
_playerInfoData = _playerGhostReffrenceHub.playerInfoData;
_characterRigidbody = _playerGhostReffrenceHub.characterRigidbody;
CheckPlayerState();
}
private void Update()
{
CheckPlayerState();
}
public void CheckPlayerState()
{
switch (_playerInfoData.currentPlayerPlayState)
{
case PlayerCharacterInfoData.playerPlayStates.Spectator:
SpawnSpectatorPlayerBody();
_characterRigidbody.useGravity = false;
break;
case PlayerCharacterInfoData.playerPlayStates.Alive:
SpawnAlivePlayerBody();
_characterRigidbody.useGravity = true;
break;
}
}
[ClientRpc]
public void SpawnAlivePlayerBody()
{
_playerInfoData.helth = 100;
if (_spectatorBody != null)
{
Destroy(_spectatorBody);
Debug.Log("destroyed spectator body");
}
if (_aliveBody == null)
{
_aliveBody = Instantiate(_aliveBodyPrefab, transform.position, transform.rotation, transform);
}
}
[ClientRpc]
public void SpawnSpectatorPlayerBody()
{
if (_aliveBody != null)
{
Destroy(_aliveBody);
Debug.Log("destroyed alive body");
SpawnDeadBody();
}
if (_spectatorBody == null)
{
if (isServer)
{
_spectatorBody = Instantiate(_spectatorBodyPrefab, transform.position, transform.rotation, transform);
}
}
}
void SpawnDeadBody()
{
//Add logic for spawning ragdoll and the dead body
}
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 2b9bd3cdb37f0f14e8da51bb08989060
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -6,6 +6,7 @@ using System.Threading.Tasks;
using Steamworks; using Steamworks;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
using UnityEngine.SceneManagement;
public class Steam_Login : MonoBehaviour public class Steam_Login : MonoBehaviour
{ {
@ -56,7 +57,10 @@ public class Steam_Login : MonoBehaviour
userInfo.profilePicture = test.texture; userInfo.profilePicture = test.texture;
StartCoroutine("CreateEOSManager"); SceneManager.LoadScene("MainMenu");
//StartCoroutine("CreateEOSManager");
} }
public Texture2D AvatarToTexture2D(Steamworks.Data.Image image) public Texture2D AvatarToTexture2D(Steamworks.Data.Image image)

View file

@ -0,0 +1,41 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Mirror;
public class TTTSC_NetworkManager : NetworkManager
{
[SerializeField]
NetworkPresenceUtilities _networkPresenceUtilities;
public override void OnClientConnect(NetworkConnection conn)
{
base.OnClientConnect(conn);
Debug.Log("Client connected to server");
_networkPresenceUtilities.ClientEnterGame("Classic", networkSceneName, numPlayers.ToString(), "16");
}
public override void OnServerAddPlayer(NetworkConnection conn)
{
base.OnServerAddPlayer(conn);
//update player count
_networkPresenceUtilities.UpdatePresence("presence_playersInGame", numPlayers.ToString());
Debug.Log("ther is " + numPlayers + " players in game");
}
public override void OnServerDisconnect(NetworkConnection conn)
{
base.OnServerDisconnect(conn);
//update player count
_networkPresenceUtilities.UpdatePresence("presence_playersInGame", numPlayers.ToString());
Debug.Log("Server disconnected");
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 5e29de0042841a2409741a96a4b6c818
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -1,5 +1,8 @@
{ {
"dependencies": { "dependencies": {
"com.adrenak.airpeer": "1.2.0",
"com.adrenak.unimic": "1.0.3",
"com.adrenak.univoice": "1.1.4",
"com.domybest.mybox": "https://github.com/Deadcows/MyBox.git", "com.domybest.mybox": "https://github.com/Deadcows/MyBox.git",
"com.unity.cinemachine": "2.8.4", "com.unity.cinemachine": "2.8.4",
"com.unity.ide.rider": "3.0.14", "com.unity.ide.rider": "3.0.14",
@ -13,6 +16,8 @@
"com.unity.ugui": "1.0.0", "com.unity.ugui": "1.0.0",
"com.unity.visualeffectgraph": "12.1.6", "com.unity.visualeffectgraph": "12.1.6",
"com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync", "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync",
"com.wooshii.hierarchydecorator": "0.8.6",
"dev.chsxf.autoscene": "1.2.2",
"com.unity.modules.ai": "1.0.0", "com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0", "com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0", "com.unity.modules.animation": "1.0.0",
@ -43,12 +48,7 @@
"com.unity.modules.video": "1.0.0", "com.unity.modules.video": "1.0.0",
"com.unity.modules.vr": "1.0.0", "com.unity.modules.vr": "1.0.0",
"com.unity.modules.wind": "1.0.0", "com.unity.modules.wind": "1.0.0",
"com.unity.modules.xr": "1.0.0", "com.unity.modules.xr": "1.0.0"
"com.adrenak.airpeer": "1.2.0",
"com.adrenak.unimic": "1.0.3",
"com.adrenak.univoice": "1.1.4",
"com.wooshii.hierarchydecorator": "0.8.6",
"dev.chsxf.autoscene": "1.2.2"
}, },
"scopedRegistries": [ "scopedRegistries": [
{ {
@ -58,8 +58,10 @@
"com.adrenak.airpeer", "com.adrenak.airpeer",
"com.adrenak.unimic", "com.adrenak.unimic",
"com.adrenak.univoice", "com.adrenak.univoice",
"com.charcolle.unityeditormemo",
"com.openupm", "com.openupm",
"com.wooshii.hierarchydecorator", "com.wooshii.hierarchydecorator",
"com.yasirkula.ingamedebugconsole",
"dev.chsxf.autoscene" "dev.chsxf.autoscene"
] ]
} }

View file

@ -32,8 +32,10 @@ MonoBehaviour:
- com.adrenak.airpeer - com.adrenak.airpeer
- com.adrenak.unimic - com.adrenak.unimic
- com.adrenak.univoice - com.adrenak.univoice
- com.charcolle.unityeditormemo
- com.openupm - com.openupm
- com.wooshii.hierarchydecorator - com.wooshii.hierarchydecorator
- com.yasirkula.ingamedebugconsole
- dev.chsxf.autoscene - dev.chsxf.autoscene
m_IsDefault: 0 m_IsDefault: 0
m_Capabilities: 0 m_Capabilities: 0

View file

@ -1,2 +1,2 @@
m_EditorVersion: 2021.3.1f1 m_EditorVersion: 2021.3.3f1
m_EditorVersionWithRevision: 2021.3.1f1 (3b70a0754835) m_EditorVersionWithRevision: 2021.3.3f1 (af2e63e8f9bd)