Skip to content

Commit

Permalink
Multiplayer Tools
Browse files Browse the repository at this point in the history
  • Loading branch information
GraphicEdit committed Dec 28, 2023
1 parent 668c0d4 commit 02ae93e
Show file tree
Hide file tree
Showing 36 changed files with 1,211 additions and 464 deletions.
22 changes: 1 addition & 21 deletions DarkFlow/Assets/Characters/1_Mutant/Mutant.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -813,10 +813,6 @@ PrefabInstance:
type: 3}
insertIndex: -1
addedObject: {fileID: 8027232384722410602}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a65433442e687234ab8043c546677d72,
type: 3}
insertIndex: -1
addedObject: {fileID: 8825393132258296762}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a65433442e687234ab8043c546677d72,
type: 3}
insertIndex: -1
Expand Down Expand Up @@ -913,7 +909,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: 4419d82f33d36e848b3ed5af4c8da37e,
m_Actions: {fileID: -944628639613478452, guid: 42bbd845906c9dd4fa77e979ee644342,
type: 3}
m_NotificationBehavior: 0
m_UIInputModule: {fileID: 0}
Expand Down Expand Up @@ -1045,21 +1041,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
TransitionStateInfoList: []
m_Animator: {fileID: 222671947941112760}
--- !u!114 &8825393132258296762
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2247144937675617167}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f05cd39e2b8b7604caee407644cd00c3, type: 3}
m_Name:
m_EditorClassIdentifier:
isObjectPickedUp:
m_InternalValue: 0
m_LocalHeldPosition: {x: 0, y: 2.85, z: 0}
--- !u!114 &5652289010296803950
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -1072,7 +1053,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 854c882e4139d184fbbe7fef3fa272e2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ServerPlayerMove: {fileID: 8825393132258296762}
m_CharacterController: {fileID: 2129690468861909873}
m_ThirdPersonController: {fileID: 5509808468128901478}
m_CameraFollow: {fileID: 994559427591439665}
Expand Down
22 changes: 1 addition & 21 deletions DarkFlow/Assets/Characters/2_Erika/Erika.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -1283,10 +1283,6 @@ PrefabInstance:
type: 3}
insertIndex: -1
addedObject: {fileID: 7905829003486985161}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 4f52f003eca24b843924f016ea500470,
type: 3}
insertIndex: -1
addedObject: {fileID: 716503057832604298}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 4f52f003eca24b843924f016ea500470,
type: 3}
insertIndex: -1
Expand Down Expand Up @@ -1377,7 +1373,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: 4419d82f33d36e848b3ed5af4c8da37e,
m_Actions: {fileID: -944628639613478452, guid: 42bbd845906c9dd4fa77e979ee644342,
type: 3}
m_NotificationBehavior: 0
m_UIInputModule: {fileID: 0}
Expand Down Expand Up @@ -1493,21 +1489,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
TransitionStateInfoList: []
m_Animator: {fileID: 7385380308929055139}
--- !u!114 &716503057832604298
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4663426026667250098}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f05cd39e2b8b7604caee407644cd00c3, type: 3}
m_Name:
m_EditorClassIdentifier:
isObjectPickedUp:
m_InternalValue: 0
m_LocalHeldPosition: {x: 0, y: 2.85, z: 0}
--- !u!114 &800218253002373474
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -1520,7 +1501,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 854c882e4139d184fbbe7fef3fa272e2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ServerPlayerMove: {fileID: 716503057832604298}
m_CharacterController: {fileID: 4810382554605961037}
m_ThirdPersonController: {fileID: 3088514794462180247}
m_CameraFollow: {fileID: 8408292032187987872}
Expand Down
67 changes: 2 additions & 65 deletions DarkFlow/Assets/Prefabs/EmptPlayer.prefab
Original file line number Diff line number Diff line change
@@ -1,67 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3984814823395178536
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5203344646249168406}
- component: {fileID: 8304618723454314381}
- component: {fileID: 5759118789581747785}
m_Layer: 0
m_Name: cm
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5203344646249168406
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3984814823395178536}
serializedVersion: 2
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_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 8854747452121219814}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8304618723454314381
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3984814823395178536}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &5759118789581747785
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3984814823395178536}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3}
m_Name:
m_EditorClassIdentifier:
m_NoiseProfile: {fileID: 0}
m_PivotOffset: {x: 0, y: 0, z: 1}
m_AmplitudeGain: 0.5
m_FrequencyGain: 0.3
mNoiseOffsets: {x: 0, y: 0, z: 0}
--- !u!1 &8854747452121219810
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -91,8 +29,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5203344646249168406}
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8854747452121219813
Expand All @@ -107,7 +44,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 3761423118
GlobalObjectIdHash: 3783676955
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 1
ActiveSceneSynchronization: 0
Expand Down
111 changes: 110 additions & 1 deletion DarkFlow/Assets/Prefabs/EnvironmentMain.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Transform:
m_GameObject: {fileID: 3380972484498700283}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: 0, z: -0, w: 1}
m_LocalPosition: {x: -1.644872, y: 0.36, z: -1.72}
m_LocalPosition: {x: 1.07, y: 0.49, z: -5.02}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_Children: []
Expand Down Expand Up @@ -105,6 +105,111 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &8689410107795753702
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6323771381898580408}
- component: {fileID: 7341639026134730347}
- component: {fileID: 3351374400316864635}
- component: {fileID: 3478337274159224239}
m_Layer: 0
m_Name: Cube (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6323771381898580408
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8689410107795753702}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: 0, z: -0, w: 1}
m_LocalPosition: {x: 1.35, y: 0.98, z: -4.37}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 4474145340166388366}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &7341639026134730347
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8689410107795753702}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &3351374400316864635
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8689410107795753702}
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: 31321ba15b8f8eb4c954353edc038b1d, 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!65 &3478337274159224239
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8689410107795753702}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &4151722947518356837
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -185,6 +290,10 @@ PrefabInstance:
type: 3}
insertIndex: -1
addedObject: {fileID: 8609971574843151533}
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4eecdfa58a695ad42ab75e464e6130bf,
type: 3}
insertIndex: -1
addedObject: {fileID: 6323771381898580408}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 4eecdfa58a695ad42ab75e464e6130bf,
type: 3}
Expand Down
33 changes: 0 additions & 33 deletions DarkFlow/Assets/Prefabs/GameObject.prefab

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 2731206212
GlobalObjectIdHash: 3279208134
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 1
ActiveSceneSynchronization: 0
Expand Down
8 changes: 6 additions & 2 deletions DarkFlow/Assets/Resources/SynchedServerData.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6821460796240439114}
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6821460796240439115
MonoBehaviour:
Expand All @@ -45,8 +45,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 951099334
GlobalObjectIdHash: 1607073199
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 1
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
SpawnWithObservers: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
--- !u!114 &6821460796240439117
Expand Down
Loading

0 comments on commit 02ae93e

Please sign in to comment.