janis/defrain-shooter-unity
1
0
Fork 0
mirror of https://github.com/DerTyp7/defrain-shooter-unity.git synced 2025-10-31 05:27:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'player-controller' of https://github.com/DerTyp187/defrain into player-controller

Browse Source
This commit is contained in:
juliuse98
2021-11-01 14:32:33 +01:00
parent 314c3faf30 2fc1a3f063
commit 0e22401957
12 changed files with 343 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

185
Assets/Scenes/TestScene.unity
View File

@@ -333,6 +333,67 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 2534964839176971238, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
--- !u!1001 &556080222
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -4742972085864279645, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3}
propertyPath: sceneId
value: 668563316
objectReference: {fileID: 0}
- target: {fileID: 3422988367618467032, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3}
propertyPath: m_Name
value: GameManager
objectReference: {fileID: 0}
- target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3}
--- !u!1 &589432432 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -6763858364670572316, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
@@ -462,7 +523,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1001 &739500445
PrefabInstance:
@@ -473,7 +534,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
propertyPath: m_RootOrder
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
propertyPath: m_LocalPosition.x
@@ -683,120 +744,6 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -3329902420748629119, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
--- !u!1 &1067101116
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1067101117}
- component: {fileID: 1067101119}
- component: {fileID: 1067101118}
- component: {fileID: 1067101120}
- component: {fileID: 1067101121}
m_Layer: 0
m_Name: GameManager
m_TagString: GameController
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1067101117
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1067101116}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1067101118
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1067101116}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6b0fecffa3f624585964b0d0eb21b18e, type: 3}
m_Name:
m_EditorClassIdentifier:
Port: 7777
DualMode: 1
NoDelay: 1
Interval: 10
Timeout: 10000
FastResend: 2
CongestionWindow: 0
SendWindowSize: 4096
ReceiveWindowSize: 4096
NonAlloc: 1
debugLog: 0
statisticsGUI: 0
statisticsLog: 0
--- !u!114 &1067101119
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1067101116}
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/TestScene.unity
onlineScene: Assets/Scenes/TestScene.unity
transport: {fileID: 1067101118}
networkAddress: localhost
maxConnections: 100
authenticator: {fileID: 0}
playerPrefab: {fileID: 6272346181302961293, guid: 2935eead9a075fd489d6a6dc273a5999, type: 3}
autoCreatePlayer: 1
playerSpawnMethod: 0
spawnPrefabs:
- {fileID: 0}
--- !u!114 &1067101120
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1067101116}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6442dc8070ceb41f094e44de0bf87274, type: 3}
m_Name:
m_EditorClassIdentifier:
offsetX: 0
offsetY: 0
--- !u!114 &1067101121
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1067101116}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 26ee7b094ee25bf49aaf5ffba35f8cf6, type: 3}
m_Name:
m_EditorClassIdentifier:
Players: []
--- !u!1 &1111479331 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2550463727306718371, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3}
@@ -880,7 +827,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1362549044 stripped
Transform:
@@ -1038,7 +985,7 @@ Transform:
m_LocalScale: {x: 4.6584, y: 1, z: 14.388176}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &4636852677990031179
PrefabInstance:
@@ -1057,7 +1004,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3}
propertyPath: m_RootOrder
value: 3
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3}
propertyPath: m_AnchorMax.x