Death is here

This commit is contained in:
Sewmina
2022-06-26 03:03:24 +05:30
parent a18c7028c4
commit 253710d137
135 changed files with 1208 additions and 269 deletions

View File

@@ -1,6 +1,7 @@
/Library/* /Library/**
/Temp/* /Temp/**
/Temp /Temp/
/ProjectSettings/ProjectVersion.txt
**.log **.log
**.sln **.sln
**.csproj **.csproj

View File

@@ -129,6 +129,85 @@ TrailRenderer:
m_MinVertexDistance: 1 m_MinVertexDistance: 1
m_Autodestruct: 0 m_Autodestruct: 0
m_Emitting: 1 m_Emitting: 1
--- !u!1 &1381099729569166942
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6790134988799929600}
- component: {fileID: 3892614620523651463}
- component: {fileID: 1318931860792545326}
m_Layer: 5
m_Name: Username
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6790134988799929600
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1381099729569166942}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3767104678148148169}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.000024795532, y: 0.00002503395}
m_SizeDelta: {x: -0.000049591, y: 0.000050068}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3892614620523651463
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1381099729569166942}
m_CullTransparentMesh: 1
--- !u!114 &1318931860792545326
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1381099729569166942}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: ea4910b9ff2a74dd0b4550a216ba0821, type: 3}
m_FontSize: 2
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 0
m_MaxSize: 2
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Username
--- !u!1 &5431987895376475548 --- !u!1 &5431987895376475548
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -163,6 +242,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 5431987895404559666} - {fileID: 5431987895404559666}
- {fileID: 3767104678148148169}
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}
@@ -248,6 +328,9 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
syncMode: 0 syncMode: 0
syncInterval: 0.1 syncInterval: 0.1
pname:
Scores: 0
pnameTxt: {fileID: 1318931860792545326}
body: {fileID: 5431987895376475546} body: {fileID: 5431987895376475546}
trailMgr: {fileID: 5995183602835295541} trailMgr: {fileID: 5995183602835295541}
movingSpeed: 0.1 movingSpeed: 0.1
@@ -271,6 +354,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f3fd3790e46aca946913301ba3099ba0, type: 3} m_Script: {fileID: 11500000, guid: f3fd3790e46aca946913301ba3099ba0, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
controller: {fileID: 2701406673750748793}
trail: {fileID: 1146104764719429896} trail: {fileID: 1146104764719429896}
positions: [] positions: []
trailPoolParent: {fileID: 8130040756198270646} trailPoolParent: {fileID: 8130040756198270646}
@@ -292,7 +376,10 @@ MonoBehaviour:
syncInterval: 0.1 syncInterval: 0.1
trail: {fileID: 1146104764719429896} trail: {fileID: 1146104764719429896}
line: {fileID: 8349033136630816928} line: {fileID: 8349033136630816928}
DetourError: {x: 0, y: 1.3, z: 0} enableValidation: 1
maxDetourPoints: 1
DetourThreshold: 1
Detours: 0
positions: [] positions: []
--- !u!61 &-4779029823867914901 --- !u!61 &-4779029823867914901
BoxCollider2D: BoxCollider2D:
@@ -577,7 +664,7 @@ LineRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 2 m_SortingOrder: -1
m_Positions: m_Positions:
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 1} - {x: 0, y: 0, z: 1}
@@ -636,3 +723,85 @@ LineRenderer:
generateLightingData: 0 generateLightingData: 0
m_UseWorldSpace: 0 m_UseWorldSpace: 0
m_Loop: 0 m_Loop: 0
--- !u!1 &6430937021889153566
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3767104678148148169}
- component: {fileID: 5701248232880625800}
- component: {fileID: 4497131827776726101}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3767104678148148169
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6430937021889153566}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_Children:
- {fileID: 6790134988799929600}
m_Father: {fileID: 5431987895376475546}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 3.23}
m_SizeDelta: {x: 20, y: 5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &5701248232880625800
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6430937021889153566}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 2
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder: 2
m_TargetDisplay: 0
--- !u!114 &4497131827776726101
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6430937021889153566}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 20
m_PresetInfoIsWorld: 1

View File

@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1} m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@@ -123,6 +123,49 @@ NavMeshSettings:
debug: debug:
m_Flags: 0 m_Flags: 0
m_NavMeshData: {fileID: 0} m_NavMeshData: {fileID: 0}
--- !u!1 &5820110
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5820111}
- component: {fileID: 5820112}
m_Layer: 0
m_Name: SpawnPoint (10)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5820111
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5820110}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -70.8, y: 32.1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 945516891}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5820112
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5820110}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &42724089 --- !u!1 &42724089
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -169,7 +212,7 @@ MonoBehaviour:
ReliableMaxMessageSize: 298449 ReliableMaxMessageSize: 298449
UnreliableMaxMessageSize: 1199 UnreliableMaxMessageSize: 1199
debugLog: 0 debugLog: 0
statisticsGUI: 0 statisticsGUI: 1
statisticsLog: 0 statisticsLog: 0
--- !u!114 &42724091 --- !u!114 &42724091
MonoBehaviour: MonoBehaviour:
@@ -190,7 +233,7 @@ MonoBehaviour:
offlineScene: offlineScene:
onlineScene: onlineScene:
transport: {fileID: 42724090} transport: {fileID: 42724090}
networkAddress: vps.playpoolstudios.com networkAddress: localhost
maxConnections: 100 maxConnections: 100
authenticator: {fileID: 0} authenticator: {fileID: 0}
playerPrefab: {fileID: 5431987895376475548, guid: e811a838f2ebb2f4fb8055331ed295e9, type: 3} playerPrefab: {fileID: 5431987895376475548, guid: e811a838f2ebb2f4fb8055331ed295e9, type: 3}
@@ -301,6 +344,49 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 43679075} m_GameObject: {fileID: 43679075}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &290750407
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 290750408}
- component: {fileID: 290750409}
m_Layer: 0
m_Name: SpawnPoint (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &290750408
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 290750407}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -29.6, y: 13.9, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 945516891}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &290750409
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 290750407}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &332697607 --- !u!1 &332697607
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -311,6 +397,8 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 332697609} - component: {fileID: 332697609}
- component: {fileID: 332697608} - component: {fileID: 332697608}
- component: {fileID: 332697611}
- component: {fileID: 332697610}
m_Layer: 0 m_Layer: 0
m_Name: GameManager m_Name: GameManager
m_TagString: Untagged m_TagString: Untagged
@@ -331,6 +419,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
trailCollidersParent: {fileID: 697893403} trailCollidersParent: {fileID: 697893403}
deadScreen: {fileID: 508845190}
--- !u!4 &332697609 --- !u!4 &332697609
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -345,6 +434,37 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 12 m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &332697610
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 332697607}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c35843cf3f2e5e0fc842ea02800896a7, type: 3}
m_Name:
m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1
--- !u!114 &332697611
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 332697607}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
m_Name:
m_EditorClassIdentifier:
sceneId: 901459289
serverOnly: 0
visible: 0
m_AssetId:
hasSpawned: 0
--- !u!1 &409497206 --- !u!1 &409497206
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -701,6 +821,168 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 474562391} m_GameObject: {fileID: 474562391}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &494509960
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 494509961}
- component: {fileID: 494509962}
m_Layer: 0
m_Name: SpawnPoint (8)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &494509961
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 494509960}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 30.7, y: -23.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 945516891}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &494509962
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 494509960}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &508845190
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 508845191}
- component: {fileID: 508845193}
- component: {fileID: 508845192}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &508845191
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 508845190}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1044958374}
m_Father: {fileID: 2058016609}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -400, y: -500}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &508845192
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 508845190}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.7169812, g: 0, b: 0, a: 0.50980395}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: e2d313b6eccca443b8ccc560f6360e58, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &508845193
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 508845190}
m_CullTransparentMesh: 1
--- !u!1 &613727044
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 613727045}
- component: {fileID: 613727046}
m_Layer: 0
m_Name: SpawnPoint (5)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &613727045
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 613727044}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 48.5, y: 22.2, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 945516891}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &613727046
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 613727044}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &682747410 --- !u!1 &682747410
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1234,6 +1516,89 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
rotationVector: {x: 0, y: 0, z: 0.2} rotationVector: {x: 0, y: 0, z: 0.2}
--- !u!1 &871230063
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 871230064}
- component: {fileID: 871230065}
m_Layer: 0
m_Name: SpawnPoint (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &871230064
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 871230063}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -30.9, y: -19.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 945516891}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &871230065
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 871230063}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &945516890
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 945516891}
m_Layer: 0
m_Name: SpawnPoints
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &945516891
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 945516890}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 400.69867, y: 399.47076, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1853399999}
- {fileID: 290750408}
- {fileID: 871230064}
- {fileID: 1474265871}
- {fileID: 613727045}
- {fileID: 1874776083}
- {fileID: 1837953384}
- {fileID: 494509961}
- {fileID: 1398901127}
- {fileID: 5820111}
m_Father: {fileID: 0}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1012805075 --- !u!1 &1012805075
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1327,6 +1692,85 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &1044958373
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1044958374}
- component: {fileID: 1044958376}
- component: {fileID: 1044958375}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1044958374
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1044958373}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 508845191}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1044958375
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1044958373}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: ea4910b9ff2a74dd0b4550a216ba0821, type: 3}
m_FontSize: 71
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 94
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: YOU DIED!
--- !u!222 &1044958376
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1044958373}
m_CullTransparentMesh: 1
--- !u!1 &1248894594 --- !u!1 &1248894594
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1338,8 +1782,6 @@ GameObject:
- component: {fileID: 1248894597} - component: {fileID: 1248894597}
- component: {fileID: 1248894596} - component: {fileID: 1248894596}
- component: {fileID: 1248894595} - component: {fileID: 1248894595}
- component: {fileID: 1248894599}
- component: {fileID: 1248894598}
m_Layer: 0 m_Layer: 0
m_Name: EventSystem m_Name: EventSystem
m_TagString: Untagged m_TagString: Untagged
@@ -1395,37 +1837,6 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1248894598
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1248894594}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 88f2fef63cda9194ca1acd5c3e55694f, type: 3}
m_Name:
m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1
--- !u!114 &1248894599
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1248894594}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
m_Name:
m_EditorClassIdentifier:
sceneId: 1161278506
serverOnly: 0
visible: 0
m_AssetId:
hasSpawned: 0
--- !u!1 &1259726041 --- !u!1 &1259726041
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1631,6 +2042,92 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
rotationVector: {x: 0, y: 0, z: 0.2} rotationVector: {x: 0, y: 0, z: 0.2}
--- !u!1 &1398901126
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1398901127}
- component: {fileID: 1398901128}
m_Layer: 0
m_Name: SpawnPoint (9)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1398901127
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1398901126}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 77, y: 26.7, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 945516891}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1398901128
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1398901126}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1474265870
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1474265871}
- component: {fileID: 1474265872}
m_Layer: 0
m_Name: SpawnPoint (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1474265871
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1474265870}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 43.5, y: -18.6, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 945516891}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1474265872
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1474265870}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1550941529 --- !u!1 &1550941529
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1754,6 +2251,135 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
rotationVector: {x: 0, y: 0, z: 0.2} rotationVector: {x: 0, y: 0, z: 0.2}
--- !u!1 &1837953383
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1837953384}
- component: {fileID: 1837953385}
m_Layer: 0
m_Name: SpawnPoint (7)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1837953384
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1837953383}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 17.4, y: 2.9, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 945516891}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1837953385
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1837953383}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1853399998
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1853399999}
- component: {fileID: 1853400000}
m_Layer: 0
m_Name: SpawnPoint (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1853399999
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1853399998}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 945516891}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1853400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1853399998}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1874776082
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1874776083}
- component: {fileID: 1874776084}
m_Layer: 0
m_Name: SpawnPoint (6)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1874776083
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1874776082}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -60.5, y: -6.2, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 945516891}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1874776084
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1874776082}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2058016605 --- !u!1 &2058016605
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1846,6 +2472,7 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: m_Children:
- {fileID: 474562392} - {fileID: 474562392}
- {fileID: 508845191}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@@ -11,7 +11,7 @@ public class CameraFollower : MonoBehaviour
void Start() void Start()
{ {
if(target==null){return;} if(target==null){return;}
SetAutoOffset(); if(autoOffset){SetAutoOffset();}
} }
// Update is called once per frame // Update is called once per frame
@@ -23,7 +23,7 @@ public class CameraFollower : MonoBehaviour
public void SetTarget(Transform Target){ public void SetTarget(Transform Target){
target = Target; target = Target;
SetAutoOffset(); if(autoOffset){SetAutoOffset();}
} }
void SetAutoOffset(){ void SetAutoOffset(){

View File

@@ -0,0 +1,24 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Mirror;
public class MinigameManager : NetworkBehaviour
{
public void SetRespawn(GameObject player){
StartCoroutine(setRespawn(player));
}
IEnumerator setRespawn(GameObject player){
if(isServer){
player.SetActive(false);
yield return new WaitForSeconds(3);
Vector3 RespawnPoint = NetworkManager.startPositions[Random.Range(0, NetworkManager.startPositions.Count-1)].position;
player.GetComponent<SpaceshipController>().Respawn(RespawnPoint);
}else{
yield return new WaitForSeconds(1);
}
}
}

View File

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

View File

@@ -1,80 +1,80 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using Mirror; using Mirror;
public class NetworkTrail : NetworkBehaviour public class NetworkTrail : NetworkBehaviour
{ {
public TrailRenderer trail; public TrailRenderer trail;
public LineRenderer line; public LineRenderer line;
public bool enableValidation = true; public bool enableValidation = true;
public int maxDetourPoints = 1; public int maxDetourPoints = 1;
public float DetourThreshold = 1; public float DetourThreshold = 1;
public int Detours; public int Detours;
public Vector3[] positions; public Vector3[] positions;
void Start() void Start()
{ {
//trail.gameObject.SetActive(isServer); //trail.gameObject.SetActive(isServer);
line.gameObject.SetActive(!isServer); line.gameObject.SetActive(!isServer);
line.transform.parent=null; line.transform.parent=null;
line.transform.position =Vector3.zero; line.transform.position =Vector3.zero;
} }
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
if(isServer){ if(isServer){
positions = new Vector3[trail.positionCount]; positions = new Vector3[trail.positionCount];
trail.GetPositions(positions); trail.GetPositions(positions);
RpcUpdatePositions(positions); RpcUpdatePositions(positions);
}else{ }else{
} }
} }
[ClientRpc] [ClientRpc]
void RpcUpdatePositions(Vector3[] Positions){ void RpcUpdatePositions(Vector3[] Positions){
if(!enableValidation){return;} if(!enableValidation){return;}
positions = Positions; positions = Positions;
line.positionCount = positions.Length; line.positionCount = positions.Length;
line.SetPositions(positions); line.SetPositions(positions);
//Validate With Trail //Validate With Trail
Vector3[] localPositions = new Vector3[trail.positionCount]; Vector3[] localPositions = new Vector3[trail.positionCount];
trail.GetPositions(localPositions); trail.GetPositions(localPositions);
Detours = 0; Detours = 0;
for(int i=0; i < Positions.Length; i++){ for(int i=0; i < Positions.Length; i++){
bool pointValidated = false; bool pointValidated = false;
for(int j=1; j < 3; j++){ for(int j=1; j < 3; j++){
try{ try{
if(isCloseEnough(Positions[i], localPositions[i+j])){ if(isCloseEnough(Positions[i], localPositions[i+j])){
pointValidated = true; pointValidated = true;
break; break;
} }
if(isCloseEnough(Positions[i], localPositions[i-j])){ if(isCloseEnough(Positions[i], localPositions[i-j])){
pointValidated = true; pointValidated = true;
break; break;
} }
}catch{ }catch{
//No local position, Hence, no validation //No local position, Hence, no validation
} }
} }
if(!pointValidated){ if(!pointValidated){
Detours++; Detours++;
} }
} }
if(Detours > maxDetourPoints){ if(Detours > maxDetourPoints){
//Too much detours, Set back to servers data //Too much detours, Set back to servers data
trail.SetPositions(Positions); trail.SetPositions(Positions);
} }
} }
bool isCloseEnough(Vector3 a, Vector3 b){ bool isCloseEnough(Vector3 a, Vector3 b){
return Vector3.Distance(a,b) < DetourThreshold; return Vector3.Distance(a,b) < DetourThreshold;
} }
} }

View File

@@ -5,6 +5,7 @@ using UnityEngine;
public class SceneDataHolder : MonoBehaviour public class SceneDataHolder : MonoBehaviour
{ {
public Transform trailCollidersParent; public Transform trailCollidersParent;
public GameObject deadScreen;
void Awake() void Awake()
{ {
SceneData.holder = this; SceneData.holder = this;
@@ -13,5 +14,6 @@ public class SceneDataHolder : MonoBehaviour
public static class SceneData{ public static class SceneData{
public static GameObject localPlayer;
public static SceneDataHolder holder; public static SceneDataHolder holder;
} }

View File

@@ -2,9 +2,17 @@ using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using Mirror; using Mirror;
using System.Linq; using System.Linq;
using UnityEngine.UI;
public class SpaceshipController : NetworkBehaviour public class SpaceshipController : NetworkBehaviour
{ {
[SyncVar(hook=nameof(OnPnameChanged))]
public string pname;
[SyncVar(hook=nameof(OnScoresChanged))]
public int Scores;
[SyncVar]
public bool dead;
public Text pnameTxt;
public Transform body; public Transform body;
public TrailMgr trailMgr; public TrailMgr trailMgr;
public float movingSpeed = 0.1f; public float movingSpeed = 0.1f;
@@ -21,6 +29,18 @@ public class SpaceshipController : NetworkBehaviour
public bool showDebugHUD = false; public bool showDebugHUD = false;
[Command]
void CmdSetPname(string value){
pname = value;
}
void OnPnameChanged(string oldName, string newName){
pnameTxt.text = newName;
}
void OnScoresChanged(int oldScores, int newScores){
Debug.Log($"Add scores { newScores - oldScores}, (total: {newScores})");
}
void Start() void Start()
{ {
@@ -28,6 +48,15 @@ public class SpaceshipController : NetworkBehaviour
{ {
if (joystick == null) { joystick = FindObjectOfType<Joystick>(); } if (joystick == null) { joystick = FindObjectOfType<Joystick>(); }
FindObjectOfType<CameraFollower>().SetTarget(transform); FindObjectOfType<CameraFollower>().SetTarget(transform);
string myName = PlayerPrefs.GetString("username");
SceneData.localPlayer = gameObject;
if(isServer){pname=myName;}else{
CmdSetPname(myName);
}
pnameTxt.text = myName;
pnameTxt.gameObject.SetActive(false);
} }
if (isServer) if (isServer)
{ {
@@ -42,6 +71,8 @@ public class SpaceshipController : NetworkBehaviour
int lastClientUpdateTime = 0; int lastClientUpdateTime = 0;
void FixedUpdate() void FixedUpdate()
{ {
if(dead){return;}
if (isLocalPlayer) if (isLocalPlayer)
{ {
joyInput = joystick.input; joyInput = joystick.input;
@@ -68,11 +99,15 @@ public class SpaceshipController : NetworkBehaviour
{ {
Vector3 newPosition = body.position + Detour; Vector3 newPosition = body.position + Detour;
Quaternion newRotation = body.rotation * RotationDetour; Quaternion newRotation = body.rotation * RotationDetour;
if(Detour.magnitude > 0.5f){
body.position = Vector3.Lerp(body.position, newPosition, (Mathf.Abs(Detour.magnitude) > 0.2f) ? DetourCorrectionFactor * 2 * Detour.magnitude : DetourCorrectionFactor); trailMgr.trail.emitting =false;
}
body.position = Vector3.Lerp(body.position, newPosition, (Mathf.Abs(Detour.magnitude) > 0.2f) ? DetourCorrectionFactor * 2 * Detour.magnitude : DetourCorrectionFactor);
Detour = newPosition - body.position; Detour = newPosition - body.position;
body.rotation = Quaternion.Lerp(body.rotation, newRotation, DetourCorrectionFactor * ((joystick.touchDown) ? 0.1f : 1)); body.rotation = Quaternion.Lerp(body.rotation, newRotation, DetourCorrectionFactor * ((joystick.touchDown) ? 0.1f : 1));
RotationDetour = Quaternion.Inverse(transform.rotation) * newRotation; RotationDetour = Quaternion.Inverse(transform.rotation) * newRotation;
trailMgr.trail.emitting=true;
} }
} }
@@ -213,6 +248,7 @@ public class SpaceshipController : NetworkBehaviour
} }
int distanceSinceSent = (int)Vector3.Distance(newPosition, position); int distanceSinceSent = (int)Vector3.Distance(newPosition, position);
#region trailSyncOld
// Vector3[] newTrailPositions = new Vector3[trailPositions.Length]; // Vector3[] newTrailPositions = new Vector3[trailPositions.Length];
// for(int i=0; i < trailPositions.Length; i++){ // for(int i=0; i < trailPositions.Length; i++){
// if(i > trailPositions.Length - distanceSinceSent-1){ // if(i > trailPositions.Length - distanceSinceSent-1){
@@ -229,7 +265,7 @@ public class SpaceshipController : NetworkBehaviour
// } // }
// } // }
// trailMgr.trail.SetPositions(newTrailPositions); // trailMgr.trail.SetPositions(newTrailPositions);
#endregion
// Vector3 newPosition = position + new Vector3(0, movingSpeed * ); // Vector3 newPosition = position + new Vector3(0, movingSpeed * );
// Vector3 newPosition = position; // Vector3 newPosition = position;
@@ -279,6 +315,69 @@ public class SpaceshipController : NetworkBehaviour
trailMgr = GetComponent<TrailMgr>(); trailMgr = GetComponent<TrailMgr>();
} }
} }
public void TrailCollided(RaycastHit2D hit){
if(!isServer){
// Debug.Log("This cannot run on client, That's illegal!"); // <-- What this log says
return;
}
SpaceshipController deadPlayer = hit.collider.GetComponent<SpaceshipController>();
if(deadPlayer!=null && !deadPlayer.dead){ // <-- okay we killed someone
deadPlayer.Die(pname);
Debug.Log($"{pname} killed {deadPlayer.pname}");
Scores+= 10; //TODO: Need to change Scores on kills?
}
}
public void Die(string killer){
Debug.Log("You got killed by " + killer);
//Handle Respawning
dead=true;
RpcDie(killer);
FindObjectOfType<MinigameManager>().SetRespawn(gameObject);
}
[ClientRpc]
public void RpcDie(string killer){
Debug.Log($"{killer} killed {pname} : isItMe? -> {isLocalPlayer}");
gameObject.SetActive(false);
if(isLocalPlayer){
//TODO: Death message goes here
SceneData.holder.deadScreen.SetActive(true);
}
}
public void Respawn(Vector3 respawnPoint){
dead=false;
trailMgr.trail.emitting =false;
trailMgr.trail.Clear();
RpcRespawn(respawnPoint);
transform.position = respawnPoint;
trailMgr.trail.emitting=true;
gameObject.SetActive(true);
}
[ClientRpc]
public void RpcRespawn(Vector3 respawnPoint){
GetComponent<NetworkTrail>().enableValidation=false;
trailMgr.trail.Clear();
trailMgr.positions = new Vector3[0];
trailMgr.trail.emitting = false;
transform.position = respawnPoint;
trailMgr.trail.emitting=true;
GetComponent<NetworkTrail>().enableValidation=true;
gameObject.SetActive(true);
if(isLocalPlayer){
SceneData.holder.deadScreen.SetActive(false);
}
}
} }

View File

@@ -1,22 +1,22 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
public class TrailCollider : MonoBehaviour public class TrailCollider : MonoBehaviour
{ {
public Color gizmoColor = Color.red; public Color gizmoColor = Color.red;
public TrailMgr trailMgr; public TrailMgr trailMgr;
public float radius; public float radius;
void Update(){ void Update(){
RaycastHit2D hit = Physics2D.CircleCast(transform.position, radius, Vector2.up); RaycastHit2D hit = Physics2D.CircleCast(transform.position, radius, Vector2.up);
if(hit.collider!=null){ if(hit.collider!=null){
if(hit.transform.root == trailMgr.transform){return;} // <-- avoid eating myself if(hit.transform.root == trailMgr.transform){return;} // <-- avoid eating myself
trailMgr.OnColliderHit(hit); trailMgr.OnColliderHit(hit);
} }
} }
private void OnDrawGizmos() { private void OnDrawGizmos() {
Gizmos.color = gizmoColor; Gizmos.color = gizmoColor;
Gizmos.DrawWireSphere(transform.position,radius); Gizmos.DrawWireSphere(transform.position,radius);
} }
} }

View File

@@ -1,47 +1,53 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
public class TrailMgr : MonoBehaviour public class TrailMgr : MonoBehaviour
{ {
public TrailRenderer trail; public SpaceshipController controller;
public Vector3[] positions; public TrailRenderer trail;
public Transform trailPoolParent;
public GameObject trailColliderObj; public Vector3[] positions;
public List<GameObject> trailsPool; public Transform trailPoolParent;
public GameObject trailColliderObj;
void Start(){ public List<GameObject> trailsPool;
}
void Start(){
// Update is called once per frame }
void Update(){
positions = new Vector3[trail.positionCount]; // Update is called once per frame
int length = trail.GetPositions(positions); void Update(){
if(length > trailsPool.Count){ positions = new Vector3[trail.positionCount];
//must create new trails int length = trail.GetPositions(positions);
int missingCount = length - trailsPool.Count; if(length > trailsPool.Count){
for(int i =0; i < missingCount; i++){ //must create new trails
GameObject newTrail = Instantiate(trailColliderObj, trailPoolParent); int missingCount = length - trailsPool.Count;
// Debug.Log("Spawned new trail obj " + newTrail.name); for(int i =0; i < missingCount; i++){
newTrail.GetComponent<TrailCollider>().trailMgr = this; GameObject newTrail = Instantiate(trailColliderObj, trailPoolParent);
trailsPool.Add(newTrail); // Debug.Log("Spawned new trail obj " + newTrail.name);
} newTrail.GetComponent<TrailCollider>().trailMgr = this;
} trailsPool.Add(newTrail);
for(int i =0; i < trailsPool.Count; i++){ }
if(i < length){ }
trailsPool[i].SetActive(true); for(int i =0; i < trailsPool.Count; i++){
trailsPool[i].transform.position = positions[i]; if(i < length){
}else{ trailsPool[i].SetActive(true);
trailsPool[i].SetActive(false); trailsPool[i].transform.position = positions[i];
} }else{
} trailsPool[i].SetActive(false);
} }
}
}
public void OnColliderHit(RaycastHit2D hit){
return;
Debug.Log($"{hit.collider.name} got hit by my trail"); public void OnColliderHit(RaycastHit2D hit){
Destroy(hit.transform.gameObject); controller.TrailCollided(hit);
} }
}
void OnValidate(){
if(controller==null){
controller = GetComponent<SpaceshipController>();
}
}
}

Some files were not shown because too many files have changed in this diff Show More