diff --git a/Assets/Developer/Prefabs/CraftingAnvil_Interactable.prefab b/Assets/Developer/Prefabs/CraftingAnvil_Interactable.prefab index b846934a..e8d1cb21 100644 --- a/Assets/Developer/Prefabs/CraftingAnvil_Interactable.prefab +++ b/Assets/Developer/Prefabs/CraftingAnvil_Interactable.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8809089216443887356} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -101,13 +100,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3535219268438814658} + 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: 4654368964201875787} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7684513129941051825 MeshFilter: @@ -137,7 +136,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: be2c382f522695c4fa3947ac8e1d4457, type: 2} + - {fileID: 2100000, guid: 19a6eb6f1c42e0e41b31cb94860f9743, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -182,6 +181,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4654368964201875796} + 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} @@ -189,7 +189,6 @@ Transform: m_Children: - {fileID: 6619472521885665227} m_Father: {fileID: 4654368964328857930} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4654368964328857940 GameObject: @@ -216,6 +215,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4654368964328857940} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 7.62, y: 0.058, z: 4.64} m_LocalScale: {x: 1, y: 1, z: 1} @@ -226,7 +226,6 @@ Transform: - {fileID: 8809089216443887356} - {fileID: 1680714231933374443} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &4654368964328857928 BoxCollider: @@ -236,9 +235,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4654368964328857940} 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: 2 + serializedVersion: 3 m_Size: {x: 1.5, y: 2, z: 2} m_Center: {x: 0, y: 0.5, z: 0} --- !u!114 &4654368964328857941 @@ -285,13 +292,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4654368964663929545} + 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: 4654368964684668332} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4654368964663929551 MonoBehaviour: @@ -332,6 +339,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4654368964684668333} + 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} @@ -339,7 +347,6 @@ Transform: m_Children: - {fileID: 4654368964663929544} m_Father: {fileID: 4654368964328857930} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4964334900580798192 GameObject: @@ -374,7 +381,6 @@ RectTransform: m_Children: - {fileID: 7870490292661654589} m_Father: {fileID: 4654368964328857930} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -398,7 +404,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -447,6 +455,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4654368964328857930} m_Modifications: - target: {fileID: 1239046225191970215, guid: 232dddf320efaa247b8ffe7ad4860ac9, type: 3} @@ -522,6 +531,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 232dddf320efaa247b8ffe7ad4860ac9, type: 3} --- !u!1 &1680714231933088143 stripped GameObject: diff --git a/Assets/Developer/Prefabs/Persistent Objects.prefab b/Assets/Developer/Prefabs/Persistent Objects.prefab index 8a867ac1..96dfe73b 100644 --- a/Assets/Developer/Prefabs/Persistent Objects.prefab +++ b/Assets/Developer/Prefabs/Persistent Objects.prefab @@ -5479,7 +5479,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 168.74998, y: -600} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 450, y: 0} m_Pivot: {x: 0.5, y: 0} --- !u!114 &2959850296507468170 MonoBehaviour: @@ -5854,6 +5854,54 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 400, y: 100} m_Pivot: {x: 1, y: 1} +--- !u!1 &3440357343539562716 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2777333823310733656} + - component: {fileID: 6931523943218313840} + m_Layer: 0 + m_Name: OnCharacterConfirmed + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2777333823310733656 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3440357343539562716} + 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: 7475116342785696725} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6931523943218313840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3440357343539562716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b18d3d5defd7c6845a22a1583a92bfb1, type: 3} + m_Name: + m_EditorClassIdentifier: + Event: {fileID: 11400000, guid: e229e437d86ab0048bd49fa41f680b4d, type: 2} + Response: + m_PersistentCalls: + m_Calls: [] --- !u!1 &3456748640505479282 GameObject: m_ObjectHideFlags: 0 @@ -12948,7 +12996,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7475116342452656566} - - component: {fileID: 7475116342452656565} + - component: {fileID: 5723897653044731306} m_Layer: 0 m_Name: OnPlayerSpawned m_TagString: Untagged @@ -12971,7 +13019,7 @@ Transform: m_Children: [] m_Father: {fileID: 7475116342844710275} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7475116342452656565 +--- !u!114 &5723897653044731306 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -12980,7 +13028,7 @@ MonoBehaviour: m_GameObject: {fileID: 7475116342452656567} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 687794f951b2e3543aed2872920d3d6e, type: 3} + m_Script: {fileID: 11500000, guid: ea37414de775f7e488c55fed47ec09e7, type: 3} m_Name: m_EditorClassIdentifier: Event: {fileID: 11400000, guid: b3af5678d5130fe409229924bbcb4705, type: 2} @@ -13527,6 +13575,7 @@ Transform: - {fileID: 7475116342145954546} - {fileID: 418413600634147240} - {fileID: 7475116342871483252} + - {fileID: 2777333823310733656} m_Father: {fileID: 7475116342638198534} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7475116342785696726 @@ -13543,13 +13592,10 @@ MonoBehaviour: m_EditorClassIdentifier: onSpawnRiftRequest: {fileID: 11400000, guid: 8e3f503514db5934d965671de2695496, type: 2} charSelected: {fileID: 11400000, guid: b49ec4a9d00fc3d49a40d12c1e19feab, type: 2} - onPlayerJoinedParty: {fileID: 11400000, guid: 975ad91a630432f44b7eae4bd43b9444, type: 2} - onPlayerLeftParty: {fileID: 11400000, guid: 79b85b2c4ee3cac4090190551618eabb, type: 2} - onPlayerVoted: {fileID: 11400000, guid: 60ad71c35f341824ba50d350a4dbc039, type: 2} - onPlayerVoteCanceled: {fileID: 11400000, guid: d78f3b47e5f2863419b4dad25bd8b5c2, type: 2} onLoadLevelStarting: {fileID: 11400000, guid: c86d4c85a149f9648adda7cdcbdefbd9, type: 2} onJoinedRoom: {fileID: 11400000, guid: f1a37dbd6b4904a4f9d9834d72d99370, type: 2} onLeftRoom: {fileID: 11400000, guid: 75cceab83bd139a42b04dd1d7ef6502f, type: 2} + onCharacterConfirmed: {fileID: 6931523943218313840} onGameSceneLoaded: {fileID: 1384308382823606702} onJobSelected: {fileID: 7548970992762845130} onPlayerSpawned: {fileID: 7475116342871483259} @@ -13663,7 +13709,7 @@ MonoBehaviour: onPlayerLeftParty: {fileID: 7475116340948671880} onPlayerVoted: {fileID: 6230316876783271557} onPlayerVoteCanceled: {fileID: 3794219214771421788} - onPlayerSpawned: {fileID: 7475116342452656565} + onPlayerSpawned: {fileID: 5723897653044731306} classImages: - {fileID: 21300000, guid: 23ef5a7692693cd428d87441042dfa2e, type: 3} - {fileID: 21300000, guid: 43ec3f0dab32b934bb86fd4614e3872c, type: 3} @@ -13775,7 +13821,7 @@ MonoBehaviour: m_GameObject: {fileID: 7475116342871483253} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 687794f951b2e3543aed2872920d3d6e, type: 3} + m_Script: {fileID: 11500000, guid: ea37414de775f7e488c55fed47ec09e7, type: 3} m_Name: m_EditorClassIdentifier: Event: {fileID: 11400000, guid: b3af5678d5130fe409229924bbcb4705, type: 2} @@ -20817,9 +20863,6 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3924727575983281357, guid: fbdf67e5bc2150d4ea0bee21168583a2, type: 3} insertIndex: -1 addedObject: {fileID: 5320263948724708512} - - targetCorrespondingSourceObject: {fileID: 3924727575983281357, guid: fbdf67e5bc2150d4ea0bee21168583a2, type: 3} - insertIndex: -1 - addedObject: {fileID: 9107034706859464551} m_SourcePrefab: {fileID: 100100000, guid: fbdf67e5bc2150d4ea0bee21168583a2, type: 3} --- !u!1 &545537295325693117 stripped GameObject: @@ -20886,31 +20929,11 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 m_IsOn: 1 ---- !u!114 &9107034706859464551 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 545537295325693117} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 50b3f63970a204e72b36153eb93684bf, type: 3} - m_Name: - m_EditorClassIdentifier: - Content: {fileID: 4484641109173632336} - Toggle: {fileID: 5320263948724708512} - invert: 1 --- !u!224 &1656338257793937660 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2817339626455703692, guid: fbdf67e5bc2150d4ea0bee21168583a2, type: 3} m_PrefabInstance: {fileID: 3595365262367674480} m_PrefabAsset: {fileID: 0} ---- !u!1 &4484641109173632336 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1142200150422990112, guid: fbdf67e5bc2150d4ea0bee21168583a2, type: 3} - m_PrefabInstance: {fileID: 3595365262367674480} - m_PrefabAsset: {fileID: 0} --- !u!114 &4624652980215149907 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8199749570185962787, guid: fbdf67e5bc2150d4ea0bee21168583a2, type: 3} @@ -27509,7 +27532,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22405792, guid: 98484fbd97870af4d8569162460a89bb, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 450 objectReference: {fileID: 0} - target: {fileID: 22405792, guid: 98484fbd97870af4d8569162460a89bb, type: 3} propertyPath: m_SizeDelta.y diff --git a/Assets/Developer/Prefabs/UI/AbilityBindInstance.prefab b/Assets/Developer/Prefabs/UI/AbilityBindInstance.prefab index 055b6c9c..0e892519 100644 --- a/Assets/Developer/Prefabs/UI/AbilityBindInstance.prefab +++ b/Assets/Developer/Prefabs/UI/AbilityBindInstance.prefab @@ -425,7 +425,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 66efb24ed46044ab8a039599cbc47d7b, type: 3} + m_Sprite: {fileID: 21300000, guid: 1bc1adfe09a4215459e403f002a487df, type: 3} m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Developer/Prefabs/UI/JobCount.prefab b/Assets/Developer/Prefabs/UI/JobCount.prefab index 1b61716d..ccf44ce2 100644 --- a/Assets/Developer/Prefabs/UI/JobCount.prefab +++ b/Assets/Developer/Prefabs/UI/JobCount.prefab @@ -33,7 +33,6 @@ RectTransform: m_Children: - {fileID: 842748434759016157} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -118,14 +117,13 @@ RectTransform: m_GameObject: {fileID: 7932321287460808068} 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_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5854706016378748256} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 1, y: 1} @@ -157,7 +155,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fd47c8b4ebfbd4339858d4d23f587519, type: 3} + m_Sprite: {fileID: 21300000, guid: 9a01fb5c39cdfa84e94f2cba2ac86bf8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat b/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat index d1c62e4a..ae4e5ff0 100644 --- a/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat +++ b/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat @@ -78,7 +78,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 7.2734737 + - _Rotation: 6.6608133 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Resources/-Cameras/Main_Camera_RiftHuntersInn_PostProcessing Variant.prefab b/Assets/Resources/-Cameras/Main_Camera_RiftHuntersInn_PostProcessing Variant.prefab index 2c6080e9..7f026d65 100644 --- a/Assets/Resources/-Cameras/Main_Camera_RiftHuntersInn_PostProcessing Variant.prefab +++ b/Assets/Resources/-Cameras/Main_Camera_RiftHuntersInn_PostProcessing Variant.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4097245961428926929, guid: cf2c0a59df5b4144fb94f85c7e938288, type: 3} @@ -72,6 +73,15 @@ PrefabInstance: value: 0.3882353 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4097245961428926929, guid: cf2c0a59df5b4144fb94f85c7e938288, type: 3} + insertIndex: -1 + addedObject: {fileID: 1270398056} + - targetCorrespondingSourceObject: {fileID: 4097245961428926929, guid: cf2c0a59df5b4144fb94f85c7e938288, type: 3} + insertIndex: -1 + addedObject: {fileID: 2010927401967130128} m_SourcePrefab: {fileID: 100100000, guid: cf2c0a59df5b4144fb94f85c7e938288, type: 3} --- !u!1 &3246946022219845790 stripped GameObject: @@ -90,14 +100,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 758b285c6d780ef4c89642e993a50e14, type: 3} m_Name: m_EditorClassIdentifier: - onPlayerSpawned: {fileID: 1270398057} + onPlayerSpawned: {fileID: 2010927401967130128} SpectatorMode: 0 SmoothMovement: 0 offset: {x: 0, y: 7.5, z: -5} rotationEuler: {x: 60, y: 0, z: 0} HasCutsceneAnimation: 0 players: [] ---- !u!114 &1270398057 +--- !u!114 &2010927401967130128 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -106,7 +116,7 @@ MonoBehaviour: m_GameObject: {fileID: 3246946022219845790} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 687794f951b2e3543aed2872920d3d6e, type: 3} + m_Script: {fileID: 11500000, guid: ea37414de775f7e488c55fed47ec09e7, type: 3} m_Name: m_EditorClassIdentifier: Event: {fileID: 11400000, guid: b3af5678d5130fe409229924bbcb4705, type: 2} diff --git a/Assets/Resources/Abilities/AntiProjectilePrefab.prefab b/Assets/Resources/Abilities/AntiProjectilePrefab.prefab index a3192c47..3016797c 100644 --- a/Assets/Resources/Abilities/AntiProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/AntiProjectilePrefab.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 947724257537720396} + 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} @@ -30,7 +31,6 @@ Transform: m_Children: - {fileID: 947724257993371991} m_Father: {fileID: 947724257692438901} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &947724257684442702 GameObject: @@ -58,13 +58,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 947724257684442702} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.6, z: 1} m_LocalScale: {x: 0.5, y: 0.49999994, z: 0.49999994} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 947724257993371991} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &947724257684442698 MeshFilter: @@ -124,9 +124,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 947724257684442702} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.5, y: 1.5, z: 0.4} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &947724257692438902 @@ -139,8 +147,6 @@ GameObject: m_Component: - component: {fileID: 947724257692438901} - component: {fileID: 947724257692438900} - - component: {fileID: 947724257692438898} - - component: {fileID: 947724257692438899} - component: {fileID: 947724257692438897} - component: {fileID: 947724257692438896} m_Layer: 31 @@ -157,6 +163,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 947724257692438902} + 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} @@ -164,7 +171,6 @@ Transform: m_Children: - {fileID: 947724257537720395} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &947724257692438900 Rigidbody: @@ -173,54 +179,26 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 947724257692438902} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!114 &947724257692438898 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 947724257692438902} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 947724257692438899} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &947724257692438899 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 947724257692438902} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!114 &947724257692438897 MonoBehaviour: m_ObjectHideFlags: 0 @@ -235,12 +213,11 @@ MonoBehaviour: m_EditorClassIdentifier: visuals: {fileID: 947724257537720396} antiProjectileTag: {fileID: 947724257692438896} - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} duration: 0 followUser: 0 + breakOnHit: 0 onProjectileBlocked: m_PersistentCalls: m_Calls: [] @@ -256,7 +233,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e2059e61881754b48b2b139321b72289, type: 3} m_Name: m_EditorClassIdentifier: - targetTag: {fileID: 11400000, guid: bbc3165000346194985eebb628129001, type: 2} + targetTag: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} --- !u!1 &947724257993371976 GameObject: m_ObjectHideFlags: 0 @@ -281,6 +261,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 947724257993371976} + 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} @@ -288,7 +269,6 @@ Transform: m_Children: - {fileID: 947724257684442697} m_Father: {fileID: 947724257537720395} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &947724257993371990 MonoBehaviour: diff --git a/Assets/Resources/Abilities/AreaOfEffectOverTimePrefab.prefab b/Assets/Resources/Abilities/AreaOfEffectOverTimePrefab.prefab index 01634e6c..3302689c 100644 --- a/Assets/Resources/Abilities/AreaOfEffectOverTimePrefab.prefab +++ b/Assets/Resources/Abilities/AreaOfEffectOverTimePrefab.prefab @@ -11,8 +11,6 @@ GameObject: - component: {fileID: 753911528859556810} - component: {fileID: 753911528859556822} - component: {fileID: 753911528859556823} - - component: {fileID: 753911528859556808} - - component: {fileID: 753911528859556809} m_Layer: 30 m_Name: AreaOfEffectOverTimePrefab m_TagString: Untagged @@ -27,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 753911528859556811} + 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} @@ -34,7 +33,6 @@ Transform: m_Children: - {fileID: 6879643804943630511} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &753911528859556822 Rigidbody: @@ -43,10 +41,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 753911528859556811} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -69,55 +78,23 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} + impactHitVFX: {fileID: 0} + shouldDisableVisualsOnDelayedDestroyEntered: 1 ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 + shouldResizeVisuals: 0 telegraphDelay: 0 lifeSpan: 0 + canHitSelf: 0 + onTargetHit: + m_PersistentCalls: + m_Calls: [] duration: 0 followUser: 0 ---- !u!114 &753911528859556808 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 753911528859556811} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 753911528859556823} - - {fileID: 753911528859556809} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &753911528859556809 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 753911528859556811} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 + followTarget: 0 + damageFollowingTarget: 0 + OptionalBoxOverlap: {fileID: 0} --- !u!1 &4866147177977517818 GameObject: m_ObjectHideFlags: 0 @@ -141,11 +118,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4866147177977517818} + 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: 753911528859556810} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Abilities/AreaOfEffectPrefab.prefab b/Assets/Resources/Abilities/AreaOfEffectPrefab.prefab index ff974752..2c1dd901 100644 --- a/Assets/Resources/Abilities/AreaOfEffectPrefab.prefab +++ b/Assets/Resources/Abilities/AreaOfEffectPrefab.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4737951027217692121} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.02, z: 0} m_LocalScale: {x: 1, y: 0.01, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4737951027918891027} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4737951027217692117 MeshFilter: @@ -92,9 +92,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4737951027217692121} 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: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!1 &4737951027310239587 @@ -123,13 +131,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4737951027310239587} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.02, z: 0} m_LocalScale: {x: 1, y: 0.01, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4737951027918891027} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4737951027310239583 MeshFilter: @@ -189,9 +197,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4737951027310239587} 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: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!1 &4737951027918891026 @@ -205,8 +221,6 @@ GameObject: - component: {fileID: 4737951027918891027} - component: {fileID: 4737951027918891023} - component: {fileID: 4737951027918891022} - - component: {fileID: 4737951027918891025} - - component: {fileID: 4737951027918891024} m_Layer: 30 m_Name: AreaOfEffectPrefab m_TagString: Untagged @@ -221,6 +235,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4737951027918891026} + 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} @@ -229,7 +244,6 @@ Transform: - {fileID: 4737951027217692118} - {fileID: 4737951027310239584} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &4737951027918891023 Rigidbody: @@ -238,10 +252,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4737951027918891026} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -264,50 +289,15 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} + impactHitVFX: {fileID: 0} + shouldDisableVisualsOnDelayedDestroyEntered: 1 ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 + shouldResizeVisuals: 0 telegraphDelay: 0 lifeSpan: 0 ---- !u!114 &4737951027918891025 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4737951027918891026} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 4737951027918891022} - - {fileID: 4737951027918891024} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &4737951027918891024 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4737951027918891026} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 + canHitSelf: 0 + onTargetHit: + m_PersistentCalls: + m_Calls: [] diff --git a/Assets/Resources/Abilities/ArmorSplitter_SlashPrefab.prefab b/Assets/Resources/Abilities/ArmorSplitter_SlashPrefab.prefab index 44e73602..48d71679 100644 --- a/Assets/Resources/Abilities/ArmorSplitter_SlashPrefab.prefab +++ b/Assets/Resources/Abilities/ArmorSplitter_SlashPrefab.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3038300817935849} + 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} @@ -31,7 +32,6 @@ Transform: - {fileID: 3038301379305787} - {fileID: 7931501863358608295} m_Father: {fileID: 8571073935089530157} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3038301379305791 GameObject: @@ -59,13 +59,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3038301379305791} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 0.25, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3038300817935830} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3038301379305786 MeshFilter: @@ -125,9 +125,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3038301379305791} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &8571073935089530159 @@ -141,8 +149,6 @@ GameObject: - component: {fileID: 8571073935089530157} - component: {fileID: 8571073935089530158} - component: {fileID: 8571073935089530152} - - component: {fileID: 8571073935089530154} - - component: {fileID: 8571073935089530155} m_Layer: 30 m_Name: ArmorSplitter_SlashPrefab m_TagString: Untagged @@ -157,6 +163,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8571073935089530159} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} @@ -164,7 +171,6 @@ Transform: m_Children: - {fileID: 3038300817935830} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &8571073935089530158 Rigidbody: @@ -173,10 +179,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8571073935089530159} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -200,8 +217,6 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} lifeSpan: 0 @@ -213,50 +228,12 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &8571073935089530154 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8571073935089530159} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 8571073935089530155} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &8571073935089530155 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8571073935089530159} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1001 &6300172379028399319 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3038300817935830} m_Modifications: - target: {fileID: 4142449149891155824, guid: adee6806da2db7646b158620c26bf622, type: 3} @@ -324,6 +301,9 @@ PrefabInstance: value: CFXR4 Sword Trail FIRE (360 Thin Spiral) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: adee6806da2db7646b158620c26bf622, type: 3} --- !u!4 &7931501863358608295 stripped Transform: diff --git a/Assets/Resources/Abilities/ArrowProjectilePrefab.prefab b/Assets/Resources/Abilities/ArrowProjectilePrefab.prefab index bc5b582e..cc9443f5 100644 --- a/Assets/Resources/Abilities/ArrowProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/ArrowProjectilePrefab.prefab @@ -24,17 +24,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3844554688752882006} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.4999998, y: 0.49999982, z: 0.49999988} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5408610653861158196} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!96 &4006260535200030157 TrailRenderer: - serializedVersion: 2 + serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -75,6 +75,7 @@ TrailRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Time: 0.33 + m_PreviewTimeScale: 1 m_Parameters: serializedVersion: 3 widthMultiplier: 0.015 @@ -120,17 +121,21 @@ TrailRenderer: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 numCornerVertices: 0 numCapVertices: 0 alignment: 0 textureMode: 0 + textureScale: {x: 1, y: 1} shadowBias: 0.5 generateLightingData: 0 m_MinVertexDistance: 0.1 + m_MaskInteraction: 0 m_Autodestruct: 0 m_Emitting: 1 + m_ApplyActiveColorSpace: 0 --- !u!1 &6112776810822369217 GameObject: m_ObjectHideFlags: 0 @@ -155,6 +160,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6112776810822369217} + 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} @@ -163,7 +169,6 @@ Transform: - {fileID: 7903154496604224877} - {fileID: 214734812007154156} m_Father: {fileID: 8607891234483246272} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7232510528443783147 MonoBehaviour: @@ -190,8 +195,6 @@ GameObject: - component: {fileID: 8607891234483246272} - component: {fileID: 8607891234483246275} - component: {fileID: 8607891234483246273} - - component: {fileID: 8607891234483246279} - - component: {fileID: 8607891234483246278} m_Layer: 30 m_Name: ArrowProjectilePrefab m_TagString: Untagged @@ -206,6 +209,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8607891234483246274} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1.031} m_LocalScale: {x: 1, y: 1, z: 1} @@ -213,7 +217,6 @@ Transform: m_Children: - {fileID: 5408610653861158196} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &8607891234483246275 Rigidbody: @@ -222,10 +225,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8607891234483246274} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -245,8 +259,6 @@ MonoBehaviour: m_EditorClassIdentifier: hitParticlesPrefab: {fileID: 8525990746615576120, guid: b85d21f3b8fed714bacf0c4fd50fa512, type: 3} visuals: {fileID: 6112776810822369217} - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} speed: 0 @@ -256,50 +268,12 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &8607891234483246279 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8607891234483246274} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 8607891234483246278} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &8607891234483246278 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8607891234483246274} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1001 &7649113661387922054 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5408610653861158196} m_Modifications: - target: {fileID: -8679921383154817045, guid: bebb1498cf3ec654a822364b0c736732, type: 3} @@ -355,6 +329,12 @@ PrefabInstance: value: 30 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: bebb1498cf3ec654a822364b0c736732, type: 3} + insertIndex: -1 + addedObject: {fileID: 7649113661387922051} m_SourcePrefab: {fileID: 100100000, guid: bebb1498cf3ec654a822364b0c736732, type: 3} --- !u!1 &7414743066936895447 stripped GameObject: @@ -369,9 +349,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7414743066936895447} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.6, y: 0.74854666, z: 0.6} m_Center: {x: -0.0000034403056, y: -0.008655371, z: 0.016935034} --- !u!4 &7903154496604224877 stripped diff --git a/Assets/Resources/Abilities/AuraOfDeath_AreaOfEffectOverTimeWithTickEvent.prefab b/Assets/Resources/Abilities/AuraOfDeath_AreaOfEffectOverTimeWithTickEvent.prefab index 52b4c2ab..f3da70e1 100644 --- a/Assets/Resources/Abilities/AuraOfDeath_AreaOfEffectOverTimeWithTickEvent.prefab +++ b/Assets/Resources/Abilities/AuraOfDeath_AreaOfEffectOverTimeWithTickEvent.prefab @@ -99,8 +99,6 @@ GameObject: - component: {fileID: 7860705739450478572} - component: {fileID: 7860705739450478576} - component: {fileID: 7860705739450478577} - - component: {fileID: 7860705739450478574} - - component: {fileID: 7860705739450478575} m_Layer: 30 m_Name: AuraOfDeath_AreaOfEffectOverTimeWithTickEvent m_TagString: Untagged @@ -171,8 +169,6 @@ MonoBehaviour: m_Bits: 2147483648 impactHitVFX: {fileID: 5642766282230003982, guid: b5c8ca7ed10b61e499cce8ec3b6e2e4c, type: 3} shouldDisableVisualsOnDelayedDestroyEntered: 0 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 @@ -203,46 +199,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &7860705739450478574 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7860705739450478573} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 7860705739450478577} - - {fileID: 7860705739450478575} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &7860705739450478575 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7860705739450478573} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1001 &4965738088363716240 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/AxeThrowProjectilePrefab.prefab b/Assets/Resources/Abilities/AxeThrowProjectilePrefab.prefab index 1a84f575..fffa08c5 100644 --- a/Assets/Resources/Abilities/AxeThrowProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/AxeThrowProjectilePrefab.prefab @@ -57,8 +57,6 @@ GameObject: - component: {fileID: 2740904024514934884} - component: {fileID: 2740904024514934887} - component: {fileID: 2740904024514934885} - - component: {fileID: 2740904024514934883} - - component: {fileID: 2740904024514934882} m_Layer: 30 m_Name: AxeThrowProjectilePrefab m_TagString: Untagged @@ -123,8 +121,6 @@ MonoBehaviour: m_EditorClassIdentifier: hitParticlesPrefab: {fileID: 8525990746615576120, guid: b85d21f3b8fed714bacf0c4fd50fa512, type: 3} visuals: {fileID: 407585489956885349} - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} speed: 0 @@ -134,45 +130,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &2740904024514934883 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2740904024514934886} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 2740904024514934882} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &2740904024514934882 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2740904024514934886} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &4110603956934488078 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/BasicMinionPrefab.prefab b/Assets/Resources/Abilities/BasicMinionPrefab.prefab index 46aba260..af99dabd 100644 --- a/Assets/Resources/Abilities/BasicMinionPrefab.prefab +++ b/Assets/Resources/Abilities/BasicMinionPrefab.prefab @@ -4970,8 +4970,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2db571c50b3b30f44a9d93c5eb61126f, type: 3} m_Name: m_EditorClassIdentifier: - shouldDrainMana: 1 - OwnerMana: {fileID: 0} + OwnerSpiritPower: {fileID: 0} + spiritPowerReserved: 0 minionHealth: {fileID: 0} minionStats: {fileID: 0} --- !u!1 &1773925912441182246 @@ -5018,7 +5018,6 @@ GameObject: - component: {fileID: 4329571744063676187} - component: {fileID: 7707231656763327841} - component: {fileID: 8300159577186174745} - - component: {fileID: 8726789643333029568} - component: {fileID: 4329571744063676186} m_Layer: 31 m_Name: Skeleton @@ -5086,42 +5085,6 @@ CapsuleCollider: m_Height: 2.5 m_Direction: 1 m_Center: {x: 0, y: 1.2, z: 0} ---- !u!114 &8726789643333029568 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3989743020345623969} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b8c4a61274f60b4ea5fb4299cfdbf14, type: 3} - m_Name: - m_EditorClassIdentifier: - ShowLayerWeightsInspector: 1 - ShowParameterInspector: 1 - m_SynchronizeParameters: - - Type: 1 - SynchronizeType: 1 - Name: movementSpeed - - Type: 9 - SynchronizeType: 0 - Name: throw - - Type: 9 - SynchronizeType: 0 - Name: cast - - Type: 9 - SynchronizeType: 0 - Name: melee - - Type: 1 - SynchronizeType: 0 - Name: throwingTime - - Type: 9 - SynchronizeType: 0 - Name: dead - m_SynchronizeLayers: - - SynchronizeType: 1 - LayerIndex: 0 --- !u!114 &4329571744063676186 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5143,8 +5106,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4296156910025484506} - - component: {fileID: 2475434436818348717} - - component: {fileID: 2475434436818348716} - component: {fileID: 4296156910025484504} - component: {fileID: 2475434436818348718} - component: {fileID: 2475434436818348719} @@ -5196,48 +5157,6 @@ Transform: - {fileID: 636923079769064192} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2475434436818348717 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4296156910025484507} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 2475434436818348716} - - {fileID: 2475434436818348714} - - {fileID: 2475434436818348713} - - {fileID: 8726789643333029568} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &2475434436818348716 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4296156910025484507} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!114 &4296156910025484504 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5256,7 +5175,6 @@ MonoBehaviour: patrolAgentSpeed: 5 chasingAgentSpeed: 3 timeBetweenAttacks: 2 - photonView: {fileID: 0} myTag: {fileID: 0} animatorController: {fileID: 0} abilityPriorityManager: {fileID: 0} @@ -5273,6 +5191,7 @@ MonoBehaviour: movementMask: serializedVersion: 2 m_Bits: 8 + owner: {fileID: 0} --- !u!195 &2475434436818348718 NavMeshAgent: m_ObjectHideFlags: 0 @@ -5386,7 +5305,6 @@ MonoBehaviour: onDeath: m_PersistentCalls: m_Calls: [] - photonView: {fileID: 0} invulnerable: 0 OnInvulnerabilityStateChanged: m_PersistentCalls: @@ -5415,7 +5333,6 @@ MonoBehaviour: onMaxManaChanged: m_PersistentCalls: m_Calls: [] - photonView: {fileID: 0} OnNoManaCostStateChanged: m_PersistentCalls: m_Calls: [] @@ -5484,7 +5401,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -5573,7 +5489,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -5599,7 +5514,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -5628,7 +5542,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -5657,7 +5570,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -5701,7 +5613,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -5904,8 +5815,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 68722050dc098fd44b9fd59255e4865e, type: 3} m_Name: m_EditorClassIdentifier: - onPlayerJoinedParty: {fileID: 568148923611501537} - onPlayerLeftParty: {fileID: 890648897281043318} --- !u!1 &5371923187957039206 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/BasicMinionPrefab_Golem Variant.prefab b/Assets/Resources/Abilities/BasicMinionPrefab_Golem Variant.prefab index 5c34f365..a03e13d7 100644 --- a/Assets/Resources/Abilities/BasicMinionPrefab_Golem Variant.prefab +++ b/Assets/Resources/Abilities/BasicMinionPrefab_Golem Variant.prefab @@ -123,10 +123,6 @@ PrefabInstance: propertyPath: Vitality.BaseValue value: 3 objectReference: {fileID: 0} - - target: {fileID: 2475434436818348717, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2475434436818348718, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: m_Height value: 2 @@ -283,23 +279,12 @@ PrefabInstance: propertyPath: m_Center.y value: 2 objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.size - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[6].Name - value: jump - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[6].Type - value: 9 - objectReference: {fileID: 0} - target: {fileID: 9207610886645488137, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: m_AnchoredPosition.y value: 2.35 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4329571744063676187, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} diff --git a/Assets/Resources/Abilities/BasicMinionPrefab_Mage Mirror Image Variant.prefab b/Assets/Resources/Abilities/BasicMinionPrefab_Mage Mirror Image Variant.prefab index 5b00dc9f..5ea6366a 100644 --- a/Assets/Resources/Abilities/BasicMinionPrefab_Mage Mirror Image Variant.prefab +++ b/Assets/Resources/Abilities/BasicMinionPrefab_Mage Mirror Image Variant.prefab @@ -237,10 +237,6 @@ PrefabInstance: propertyPath: Intelligence.BaseValue value: 2 objectReference: {fileID: 0} - - target: {fileID: 2475434436818348717, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4296156910025484504, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: timeBetweenAttacks value: 1 @@ -345,87 +341,12 @@ PrefabInstance: propertyPath: m_Controller value: objectReference: {fileID: 9100000, guid: b292994347ef74847b232e89a43d38d5, type: 2} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeLayers.Array.size - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.size - value: 14 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[6].Name - value: castingTime - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[6].Type - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[7].Name - value: spinning - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[7].Type - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[8].Name - value: revived - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[8].Type - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[9].Name - value: summon - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[9].Type - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[10].Name - value: fish - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[10].Type - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[11].Name - value: pickup - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[11].Type - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[12].Name - value: potion - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[12].Type - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[13].Name - value: spellcasting - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[13].Type - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeLayers.Array.data[1].LayerIndex - value: 1 - objectReference: {fileID: 0} - target: {fileID: 9207610886645488137, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: m_AnchoredPosition.y value: 1.45 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4329571744063676187, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} diff --git a/Assets/Resources/Abilities/BasicMinionPrefab_Mage Variant.prefab b/Assets/Resources/Abilities/BasicMinionPrefab_Mage Variant.prefab index edd77149..69de6ed1 100644 --- a/Assets/Resources/Abilities/BasicMinionPrefab_Mage Variant.prefab +++ b/Assets/Resources/Abilities/BasicMinionPrefab_Mage Variant.prefab @@ -107,10 +107,6 @@ PrefabInstance: propertyPath: Intelligence.BaseValue value: 2 objectReference: {fileID: 0} - - target: {fileID: 2475434436818348717, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4296156910025484504, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: timeBetweenAttacks value: 1 @@ -203,7 +199,8 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 1.45 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4329571744063676187, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} diff --git a/Assets/Resources/Abilities/BasicMinionPrefab_Rogue Variant.prefab b/Assets/Resources/Abilities/BasicMinionPrefab_Rogue Variant.prefab index 045063ae..646be378 100644 --- a/Assets/Resources/Abilities/BasicMinionPrefab_Rogue Variant.prefab +++ b/Assets/Resources/Abilities/BasicMinionPrefab_Rogue Variant.prefab @@ -28,10 +28,6 @@ PrefabInstance: propertyPath: Agility.BaseValue value: 2 objectReference: {fileID: 0} - - target: {fileID: 2475434436818348717, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4296156910025484504, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: timeBetweenAttacks value: 0.5 @@ -96,10 +92,6 @@ PrefabInstance: propertyPath: abilityPriorityList.Array.data[1].ability value: objectReference: {fileID: 11400000, guid: ae71fbffabf4be44cac54e69769419a8, type: 2} - - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.size - value: 2 - objectReference: {fileID: 0} - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: abilityPriorityList.Array.data[1].castConditions.Array.size value: 3 @@ -124,7 +116,8 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 1.35 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4329571744063676187, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} diff --git a/Assets/Resources/Abilities/BasicMinionPrefab_Savage Variant.prefab b/Assets/Resources/Abilities/BasicMinionPrefab_Savage Variant.prefab index 124efe01..567bedca 100644 --- a/Assets/Resources/Abilities/BasicMinionPrefab_Savage Variant.prefab +++ b/Assets/Resources/Abilities/BasicMinionPrefab_Savage Variant.prefab @@ -20,10 +20,6 @@ PrefabInstance: propertyPath: Strength.BaseValue value: 2 objectReference: {fileID: 0} - - target: {fileID: 2475434436818348717, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4296156910025484504, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: timeBetweenAttacks value: 0.75 @@ -88,10 +84,6 @@ PrefabInstance: propertyPath: abilityPriorityList.Array.data[1].ability value: objectReference: {fileID: 11400000, guid: ae71fbffabf4be44cac54e69769419a8, type: 2} - - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.size - value: 2 - objectReference: {fileID: 0} - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: abilityPriorityList.Array.data[1].castConditions.Array.size value: 3 @@ -116,7 +108,8 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 1.35 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4329571744063676187, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} diff --git a/Assets/Resources/Abilities/BasicMinionPrefab_Vamp-Cultist-Satanist Bloody Shadow Variant.prefab b/Assets/Resources/Abilities/BasicMinionPrefab_Vamp-Cultist-Satanist Bloody Shadow Variant.prefab index 587f8b47..590aa8fa 100644 --- a/Assets/Resources/Abilities/BasicMinionPrefab_Vamp-Cultist-Satanist Bloody Shadow Variant.prefab +++ b/Assets/Resources/Abilities/BasicMinionPrefab_Vamp-Cultist-Satanist Bloody Shadow Variant.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4638813491977896958} m_Modifications: - target: {fileID: 310501998914086865, guid: cfa80d1224dc4bf46adaf48681a6080c, type: 3} @@ -152,12 +153,21 @@ PrefabInstance: - {fileID: 1235672432261282576, guid: cfa80d1224dc4bf46adaf48681a6080c, type: 3} - {fileID: 2855440144810541910, guid: cfa80d1224dc4bf46adaf48681a6080c, type: 3} - {fileID: 7716045718905858460, guid: cfa80d1224dc4bf46adaf48681a6080c, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cfa80d1224dc4bf46adaf48681a6080c, type: 3} +--- !u!4 &9126833327833035820 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6091832650452064618, guid: cfa80d1224dc4bf46adaf48681a6080c, type: 3} + m_PrefabInstance: {fileID: 3036427852074282310} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8617340733075610362 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4638813491977896958} m_Modifications: - target: {fileID: 514046598620691942, guid: 7781ea4ec1b78a84287f47a962577a68, type: 3} @@ -226,12 +236,21 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 856576155116208305, guid: 7781ea4ec1b78a84287f47a962577a68, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7781ea4ec1b78a84287f47a962577a68, type: 3} +--- !u!4 &8934969834110795174 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 894406551022397276, guid: 7781ea4ec1b78a84287f47a962577a68, type: 3} + m_PrefabInstance: {fileID: 8617340733075610362} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8968314771729947877 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 2475434436818348713, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} @@ -258,10 +277,6 @@ PrefabInstance: propertyPath: Intelligence.BaseValue value: 1 objectReference: {fileID: 0} - - target: {fileID: 2475434436818348717, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4296156910025484504, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: timeBetweenAttacks value: 0.5 @@ -374,87 +389,21 @@ PrefabInstance: propertyPath: m_Controller value: objectReference: {fileID: 9100000, guid: b292994347ef74847b232e89a43d38d5, type: 2} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeLayers.Array.size - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.size - value: 14 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[6].Name - value: castingTime - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[6].Type - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[7].Name - value: spinning - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[7].Type - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[8].Name - value: revived - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[8].Type - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[9].Name - value: summon - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[9].Type - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[10].Name - value: fish - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[10].Type - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[11].Name - value: pickup - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[11].Type - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[12].Name - value: potion - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[12].Type - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[13].Name - value: spellcasting - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeParameters.Array.data[13].Type - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 8726789643333029568, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: m_SynchronizeLayers.Array.data[1].LayerIndex - value: 1 - objectReference: {fileID: 0} - target: {fileID: 9207610886645488137, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: m_AnchoredPosition.y value: 1.45 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4329571744063676187, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} + insertIndex: -1 + addedObject: {fileID: 8934969834110795174} + - targetCorrespondingSourceObject: {fileID: 4329571744063676187, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} + insertIndex: -1 + addedObject: {fileID: 9126833327833035820} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} --- !u!4 &4638813491977896958 stripped Transform: diff --git a/Assets/Resources/Abilities/BasicMinionPrefab_Warrior Variant.prefab b/Assets/Resources/Abilities/BasicMinionPrefab_Warrior Variant.prefab index 69f80d13..4aec7e3d 100644 --- a/Assets/Resources/Abilities/BasicMinionPrefab_Warrior Variant.prefab +++ b/Assets/Resources/Abilities/BasicMinionPrefab_Warrior Variant.prefab @@ -107,10 +107,6 @@ PrefabInstance: propertyPath: Vitality.BaseValue value: 2 objectReference: {fileID: 0} - - target: {fileID: 2475434436818348717, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4296156910025484504, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: timeBetweenAttacks value: 1.25 @@ -175,10 +171,6 @@ PrefabInstance: propertyPath: abilityPriorityList.Array.data[1].ability value: objectReference: {fileID: 11400000, guid: ae71fbffabf4be44cac54e69769419a8, type: 2} - - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} - propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.size - value: 2 - objectReference: {fileID: 0} - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: abilityPriorityList.Array.data[1].castConditions.Array.size value: 3 @@ -211,7 +203,8 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 1.4 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4329571744063676187, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} diff --git a/Assets/Resources/Abilities/BatSwarm_AreaOfEffectOverTimeWithTickEvent.prefab b/Assets/Resources/Abilities/BatSwarm_AreaOfEffectOverTimeWithTickEvent.prefab index ad1b6e0a..a3c6edaf 100644 --- a/Assets/Resources/Abilities/BatSwarm_AreaOfEffectOverTimeWithTickEvent.prefab +++ b/Assets/Resources/Abilities/BatSwarm_AreaOfEffectOverTimeWithTickEvent.prefab @@ -186,8 +186,6 @@ GameObject: - component: {fileID: 7681102451873883168} - component: {fileID: 7681102451873883196} - component: {fileID: 7681102451873883197} - - component: {fileID: 7681102451873883170} - - component: {fileID: 7681102451873883171} m_Layer: 30 m_Name: BatSwarm_AreaOfEffectOverTimeWithTickEvent m_TagString: Untagged @@ -259,8 +257,6 @@ MonoBehaviour: m_Bits: 2147483648 impactHitVFX: {fileID: 4553287630450876385, guid: 15483e51212e3d74886ea57291f4639a, type: 3} shouldDisableVisualsOnDelayedDestroyEntered: 0 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 @@ -291,46 +287,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &7681102451873883170 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7681102451873883169} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 7681102451873883197} - - {fileID: 7681102451873883171} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &7681102451873883171 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7681102451873883169} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &7681102452339790672 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/Blizzard_AreaOfEffectOverTimePrefab Variant.prefab b/Assets/Resources/Abilities/Blizzard_AreaOfEffectOverTimePrefab Variant.prefab index b40c378a..99bf8832 100644 --- a/Assets/Resources/Abilities/Blizzard_AreaOfEffectOverTimePrefab Variant.prefab +++ b/Assets/Resources/Abilities/Blizzard_AreaOfEffectOverTimePrefab Variant.prefab @@ -106,10 +106,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 753911528859556808, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} propertyPath: m_RootOrder value: 0 @@ -162,10 +158,6 @@ PrefabInstance: propertyPath: impactHitVFX value: objectReference: {fileID: 5112403345868107898, guid: 6f34ef0d986e9db4199cf75805f79753, type: 3} - - target: {fileID: 4866147177977517818, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7054294892364551028, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} propertyPath: m_IsActive value: 1 @@ -174,7 +166,8 @@ PrefabInstance: propertyPath: lengthInSec value: 5 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} diff --git a/Assets/Resources/Abilities/Blood Drain_DrainProjectileAbility.prefab b/Assets/Resources/Abilities/Blood Drain_DrainProjectileAbility.prefab index 352e79b5..3731fac8 100644 --- a/Assets/Resources/Abilities/Blood Drain_DrainProjectileAbility.prefab +++ b/Assets/Resources/Abilities/Blood Drain_DrainProjectileAbility.prefab @@ -42,9 +42,7 @@ GameObject: m_Component: - component: {fileID: 8966047921959179495} - component: {fileID: 8966047921959179494} - - component: {fileID: 2263027287439817283} - component: {fileID: 1827139782585408913} - - component: {fileID: 994315156573659964} m_Layer: 0 m_Name: Blood Drain_DrainProjectileAbility m_TagString: Untagged @@ -83,8 +81,6 @@ MonoBehaviour: m_EditorClassIdentifier: hitParticlesPrefab: {fileID: 3781946150010653001, guid: 0a4bc2e019620cf4cbf17c2d374a6fb8, type: 3} visuals: {fileID: 8966047921438838140} - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} speed: 0 @@ -92,29 +88,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &2263027287439817283 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8966047921959179417} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 994315156573659964} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 --- !u!54 &1827139782585408913 Rigidbody: m_ObjectHideFlags: 0 @@ -142,22 +115,6 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!114 &994315156573659964 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8966047921959179417} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &9157631228044945684 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/BloodBath_AreaOfEffectWithImpactEvent.prefab b/Assets/Resources/Abilities/BloodBath_AreaOfEffectWithImpactEvent.prefab index adfc8c55..fb269e25 100644 --- a/Assets/Resources/Abilities/BloodBath_AreaOfEffectWithImpactEvent.prefab +++ b/Assets/Resources/Abilities/BloodBath_AreaOfEffectWithImpactEvent.prefab @@ -24,6 +24,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4772960341985427853} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} @@ -31,7 +32,6 @@ Transform: m_Children: - {fileID: 4469288950559496050} m_Father: {fileID: 4772960342460004093} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4772960341985427889 MeshFilter: @@ -52,8 +52,6 @@ GameObject: - component: {fileID: 4772960342460004093} - component: {fileID: 4772960342460004065} - component: {fileID: 4772960342460004064} - - component: {fileID: 4772960342460004095} - - component: {fileID: 4772960342460004094} m_Layer: 30 m_Name: BloodBath_AreaOfEffectWithImpactEvent m_TagString: Untagged @@ -68,6 +66,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4772960342460004092} + 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} @@ -76,7 +75,6 @@ Transform: - {fileID: 4772960341985427854} - {fileID: 5218053298088991715} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &4772960342460004065 Rigidbody: @@ -85,10 +83,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4772960342460004092} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -113,8 +122,6 @@ MonoBehaviour: m_Bits: 2147483648 impactHitVFX: {fileID: 4553287630450876385, guid: 15483e51212e3d74886ea57291f4639a, type: 3} shouldDisableVisualsOnDelayedDestroyEntered: 0 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 @@ -141,46 +148,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &4772960342460004095 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4772960342460004092} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 4772960342460004064} - - {fileID: 4772960342460004094} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &4772960342460004094 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4772960342460004092} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &5218053298088991717 GameObject: m_ObjectHideFlags: 0 @@ -205,13 +172,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5218053298088991717} + 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: 4772960342460004093} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5218053298088991722 MonoBehaviour: @@ -233,6 +200,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4772960341985427854} m_Modifications: - target: {fileID: 791723716890634802, guid: 9eaa11e20486b394dad6bd421edc9083, type: 3} @@ -300,6 +268,9 @@ PrefabInstance: value: BloodBath objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9eaa11e20486b394dad6bd421edc9083, type: 3} --- !u!4 &4469288950559496050 stripped Transform: diff --git a/Assets/Resources/Abilities/BloodRose_AreaOfEffectOverTimePrefab Variant.prefab b/Assets/Resources/Abilities/BloodRose_AreaOfEffectOverTimePrefab Variant.prefab index c3041ec9..7d174c73 100644 --- a/Assets/Resources/Abilities/BloodRose_AreaOfEffectOverTimePrefab Variant.prefab +++ b/Assets/Resources/Abilities/BloodRose_AreaOfEffectOverTimePrefab Variant.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4220815755697051531} m_Modifications: - target: {fileID: 3377181292992421420, guid: 48c5715f9603c3842a353516a8baefbb, type: 3} @@ -72,18 +73,23 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 48c5715f9603c3842a353516a8baefbb, type: 3} +--- !u!4 &685927852275870676 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3423388300971593625, guid: 48c5715f9603c3842a353516a8baefbb, type: 3} + m_PrefabInstance: {fileID: 2740077787012457549} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7343750338178979620 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 753911528859556808, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} propertyPath: m_RootOrder value: 0 @@ -144,7 +150,14 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} + insertIndex: -1 + addedObject: {fileID: 685927852275870676} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} --- !u!4 &4220815755697051531 stripped Transform: diff --git a/Assets/Resources/Abilities/BloodVacuum_AreaOfEffectOverTimeWithTickEvent.prefab b/Assets/Resources/Abilities/BloodVacuum_AreaOfEffectOverTimeWithTickEvent.prefab index ccf6b5d1..90450b2b 100644 --- a/Assets/Resources/Abilities/BloodVacuum_AreaOfEffectOverTimeWithTickEvent.prefab +++ b/Assets/Resources/Abilities/BloodVacuum_AreaOfEffectOverTimeWithTickEvent.prefab @@ -58,8 +58,6 @@ GameObject: - component: {fileID: 5268821355948254243} - component: {fileID: 5268821355948254271} - component: {fileID: 5268821355948254270} - - component: {fileID: 5268821355948254241} - - component: {fileID: 5268821355948254240} m_Layer: 30 m_Name: BloodVacuum_AreaOfEffectOverTimeWithTickEvent m_TagString: Untagged @@ -131,8 +129,6 @@ MonoBehaviour: m_Bits: 2147483648 impactHitVFX: {fileID: 4553287630450876385, guid: 15483e51212e3d74886ea57291f4639a, type: 3} shouldDisableVisualsOnDelayedDestroyEntered: 0 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 @@ -163,46 +159,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &5268821355948254241 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5268821355948254242} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 5268821355948254270} - - {fileID: 5268821355948254240} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &5268821355948254240 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5268821355948254242} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &5268821356547593043 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/BloodVacuum_AreaOfEffectWithImpactEvent.prefab b/Assets/Resources/Abilities/BloodVacuum_AreaOfEffectWithImpactEvent.prefab index 09136457..81b77aea 100644 --- a/Assets/Resources/Abilities/BloodVacuum_AreaOfEffectWithImpactEvent.prefab +++ b/Assets/Resources/Abilities/BloodVacuum_AreaOfEffectWithImpactEvent.prefab @@ -24,13 +24,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6987410256166384760} + 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: 7687237107928750432} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6987410256166384759 MonoBehaviour: @@ -46,6 +46,7 @@ MonoBehaviour: m_EditorClassIdentifier: ability: {fileID: 11400000, guid: aa61ab8f8cd8a2b47939eb31fe620c62, type: 2} abilityPrefabName: {fileID: 8966047921959179417, guid: 15b7bc6597eaf3c48a39f36fcb469757, type: 3} + canDrainAllies: 0 --- !u!1 &7687237107928750433 GameObject: m_ObjectHideFlags: 0 @@ -57,8 +58,6 @@ GameObject: - component: {fileID: 7687237107928750432} - component: {fileID: 7687237107928750460} - component: {fileID: 7687237107928750461} - - component: {fileID: 7687237107928750434} - - component: {fileID: 7687237107928750435} m_Layer: 30 m_Name: BloodVacuum_AreaOfEffectWithImpactEvent m_TagString: Untagged @@ -73,6 +72,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7687237107928750433} + 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} @@ -81,7 +81,6 @@ Transform: - {fileID: 7687237108527803923} - {fileID: 6987410256166384766} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &7687237107928750460 Rigidbody: @@ -90,10 +89,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7687237107928750433} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -118,8 +128,6 @@ MonoBehaviour: m_Bits: 2147483648 impactHitVFX: {fileID: 4553287630450876385, guid: 15483e51212e3d74886ea57291f4639a, type: 3} shouldDisableVisualsOnDelayedDestroyEntered: 0 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 @@ -146,46 +154,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &7687237107928750434 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7687237107928750433} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 7687237107928750461} - - {fileID: 7687237107928750435} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &7687237107928750435 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7687237107928750433} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &7687237108527803920 GameObject: m_ObjectHideFlags: 0 @@ -210,6 +178,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7687237108527803920} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} @@ -217,7 +186,6 @@ Transform: m_Children: - {fileID: 5377490359894690413} m_Father: {fileID: 7687237107928750432} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7687237108527803948 MeshFilter: @@ -232,6 +200,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7687237108527803923} m_Modifications: - target: {fileID: 1464211568921416440, guid: c1d41160f35db9541962af4cb9a60639, type: 3} @@ -391,6 +360,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c1d41160f35db9541962af4cb9a60639, type: 3} --- !u!4 &5377490359894690413 stripped Transform: diff --git a/Assets/Resources/Abilities/BoneThrowProjectilePrefab.prefab b/Assets/Resources/Abilities/BoneThrowProjectilePrefab.prefab index 072d4437..72b6d108 100644 --- a/Assets/Resources/Abilities/BoneThrowProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/BoneThrowProjectilePrefab.prefab @@ -11,8 +11,6 @@ GameObject: - component: {fileID: 6063651656755616564} - component: {fileID: 6063651656755616567} - component: {fileID: 6063651656755616565} - - component: {fileID: 6063651656755616563} - - component: {fileID: 6063651656755616562} m_Layer: 30 m_Name: BoneThrowProjectilePrefab m_TagString: Untagged @@ -77,8 +75,6 @@ MonoBehaviour: m_EditorClassIdentifier: hitParticlesPrefab: {fileID: 8525990746615576120, guid: b85d21f3b8fed714bacf0c4fd50fa512, type: 3} visuals: {fileID: 8613070970443132981} - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} speed: 0 @@ -88,45 +84,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &6063651656755616563 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6063651656755616566} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 6063651656755616562} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &6063651656755616562 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6063651656755616566} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &8613070970443132981 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/Bonestorm_ProjectileAreaOfEffectOverTimeWithTickEvent.prefab b/Assets/Resources/Abilities/Bonestorm_ProjectileAreaOfEffectOverTimeWithTickEvent.prefab index c83c2fab..0b21fe2c 100644 --- a/Assets/Resources/Abilities/Bonestorm_ProjectileAreaOfEffectOverTimeWithTickEvent.prefab +++ b/Assets/Resources/Abilities/Bonestorm_ProjectileAreaOfEffectOverTimeWithTickEvent.prefab @@ -797,8 +797,6 @@ GameObject: - component: {fileID: 7681102451873883168} - component: {fileID: 7681102451873883196} - component: {fileID: 1813405135002957620} - - component: {fileID: 7681102451873883170} - - component: {fileID: 7681102451873883171} m_Layer: 30 m_Name: Bonestorm_ProjectileAreaOfEffectOverTimeWithTickEvent m_TagString: Untagged @@ -871,8 +869,6 @@ MonoBehaviour: m_Bits: 2147483648 impactHitVFX: {fileID: 5642766282230003982, guid: b5c8ca7ed10b61e499cce8ec3b6e2e4c, type: 3} shouldDisableVisualsOnDelayedDestroyEntered: 1 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 @@ -908,46 +904,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &7681102451873883170 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7681102451873883169} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 1813405135002957620} - - {fileID: 7681102451873883171} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &7681102451873883171 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7681102451873883169} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &7681102452339790672 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/BurstOfCorruption_AreaOfEffectPrefab Variant.prefab b/Assets/Resources/Abilities/BurstOfCorruption_AreaOfEffectPrefab Variant.prefab index 8af5e706..a0472de2 100644 --- a/Assets/Resources/Abilities/BurstOfCorruption_AreaOfEffectPrefab Variant.prefab +++ b/Assets/Resources/Abilities/BurstOfCorruption_AreaOfEffectPrefab Variant.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2060993993} + 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} @@ -30,13 +31,13 @@ Transform: m_Children: - {fileID: 3239527872085897709} m_Father: {fileID: 8979840876601850888} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &4422069639109923867 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4737951027217692116, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} @@ -63,10 +64,6 @@ PrefabInstance: propertyPath: shouldDisableVisualsOnDelayedDestroyEntered value: 0 objectReference: {fileID: 0} - - target: {fileID: 4737951027918891025, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4737951027918891026, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} propertyPath: m_Name value: BurstOfCorruption_AreaOfEffectPrefab Variant @@ -123,6 +120,13 @@ PrefabInstance: - {fileID: 4737951027217692119, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} - {fileID: 4737951027217692116, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} - {fileID: 4737951027217692117, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4737951027918891027, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + insertIndex: -1 + addedObject: {fileID: 2060993994} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} --- !u!4 &8979840876601850888 stripped Transform: @@ -134,6 +138,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2060993994} m_Modifications: - target: {fileID: 1408815150312407145, guid: 25d9c846b93dd1c4daf736bb9a448370, type: 3} @@ -233,6 +238,9 @@ PrefabInstance: value: 0.28729415 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25d9c846b93dd1c4daf736bb9a448370, type: 3} --- !u!4 &3239527872085897709 stripped Transform: diff --git a/Assets/Resources/Abilities/BurstOfHope_AreaOfEffectPrefab Variant.prefab b/Assets/Resources/Abilities/BurstOfHope_AreaOfEffectPrefab Variant.prefab index fd3122b1..c852f4c0 100644 --- a/Assets/Resources/Abilities/BurstOfHope_AreaOfEffectPrefab Variant.prefab +++ b/Assets/Resources/Abilities/BurstOfHope_AreaOfEffectPrefab Variant.prefab @@ -64,10 +64,6 @@ PrefabInstance: propertyPath: shouldDisableVisualsOnDelayedDestroyEntered value: 0 objectReference: {fileID: 0} - - target: {fileID: 4737951027918891025, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4737951027918891026, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} propertyPath: m_Name value: BurstOfHope_AreaOfEffectPrefab Variant @@ -124,6 +120,7 @@ PrefabInstance: - {fileID: 4737951027217692119, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} - {fileID: 4737951027217692116, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} - {fileID: 4737951027217692117, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4737951027918891027, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} diff --git a/Assets/Resources/Abilities/ChallengingShout_AreaOfEffectPrefab Variant (1) Variant.prefab b/Assets/Resources/Abilities/ChallengingShout_AreaOfEffectPrefab Variant (1) Variant.prefab index 0111a59a..554c2e24 100644 --- a/Assets/Resources/Abilities/ChallengingShout_AreaOfEffectPrefab Variant (1) Variant.prefab +++ b/Assets/Resources/Abilities/ChallengingShout_AreaOfEffectPrefab Variant (1) Variant.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6975426450193729482} + 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} @@ -31,13 +32,13 @@ Transform: - {fileID: 4516928461563506034} - {fileID: 7999616913023819765} m_Father: {fileID: 8058865113381185809} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &372438888284065627 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6975426450193729481} m_Modifications: - target: {fileID: 4240148157295834012, guid: 45728a9dd9fa9004aaeb75fedd1a29c9, type: 3} @@ -89,6 +90,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 45728a9dd9fa9004aaeb75fedd1a29c9, type: 3} --- !u!4 &4516928461563506034 stripped Transform: @@ -100,6 +104,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4737951027217692116, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} @@ -126,10 +131,6 @@ PrefabInstance: propertyPath: shouldDisableVisualsOnDelayedDestroyEntered value: 0 objectReference: {fileID: 0} - - target: {fileID: 4737951027918891025, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4737951027918891026, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} propertyPath: m_Name value: ChallengingShout_AreaOfEffectPrefab Variant (1) Variant @@ -186,6 +187,13 @@ PrefabInstance: - {fileID: 4737951027217692119, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} - {fileID: 4737951027217692116, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} - {fileID: 4737951027217692117, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4737951027918891027, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + insertIndex: -1 + addedObject: {fileID: 6975426450193729481} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} --- !u!4 &8058865113381185809 stripped Transform: @@ -197,6 +205,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6975426450193729481} m_Modifications: - target: {fileID: 4299738629470430756, guid: 82066d902ed0dd6488ddfd32eb994801, type: 3} @@ -256,6 +265,9 @@ PrefabInstance: value: vfx_Shockwave_01 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 82066d902ed0dd6488ddfd32eb994801, type: 3} --- !u!4 &7999616913023819765 stripped Transform: diff --git a/Assets/Resources/Abilities/ChanneledAbilityPrefab.prefab b/Assets/Resources/Abilities/ChanneledAbilityPrefab.prefab index abcccd11..fbd2490b 100644 --- a/Assets/Resources/Abilities/ChanneledAbilityPrefab.prefab +++ b/Assets/Resources/Abilities/ChanneledAbilityPrefab.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6684366851844296982} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.6, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -30,7 +31,6 @@ Transform: m_Children: - {fileID: 7496199582761605575} m_Father: {fileID: 6684366852784880872} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6684366852784880873 GameObject: @@ -43,8 +43,6 @@ GameObject: - component: {fileID: 6684366852784880872} - component: {fileID: 6684366852784880874} - component: {fileID: 6684366852784880875} - - component: {fileID: 6684366852784880869} - - component: {fileID: 6684366852784880868} m_Layer: 0 m_Name: ChanneledAbilityPrefab m_TagString: Untagged @@ -59,6 +57,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6684366852784880873} + 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} @@ -66,7 +65,6 @@ Transform: m_Children: - {fileID: 6684366851844296977} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &6684366852784880874 Rigidbody: @@ -75,10 +73,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6684366852784880873} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -100,59 +109,30 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} + ownerHealth: {fileID: 0} + ownerMana: {fileID: 0} ability: {fileID: 0} duration: 0 canHitSelf: 0 followUser: 0 + allowAiming: 0 radius: 0 + healthCostPerTick: 0 + percentHealthCostPerTick: 0 + manaCostPerTick: 0 + percentManaCostPerTick: 0 channeling: 0 ---- !u!114 &6684366852784880869 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6684366852784880873} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 6684366852784880868} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &6684366852784880868 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6684366852784880873} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 + OptionalBoxOverlap: {fileID: 0} + onTickHappened: + m_PersistentCalls: + m_Calls: [] --- !u!1001 &6684366853070150714 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6684366851844296977} m_Modifications: - target: {fileID: 1443053970693627874, guid: b3416c8b2e3c7804b8c061dc4a36fc43, type: 3} @@ -252,6 +232,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3416c8b2e3c7804b8c061dc4a36fc43, type: 3} --- !u!4 &7496199582761605575 stripped Transform: diff --git a/Assets/Resources/Abilities/ChargedUp_AreaOfEffectOverTimePrefab Variant.prefab b/Assets/Resources/Abilities/ChargedUp_AreaOfEffectOverTimePrefab Variant.prefab index b36861ab..35440534 100644 --- a/Assets/Resources/Abilities/ChargedUp_AreaOfEffectOverTimePrefab Variant.prefab +++ b/Assets/Resources/Abilities/ChargedUp_AreaOfEffectOverTimePrefab Variant.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 9170808337143388674} m_Modifications: - target: {fileID: 1570043086163892863, guid: d6041612abfc8cb4983459299b556838, type: 3} @@ -80,34 +81,23 @@ PrefabInstance: value: 5 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d6041612abfc8cb4983459299b556838, type: 3} +--- !u!4 &268359234214462840 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2559523764841597002, guid: d6041612abfc8cb4983459299b556838, type: 3} + m_PrefabInstance: {fileID: 2322773292043291954} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2322773292487711405 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 753911528859556808, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 753911528859556808, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: ObservedComponents.Array.size - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 753911528859556808, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: ObservedComponents.Array.data[0] - value: - objectReference: {fileID: 3047327856582476132} - - target: {fileID: 753911528859556808, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: ObservedComponents.Array.data[1] - value: - objectReference: {fileID: 8344547621681889512} - - target: {fileID: 753911528859556808, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: ObservedComponents.Array.data[2] - value: - objectReference: {fileID: 8344547621681889512} - target: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} propertyPath: m_RootOrder value: 0 @@ -116,18 +106,6 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - target: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -166,18 +144,26 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 753911528859556823, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} + - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} + insertIndex: -1 + addedObject: {fileID: 5532653055153756192} + - targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} + insertIndex: -1 + addedObject: {fileID: 8169554137934841777} + - targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} + insertIndex: -1 + addedObject: {fileID: 268359234214462840} + - targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} + insertIndex: -1 + addedObject: {fileID: 365179220479891116} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 753911528859556811, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} + insertIndex: -1 + addedObject: {fileID: 8344547621681889512} m_SourcePrefab: {fileID: 100100000, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} ---- !u!114 &3047327856582476132 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 753911528859556809, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - m_PrefabInstance: {fileID: 2322773292487711405} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3047327856582476134} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &3047327856582476134 stripped GameObject: m_CorrespondingSourceObject: {fileID: 753911528859556811, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} @@ -202,8 +188,6 @@ MonoBehaviour: m_Bits: 2147483648 impactHitVFX: {fileID: 2965222256817593503, guid: a164e676dbbd6e54587237e619372c98, type: 3} shouldDisableVisualsOnDelayedDestroyEntered: 1 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 @@ -254,6 +238,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 9170808337143388674} m_Modifications: - target: {fileID: 205611106216187159, guid: 4d9a3b35b3bc07649b697df7fb497b6d, type: 3} @@ -317,12 +302,21 @@ PrefabInstance: value: 50 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4d9a3b35b3bc07649b697df7fb497b6d, type: 3} +--- !u!4 &8169554137934841777 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5862613817031353211, guid: 4d9a3b35b3bc07649b697df7fb497b6d, type: 3} + m_PrefabInstance: {fileID: 2322773292741469386} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3576278621380377913 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 9170808337143388674} m_Modifications: - target: {fileID: 3796568457877498773, guid: c50f9e2c685970e4c8ebcd5fc8c7b3e4, type: 3} @@ -374,12 +368,21 @@ PrefabInstance: value: vfx_Lightning_02 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c50f9e2c685970e4c8ebcd5fc8c7b3e4, type: 3} +--- !u!4 &365179220479891116 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3796568457877498773, guid: c50f9e2c685970e4c8ebcd5fc8c7b3e4, type: 3} + m_PrefabInstance: {fileID: 3576278621380377913} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4125335655382747991 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3047327856582476135} m_Modifications: - target: {fileID: 548295500233825645, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} @@ -435,9 +438,17 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} --- !u!82 &4529439464165365306 stripped AudioSource: m_CorrespondingSourceObject: {fileID: 548295500233825645, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} m_PrefabInstance: {fileID: 4125335655382747991} m_PrefabAsset: {fileID: 0} +--- !u!4 &5532653055153756192 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} + m_PrefabInstance: {fileID: 4125335655382747991} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Abilities/ColdSlash_NetworkedSlashWithOnHitEvent_Prefab.prefab b/Assets/Resources/Abilities/ColdSlash_NetworkedSlashWithOnHitEvent_Prefab.prefab index d3aec352..30514e79 100644 --- a/Assets/Resources/Abilities/ColdSlash_NetworkedSlashWithOnHitEvent_Prefab.prefab +++ b/Assets/Resources/Abilities/ColdSlash_NetworkedSlashWithOnHitEvent_Prefab.prefab @@ -24,13 +24,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3569878673956727054} + 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: 4739689218961410419} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2203050115725584431 MonoBehaviour: @@ -70,6 +70,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3980789815621071287} + 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} @@ -79,7 +80,6 @@ Transform: - {fileID: 2944464246602226256} - {fileID: 299467965112004538} m_Father: {fileID: 4739689218961410419} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3980789816181677409 GameObject: @@ -107,13 +107,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3980789816181677409} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.5} m_LocalScale: {x: 2.5, y: 0.25, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3980789815621071240} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3980789816181677412 MeshFilter: @@ -173,9 +173,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3980789816181677409} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &4739689218961410417 @@ -189,8 +197,6 @@ GameObject: - component: {fileID: 4739689218961410419} - component: {fileID: 4739689218961410416} - component: {fileID: 4739689218961410422} - - component: {fileID: 4739689218961410420} - - component: {fileID: 4739689218961410421} m_Layer: 30 m_Name: ColdSlash_NetworkedSlashWithOnHitEvent_Prefab m_TagString: Untagged @@ -205,6 +211,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4739689218961410417} + 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} @@ -213,7 +220,6 @@ Transform: - {fileID: 3980789815621071240} - {fileID: 3430059182134667346} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &4739689218961410416 Rigidbody: @@ -222,10 +228,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4739689218961410417} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -249,8 +266,6 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} lifeSpan: 0 @@ -265,50 +280,12 @@ MonoBehaviour: onImpactHappened: m_PersistentCalls: m_Calls: [] ---- !u!114 &4739689218961410420 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4739689218961410417} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 4739689218961410421} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &4739689218961410421 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4739689218961410417} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1001 &1865155140683007229 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3980789815621071240} m_Modifications: - target: {fileID: 1711387084659657927, guid: ca6705a3f9070d14d819d179493bcfa0, type: 3} @@ -396,6 +373,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ca6705a3f9070d14d819d179493bcfa0, type: 3} --- !u!4 &299467965112004538 stripped Transform: @@ -407,6 +387,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3980789815621071240} m_Modifications: - target: {fileID: 1171201465392465800, guid: 4aa9f30a28a77224ba84b2a2c334c71b, type: 3} @@ -490,6 +471,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4aa9f30a28a77224ba84b2a2c334c71b, type: 3} --- !u!4 &2944464246602226256 stripped Transform: diff --git a/Assets/Resources/Abilities/Consecration_AreaOfEffectOverTimePrefab Variant.prefab b/Assets/Resources/Abilities/Consecration_AreaOfEffectOverTimePrefab Variant.prefab index a6fb5755..1ab5a405 100644 --- a/Assets/Resources/Abilities/Consecration_AreaOfEffectOverTimePrefab Variant.prefab +++ b/Assets/Resources/Abilities/Consecration_AreaOfEffectOverTimePrefab Variant.prefab @@ -8,10 +8,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 753911528859556808, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} propertyPath: m_RootOrder value: 0 @@ -68,7 +64,8 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} diff --git a/Assets/Resources/Abilities/CorruptedGrounds_AreaOfEffectOverTimePrefab Variant.prefab b/Assets/Resources/Abilities/CorruptedGrounds_AreaOfEffectOverTimePrefab Variant.prefab index bda4b5c6..e849b20e 100644 --- a/Assets/Resources/Abilities/CorruptedGrounds_AreaOfEffectOverTimePrefab Variant.prefab +++ b/Assets/Resources/Abilities/CorruptedGrounds_AreaOfEffectOverTimePrefab Variant.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3637001385577036596} m_Modifications: - target: {fileID: 6929723789506349224, guid: 659a9415a67112d4f9a3f44f4df92992, type: 3} @@ -56,18 +57,23 @@ PrefabInstance: value: Dark circle objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 659a9415a67112d4f9a3f44f4df92992, type: 3} +--- !u!4 &7790284980832457823 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6929723789506349224, guid: 659a9415a67112d4f9a3f44f4df92992, type: 3} + m_PrefabInstance: {fileID: 880442698019757303} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7854382112001883035 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 753911528859556808, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} propertyPath: m_RootOrder value: 0 @@ -120,7 +126,14 @@ PrefabInstance: propertyPath: impactHitVFX value: objectReference: {fileID: 3781946150010653001, guid: d25d25ca6583f0747bb6fbd95b181c39, type: 3} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} + insertIndex: -1 + addedObject: {fileID: 7790284980832457823} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} --- !u!4 &3637001385577036596 stripped Transform: diff --git a/Assets/Resources/Abilities/CorruptedSlashPrefab.prefab b/Assets/Resources/Abilities/CorruptedSlashPrefab.prefab index 611f50b4..be5944dd 100644 --- a/Assets/Resources/Abilities/CorruptedSlashPrefab.prefab +++ b/Assets/Resources/Abilities/CorruptedSlashPrefab.prefab @@ -11,8 +11,6 @@ GameObject: - component: {fileID: 3230252606085961015} - component: {fileID: 3230252606085961012} - component: {fileID: 3230252606085961010} - - component: {fileID: 3230252606085961008} - - component: {fileID: 3230252606085961009} m_Layer: 30 m_Name: CorruptedSlashPrefab m_TagString: Untagged @@ -27,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3230252606085961013} + 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} @@ -34,7 +33,6 @@ Transform: m_Children: - {fileID: 6497692220201577932} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &3230252606085961012 Rigidbody: @@ -43,10 +41,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3230252606085961013} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -70,8 +79,6 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} lifeSpan: 0 @@ -83,45 +90,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &3230252606085961008 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3230252606085961013} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 3230252606085961009} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &3230252606085961009 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3230252606085961013} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &6497692219690533157 GameObject: m_ObjectHideFlags: 0 @@ -148,13 +116,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6497692219690533157} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.5} m_LocalScale: {x: 2.5, y: 0.25, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6497692220201577932} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6497692219690533152 MeshFilter: @@ -214,9 +182,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6497692219690533157} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &6497692220201577971 @@ -242,6 +218,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6497692220201577971} + 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} @@ -250,13 +227,13 @@ Transform: - {fileID: 6497692219690533153} - {fileID: 6416745584359675910} m_Father: {fileID: 3230252606085961015} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3923109582014194031 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6497692220201577932} m_Modifications: - target: {fileID: 8033704293342361961, guid: cf32df90b0e8ff94eafabb52e6646e20, type: 3} @@ -308,6 +285,9 @@ PrefabInstance: value: CFXR4 Sword Trail Light (360 Spiral) Dark Variant objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cf32df90b0e8ff94eafabb52e6646e20, type: 3} --- !u!4 &6416745584359675910 stripped Transform: diff --git a/Assets/Resources/Abilities/DarkMatter_ProjectilePrefab.prefab b/Assets/Resources/Abilities/DarkMatter_ProjectilePrefab.prefab index a264b5bb..39800269 100644 --- a/Assets/Resources/Abilities/DarkMatter_ProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/DarkMatter_ProjectilePrefab.prefab @@ -116,8 +116,6 @@ GameObject: - component: {fileID: 5409629005393311443} - component: {fileID: 5409629005393311440} - component: {fileID: 5409629005393311442} - - component: {fileID: 5409629005393311444} - - component: {fileID: 5409629005393311445} m_Layer: 30 m_Name: DarkMatter_ProjectilePrefab m_TagString: Untagged @@ -183,8 +181,6 @@ MonoBehaviour: m_EditorClassIdentifier: hitParticlesPrefab: {fileID: 3781946150010653001, guid: d25d25ca6583f0747bb6fbd95b181c39, type: 3} visuals: {fileID: 7862011006772686318} - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} speed: 0 @@ -194,45 +190,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &5409629005393311444 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5409629005393311441} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 5409629005393311445} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &5409629005393311445 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5409629005393311441} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &7862011006772686318 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/DragonBreath_ChanneledAbilityPrefab Variant.prefab b/Assets/Resources/Abilities/DragonBreath_ChanneledAbilityPrefab Variant.prefab index 96ca62f4..f7546334 100644 --- a/Assets/Resources/Abilities/DragonBreath_ChanneledAbilityPrefab Variant.prefab +++ b/Assets/Resources/Abilities/DragonBreath_ChanneledAbilityPrefab Variant.prefab @@ -131,10 +131,6 @@ PrefabInstance: propertyPath: m_Intensity value: 0 objectReference: {fileID: 0} - - target: {fileID: 6684366852784880869, guid: f15e487e3a2d10649b5606f62f5754bf, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6684366852784880872, guid: f15e487e3a2d10649b5606f62f5754bf, type: 3} propertyPath: m_RootOrder value: 0 @@ -191,7 +187,8 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 6684366851844296977, guid: f15e487e3a2d10649b5606f62f5754bf, type: 3} diff --git a/Assets/Resources/Abilities/ElectroSlash_NetworkedSlashWithOnHitEvent_Prefab (1).prefab b/Assets/Resources/Abilities/ElectroSlash_NetworkedSlashWithOnHitEvent_Prefab (1).prefab index 6a8cb527..e3f78267 100644 --- a/Assets/Resources/Abilities/ElectroSlash_NetworkedSlashWithOnHitEvent_Prefab (1).prefab +++ b/Assets/Resources/Abilities/ElectroSlash_NetworkedSlashWithOnHitEvent_Prefab (1).prefab @@ -196,8 +196,6 @@ GameObject: - component: {fileID: 4739689218961410419} - component: {fileID: 4739689218961410416} - component: {fileID: 4739689218961410422} - - component: {fileID: 4739689218961410420} - - component: {fileID: 4739689218961410421} m_Layer: 30 m_Name: ElectroSlash_NetworkedSlashWithOnHitEvent_Prefab (1) m_TagString: Untagged @@ -267,8 +265,6 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} lifeSpan: 0 @@ -283,45 +279,6 @@ MonoBehaviour: onImpactHappened: m_PersistentCalls: m_Calls: [] ---- !u!114 &4739689218961410420 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4739689218961410417} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 4739689218961410421} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &4739689218961410421 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4739689218961410417} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1001 &4161430360866507885 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/FanOfArrows_Shoot_AreaOfEffectWithImpactEventPrefab.prefab b/Assets/Resources/Abilities/FanOfArrows_Shoot_AreaOfEffectWithImpactEventPrefab.prefab index 2f5fa295..1d1703b2 100644 --- a/Assets/Resources/Abilities/FanOfArrows_Shoot_AreaOfEffectWithImpactEventPrefab.prefab +++ b/Assets/Resources/Abilities/FanOfArrows_Shoot_AreaOfEffectWithImpactEventPrefab.prefab @@ -24,6 +24,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2569138105968346217} + 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} @@ -31,7 +32,6 @@ Transform: m_Children: - {fileID: 2569138106013936177} m_Father: {fileID: 3022373358597925233} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2569138105968346222 MonoBehaviour: @@ -79,6 +79,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2569138106013936178} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -93,7 +94,6 @@ Transform: - {fileID: 7361961845736109003} - {fileID: 7361961847312288262} m_Father: {fileID: 2569138105968346223} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3022373358124539393 GameObject: @@ -119,13 +119,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3022373358124539393} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 3022373358597925233} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3022373358124539453 MeshFilter: @@ -146,8 +146,6 @@ GameObject: - component: {fileID: 3022373358597925233} - component: {fileID: 3022373358597925229} - component: {fileID: 3022373358597925228} - - component: {fileID: 3022373358597925235} - - component: {fileID: 3022373358597925234} m_Layer: 30 m_Name: FanOfArrows_Shoot_AreaOfEffectWithImpactEventPrefab m_TagString: Untagged @@ -162,6 +160,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3022373358597925232} + 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} @@ -170,7 +169,6 @@ Transform: - {fileID: 3022373358124539394} - {fileID: 2569138105968346223} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &3022373358597925229 Rigidbody: @@ -179,10 +177,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3022373358597925232} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -207,8 +216,6 @@ MonoBehaviour: m_Bits: 2147483648 impactHitVFX: {fileID: 0} shouldDisableVisualsOnDelayedDestroyEntered: 1 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 @@ -235,52 +242,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &3022373358597925235 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3022373358597925232} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 3022373358597925228} - - {fileID: 3022373358597925234} - - {fileID: 2569138105968346222} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &3022373358597925234 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3022373358597925232} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1001 &1251910758176073980 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2569138106013936177} m_Modifications: - target: {fileID: 8607891234483246272, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} @@ -335,11 +302,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8607891234483246279, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} --- !u!4 &7361961846372416572 stripped Transform: @@ -362,6 +329,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2569138106013936177} m_Modifications: - target: {fileID: 8607891234483246272, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} @@ -416,11 +384,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8607891234483246279, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} --- !u!114 &7361961845613573154 stripped MonoBehaviour: @@ -443,6 +411,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2569138106013936177} m_Modifications: - target: {fileID: 8607891234483246272, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} @@ -497,11 +466,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8607891234483246279, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} --- !u!4 &7361961845629194344 stripped Transform: @@ -524,6 +493,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2569138106013936177} m_Modifications: - target: {fileID: 8607891234483246272, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} @@ -578,11 +548,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8607891234483246279, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} --- !u!114 &7361961845736109002 stripped MonoBehaviour: @@ -605,6 +575,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2569138106013936177} m_Modifications: - target: {fileID: 8607891234483246272, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} @@ -659,11 +630,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8607891234483246279, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} --- !u!114 &7361961846950463712 stripped MonoBehaviour: @@ -686,6 +657,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2569138106013936177} m_Modifications: - target: {fileID: 8607891234483246272, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} @@ -740,11 +712,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8607891234483246279, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} --- !u!114 &7361961847045344376 stripped MonoBehaviour: @@ -767,6 +739,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2569138106013936177} m_Modifications: - target: {fileID: 8607891234483246272, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} @@ -821,11 +794,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8607891234483246279, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} --- !u!4 &7361961847312288262 stripped Transform: @@ -848,6 +821,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2569138106013936177} m_Modifications: - target: {fileID: 8607891234483246272, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} @@ -902,11 +876,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8607891234483246279, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} --- !u!4 &7361961847454792950 stripped Transform: diff --git a/Assets/Resources/Abilities/FanOfKnives_Throw_AreaOfEffectWithImpactEventPrefab.prefab b/Assets/Resources/Abilities/FanOfKnives_Throw_AreaOfEffectWithImpactEventPrefab.prefab index 49d6500c..43f7e2fb 100644 --- a/Assets/Resources/Abilities/FanOfKnives_Throw_AreaOfEffectWithImpactEventPrefab.prefab +++ b/Assets/Resources/Abilities/FanOfKnives_Throw_AreaOfEffectWithImpactEventPrefab.prefab @@ -51,8 +51,6 @@ GameObject: - component: {fileID: 7204010123364452183} - component: {fileID: 7204010123364452171} - component: {fileID: 7204010123364452170} - - component: {fileID: 7204010123364452181} - - component: {fileID: 7204010123364452180} m_Layer: 30 m_Name: FanOfKnives_Throw_AreaOfEffectWithImpactEventPrefab m_TagString: Untagged @@ -123,8 +121,6 @@ MonoBehaviour: m_Bits: 2147483648 impactHitVFX: {fileID: 0} shouldDisableVisualsOnDelayedDestroyEntered: 1 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 @@ -151,47 +147,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &7204010123364452181 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7204010123364452182} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 7204010123364452170} - - {fileID: 7204010123364452180} - - {fileID: 7615306565453113928} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &7204010123364452180 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7204010123364452182} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &7615306565453113935 GameObject: m_ObjectHideFlags: 0 @@ -347,15 +302,13 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 3193727938999914990, guid: 76c807989cc347a43992d6f1829976f5, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4150471083779003608, guid: 76c807989cc347a43992d6f1829976f5, type: 3} propertyPath: rotationSpeed value: 1188 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -436,15 +389,13 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 3193727938999914990, guid: 76c807989cc347a43992d6f1829976f5, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4150471083779003608, guid: 76c807989cc347a43992d6f1829976f5, type: 3} propertyPath: rotationSpeed value: 1188 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -525,15 +476,13 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 3193727938999914990, guid: 76c807989cc347a43992d6f1829976f5, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4150471083779003608, guid: 76c807989cc347a43992d6f1829976f5, type: 3} propertyPath: rotationSpeed value: 1188 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -614,15 +563,13 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 3193727938999914990, guid: 76c807989cc347a43992d6f1829976f5, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4150471083779003608, guid: 76c807989cc347a43992d6f1829976f5, type: 3} propertyPath: rotationSpeed value: 1188 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -703,15 +650,13 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 3193727938999914990, guid: 76c807989cc347a43992d6f1829976f5, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4150471083779003608, guid: 76c807989cc347a43992d6f1829976f5, type: 3} propertyPath: rotationSpeed value: 1188 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -792,15 +737,13 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 3193727938999914990, guid: 76c807989cc347a43992d6f1829976f5, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4150471083779003608, guid: 76c807989cc347a43992d6f1829976f5, type: 3} propertyPath: rotationSpeed value: 1188 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -881,15 +824,13 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 3193727938999914990, guid: 76c807989cc347a43992d6f1829976f5, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4150471083779003608, guid: 76c807989cc347a43992d6f1829976f5, type: 3} propertyPath: rotationSpeed value: 1188 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -970,15 +911,13 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 3193727938999914990, guid: 76c807989cc347a43992d6f1829976f5, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4150471083779003608, guid: 76c807989cc347a43992d6f1829976f5, type: 3} propertyPath: rotationSpeed value: 1188 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] diff --git a/Assets/Resources/Abilities/Firewall_AreaOfEffectOverTimePrefab Variant Variant.prefab b/Assets/Resources/Abilities/Firewall_AreaOfEffectOverTimePrefab Variant Variant.prefab index 9412c057..db71d7ed 100644 --- a/Assets/Resources/Abilities/Firewall_AreaOfEffectOverTimePrefab Variant Variant.prefab +++ b/Assets/Resources/Abilities/Firewall_AreaOfEffectOverTimePrefab Variant Variant.prefab @@ -122,10 +122,6 @@ PrefabInstance: propertyPath: m_Name value: Firewall_AreaOfEffectOverTimePrefab Variant Variant objectReference: {fileID: 0} - - target: {fileID: 7332445597516000774, guid: 49d4c037b88cfc54a9fe2d4a84012145, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7332445597516000793, guid: 49d4c037b88cfc54a9fe2d4a84012145, type: 3} propertyPath: impactHitVFX value: @@ -138,7 +134,8 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 7332445597516000772, guid: 49d4c037b88cfc54a9fe2d4a84012145, type: 3} diff --git a/Assets/Resources/Abilities/GlacialBomb_AreaOfEffectWithImpactEventPrefab.prefab b/Assets/Resources/Abilities/GlacialBomb_AreaOfEffectWithImpactEventPrefab.prefab index a2995569..bd0e2302 100644 --- a/Assets/Resources/Abilities/GlacialBomb_AreaOfEffectWithImpactEventPrefab.prefab +++ b/Assets/Resources/Abilities/GlacialBomb_AreaOfEffectWithImpactEventPrefab.prefab @@ -147,8 +147,6 @@ GameObject: - component: {fileID: 7535207197812752308} - component: {fileID: 7535207197812752296} - component: {fileID: 7535207197812752297} - - component: {fileID: 7535207197812752310} - - component: {fileID: 7535207197812752311} m_Layer: 30 m_Name: GlacialBomb_AreaOfEffectWithImpactEventPrefab m_TagString: Untagged @@ -220,8 +218,6 @@ MonoBehaviour: m_Bits: 2147483648 impactHitVFX: {fileID: 5112403345868107898, guid: 6f34ef0d986e9db4199cf75805f79753, type: 3} shouldDisableVisualsOnDelayedDestroyEntered: 0 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 @@ -248,47 +244,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &7535207197812752310 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7535207197812752309} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 7535207197812752297} - - {fileID: 7535207197812752311} - - {fileID: 7116996883530437291} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &7535207197812752311 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7535207197812752309} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1001 &1595671668978362659 PrefabInstance: m_ObjectHideFlags: 0 @@ -349,7 +304,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -430,7 +387,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -511,7 +470,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -592,7 +553,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -673,7 +636,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -754,7 +719,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -835,7 +802,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -1060,7 +1029,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] diff --git a/Assets/Resources/Abilities/GolemSlam_AreaOfEffectWithImpactEventPrefab (1).prefab b/Assets/Resources/Abilities/GolemSlam_AreaOfEffectWithImpactEventPrefab (1).prefab index 04136864..2a9f940f 100644 --- a/Assets/Resources/Abilities/GolemSlam_AreaOfEffectWithImpactEventPrefab (1).prefab +++ b/Assets/Resources/Abilities/GolemSlam_AreaOfEffectWithImpactEventPrefab (1).prefab @@ -23,13 +23,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3840632999529257836} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3840632999559116081} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3840632999559116087 GameObject: @@ -54,6 +54,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3840632999559116087} + 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} @@ -61,7 +62,6 @@ Transform: m_Children: - {fileID: 3840632999529257839} m_Father: {fileID: 4547055273174472751} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4547055272709517151 GameObject: @@ -87,6 +87,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4547055272709517151} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} @@ -94,7 +95,6 @@ Transform: m_Children: - {fileID: 2118928263416060428} m_Father: {fileID: 4547055273174472751} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4547055272709517155 MeshFilter: @@ -115,8 +115,6 @@ GameObject: - component: {fileID: 4547055273174472751} - component: {fileID: 4547055273174472755} - component: {fileID: 4547055273174472754} - - component: {fileID: 4547055273174472749} - - component: {fileID: 4547055273174472748} m_Layer: 30 m_Name: GolemSlam_AreaOfEffectWithImpactEventPrefab (1) m_TagString: Untagged @@ -131,6 +129,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4547055273174472750} + 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} @@ -139,7 +138,6 @@ Transform: - {fileID: 4547055272709517148} - {fileID: 3840632999559116081} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &4547055273174472755 Rigidbody: @@ -148,10 +146,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4547055273174472750} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -176,8 +185,6 @@ MonoBehaviour: m_Bits: 2147483648 impactHitVFX: {fileID: 5880797563127281583, guid: 1e77bea53ba074448bbb87504603a2af, type: 3} shouldDisableVisualsOnDelayedDestroyEntered: 0 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 @@ -192,51 +199,12 @@ MonoBehaviour: onImpactHappened: m_PersistentCalls: m_Calls: [] ---- !u!114 &4547055273174472749 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4547055273174472750} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 4547055273174472754} - - {fileID: 4547055273174472748} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &4547055273174472748 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4547055273174472750} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1001 &7000723396996643456 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4547055272709517148} m_Modifications: - target: {fileID: 779705637047399056, guid: 87ee7299dd44ed747af24dbb91bcd33b, type: 3} @@ -340,6 +308,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 87ee7299dd44ed747af24dbb91bcd33b, type: 3} --- !u!4 &2118928263416060428 stripped Transform: diff --git a/Assets/Resources/Abilities/HolyBall_ProjectilePrefab.prefab b/Assets/Resources/Abilities/HolyBall_ProjectilePrefab.prefab index eb279875..7e0fc7b8 100644 --- a/Assets/Resources/Abilities/HolyBall_ProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/HolyBall_ProjectilePrefab.prefab @@ -11,8 +11,6 @@ GameObject: - component: {fileID: 6744685881493449316} - component: {fileID: 6744685881493449323} - component: {fileID: 6744685881493449322} - - component: {fileID: 6744685881493449321} - - component: {fileID: 6744685881493449320} m_Layer: 30 m_Name: HolyBall_ProjectilePrefab m_TagString: Untagged @@ -78,8 +76,6 @@ MonoBehaviour: m_EditorClassIdentifier: hitParticlesPrefab: {fileID: 3781946150010653001, guid: c2c5fb3197925e547819103e162fd848, type: 3} visuals: {fileID: 6744685882344048820} - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} speed: 0 @@ -89,45 +85,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &6744685881493449321 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6744685881493449327} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 6744685881493449320} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &6744685881493449320 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6744685881493449327} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &6744685881746102466 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/HolyBolt_ProjectilePrefab.prefab b/Assets/Resources/Abilities/HolyBolt_ProjectilePrefab.prefab index 23817832..ea4ae857 100644 --- a/Assets/Resources/Abilities/HolyBolt_ProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/HolyBolt_ProjectilePrefab.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3137079317782948763} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} @@ -30,7 +31,6 @@ Transform: m_Children: - {fileID: 3209433053633978768} m_Father: {fileID: 3137079318612183371} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3137079318527179757 GameObject: @@ -58,13 +58,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3137079318527179757} + 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: 3137079318612183371} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3137079318527179665 MeshFilter: @@ -124,9 +124,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3137079318527179757} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.3 m_Center: {x: 0, y: 0, z: 0} --- !u!1 &3137079318612183360 @@ -140,8 +148,6 @@ GameObject: - component: {fileID: 3137079318612183371} - component: {fileID: 3137079318612183364} - component: {fileID: 3137079318612183365} - - component: {fileID: 3137079318612183366} - - component: {fileID: 3137079318612183367} m_Layer: 30 m_Name: HolyBolt_ProjectilePrefab m_TagString: Untagged @@ -156,6 +162,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3137079318612183360} + 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} @@ -164,7 +171,6 @@ Transform: - {fileID: 3137079318527179756} - {fileID: 3137079317782948762} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &3137079318612183364 Rigidbody: @@ -173,10 +179,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3137079318612183360} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -196,8 +213,6 @@ MonoBehaviour: m_EditorClassIdentifier: hitParticlesPrefab: {fileID: 3781946150010653001, guid: c2c5fb3197925e547819103e162fd848, type: 3} visuals: {fileID: 3137079317782948763} - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} speed: 0 @@ -207,50 +222,12 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &3137079318612183366 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3137079318612183360} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 3137079318612183367} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &3137079318612183367 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3137079318612183360} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1001 &4146817701692337835 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3137079317782948762} m_Modifications: - target: {fileID: 1514976257475031237, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} @@ -326,6 +303,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} --- !u!4 &3209433053633978768 stripped Transform: diff --git a/Assets/Resources/Abilities/HolyCircle_AreaOfEffectOverTimePrefab Variant.prefab b/Assets/Resources/Abilities/HolyCircle_AreaOfEffectOverTimePrefab Variant.prefab index 3a7d5fc1..781e2529 100644 --- a/Assets/Resources/Abilities/HolyCircle_AreaOfEffectOverTimePrefab Variant.prefab +++ b/Assets/Resources/Abilities/HolyCircle_AreaOfEffectOverTimePrefab Variant.prefab @@ -8,10 +8,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 753911528859556808, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} propertyPath: m_RootOrder value: 0 @@ -60,7 +56,8 @@ PrefabInstance: propertyPath: m_Name value: HolyCircle_AreaOfEffectOverTimePrefab Variant objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} diff --git a/Assets/Resources/Abilities/Iceshard_ProjectilePrefab.prefab b/Assets/Resources/Abilities/Iceshard_ProjectilePrefab.prefab index 6656069d..e6bf4cb2 100644 --- a/Assets/Resources/Abilities/Iceshard_ProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/Iceshard_ProjectilePrefab.prefab @@ -44,8 +44,6 @@ GameObject: - component: {fileID: 4298339421658607674} - component: {fileID: 4298339421658607673} - component: {fileID: 4298339421658607675} - - component: {fileID: 4298339421658607677} - - component: {fileID: 4298339421658607676} m_Layer: 30 m_Name: Iceshard_ProjectilePrefab m_TagString: Untagged @@ -112,8 +110,6 @@ MonoBehaviour: m_EditorClassIdentifier: hitParticlesPrefab: {fileID: 4924508274929071776, guid: 0edef91621bb6b34384ccc9dbb98729c, type: 3} visuals: {fileID: 2139035406258105095} - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} speed: 0 @@ -123,45 +119,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &4298339421658607677 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4298339421658607672} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 4298339421658607676} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &4298339421658607676 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4298339421658607672} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &4298339422772769695 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/Judgement_AreaOfEffectWithImpactEvent.prefab b/Assets/Resources/Abilities/Judgement_AreaOfEffectWithImpactEvent.prefab index e09c7b39..c812bbe2 100644 --- a/Assets/Resources/Abilities/Judgement_AreaOfEffectWithImpactEvent.prefab +++ b/Assets/Resources/Abilities/Judgement_AreaOfEffectWithImpactEvent.prefab @@ -24,13 +24,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7089831228416738188} + 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: 7508320818388856468} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7089831228416738191 MonoBehaviour: @@ -72,6 +72,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7508320817788721636} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} @@ -79,7 +80,6 @@ Transform: m_Children: - {fileID: 4157879453162038164} m_Father: {fileID: 7508320818388856468} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7508320817788721624 MeshFilter: @@ -100,8 +100,6 @@ GameObject: - component: {fileID: 7508320818388856468} - component: {fileID: 7508320818388856456} - component: {fileID: 7508320818388856457} - - component: {fileID: 7508320818388856470} - - component: {fileID: 7508320818388856471} m_Layer: 30 m_Name: Judgement_AreaOfEffectWithImpactEvent m_TagString: Untagged @@ -116,6 +114,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7508320818388856469} + 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} @@ -124,7 +123,6 @@ Transform: - {fileID: 7508320817788721639} - {fileID: 7089831228416738186} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &7508320818388856456 Rigidbody: @@ -133,10 +131,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7508320818388856469} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -161,8 +170,6 @@ MonoBehaviour: m_Bits: 2147483648 impactHitVFX: {fileID: 8771972552311404799, guid: bbf9e36a48d6c5648a13889afab076fd, type: 3} shouldDisableVisualsOnDelayedDestroyEntered: 0 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 @@ -190,51 +197,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &7508320818388856470 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7508320818388856469} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 7508320818388856457} - - {fileID: 7508320818388856471} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &7508320818388856471 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7508320818388856469} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1001 &7844878557152291278 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7508320817788721639} m_Modifications: - target: {fileID: 5222750351268202474, guid: 471430dca40f907499aac08fe5b5bb09, type: 3} @@ -298,6 +266,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 471430dca40f907499aac08fe5b5bb09, type: 3} --- !u!4 &4157879453162038164 stripped Transform: diff --git a/Assets/Resources/Abilities/Judgement_Chain_AreaOfEffectOverTimePrefab Variant.prefab b/Assets/Resources/Abilities/Judgement_Chain_AreaOfEffectOverTimePrefab Variant.prefab index 2211a914..e3c81989 100644 --- a/Assets/Resources/Abilities/Judgement_Chain_AreaOfEffectOverTimePrefab Variant.prefab +++ b/Assets/Resources/Abilities/Judgement_Chain_AreaOfEffectOverTimePrefab Variant.prefab @@ -5,12 +5,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 753911528859556808, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} propertyPath: m_RootOrder value: 0 @@ -67,5 +64,9 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} diff --git a/Assets/Resources/Abilities/JusticeSlashPrefab.prefab b/Assets/Resources/Abilities/JusticeSlashPrefab.prefab index a0e5bced..7f84a6fa 100644 --- a/Assets/Resources/Abilities/JusticeSlashPrefab.prefab +++ b/Assets/Resources/Abilities/JusticeSlashPrefab.prefab @@ -11,8 +11,6 @@ GameObject: - component: {fileID: 1898899935370880001} - component: {fileID: 1898899935370880002} - component: {fileID: 1898899935370880004} - - component: {fileID: 1898899935370880006} - - component: {fileID: 1898899935370880007} m_Layer: 30 m_Name: JusticeSlashPrefab m_TagString: Untagged @@ -81,8 +79,6 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} lifeSpan: 0 @@ -94,45 +90,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &1898899935370880006 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1898899935370880003} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 1898899935370880007} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &1898899935370880007 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1898899935370880003} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &7827931710346686483 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/KnifeThrowProjectilePrefab.prefab b/Assets/Resources/Abilities/KnifeThrowProjectilePrefab.prefab index 8f06095f..59c85248 100644 --- a/Assets/Resources/Abilities/KnifeThrowProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/KnifeThrowProjectilePrefab.prefab @@ -24,6 +24,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1149486374488505064} + 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} @@ -32,7 +33,6 @@ Transform: - {fileID: 1483100810686620555} - {fileID: 6475575894023783621} m_Father: {fileID: 3193727938999914985} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4150471083779003608 MonoBehaviour: @@ -73,13 +73,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1483100810686620550} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.4999998, y: 0.49999982, z: 0.4999999} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1164188616299091997} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &1483100810686620548 MeshFilter: @@ -139,9 +139,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1483100810686620550} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.6, y: 1.2058458, z: 0.6} m_Center: {x: -0.009482754, y: 0.37802833, z: 0} --- !u!1 &3193727938999914987 @@ -155,8 +163,6 @@ GameObject: - component: {fileID: 3193727938999914985} - component: {fileID: 3193727938999914986} - component: {fileID: 3193727938999914984} - - component: {fileID: 3193727938999914990} - - component: {fileID: 3193727938999914991} m_Layer: 30 m_Name: KnifeThrowProjectilePrefab m_TagString: Untagged @@ -171,6 +177,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3193727938999914987} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1.031} m_LocalScale: {x: 1, y: 1, z: 1} @@ -178,7 +185,6 @@ Transform: m_Children: - {fileID: 1164188616299091997} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &3193727938999914986 Rigidbody: @@ -187,10 +193,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3193727938999914987} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -210,8 +227,6 @@ MonoBehaviour: m_EditorClassIdentifier: hitParticlesPrefab: {fileID: 8525990746615576120, guid: b85d21f3b8fed714bacf0c4fd50fa512, type: 3} visuals: {fileID: 1149486374488505064} - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} speed: 0 @@ -221,45 +236,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &3193727938999914990 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3193727938999914987} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 3193727938999914991} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &3193727938999914991 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3193727938999914987} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &7961699785707852927 GameObject: m_ObjectHideFlags: 0 @@ -284,17 +260,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7961699785707852927} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.4999998, y: 0.49999982, z: 0.49999988} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1164188616299091997} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!96 &7835737098400667876 TrailRenderer: - serializedVersion: 2 + serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -335,6 +311,7 @@ TrailRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Time: 0.33 + m_PreviewTimeScale: 1 m_Parameters: serializedVersion: 3 widthMultiplier: 0.05 @@ -380,14 +357,18 @@ TrailRenderer: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 numCornerVertices: 0 numCapVertices: 0 alignment: 0 textureMode: 0 + textureScale: {x: 1, y: 1} shadowBias: 0.5 generateLightingData: 0 m_MinVertexDistance: 0.1 + m_MaskInteraction: 0 m_Autodestruct: 0 m_Emitting: 1 + m_ApplyActiveColorSpace: 0 diff --git a/Assets/Resources/Abilities/KnifeThrow_III_AreaOfEffectWithImpactEventPrefab.prefab b/Assets/Resources/Abilities/KnifeThrow_III_AreaOfEffectWithImpactEventPrefab.prefab index ee88a68c..42fb6a44 100644 --- a/Assets/Resources/Abilities/KnifeThrow_III_AreaOfEffectWithImpactEventPrefab.prefab +++ b/Assets/Resources/Abilities/KnifeThrow_III_AreaOfEffectWithImpactEventPrefab.prefab @@ -51,8 +51,6 @@ GameObject: - component: {fileID: 108635384239917382} - component: {fileID: 108635384239917402} - component: {fileID: 108635384239917403} - - component: {fileID: 108635384239917380} - - component: {fileID: 108635384239917381} m_Layer: 30 m_Name: KnifeThrow_III_AreaOfEffectWithImpactEventPrefab m_TagString: Untagged @@ -123,8 +121,6 @@ MonoBehaviour: m_Bits: 2147483648 impactHitVFX: {fileID: 0} shouldDisableVisualsOnDelayedDestroyEntered: 1 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 @@ -151,47 +147,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &108635384239917380 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 108635384239917383} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 108635384239917403} - - {fileID: 108635384239917381} - - {fileID: 853215245472375897} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &108635384239917381 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 108635384239917383} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &853215245443566085 GameObject: m_ObjectHideFlags: 0 @@ -337,15 +292,13 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 3193727938999914990, guid: 76c807989cc347a43992d6f1829976f5, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4150471083779003608, guid: 76c807989cc347a43992d6f1829976f5, type: 3} propertyPath: rotationSpeed value: 1188 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -426,15 +379,13 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 3193727938999914990, guid: 76c807989cc347a43992d6f1829976f5, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4150471083779003608, guid: 76c807989cc347a43992d6f1829976f5, type: 3} propertyPath: rotationSpeed value: 1188 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -515,15 +466,13 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 3193727938999914990, guid: 76c807989cc347a43992d6f1829976f5, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4150471083779003608, guid: 76c807989cc347a43992d6f1829976f5, type: 3} propertyPath: rotationSpeed value: 1188 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] diff --git a/Assets/Resources/Abilities/MeteorShower_AreaOfEffectOverTimePrefab (1) Variant.prefab b/Assets/Resources/Abilities/MeteorShower_AreaOfEffectOverTimePrefab (1) Variant.prefab index 0b5f4e24..2cb8c95d 100644 --- a/Assets/Resources/Abilities/MeteorShower_AreaOfEffectOverTimePrefab (1) Variant.prefab +++ b/Assets/Resources/Abilities/MeteorShower_AreaOfEffectOverTimePrefab (1) Variant.prefab @@ -158,10 +158,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 753911528859556808, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} propertyPath: m_RootOrder value: 0 @@ -218,11 +214,8 @@ PrefabInstance: propertyPath: impactHitVFX value: objectReference: {fileID: 2504214343621411470, guid: 3ed0d324122d7b24eaec75c55c74aafc, type: 3} - - target: {fileID: 4866147177977517818, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} diff --git a/Assets/Resources/Abilities/NPC_AreaOfEffectPrefab.prefab b/Assets/Resources/Abilities/NPC_AreaOfEffectPrefab.prefab index 606e5844..4f37a15b 100644 --- a/Assets/Resources/Abilities/NPC_AreaOfEffectPrefab.prefab +++ b/Assets/Resources/Abilities/NPC_AreaOfEffectPrefab.prefab @@ -221,8 +221,6 @@ GameObject: - component: {fileID: 4737951027918891027} - component: {fileID: 4737951027918891023} - component: {fileID: 4737951027918891022} - - component: {fileID: 4737951027918891025} - - component: {fileID: 4737951027918891024} m_Layer: 30 m_Name: NPC_AreaOfEffectPrefab m_TagString: Untagged @@ -293,8 +291,6 @@ MonoBehaviour: m_Bits: 2147483648 impactHitVFX: {fileID: 0} shouldDisableVisualsOnDelayedDestroyEntered: 1 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 @@ -305,43 +301,3 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &4737951027918891025 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4737951027918891026} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 4737951027918891022} - - {fileID: 4737951027918891024} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &4737951027918891024 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4737951027918891026} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 diff --git a/Assets/Resources/Abilities/NPC_BoneStorm_AreaOfEffectOverTimePrefab (1) Variant.prefab b/Assets/Resources/Abilities/NPC_BoneStorm_AreaOfEffectOverTimePrefab (1) Variant.prefab index 6f233231..c12ad306 100644 --- a/Assets/Resources/Abilities/NPC_BoneStorm_AreaOfEffectOverTimePrefab (1) Variant.prefab +++ b/Assets/Resources/Abilities/NPC_BoneStorm_AreaOfEffectOverTimePrefab (1) Variant.prefab @@ -662,10 +662,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 753911528859556808, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} propertyPath: m_RootOrder value: 0 @@ -718,7 +714,8 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} diff --git a/Assets/Resources/Abilities/NaturalEnergy_ProjectilePrefab.prefab b/Assets/Resources/Abilities/NaturalEnergy_ProjectilePrefab.prefab index 3d4693e1..ea62aaf0 100644 --- a/Assets/Resources/Abilities/NaturalEnergy_ProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/NaturalEnergy_ProjectilePrefab.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2367156134087413624} + 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} @@ -30,7 +31,6 @@ Transform: m_Children: - {fileID: 3730787558996975310} m_Father: {fileID: 2367156134396898728} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2367156134396898723 GameObject: @@ -43,8 +43,6 @@ GameObject: - component: {fileID: 2367156134396898728} - component: {fileID: 2367156134396898727} - component: {fileID: 2367156134396898726} - - component: {fileID: 2367156134396898725} - - component: {fileID: 2367156134396898724} m_Layer: 30 m_Name: NaturalEnergy_ProjectilePrefab m_TagString: Untagged @@ -59,6 +57,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2367156134396898723} + 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} @@ -67,7 +66,6 @@ Transform: - {fileID: 2367156134714728207} - {fileID: 2367156134087413625} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &2367156134396898727 Rigidbody: @@ -76,10 +74,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2367156134396898723} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -99,55 +108,15 @@ MonoBehaviour: m_EditorClassIdentifier: hitParticlesPrefab: {fileID: 3781946150010653001, guid: 9ea626200818bd6438f97bf22e4a0bad, type: 3} visuals: {fileID: 2367156134087413624} - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} speed: 0 lifeSpan: 0 canPierce: 0 + canHitSelf: 0 onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &2367156134396898725 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2367156134396898723} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 2367156134396898724} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &2367156134396898724 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2367156134396898723} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &2367156134714728206 GameObject: m_ObjectHideFlags: 0 @@ -174,13 +143,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2367156134714728206} + 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: 2367156134396898728} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2367156134714728306 MeshFilter: @@ -240,9 +209,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2367156134714728206} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.3 m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &2367156133532825585 @@ -250,6 +227,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2367156134087413625} m_Modifications: - target: {fileID: 1378022812935678271, guid: 11b509b072b6a124fa79e77199bc1cfb, type: 3} @@ -317,6 +295,9 @@ PrefabInstance: value: GreenOrb objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 11b509b072b6a124fa79e77199bc1cfb, type: 3} --- !u!4 &3730787558996975310 stripped Transform: diff --git a/Assets/Resources/Abilities/PoisonCoatedSlashPrefab.prefab b/Assets/Resources/Abilities/PoisonCoatedSlashPrefab.prefab index b158e721..cafb6216 100644 --- a/Assets/Resources/Abilities/PoisonCoatedSlashPrefab.prefab +++ b/Assets/Resources/Abilities/PoisonCoatedSlashPrefab.prefab @@ -11,8 +11,6 @@ GameObject: - component: {fileID: 4159951584211507974} - component: {fileID: 4159951584211507973} - component: {fileID: 4159951584211507971} - - component: {fileID: 4159951584211507969} - - component: {fileID: 4159951584211507968} m_Layer: 30 m_Name: PoisonCoatedSlashPrefab m_TagString: Untagged @@ -27,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4159951584211507972} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} @@ -34,7 +33,6 @@ Transform: m_Children: - {fileID: 5711484517800715261} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &4159951584211507973 Rigidbody: @@ -43,10 +41,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4159951584211507972} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -70,8 +79,6 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} lifeSpan: 0 @@ -83,45 +90,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &4159951584211507969 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4159951584211507972} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 4159951584211507968} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &4159951584211507968 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4159951584211507972} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &5711484517222567700 GameObject: m_ObjectHideFlags: 0 @@ -148,13 +116,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5711484517222567700} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.5} m_LocalScale: {x: 2.5, y: 0.25, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5711484517800715261} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5711484517222567697 MeshFilter: @@ -214,9 +182,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5711484517222567700} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &5711484517800715202 @@ -242,6 +218,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5711484517800715202} + 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} @@ -250,13 +227,13 @@ Transform: - {fileID: 5711484517222567696} - {fileID: 5504498604344612407} m_Father: {fileID: 4159951584211507974} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1520947942701603392 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5711484517800715261} m_Modifications: - target: {fileID: 2136204941461301926, guid: 4a921cf1d84ec5a4ca5e18cfb7d8e240, type: 3} @@ -328,6 +305,9 @@ PrefabInstance: value: 180 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4a921cf1d84ec5a4ca5e18cfb7d8e240, type: 3} --- !u!4 &5504498604344612407 stripped Transform: diff --git a/Assets/Resources/Abilities/PoisonousPool_AreaOfEffectOverTimePrefab Variant.prefab b/Assets/Resources/Abilities/PoisonousPool_AreaOfEffectOverTimePrefab Variant.prefab index 3d6b9dd5..0e7d9c44 100644 --- a/Assets/Resources/Abilities/PoisonousPool_AreaOfEffectOverTimePrefab Variant.prefab +++ b/Assets/Resources/Abilities/PoisonousPool_AreaOfEffectOverTimePrefab Variant.prefab @@ -24596,10 +24596,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 753911528859556808, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} propertyPath: m_RootOrder value: 0 @@ -24668,7 +24664,8 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} diff --git a/Assets/Resources/Abilities/PutridOrb_ProjectilePrefab.prefab b/Assets/Resources/Abilities/PutridOrb_ProjectilePrefab.prefab index 79b973a1..eabc9f98 100644 --- a/Assets/Resources/Abilities/PutridOrb_ProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/PutridOrb_ProjectilePrefab.prefab @@ -116,8 +116,6 @@ GameObject: - component: {fileID: 482914955127851234} - component: {fileID: 482914955127851245} - component: {fileID: 482914955127851244} - - component: {fileID: 482914955127851247} - - component: {fileID: 482914955127851246} m_Layer: 30 m_Name: PutridOrb_ProjectilePrefab m_TagString: Untagged @@ -183,8 +181,6 @@ MonoBehaviour: m_EditorClassIdentifier: hitParticlesPrefab: {fileID: 5321330941649581311, guid: f0e06c1149ef5f441ad257ddc26cb318, type: 3} visuals: {fileID: 482914955438942770} - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} speed: 0 @@ -194,45 +190,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &482914955127851247 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 482914955127851241} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 482914955127851246} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &482914955127851246 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 482914955127851241} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &482914955438942770 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/RageStorm_ChanneledAbilityPrefab Variant.prefab b/Assets/Resources/Abilities/RageStorm_ChanneledAbilityPrefab Variant.prefab index 853d1d82..1b157b44 100644 --- a/Assets/Resources/Abilities/RageStorm_ChanneledAbilityPrefab Variant.prefab +++ b/Assets/Resources/Abilities/RageStorm_ChanneledAbilityPrefab Variant.prefab @@ -12,10 +12,6 @@ PrefabInstance: propertyPath: m_Intensity value: 0 objectReference: {fileID: 0} - - target: {fileID: 6684366852784880869, guid: f15e487e3a2d10649b5606f62f5754bf, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6684366852784880872, guid: f15e487e3a2d10649b5606f62f5754bf, type: 3} propertyPath: m_RootOrder value: 0 @@ -64,7 +60,8 @@ PrefabInstance: propertyPath: m_Name value: RageStorm_ChanneledAbilityPrefab Variant objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] diff --git a/Assets/Resources/Abilities/Rain_AreaOfEffectOverTimePrefab Variant.prefab b/Assets/Resources/Abilities/Rain_AreaOfEffectOverTimePrefab Variant.prefab index 3ccfca7d..13fd0662 100644 --- a/Assets/Resources/Abilities/Rain_AreaOfEffectOverTimePrefab Variant.prefab +++ b/Assets/Resources/Abilities/Rain_AreaOfEffectOverTimePrefab Variant.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3366457928594574850} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5686906574268736219} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &5649653771279106235 ParticleSystem: @@ -251,6 +251,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -280,6 +281,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -601,6 +603,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 20 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -1388,6 +1391,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -1417,6 +1421,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -3637,6 +3642,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -3666,6 +3672,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -4043,6 +4050,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -4085,6 +4093,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4114,6 +4123,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -4201,6 +4211,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4230,6 +4241,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -4268,6 +4280,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4297,6 +4310,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -4550,6 +4564,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4579,6 +4594,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -4854,13 +4870,15 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 1 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 1 m_VertexStreams: 000304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -4875,6 +4893,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3516499258260747617} m_Modifications: - target: {fileID: 4636871227284738347, guid: 1731425cf73de7541b40acd38dba18ec, type: 3} @@ -4946,6 +4965,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7153776043572740721, guid: 1731425cf73de7541b40acd38dba18ec, type: 3} + insertIndex: -1 + addedObject: {fileID: 3626055938672977083} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1731425cf73de7541b40acd38dba18ec, type: 3} --- !u!4 &5686906574268736219 stripped Transform: @@ -4957,12 +4982,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 753911528859556808, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} propertyPath: m_RootOrder value: 0 @@ -5015,10 +5037,6 @@ PrefabInstance: propertyPath: impactHitVFX value: objectReference: {fileID: 4553287630450876385, guid: 7cc1346fa829cb444884e4b457066868, type: 3} - - target: {fileID: 4866147177977517818, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7054294892364551028, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} propertyPath: m_IsActive value: 1 @@ -5027,7 +5045,14 @@ PrefabInstance: propertyPath: lengthInSec value: 5 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} + insertIndex: -1 + addedObject: {fileID: 5686906574268736219} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} --- !u!4 &3516499258260747617 stripped Transform: diff --git a/Assets/Resources/Abilities/RakeSlashPrefab.prefab b/Assets/Resources/Abilities/RakeSlashPrefab.prefab index cee96c6e..2a6ebda5 100644 --- a/Assets/Resources/Abilities/RakeSlashPrefab.prefab +++ b/Assets/Resources/Abilities/RakeSlashPrefab.prefab @@ -11,8 +11,6 @@ GameObject: - component: {fileID: 832940102972879189} - component: {fileID: 832940102972879190} - component: {fileID: 832940102972879184} - - component: {fileID: 832940102972879186} - - component: {fileID: 832940102972879187} m_Layer: 30 m_Name: RakeSlashPrefab m_TagString: Untagged @@ -81,8 +79,6 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} lifeSpan: 0 @@ -94,45 +90,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &832940102972879186 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 832940102972879191} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 832940102972879187} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &832940102972879187 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 832940102972879191} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &9040813081181522321 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/SacredSlashPrefab (1).prefab b/Assets/Resources/Abilities/SacredSlashPrefab (1).prefab index 8686f284..144d1906 100644 --- a/Assets/Resources/Abilities/SacredSlashPrefab (1).prefab +++ b/Assets/Resources/Abilities/SacredSlashPrefab (1).prefab @@ -11,8 +11,6 @@ GameObject: - component: {fileID: 3230252606085961015} - component: {fileID: 3230252606085961012} - component: {fileID: 3230252606085961010} - - component: {fileID: 3230252606085961008} - - component: {fileID: 3230252606085961009} m_Layer: 30 m_Name: SacredSlashPrefab (1) m_TagString: Untagged @@ -81,8 +79,6 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} lifeSpan: 0 @@ -94,45 +90,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &3230252606085961008 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3230252606085961013} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 3230252606085961009} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &3230252606085961009 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3230252606085961013} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &6497692219690533157 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/SanguineSlash_NetworkedSlashWithOnHitEvent_Prefab.prefab b/Assets/Resources/Abilities/SanguineSlash_NetworkedSlashWithOnHitEvent_Prefab.prefab index 1267750d..df09cffa 100644 --- a/Assets/Resources/Abilities/SanguineSlash_NetworkedSlashWithOnHitEvent_Prefab.prefab +++ b/Assets/Resources/Abilities/SanguineSlash_NetworkedSlashWithOnHitEvent_Prefab.prefab @@ -11,8 +11,6 @@ GameObject: - component: {fileID: 1844807267285195558} - component: {fileID: 1844807267285195557} - component: {fileID: 1844807267285195555} - - component: {fileID: 1844807267285195553} - - component: {fileID: 1844807267285195552} m_Layer: 30 m_Name: SanguineSlash_NetworkedSlashWithOnHitEvent_Prefab m_TagString: Untagged @@ -83,8 +81,6 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} lifeSpan: 0 @@ -123,45 +119,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &1844807267285195553 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1844807267285195556} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 1844807267285195552} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &1844807267285195552 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1844807267285195556} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &7626302713705839451 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/ShadowOrb_ProjectilePrefab.prefab b/Assets/Resources/Abilities/ShadowOrb_ProjectilePrefab.prefab index c66ecedc..220d84d0 100644 --- a/Assets/Resources/Abilities/ShadowOrb_ProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/ShadowOrb_ProjectilePrefab.prefab @@ -11,8 +11,6 @@ GameObject: - component: {fileID: 6744685881493449316} - component: {fileID: 6744685881493449323} - component: {fileID: 6744685881493449322} - - component: {fileID: 6744685881493449321} - - component: {fileID: 6744685881493449320} m_Layer: 30 m_Name: ShadowOrb_ProjectilePrefab m_TagString: Untagged @@ -78,8 +76,6 @@ MonoBehaviour: m_EditorClassIdentifier: hitParticlesPrefab: {fileID: 3781946150010653001, guid: d25d25ca6583f0747bb6fbd95b181c39, type: 3} visuals: {fileID: 6744685882344048820} - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} speed: 0 @@ -89,45 +85,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &6744685881493449321 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6744685881493449327} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 6744685881493449320} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &6744685881493449320 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6744685881493449327} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &6744685881746102466 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/ShieldThrowProjectilePrefab.prefab b/Assets/Resources/Abilities/ShieldThrowProjectilePrefab.prefab index 17d05197..92347b3c 100644 --- a/Assets/Resources/Abilities/ShieldThrowProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/ShieldThrowProjectilePrefab.prefab @@ -24,6 +24,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5332664178951649999} + 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} @@ -31,7 +32,6 @@ Transform: m_Children: - {fileID: 7349733992756040522} m_Father: {fileID: 7611295262132244942} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6186434564233795621 MonoBehaviour: @@ -73,13 +73,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7349733992756040523} + serializedVersion: 2 m_LocalRotation: {x: -0.0000006854534, y: 0.7071067, z: 0.7071068, w: -0.0000006125581} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6186434564233795642} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7349733992756040631 MeshFilter: @@ -139,9 +139,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7349733992756040523} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.5, y: 1.5, z: 0.4} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &7611295262132244940 @@ -155,8 +163,6 @@ GameObject: - component: {fileID: 7611295262132244942} - component: {fileID: 7611295262132244941} - component: {fileID: 7611295262132244943} - - component: {fileID: 7611295262132244937} - - component: {fileID: 7611295262132244936} m_Layer: 30 m_Name: ShieldThrowProjectilePrefab m_TagString: Untagged @@ -171,6 +177,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7611295262132244940} + 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} @@ -178,7 +185,6 @@ Transform: m_Children: - {fileID: 6186434564233795642} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &7611295262132244941 Rigidbody: @@ -187,10 +193,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7611295262132244940} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -210,8 +227,6 @@ MonoBehaviour: m_EditorClassIdentifier: hitParticlesPrefab: {fileID: 8525990746615576120, guid: b85d21f3b8fed714bacf0c4fd50fa512, type: 3} visuals: {fileID: 5332664178951649999} - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} speed: 0 @@ -221,42 +236,3 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &7611295262132244937 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7611295262132244940} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 7611295262132244936} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &7611295262132244936 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7611295262132244940} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 diff --git a/Assets/Resources/Abilities/ShiningLight_AreaOfEffectPrefab Variant Variant.prefab b/Assets/Resources/Abilities/ShiningLight_AreaOfEffectPrefab Variant Variant.prefab index 14b407e2..5f34be55 100644 --- a/Assets/Resources/Abilities/ShiningLight_AreaOfEffectPrefab Variant Variant.prefab +++ b/Assets/Resources/Abilities/ShiningLight_AreaOfEffectPrefab Variant Variant.prefab @@ -162,10 +162,6 @@ PrefabInstance: propertyPath: shouldDisableVisualsOnDelayedDestroyEntered value: 0 objectReference: {fileID: 0} - - target: {fileID: 4737951027918891025, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4737951027918891026, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} propertyPath: m_Name value: ShiningLight_AreaOfEffectPrefab Variant Variant @@ -222,6 +218,7 @@ PrefabInstance: - {fileID: 4737951027217692119, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} - {fileID: 4737951027217692116, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} - {fileID: 4737951027217692117, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4737951027918891027, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} diff --git a/Assets/Resources/Abilities/ShinningStar_AreaOfEffectOverTimePrefab (1) Variant.prefab b/Assets/Resources/Abilities/ShinningStar_AreaOfEffectOverTimePrefab (1) Variant.prefab index fc9103e1..1bb496b7 100644 --- a/Assets/Resources/Abilities/ShinningStar_AreaOfEffectOverTimePrefab (1) Variant.prefab +++ b/Assets/Resources/Abilities/ShinningStar_AreaOfEffectOverTimePrefab (1) Variant.prefab @@ -172,10 +172,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 753911528859556808, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} propertyPath: m_RootOrder value: 0 @@ -236,7 +232,8 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} diff --git a/Assets/Resources/Abilities/ShootArrow_III_AreaOfEffectWithImpactEventPrefab.prefab b/Assets/Resources/Abilities/ShootArrow_III_AreaOfEffectWithImpactEventPrefab.prefab index 5270c495..37bfdab9 100644 --- a/Assets/Resources/Abilities/ShootArrow_III_AreaOfEffectWithImpactEventPrefab.prefab +++ b/Assets/Resources/Abilities/ShootArrow_III_AreaOfEffectWithImpactEventPrefab.prefab @@ -96,8 +96,6 @@ GameObject: - component: {fileID: 9023701964577279872} - component: {fileID: 9023701964577279900} - component: {fileID: 9023701964577279901} - - component: {fileID: 9023701964577279874} - - component: {fileID: 9023701964577279875} m_Layer: 30 m_Name: ShootArrow_III_AreaOfEffectWithImpactEventPrefab m_TagString: Untagged @@ -168,8 +166,6 @@ MonoBehaviour: m_Bits: 2147483648 impactHitVFX: {fileID: 0} shouldDisableVisualsOnDelayedDestroyEntered: 1 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 @@ -196,47 +192,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &9023701964577279874 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9023701964577279873} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 9023701964577279901} - - {fileID: 9023701964577279875} - - {fileID: 8605368231187915423} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &9023701964577279875 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9023701964577279873} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &9023701965050542320 GameObject: m_ObjectHideFlags: 0 @@ -337,11 +292,8 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8607891234483246279, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -422,11 +374,8 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8607891234483246279, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -507,11 +456,8 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8607891234483246279, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] diff --git a/Assets/Resources/Abilities/SimpleClawSlashPrefab.prefab b/Assets/Resources/Abilities/SimpleClawSlashPrefab.prefab index 09cb109e..a21f0195 100644 --- a/Assets/Resources/Abilities/SimpleClawSlashPrefab.prefab +++ b/Assets/Resources/Abilities/SimpleClawSlashPrefab.prefab @@ -11,8 +11,6 @@ GameObject: - component: {fileID: 4462899224256174357} - component: {fileID: 4462899224256174358} - component: {fileID: 4462899224256174352} - - component: {fileID: 4462899224256174354} - - component: {fileID: 4462899224256174355} m_Layer: 30 m_Name: SimpleClawSlashPrefab m_TagString: Untagged @@ -81,8 +79,6 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} lifeSpan: 0 @@ -94,45 +90,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &4462899224256174354 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4462899224256174359} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 4462899224256174355} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &4462899224256174355 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4462899224256174359} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &5410861880112975111 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/SimpleKickPrefab.prefab b/Assets/Resources/Abilities/SimpleKickPrefab.prefab index bdf22818..428a3879 100644 --- a/Assets/Resources/Abilities/SimpleKickPrefab.prefab +++ b/Assets/Resources/Abilities/SimpleKickPrefab.prefab @@ -19897,8 +19897,6 @@ GameObject: - component: {fileID: 4233591871518015730} - component: {fileID: 4233591871518015729} - component: {fileID: 4233591871518015735} - - component: {fileID: 4233591871518015733} - - component: {fileID: 4233591871518015732} m_Layer: 30 m_Name: SimpleKickPrefab m_TagString: Untagged @@ -19969,8 +19967,6 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} lifeSpan: 0 @@ -19994,45 +19990,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &4233591871518015733 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4233591871518015728} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 4233591871518015732} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &4233591871518015732 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4233591871518015728} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &5415350756578579354 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/SimpleProjectilePrefab.prefab b/Assets/Resources/Abilities/SimpleProjectilePrefab.prefab index dcfa42eb..88352c65 100644 --- a/Assets/Resources/Abilities/SimpleProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/SimpleProjectilePrefab.prefab @@ -11,8 +11,6 @@ GameObject: - component: {fileID: 2740904024514934884} - component: {fileID: 2740904024514934887} - component: {fileID: 2740904024514934885} - - component: {fileID: 2740904024514934883} - - component: {fileID: 2740904024514934882} m_Layer: 30 m_Name: SimpleProjectilePrefab m_TagString: Untagged @@ -27,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2740904024514934886} + 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} @@ -34,7 +33,6 @@ Transform: m_Children: - {fileID: 2740904025624935389} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &2740904024514934887 Rigidbody: @@ -43,10 +41,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2740904024514934886} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -66,8 +75,6 @@ MonoBehaviour: m_EditorClassIdentifier: hitParticlesPrefab: {fileID: 8525990746615576120, guid: b85d21f3b8fed714bacf0c4fd50fa512, type: 3} visuals: {fileID: 2740904025624935361} - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} speed: 0 @@ -77,45 +84,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &2740904024514934883 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2740904024514934886} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 2740904024514934882} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &2740904024514934882 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2740904024514934886} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &2740904025624935361 GameObject: m_ObjectHideFlags: 0 @@ -142,13 +110,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2740904025624935361} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2740904024514934884} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2740904025624935388 MeshFilter: @@ -208,8 +176,16 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2740904025624935361} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Abilities/SimplePunchAPrefab.prefab b/Assets/Resources/Abilities/SimplePunchAPrefab.prefab index 3915da45..ff990d59 100644 --- a/Assets/Resources/Abilities/SimplePunchAPrefab.prefab +++ b/Assets/Resources/Abilities/SimplePunchAPrefab.prefab @@ -9969,8 +9969,6 @@ GameObject: - component: {fileID: 2490494820205918379} - component: {fileID: 2490494820205918376} - component: {fileID: 2490494820205918382} - - component: {fileID: 2490494820205918380} - - component: {fileID: 2490494820205918381} m_Layer: 30 m_Name: SimplePunchAPrefab m_TagString: Untagged @@ -10041,8 +10039,6 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} lifeSpan: 0 @@ -10066,45 +10062,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &2490494820205918380 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2490494820205918377} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 2490494820205918381} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &2490494820205918381 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2490494820205918377} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &4301127137943137995 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/SimplePunchBPrefab.prefab b/Assets/Resources/Abilities/SimplePunchBPrefab.prefab index b9f197de..678bc135 100644 --- a/Assets/Resources/Abilities/SimplePunchBPrefab.prefab +++ b/Assets/Resources/Abilities/SimplePunchBPrefab.prefab @@ -20002,8 +20002,6 @@ GameObject: - component: {fileID: 5722141525147731711} - component: {fileID: 5722141525147731708} - component: {fileID: 5722141525147731706} - - component: {fileID: 5722141525147731704} - - component: {fileID: 5722141525147731705} m_Layer: 30 m_Name: SimplePunchBPrefab m_TagString: Untagged @@ -20074,8 +20072,6 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} lifeSpan: 0 @@ -20099,45 +20095,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &5722141525147731704 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5722141525147731709} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 5722141525147731705} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &5722141525147731705 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5722141525147731709} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &6355546081823479262 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/SimpleSlashPrefab.prefab b/Assets/Resources/Abilities/SimpleSlashPrefab.prefab index f7ffa729..1cab9838 100644 --- a/Assets/Resources/Abilities/SimpleSlashPrefab.prefab +++ b/Assets/Resources/Abilities/SimpleSlashPrefab.prefab @@ -149,8 +149,6 @@ GameObject: - component: {fileID: 8389547513526139284} - component: {fileID: 8389547513526139287} - component: {fileID: 8389547513526139281} - - component: {fileID: 8389547513526139283} - - component: {fileID: 8389547513526139282} m_Layer: 30 m_Name: SimpleSlashPrefab m_TagString: Untagged @@ -219,8 +217,6 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} lifeSpan: 0 @@ -232,45 +228,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &8389547513526139283 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8389547513526139286} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 8389547513526139282} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &8389547513526139282 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8389547513526139286} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1001 &186318874008155870 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/SiphonSlash_NetworkedSlashWithOnHitEvent_Prefab.prefab b/Assets/Resources/Abilities/SiphonSlash_NetworkedSlashWithOnHitEvent_Prefab.prefab index cc307d07..20ce7d08 100644 --- a/Assets/Resources/Abilities/SiphonSlash_NetworkedSlashWithOnHitEvent_Prefab.prefab +++ b/Assets/Resources/Abilities/SiphonSlash_NetworkedSlashWithOnHitEvent_Prefab.prefab @@ -196,8 +196,6 @@ GameObject: - component: {fileID: 8389547513526139284} - component: {fileID: 8389547513526139287} - component: {fileID: 8389547513526139281} - - component: {fileID: 8389547513526139283} - - component: {fileID: 8389547513526139282} m_Layer: 30 m_Name: SiphonSlash_NetworkedSlashWithOnHitEvent_Prefab m_TagString: Untagged @@ -267,8 +265,6 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} lifeSpan: 0 @@ -295,45 +291,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &8389547513526139283 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8389547513526139286} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 8389547513526139282} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &8389547513526139282 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8389547513526139286} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1001 &5803909885283136444 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/SoulBomb_AreaOfEffectWithImpactEvent.prefab b/Assets/Resources/Abilities/SoulBomb_AreaOfEffectWithImpactEvent.prefab index a61fd5fd..ae788119 100644 --- a/Assets/Resources/Abilities/SoulBomb_AreaOfEffectWithImpactEvent.prefab +++ b/Assets/Resources/Abilities/SoulBomb_AreaOfEffectWithImpactEvent.prefab @@ -99,8 +99,6 @@ GameObject: - component: {fileID: 752672217636848573} - component: {fileID: 752672217636848545} - component: {fileID: 752672217636848544} - - component: {fileID: 752672217636848575} - - component: {fileID: 752672217636848574} m_Layer: 30 m_Name: SoulBomb_AreaOfEffectWithImpactEvent m_TagString: Untagged @@ -171,8 +169,6 @@ MonoBehaviour: m_Bits: 2147483648 impactHitVFX: {fileID: 5642766282230003982, guid: b5c8ca7ed10b61e499cce8ec3b6e2e4c, type: 3} shouldDisableVisualsOnDelayedDestroyEntered: 0 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 @@ -199,46 +195,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &752672217636848575 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 752672217636848572} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 752672217636848544} - - {fileID: 752672217636848574} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &752672217636848574 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 752672217636848572} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1001 &7307021069078939516 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/SoulEssence Drain_DrainProjectileAbility.prefab b/Assets/Resources/Abilities/SoulEssence Drain_DrainProjectileAbility.prefab index 1f2697c9..c63fffac 100644 --- a/Assets/Resources/Abilities/SoulEssence Drain_DrainProjectileAbility.prefab +++ b/Assets/Resources/Abilities/SoulEssence Drain_DrainProjectileAbility.prefab @@ -115,9 +115,7 @@ GameObject: m_Component: - component: {fileID: 1405724118519419647} - component: {fileID: 1405724118519419646} - - component: {fileID: 8108745302805101659} - component: {fileID: 8553640007321115529} - - component: {fileID: 7071614492757533988} m_Layer: 0 m_Name: SoulEssence Drain_DrainProjectileAbility m_TagString: Untagged @@ -156,8 +154,6 @@ MonoBehaviour: m_EditorClassIdentifier: hitParticlesPrefab: {fileID: 8771972552311404799, guid: 794c4dee05aeca449a5fc02390b63eb1, type: 3} visuals: {fileID: 1405724119171910500} - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} speed: 0 @@ -165,29 +161,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &8108745302805101659 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1405724118519419521} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 7071614492757533988} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 --- !u!54 &8553640007321115529 Rigidbody: m_ObjectHideFlags: 0 @@ -215,22 +188,6 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!114 &7071614492757533988 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1405724118519419521} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &1405724119171910500 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/SoulFire_ChanneledAbilityPrefab Variant.prefab b/Assets/Resources/Abilities/SoulFire_ChanneledAbilityPrefab Variant.prefab index 122d9a99..eaa43558 100644 --- a/Assets/Resources/Abilities/SoulFire_ChanneledAbilityPrefab Variant.prefab +++ b/Assets/Resources/Abilities/SoulFire_ChanneledAbilityPrefab Variant.prefab @@ -248,10 +248,6 @@ PrefabInstance: propertyPath: m_Intensity value: 0 objectReference: {fileID: 0} - - target: {fileID: 6684366852784880869, guid: f15e487e3a2d10649b5606f62f5754bf, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6684366852784880872, guid: f15e487e3a2d10649b5606f62f5754bf, type: 3} propertyPath: m_RootOrder value: 0 @@ -336,7 +332,8 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 6684366852784880872, guid: f15e487e3a2d10649b5606f62f5754bf, type: 3} diff --git a/Assets/Resources/Abilities/SpiritBeast_ProjectilePrefab.prefab b/Assets/Resources/Abilities/SpiritBeast_ProjectilePrefab.prefab index 20010f97..871e7a50 100644 --- a/Assets/Resources/Abilities/SpiritBeast_ProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/SpiritBeast_ProjectilePrefab.prefab @@ -138,8 +138,6 @@ GameObject: - component: {fileID: 5379347897197585764} - component: {fileID: 5379347897197585767} - component: {fileID: 5379347897197585765} - - component: {fileID: 5379347897197585763} - - component: {fileID: 5379347897197585762} m_Layer: 30 m_Name: SpiritBeast_ProjectilePrefab m_TagString: Untagged @@ -205,8 +203,6 @@ MonoBehaviour: m_EditorClassIdentifier: hitParticlesPrefab: {fileID: 4535006216103734310, guid: 98c4704d0fd7211449bcf5c451095a60, type: 3} visuals: {fileID: 7831458318446984793} - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} speed: 0 @@ -216,45 +212,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &5379347897197585763 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5379347897197585766} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 5379347897197585762} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &5379347897197585762 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5379347897197585766} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &5527894165426039086 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/SwordArt_AreaOfEffectPrefab Variant Variant.prefab b/Assets/Resources/Abilities/SwordArt_AreaOfEffectPrefab Variant Variant.prefab index f2beee08..2735ca98 100644 --- a/Assets/Resources/Abilities/SwordArt_AreaOfEffectPrefab Variant Variant.prefab +++ b/Assets/Resources/Abilities/SwordArt_AreaOfEffectPrefab Variant Variant.prefab @@ -65,10 +65,6 @@ PrefabInstance: propertyPath: shouldDisableVisualsOnDelayedDestroyEntered value: 0 objectReference: {fileID: 0} - - target: {fileID: 4737951027918891025, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4737951027918891026, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} propertyPath: m_Name value: SwordArt_AreaOfEffectPrefab Variant Variant @@ -125,6 +121,7 @@ PrefabInstance: - {fileID: 4737951027217692119, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} - {fileID: 4737951027217692116, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} - {fileID: 4737951027217692117, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4737951027918891027, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} diff --git a/Assets/Resources/Abilities/TaintedStar_AreaOfEffectOverTimePrefab (1) Variant.prefab b/Assets/Resources/Abilities/TaintedStar_AreaOfEffectOverTimePrefab (1) Variant.prefab index faff5bac..1d749f47 100644 --- a/Assets/Resources/Abilities/TaintedStar_AreaOfEffectOverTimePrefab (1) Variant.prefab +++ b/Assets/Resources/Abilities/TaintedStar_AreaOfEffectOverTimePrefab (1) Variant.prefab @@ -90,10 +90,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 753911528859556808, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} propertyPath: m_RootOrder value: 0 @@ -154,7 +150,8 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} diff --git a/Assets/Resources/Abilities/TearDownSlashPrefab.prefab b/Assets/Resources/Abilities/TearDownSlashPrefab.prefab index 880bec05..a9a59110 100644 --- a/Assets/Resources/Abilities/TearDownSlashPrefab.prefab +++ b/Assets/Resources/Abilities/TearDownSlashPrefab.prefab @@ -151,8 +151,6 @@ GameObject: - component: {fileID: 7964726221679715411} - component: {fileID: 7964726221679715408} - component: {fileID: 7964726221679715414} - - component: {fileID: 7964726221679715412} - - component: {fileID: 7964726221679715413} m_Layer: 30 m_Name: TearDownSlashPrefab m_TagString: Untagged @@ -221,8 +219,6 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} lifeSpan: 0 @@ -234,45 +230,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &7964726221679715412 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7964726221679715409} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 7964726221679715413} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &7964726221679715413 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7964726221679715409} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1001 &1073079339254337613 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/Tornado_ProjectileAreaOfEffectOverTimeWithTickEvent.prefab b/Assets/Resources/Abilities/Tornado_ProjectileAreaOfEffectOverTimeWithTickEvent.prefab index 807c1a93..cea41646 100644 --- a/Assets/Resources/Abilities/Tornado_ProjectileAreaOfEffectOverTimeWithTickEvent.prefab +++ b/Assets/Resources/Abilities/Tornado_ProjectileAreaOfEffectOverTimeWithTickEvent.prefab @@ -232,8 +232,6 @@ GameObject: - component: {fileID: 7681102451873883168} - component: {fileID: 7681102451873883196} - component: {fileID: 1813405135002957620} - - component: {fileID: 7681102451873883170} - - component: {fileID: 7681102451873883171} m_Layer: 30 m_Name: Tornado_ProjectileAreaOfEffectOverTimeWithTickEvent m_TagString: Untagged @@ -306,8 +304,6 @@ MonoBehaviour: m_Bits: 2147483648 impactHitVFX: {fileID: 2353600328335836179, guid: ceec7516237b4104b94300043ca39784, type: 3} shouldDisableVisualsOnDelayedDestroyEntered: 1 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 @@ -331,46 +327,6 @@ MonoBehaviour: onTargetHitByProjectile: m_PersistentCalls: m_Calls: [] ---- !u!114 &7681102451873883170 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7681102451873883169} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 1813405135002957620} - - {fileID: 7681102451873883171} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &7681102451873883171 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7681102451873883169} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &7681102452339790672 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/VampSpeedTrigger.prefab b/Assets/Resources/Abilities/VampSpeedTrigger.prefab index 07641705..9289caf6 100644 --- a/Assets/Resources/Abilities/VampSpeedTrigger.prefab +++ b/Assets/Resources/Abilities/VampSpeedTrigger.prefab @@ -95,8 +95,6 @@ GameObject: - component: {fileID: 3740678194898045932} - component: {fileID: 3740678194898045935} - component: {fileID: 3740678194898045933} - - component: {fileID: 3740678194898045931} - - component: {fileID: 3740678194898045930} m_Layer: 30 m_Name: VampSpeedTrigger m_TagString: Untagged @@ -162,8 +160,6 @@ MonoBehaviour: m_EditorClassIdentifier: hitParticlesPrefab: {fileID: 0} visuals: {fileID: 3740678193852172361} - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} speed: 0 @@ -173,42 +169,3 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &3740678194898045931 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3740678194898045934} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 3740678194898045930} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &3740678194898045930 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3740678194898045934} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 diff --git a/Assets/Resources/Abilities/WhirlingAxes_AreaOfEffectOverTimePrefab Variant.prefab b/Assets/Resources/Abilities/WhirlingAxes_AreaOfEffectOverTimePrefab Variant.prefab index dedfb33b..8f29a89b 100644 --- a/Assets/Resources/Abilities/WhirlingAxes_AreaOfEffectOverTimePrefab Variant.prefab +++ b/Assets/Resources/Abilities/WhirlingAxes_AreaOfEffectOverTimePrefab Variant.prefab @@ -662,10 +662,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 753911528859556808, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - propertyPath: sceneViewId - value: 0 - objectReference: {fileID: 0} - target: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} propertyPath: m_RootOrder value: 0 @@ -714,7 +710,8 @@ PrefabInstance: propertyPath: m_Name value: WhirlingAxes_AreaOfEffectOverTimePrefab Variant objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} diff --git a/Assets/Resources/Abilities/WildHunt_AreaOfEffectOverTimeWithTickEvent.prefab b/Assets/Resources/Abilities/WildHunt_AreaOfEffectOverTimeWithTickEvent.prefab index 8e318df0..10f5c31b 100644 --- a/Assets/Resources/Abilities/WildHunt_AreaOfEffectOverTimeWithTickEvent.prefab +++ b/Assets/Resources/Abilities/WildHunt_AreaOfEffectOverTimeWithTickEvent.prefab @@ -52,8 +52,6 @@ GameObject: - component: {fileID: 3918030657813494486} - component: {fileID: 3918030657813494474} - component: {fileID: 3918030657813494475} - - component: {fileID: 3918030657813494484} - - component: {fileID: 3918030657813494485} m_Layer: 30 m_Name: WildHunt_AreaOfEffectOverTimeWithTickEvent m_TagString: Untagged @@ -125,8 +123,6 @@ MonoBehaviour: m_Bits: 2147483648 impactHitVFX: {fileID: 2353600328335836179, guid: ceec7516237b4104b94300043ca39784, type: 3} shouldDisableVisualsOnDelayedDestroyEntered: 0 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 @@ -145,46 +141,6 @@ MonoBehaviour: onTickHappened: m_PersistentCalls: m_Calls: [] ---- !u!114 &3918030657813494484 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3918030657813494487} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 3918030657813494475} - - {fileID: 3918030657813494485} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &3918030657813494485 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3918030657813494487} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1 &4326109791453485006 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/WildSlashPrefab.prefab b/Assets/Resources/Abilities/WildSlashPrefab.prefab index 7cc3d9c3..a0babd2d 100644 --- a/Assets/Resources/Abilities/WildSlashPrefab.prefab +++ b/Assets/Resources/Abilities/WildSlashPrefab.prefab @@ -149,8 +149,6 @@ GameObject: - component: {fileID: 4802261089321297626} - component: {fileID: 4802261089321297625} - component: {fileID: 4802261089321297631} - - component: {fileID: 4802261089321297629} - - component: {fileID: 4802261089321297628} m_Layer: 30 m_Name: WildSlashPrefab m_TagString: Untagged @@ -219,8 +217,6 @@ MonoBehaviour: abilityHitLayer: serializedVersion: 2 m_Bits: 2147483648 - photonView: {fileID: 0} - owner: {fileID: 0} ownerTag: {fileID: 0} ability: {fileID: 0} lifeSpan: 0 @@ -232,45 +228,6 @@ MonoBehaviour: onTargetHit: m_PersistentCalls: m_Calls: [] ---- !u!114 &4802261089321297629 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4802261089321297624} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 4802261089321297628} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &4802261089321297628 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4802261089321297624} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!1001 &8455567527513157799 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab b/Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab index 12b73312..06768195 100644 --- a/Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab +++ b/Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 719420356144337024} - component: {fileID: 6853293170635492090} - component: {fileID: 5106598912658884738} - - component: {fileID: 5545505087058379099} - component: {fileID: 719420356144337027} m_Layer: 31 m_Name: Skeleton @@ -27,13 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 193713797072636474} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1040714684719195969} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &6853293170635492090 Animator: @@ -64,48 +63,21 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 193713797072636474} 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: 2 m_Radius: 0.5 m_Height: 2 m_Direction: 1 m_Center: {x: 0, y: 0.7, z: 0} ---- !u!114 &5545505087058379099 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 193713797072636474} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b8c4a61274f60b4ea5fb4299cfdbf14, type: 3} - m_Name: - m_EditorClassIdentifier: - ShowLayerWeightsInspector: 1 - ShowParameterInspector: 1 - m_SynchronizeParameters: - - Type: 1 - SynchronizeType: 1 - Name: movementSpeed - - Type: 9 - SynchronizeType: 0 - Name: throw - - Type: 9 - SynchronizeType: 0 - Name: cast - - Type: 9 - SynchronizeType: 0 - Name: melee - - Type: 1 - SynchronizeType: 0 - Name: throwingTime - - Type: 9 - SynchronizeType: 0 - Name: dead - m_SynchronizeLayers: - - SynchronizeType: 1 - LayerIndex: 0 --- !u!114 &719420356144337027 MonoBehaviour: m_ObjectHideFlags: 0 @@ -151,7 +123,6 @@ RectTransform: - {fileID: 719312546532619456} - {fileID: 6893429519207585842} m_Father: {fileID: 5343062316551689618} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -205,8 +176,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1040714684719195969} - - component: {fileID: 1708233211970282806} - - component: {fileID: 1708233211970282807} - component: {fileID: 1040714684719195971} - component: {fileID: 1708233211970282805} - component: {fileID: 1708233211970282804} @@ -237,6 +206,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1040714684719195968} + 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} @@ -261,50 +231,7 @@ Transform: - {fileID: 5407316254601908039} - {fileID: 4530741588054097262} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1708233211970282806 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1040714684719195968} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 1708233211970282807} - - {fileID: 1708233211970282801} - - {fileID: 1708233211970282802} - - {fileID: 5545505087058379099} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &1708233211970282807 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1040714684719195968} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!114 &1040714684719195971 MonoBehaviour: m_ObjectHideFlags: 0 @@ -323,7 +250,6 @@ MonoBehaviour: patrolAgentSpeed: 1.5 chasingAgentSpeed: 2.65 timeBetweenAttacks: 2 - photonView: {fileID: 0} myTag: {fileID: 0} animatorController: {fileID: 0} abilityPriorityManager: {fileID: 0} @@ -366,10 +292,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1040714684719195968} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 1 m_Interpolate: 0 @@ -383,8 +320,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1040714684719195968} 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: 2 m_Radius: 0.5 m_Height: 2 m_Direction: 1 @@ -430,7 +376,6 @@ MonoBehaviour: onDeath: m_PersistentCalls: m_Calls: [] - photonView: {fileID: 0} invulnerable: 0 OnInvulnerabilityStateChanged: m_PersistentCalls: @@ -459,7 +404,6 @@ MonoBehaviour: onMaxManaChanged: m_PersistentCalls: m_Calls: [] - photonView: {fileID: 0} OnNoManaCostStateChanged: m_PersistentCalls: m_Calls: [] @@ -528,7 +472,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -617,7 +560,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -643,7 +585,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -684,7 +625,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -725,7 +665,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -781,7 +720,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -806,7 +744,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -851,7 +788,6 @@ RectTransform: - {fileID: 3064391737158364881} - {fileID: 3461695688016368226} m_Father: {fileID: 5343062316551689618} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -919,6 +855,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3274151806426027965} + 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} @@ -927,7 +864,6 @@ Transform: - {fileID: 1722006805963124541} - {fileID: 1337864201749492986} m_Father: {fileID: 6271934422900593977} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3839571315374498928 GameObject: @@ -960,7 +896,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5343062316551689618} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1089,13 +1024,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4309885726238194372} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.4, z: 0} m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1040714684719195969} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!199 &9011913980371425031 ParticleSystemRenderer: @@ -1153,13 +1088,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 1 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 1 m_VertexStreams: 000304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -1387,6 +1324,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -1416,6 +1354,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -1719,6 +1658,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 1000 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -2457,6 +2397,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 3 m_NumAlphaKeys: 3 minGradient: @@ -2486,6 +2427,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -4706,6 +4648,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4735,6 +4678,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -5124,6 +5068,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -5166,6 +5111,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -5195,6 +5141,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -5282,6 +5229,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -5311,6 +5259,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -5349,6 +5298,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -5378,6 +5328,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -5631,6 +5582,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -5660,6 +5612,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -5903,13 +5856,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4310518117120737967} + 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: 1040714684719195969} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2267394292307971533 MonoBehaviour: @@ -6183,6 +6136,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4591114271746409651} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -6190,7 +6144,6 @@ Transform: m_Children: - {fileID: 2529957022982677867} m_Father: {fileID: 1040714684719195969} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5492681917134171813 GameObject: @@ -6217,13 +6170,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5492681917134171813} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.4, z: 0} m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1040714684719195969} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!199 &3671036866399702038 ParticleSystemRenderer: @@ -6281,13 +6234,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 1 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 1 m_VertexStreams: 000304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -6515,6 +6470,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -6544,6 +6500,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -6847,6 +6804,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 1000 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -7643,6 +7601,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 3 minGradient: @@ -7672,6 +7631,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -9892,6 +9852,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9921,6 +9882,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -10310,6 +10272,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -10352,6 +10315,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -10381,6 +10345,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -10468,6 +10433,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -10497,6 +10463,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -10535,6 +10502,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -10564,6 +10532,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -10817,6 +10786,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -10846,6 +10816,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -11089,13 +11060,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6581448089854058576} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 420608364184142292} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7148575297922544141 MonoBehaviour: @@ -11148,7 +11119,6 @@ RectTransform: - {fileID: 1335078160082809522} - {fileID: 1822495774932327062} m_Father: {fileID: 1040714684719195969} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -11172,7 +11142,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -11268,13 +11240,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7483758541842380129} + 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: 8252111366341183596} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3606301248622599290 MonoBehaviour: @@ -11323,7 +11295,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1822495774932327062} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11392,6 +11363,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8072770441131587596} + 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} @@ -11399,7 +11371,6 @@ Transform: m_Children: - {fileID: 8252111366341183596} m_Father: {fileID: 1040714684719195969} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7566027486260025409 MonoBehaviour: @@ -11413,8 +11384,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 68722050dc098fd44b9fd59255e4865e, type: 3} m_Name: m_EditorClassIdentifier: - onPlayerJoinedParty: {fileID: 3606301248622599290} - onPlayerLeftParty: {fileID: 4157499735769834733} --- !u!1 &8287060574767795438 GameObject: m_ObjectHideFlags: 0 @@ -11446,7 +11415,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1822495774932327062} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11574,13 +11542,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8562165150115495940} + 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: 1040714684719195969} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8562165150115495942 MonoBehaviour: @@ -11630,13 +11598,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8562165150208867322} + 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: 1040714684719195969} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8562165150208867300 MonoBehaviour: @@ -11676,13 +11644,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8562165150210779500} + 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: 1040714684719195969} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8562165150210779502 MonoBehaviour: @@ -11727,7 +11695,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1335078160082809522} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11803,7 +11770,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1335078160082809522} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11931,13 +11897,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9179101450940043261} + 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: 8252111366341183596} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4157499735769834733 MonoBehaviour: @@ -11960,6 +11926,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1040714684719195969} m_Modifications: - target: {fileID: 521339279345268759, guid: 64f97bcadc30ea54680b892789161068, type: 3} @@ -12015,6 +11982,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 64f97bcadc30ea54680b892789161068, type: 3} --- !u!4 &7146237025830416315 stripped Transform: @@ -12026,6 +11996,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1040714684719195969} m_Modifications: - target: {fileID: 6635164380670150480, guid: e83334d94a254f14ea4935beb7fdd3c1, type: 3} @@ -12077,6 +12048,9 @@ PrefabInstance: value: CFXR3 _Bleeding_ objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e83334d94a254f14ea4935beb7fdd3c1, type: 3} --- !u!4 &4934109709913625504 stripped Transform: @@ -12093,6 +12067,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1040714684719195969} m_Modifications: - target: {fileID: 5102692018217329649, guid: fa51093b89e20f34b96ab90f7cce2083, type: 3} @@ -12148,6 +12123,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fa51093b89e20f34b96ab90f7cce2083, type: 3} --- !u!1 &6045638370208658194 stripped GameObject: @@ -12164,6 +12142,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1040714684719195969} m_Modifications: - target: {fileID: 4961915953510107608, guid: 23e24e9936f1c6f4baaaef83461437db, type: 3} @@ -12219,6 +12198,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 23e24e9936f1c6f4baaaef83461437db, type: 3} --- !u!4 &6280806573428533496 stripped Transform: @@ -12235,6 +12217,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1040714684719195969} m_Modifications: - target: {fileID: 921287751983194665, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} @@ -12334,6 +12317,9 @@ PrefabInstance: value: MinimapCanvas objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} --- !u!224 &571057253116836751 stripped RectTransform: @@ -12345,6 +12331,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1040714684719195969} m_Modifications: - target: {fileID: 73626096745920581, guid: 4311ded97b4a0bf4c99266e185db2e6e, type: 3} @@ -12396,6 +12383,9 @@ PrefabInstance: value: CFXR3 _Poisoned_ objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4311ded97b4a0bf4c99266e185db2e6e, type: 3} --- !u!198 &1098384084433226102 stripped ParticleSystem: @@ -12412,6 +12402,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1040714684719195969} m_Modifications: - target: {fileID: 6294508013172393185, guid: 043176b6a68be2b43b073aaaa4782c7d, type: 3} @@ -12463,6 +12454,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 043176b6a68be2b43b073aaaa4782c7d, type: 3} --- !u!1 &4411435976634846358 stripped GameObject: @@ -12479,6 +12473,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1040714684719195969} m_Modifications: - target: {fileID: 4117085477522148337, guid: 71f8f31539e61b84bb2fa8ad6759aaae, type: 3} @@ -12530,6 +12525,9 @@ PrefabInstance: value: 'CFXR3 _Burning_ ' objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 71f8f31539e61b84bb2fa8ad6759aaae, type: 3} --- !u!198 &5407316254601908038 stripped ParticleSystem: diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Barbarian Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Barbarian Variant.prefab index 5b85343c..99f026d8 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Barbarian Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Barbarian Variant.prefab @@ -276,7 +276,8 @@ PrefabInstance: propertyPath: onFishingStarted.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 583639914168640231, guid: 55a572819c594ad4c90a6e68c2f30e0e, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 6985402682562936812, guid: 55a572819c594ad4c90a6e68c2f30e0e, type: 3} @@ -284,17 +285,6 @@ PrefabInstance: addedObject: {fileID: 2384544359715800596} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 55a572819c594ad4c90a6e68c2f30e0e, type: 3} ---- !u!114 &1788221149024619301 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 583639914168640231, guid: 55a572819c594ad4c90a6e68c2f30e0e, type: 3} - m_PrefabInstance: {fileID: 1209366866749221314} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b8c4a61274f60b4ea5fb4299cfdbf14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &1823247239247150827 stripped Transform: m_CorrespondingSourceObject: {fileID: 686220006257547049, guid: 55a572819c594ad4c90a6e68c2f30e0e, type: 3} @@ -642,14 +632,6 @@ PrefabInstance: propertyPath: ObservedComponents.Array.data[4] value: objectReference: {fileID: 1830776764180054666} - - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} - propertyPath: ObservedComponents.Array.data[5] - value: - objectReference: {fileID: 1788221149024619301} - - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} - propertyPath: ObservedComponents.Array.data[6] - value: - objectReference: {fileID: 1788221149024619301} - target: {fileID: 7726918647213528475, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: classTag value: diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Human Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Human Variant.prefab index 0cac6712..4f7dfba8 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Human Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Human Variant.prefab @@ -194,7 +194,8 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 4291157556610032653, guid: a3c8942c46a66cd468a506a92a451db5, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -215,17 +216,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 75ba268000bc14f4287a8a1f8c3dabd6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1951152564759972728 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4291157556610032653, guid: a3c8942c46a66cd468a506a92a451db5, type: 3} - m_PrefabInstance: {fileID: 2350496256958476149} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b8c4a61274f60b4ea5fb4299cfdbf14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &2060779008523578540 stripped Transform: m_CorrespondingSourceObject: {fileID: 4325699138076541913, guid: a3c8942c46a66cd468a506a92a451db5, type: 3} @@ -449,10 +439,6 @@ PrefabInstance: propertyPath: ObservedComponents.Array.size value: 6 objectReference: {fileID: 0} - - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} - propertyPath: ObservedComponents.Array.data[5] - value: - objectReference: {fileID: 1951152564759972728} - target: {fileID: 7726918647213528475, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: classTag value: diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Knight Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Knight Variant.prefab index 72b9f17d..77823c90 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Knight Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Knight Variant.prefab @@ -208,14 +208,6 @@ PrefabInstance: propertyPath: ObservedComponents.Array.data[4] value: objectReference: {fileID: 8856054663210089579} - - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} - propertyPath: ObservedComponents.Array.data[5] - value: - objectReference: {fileID: 5587652594478694127} - - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} - propertyPath: ObservedComponents.Array.data[6] - value: - objectReference: {fileID: 5587652594478694127} - target: {fileID: 7726918647213528475, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: classTag value: @@ -648,7 +640,8 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 1936994702313746462, guid: 21e6880a6d86aec4fb0f43796c8fac6e, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 8367684642823880501, guid: 21e6880a6d86aec4fb0f43796c8fac6e, type: 3} @@ -682,17 +675,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 75ba268000bc14f4287a8a1f8c3dabd6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &5587652594478694127 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1936994702313746462, guid: 21e6880a6d86aec4fb0f43796c8fac6e, type: 3} - m_PrefabInstance: {fileID: 6299060357122510577} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b8c4a61274f60b4ea5fb4299cfdbf14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &6208985573971044310 stripped GameObject: m_CorrespondingSourceObject: {fileID: 90209976913094951, guid: 21e6880a6d86aec4fb0f43796c8fac6e, type: 3} diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab index c8e8bc1b..0e2ddd07 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab @@ -343,7 +343,8 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 492335034898022818, guid: 088a10fcc3f776e4cbedbecef9997f19, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 3052689789721081116, guid: 088a10fcc3f776e4cbedbecef9997f19, type: 3} @@ -382,17 +383,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7678185868654642862, guid: 088a10fcc3f776e4cbedbecef9997f19, type: 3} m_PrefabInstance: {fileID: 5997609963086137483} m_PrefabAsset: {fileID: 0} ---- !u!114 &6192144265892874537 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 492335034898022818, guid: 088a10fcc3f776e4cbedbecef9997f19, type: 3} - m_PrefabInstance: {fileID: 5997609963086137483} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b8c4a61274f60b4ea5fb4299cfdbf14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &8747854477309951383 stripped Transform: m_CorrespondingSourceObject: {fileID: 3052689789721081116, guid: 088a10fcc3f776e4cbedbecef9997f19, type: 3} @@ -602,10 +592,6 @@ PrefabInstance: propertyPath: ObservedComponents.Array.data[5] value: objectReference: {fileID: 7230415786316253121} - - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} - propertyPath: ObservedComponents.Array.data[6] - value: - objectReference: {fileID: 6192144265892874537} - target: {fileID: 7726918647213528475, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: classTag value: diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Naturalist Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Naturalist Variant.prefab index 3ca6a63b..ec1e7b57 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Naturalist Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Naturalist Variant.prefab @@ -188,10 +188,6 @@ PrefabInstance: propertyPath: ObservedComponents.Array.size value: 6 objectReference: {fileID: 0} - - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} - propertyPath: ObservedComponents.Array.data[5] - value: - objectReference: {fileID: 1500358052} - target: {fileID: 7726918647213528475, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: classTag value: @@ -367,7 +363,8 @@ PrefabInstance: propertyPath: m_Name value: Naturalist objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3288727660570033581, guid: af5fddb774a0f724c92b801e22ea7965, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 6588971775634375810, guid: af5fddb774a0f724c92b801e22ea7965, type: 3} @@ -386,17 +383,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 75ba268000bc14f4287a8a1f8c3dabd6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1500358052 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3288727660570033581, guid: af5fddb774a0f724c92b801e22ea7965, type: 3} - m_PrefabInstance: {fileID: 3288727662027773961} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b8c4a61274f60b4ea5fb4299cfdbf14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1362499111226863775 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4560873030512601238, guid: af5fddb774a0f724c92b801e22ea7965, type: 3} diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Necromancer Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Necromancer Variant.prefab index 65aeb052..b2268834 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Necromancer Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Necromancer Variant.prefab @@ -400,10 +400,6 @@ PrefabInstance: propertyPath: ObservedComponents.Array.data[5] value: objectReference: {fileID: 2979345162832780578} - - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} - propertyPath: ObservedComponents.Array.data[6] - value: - objectReference: {fileID: 2747273072329540181} - target: {fileID: 7726918647213528475, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: classTag value: @@ -791,7 +787,8 @@ PrefabInstance: propertyPath: m_SynchronizeParameters.Array.data[15].Type value: 1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 7716045718905858460, guid: 5dae863231f47364a8cff4666c86675c, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4467107156232270255, guid: 5dae863231f47364a8cff4666c86675c, type: 3} @@ -814,17 +811,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 6091832650452064618, guid: 5dae863231f47364a8cff4666c86675c, type: 3} m_PrefabInstance: {fileID: 5563248454827535305} m_PrefabAsset: {fileID: 0} ---- !u!114 &2747273072329540181 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7716045718905858460, guid: 5dae863231f47364a8cff4666c86675c, type: 3} - m_PrefabInstance: {fileID: 5563248454827535305} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b8c4a61274f60b4ea5fb4299cfdbf14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &6634186501247815897 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1235672432261282576, guid: 5dae863231f47364a8cff4666c86675c, type: 3} diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab index ff061893..88d754a4 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab @@ -283,10 +283,6 @@ PrefabInstance: propertyPath: ObservedComponents.Array.data[5] value: objectReference: {fileID: 1240144468001624216} - - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} - propertyPath: ObservedComponents.Array.data[6] - value: - objectReference: {fileID: 8112063480741076945} - target: {fileID: 7726918647213528475, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: classTag value: @@ -702,7 +698,8 @@ PrefabInstance: propertyPath: m_Name value: Priest objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6567432688714911206, guid: 78e91c3f61b3c724fbdc0ad0d233215e, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4353885798923642103, guid: 78e91c3f61b3c724fbdc0ad0d233215e, type: 3} @@ -731,17 +728,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1804341762400684692, guid: 78e91c3f61b3c724fbdc0ad0d233215e, type: 3} m_PrefabInstance: {fileID: 3150237142380810807} m_PrefabAsset: {fileID: 0} ---- !u!114 &8112063480741076945 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6567432688714911206, guid: 78e91c3f61b3c724fbdc0ad0d233215e, type: 3} - m_PrefabInstance: {fileID: 3150237142380810807} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b8c4a61274f60b4ea5fb4299cfdbf14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &9128563494464626181 stripped Transform: m_CorrespondingSourceObject: {fileID: 6131879451647020082, guid: 78e91c3f61b3c724fbdc0ad0d233215e, type: 3} diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Rogue Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Rogue Variant.prefab index ccc8356b..16bb01eb 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Rogue Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Rogue Variant.prefab @@ -355,10 +355,6 @@ PrefabInstance: propertyPath: ObservedComponents.Array.size value: 6 objectReference: {fileID: 0} - - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} - propertyPath: ObservedComponents.Array.data[5] - value: - objectReference: {fileID: 7812573144831779826} - target: {fileID: 7726918647213528475, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: classTag value: @@ -644,7 +640,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -76.903 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3115638087044978393, guid: d5ece5c7a51e20345adcea09015e8780, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 5026741655768996343, guid: d5ece5c7a51e20345adcea09015e8780, type: 3} @@ -680,17 +677,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 3221834224764137778, guid: d5ece5c7a51e20345adcea09015e8780, type: 3} m_PrefabInstance: {fileID: 5140627754366678315} m_PrefabAsset: {fileID: 0} ---- !u!114 &7812573144831779826 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3115638087044978393, guid: d5ece5c7a51e20345adcea09015e8780, type: 3} - m_PrefabInstance: {fileID: 5140627754366678315} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b8c4a61274f60b4ea5fb4299cfdbf14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &7812573144831779827 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3115638087044978392, guid: d5ece5c7a51e20345adcea09015e8780, type: 3} diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Vampire Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Vampire Variant.prefab index cf5b59cc..3fe816b2 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Vampire Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Vampire Variant.prefab @@ -291,7 +291,8 @@ PrefabInstance: propertyPath: m_SynchronizeParameters.Array.data[15].Type value: 1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 7716045718905858460, guid: cfa80d1224dc4bf46adaf48681a6080c, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4467107156232270255, guid: cfa80d1224dc4bf46adaf48681a6080c, type: 3} @@ -315,17 +316,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 75ba268000bc14f4287a8a1f8c3dabd6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &4660903209845300574 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7716045718905858460, guid: cfa80d1224dc4bf46adaf48681a6080c, type: 3} - m_PrefabInstance: {fileID: 3150897364273738946} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b8c4a61274f60b4ea5fb4299cfdbf14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &9165025285707558312 stripped Transform: m_CorrespondingSourceObject: {fileID: 6091832650452064618, guid: cfa80d1224dc4bf46adaf48681a6080c, type: 3} @@ -595,14 +585,6 @@ PrefabInstance: propertyPath: ObservedComponents.Array.data[4] value: objectReference: {fileID: 2077970117864674179} - - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} - propertyPath: ObservedComponents.Array.data[5] - value: - objectReference: {fileID: 4660903209845300574} - - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} - propertyPath: ObservedComponents.Array.data[6] - value: - objectReference: {fileID: 4660903209845300574} - target: {fileID: 7726918647213528475, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: classTag value: diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Werewolf Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Werewolf Variant.prefab index e193a0a0..faf9073e 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Werewolf Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Werewolf Variant.prefab @@ -88,7 +88,8 @@ PrefabInstance: propertyPath: m_Name value: Werewolf_Wolf objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3607172010876965761, guid: 7f806df6b4390bf49947b3f77f96bc1c, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 937978023436754018, guid: 7f806df6b4390bf49947b3f77f96bc1c, type: 3} @@ -101,17 +102,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 937978023436754018, guid: 7f806df6b4390bf49947b3f77f96bc1c, type: 3} m_PrefabInstance: {fileID: 1605806371705270757} m_PrefabAsset: {fileID: 0} ---- !u!114 &2614277693402817124 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3607172010876965761, guid: 7f806df6b4390bf49947b3f77f96bc1c, type: 3} - m_PrefabInstance: {fileID: 1605806371705270757} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b8c4a61274f60b4ea5fb4299cfdbf14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &8230457677127943490 stripped Transform: m_CorrespondingSourceObject: {fileID: 7237440480908424359, guid: 7f806df6b4390bf49947b3f77f96bc1c, type: 3} @@ -265,10 +255,6 @@ PrefabInstance: propertyPath: ObservedComponents.Array.size value: 6 objectReference: {fileID: 0} - - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} - propertyPath: ObservedComponents.Array.data[5] - value: - objectReference: {fileID: 2614277693402817124} - target: {fileID: 7726918647213528475, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: classTag value: diff --git a/Assets/Resources/PlayerPrefab.prefab b/Assets/Resources/PlayerPrefab.prefab index 23734556..678ea32a 100644 --- a/Assets/Resources/PlayerPrefab.prefab +++ b/Assets/Resources/PlayerPrefab.prefab @@ -329,8 +329,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8785094005405139760} - - component: {fileID: 7687765528848249431} - - component: {fileID: 7931791360169622515} - component: {fileID: 489555198890004946} - component: {fileID: 7726918647213528475} - component: {fileID: 5523225171841185422} @@ -406,50 +404,6 @@ Transform: - {fileID: 6063186782999826210} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7687765528848249431 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 480331571121010796} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 7931791360169622515} - - {fileID: 9176951908243474339} - - {fileID: 9115515025738910048} - - {fileID: 3393006372492297274} - - {fileID: 1869432520870514277} - - {fileID: 3993657840148777867} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &7931791360169622515 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 480331571121010796} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 0 - m_UseLocal: 1 --- !u!114 &489555198890004946 MonoBehaviour: m_ObjectHideFlags: 0 @@ -479,7 +433,6 @@ MonoBehaviour: classTag: {fileID: 0} onPlayerSpawned: {fileID: 11400000, guid: b3af5678d5130fe409229924bbcb4705, type: 2} onPlayerDeath: {fileID: 11400000, guid: 1c68aa1fd03f57d4eaa09ff5fafa5ea6, type: 2} - photonView: {fileID: 0} character: {fileID: 0} projectileSpawnLocation: {fileID: 1501747715295767159} health: {fileID: 0} @@ -487,6 +440,7 @@ MonoBehaviour: classResource: {fileID: 0} spiritPower: {fileID: 0} abilityCooldownTracker: {fileID: 0} + playerTag: {fileID: 0} --- !u!195 &5523225171841185422 NavMeshAgent: m_ObjectHideFlags: 0 @@ -728,7 +682,6 @@ MonoBehaviour: onDeath: m_PersistentCalls: m_Calls: [] - photonView: {fileID: 0} invulnerable: 0 OnInvulnerabilityStateChanged: m_PersistentCalls: @@ -757,7 +710,6 @@ MonoBehaviour: onMaxManaChanged: m_PersistentCalls: m_Calls: [] - photonView: {fileID: 0} OnNoManaCostStateChanged: m_PersistentCalls: m_Calls: [] @@ -785,7 +737,6 @@ MonoBehaviour: onMaxSpiritPowerChanged: m_PersistentCalls: m_Calls: [] - photonView: {fileID: 0} OnNoSpiritPowerCostStateChanged: m_PersistentCalls: m_Calls: [] @@ -810,7 +761,6 @@ MonoBehaviour: onResourceChanged: m_PersistentCalls: m_Calls: [] - photonView: {fileID: 0} --- !u!114 &4217372937522934288 MonoBehaviour: m_ObjectHideFlags: 0 @@ -838,7 +788,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -927,7 +876,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -953,7 +901,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -979,7 +926,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -1020,7 +966,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -1061,7 +1006,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -1117,7 +1061,6 @@ MonoBehaviour: m_EditorClassIdentifier: canStack: 1 canRefresh: 1 - owner: {fileID: 0} taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -3264,7 +3207,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5447783134482355923} - - component: {fileID: 1248313421135328660} + - component: {fileID: 3362692278104209379} m_Layer: 0 m_Name: OnPlayerSpawned m_TagString: Untagged @@ -3287,7 +3230,7 @@ Transform: m_Children: [] m_Father: {fileID: 5521421693679146049} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1248313421135328660 +--- !u!114 &3362692278104209379 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3296,7 +3239,7 @@ MonoBehaviour: m_GameObject: {fileID: 8924332507532078973} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 687794f951b2e3543aed2872920d3d6e, type: 3} + m_Script: {fileID: 11500000, guid: ea37414de775f7e488c55fed47ec09e7, type: 3} m_Name: m_EditorClassIdentifier: Event: {fileID: 11400000, guid: b3af5678d5130fe409229924bbcb4705, type: 2} diff --git a/Assets/Resources/Rifts/BlueRift.prefab b/Assets/Resources/Rifts/BlueRift.prefab index 9728a8e9..eea1e7ca 100644 --- a/Assets/Resources/Rifts/BlueRift.prefab +++ b/Assets/Resources/Rifts/BlueRift.prefab @@ -283,8 +283,6 @@ GameObject: m_Component: - component: {fileID: 8063846276060961367} - component: {fileID: 8063846276060961366} - - component: {fileID: 4798301399308187308} - - component: {fileID: 3531246798502308157} m_Layer: 0 m_Name: BlueRift m_TagString: Untagged @@ -352,46 +350,6 @@ MonoBehaviour: - {fileID: 5274108275487486174} - {fileID: 8876198979701609162} - {fileID: 4306789310770826581} ---- !u!114 &4798301399308187308 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8063846276060961365} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 8063846276060961366} - - {fileID: 3531246798502308157} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &3531246798502308157 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8063846276060961365} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 1 - m_UseLocal: 1 --- !u!1 &8089890358082899586 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Rifts/GreenRift.prefab b/Assets/Resources/Rifts/GreenRift.prefab index a447259f..36e14765 100644 --- a/Assets/Resources/Rifts/GreenRift.prefab +++ b/Assets/Resources/Rifts/GreenRift.prefab @@ -23,13 +23,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 118546361889724380} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3232662947221405473} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2411753345248462447 GameObject: @@ -54,13 +54,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2411753345248462447} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3232662947221405473} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2794742858379494962 GameObject: @@ -85,13 +85,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2794742858379494962} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3232662947221405473} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3222080460636412588 GameObject: @@ -116,13 +116,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3222080460636412588} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3232662947221405473} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4835809551101398872 GameObject: @@ -147,13 +147,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4835809551101398872} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3232662947221405473} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5541105830002761052 GameObject: @@ -178,13 +178,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5541105830002761052} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3232662947221405473} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5548211852014960636 GameObject: @@ -209,13 +209,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5548211852014960636} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3232662947221405473} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6562585086492496827 GameObject: @@ -227,8 +227,6 @@ GameObject: m_Component: - component: {fileID: 6562585086492496825} - component: {fileID: 6562585086492496824} - - component: {fileID: 8533345581456113474} - - component: {fileID: -945971983767443671} m_Layer: 0 m_Name: GreenRift m_TagString: Untagged @@ -243,6 +241,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6562585086492496827} + 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} @@ -255,7 +254,6 @@ Transform: - {fileID: 3232662947221405473} - {fileID: 2684391718467276974} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6562585086492496824 MonoBehaviour: @@ -296,46 +294,6 @@ MonoBehaviour: - {fileID: 3836777172280309341} - {fileID: 8637062587925670033} - {fileID: 4683891367406291568} ---- !u!114 &8533345581456113474 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6562585086492496827} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 6562585086492496824} - - {fileID: -945971983767443671} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &-945971983767443671 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6562585086492496827} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 1 - m_UseLocal: 1 --- !u!1 &7694215737607252039 GameObject: m_ObjectHideFlags: 0 @@ -360,13 +318,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7694215737607252039} + 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: 6562585086492496825} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2453783842184322481 MonoBehaviour: @@ -407,6 +365,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7723117121169714604} + 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} @@ -421,7 +380,6 @@ Transform: - {fileID: 8637062587925670033} - {fileID: 4683891367406291568} m_Father: {fileID: 6562585086492496825} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8173768138747054827 GameObject: @@ -446,19 +404,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8173768138747054827} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3232662947221405473} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &645069216927878224 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6562585086492496825} m_Modifications: - target: {fileID: 921287751983194665, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} @@ -562,6 +521,9 @@ PrefabInstance: value: MinimapCanvas objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} --- !u!224 &2684391718467276974 stripped RectTransform: @@ -573,6 +535,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6562585086492496825} m_Modifications: - target: {fileID: 129202, guid: 7565b74ae17e96041944e8a5b69d3b2b, type: 3} @@ -636,6 +599,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7565b74ae17e96041944e8a5b69d3b2b, type: 3} --- !u!1 &2128458796484936370 stripped GameObject: @@ -652,6 +618,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6562585086492496825} m_Modifications: - target: {fileID: 150096, guid: 77a5e6287119b8043aae927a857e4864, type: 3} @@ -715,6 +682,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 77a5e6287119b8043aae927a857e4864, type: 3} --- !u!4 &2128458797217331559 stripped Transform: @@ -731,6 +701,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6562585086492496825} m_Modifications: - target: {fileID: 138012, guid: 12b4881e50528bb41b2a8973a5ad4ddc, type: 3} @@ -790,6 +761,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12b4881e50528bb41b2a8973a5ad4ddc, type: 3} --- !u!4 &2128458797638270265 stripped Transform: diff --git a/Assets/Resources/Rifts/Interactables/BlueRift_Interactable.prefab b/Assets/Resources/Rifts/Interactables/BlueRift_Interactable.prefab index 61274087..5901bc5a 100644 --- a/Assets/Resources/Rifts/Interactables/BlueRift_Interactable.prefab +++ b/Assets/Resources/Rifts/Interactables/BlueRift_Interactable.prefab @@ -9,8 +9,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 563811297977339539} - - component: {fileID: 3075250075886477928} - - component: {fileID: 6429456182507077113} - component: {fileID: 6429456182507077112} - component: {fileID: 6429456182507077119} m_Layer: 10 @@ -27,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 563811297977339537} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 2.5} @@ -38,47 +37,7 @@ Transform: - {fileID: 6149471216960013469} - {fileID: 4058939447645804349} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3075250075886477928 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 563811297977339537} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 6429456182507077113} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &6429456182507077113 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 563811297977339537} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 1 - m_UseLocal: 1 --- !u!114 &6429456182507077112 MonoBehaviour: m_ObjectHideFlags: 0 @@ -122,8 +81,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 563811297977339537} 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: 2 m_Radius: 0.85 m_Height: 3 m_Direction: 1 @@ -133,6 +101,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 563811297977339539} m_Modifications: - target: {fileID: 185454, guid: ade1f0bfc938f694ab4f3bc05fc5c55b, type: 3} @@ -196,6 +165,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ade1f0bfc938f694ab4f3bc05fc5c55b, type: 3} --- !u!1 &563811297492312572 stripped GameObject: @@ -212,6 +184,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 563811297977339539} m_Modifications: - target: {fileID: 129282, guid: 1be59f1cbeaab354f9ca4f2b66abda33, type: 3} @@ -275,6 +248,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1be59f1cbeaab354f9ca4f2b66abda33, type: 3} --- !u!1 &563811297767019308 stripped GameObject: @@ -291,6 +267,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 563811297977339539} m_Modifications: - target: {fileID: 100898, guid: a25b3d9a8119bf047b7609dba7f57302, type: 3} @@ -350,6 +327,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a25b3d9a8119bf047b7609dba7f57302, type: 3} --- !u!4 &563811298039175303 stripped Transform: @@ -366,6 +346,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 563811297977339539} m_Modifications: - target: {fileID: 1570043086163892863, guid: d6041612abfc8cb4983459299b556838, type: 3} @@ -425,6 +406,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d6041612abfc8cb4983459299b556838, type: 3} --- !u!1 &1015728291596272904 stripped GameObject: @@ -441,6 +425,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 563811297977339539} m_Modifications: - target: {fileID: 921287751983194665, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} @@ -544,6 +529,9 @@ PrefabInstance: value: MinimapCanvas objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} --- !u!224 &6149471216960013469 stripped RectTransform: diff --git a/Assets/Resources/Rifts/Interactables/GreenRift_Interactable.prefab b/Assets/Resources/Rifts/Interactables/GreenRift_Interactable.prefab index 1240ea6a..859de9c1 100644 --- a/Assets/Resources/Rifts/Interactables/GreenRift_Interactable.prefab +++ b/Assets/Resources/Rifts/Interactables/GreenRift_Interactable.prefab @@ -9,8 +9,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6680311043411922550} - - component: {fileID: 8199734708411671181} - - component: {fileID: 170064445024812316} - component: {fileID: 170064445024812317} - component: {fileID: 170064445024812314} m_Layer: 10 @@ -27,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6680311043411922548} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 2.5} @@ -38,47 +37,7 @@ Transform: - {fileID: 1022734512959865976} - {fileID: 1766817057003405627} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8199734708411671181 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6680311043411922548} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 170064445024812316} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &170064445024812316 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6680311043411922548} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 1 - m_UseLocal: 1 --- !u!114 &170064445024812317 MonoBehaviour: m_ObjectHideFlags: 0 @@ -122,8 +81,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6680311043411922548} 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: 2 m_Radius: 0.85 m_Height: 3 m_Direction: 1 @@ -133,6 +101,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6680311043411922550} m_Modifications: - target: {fileID: 1667258629637928252, guid: e4a9fd0ef6f4ba54c810f0633a16327b, type: 3} @@ -192,6 +161,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e4a9fd0ef6f4ba54c810f0633a16327b, type: 3} --- !u!4 &1766817057003405627 stripped Transform: @@ -208,6 +180,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6680311043411922550} m_Modifications: - target: {fileID: 921287751983194665, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} @@ -311,6 +284,9 @@ PrefabInstance: value: MinimapCanvas objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} --- !u!224 &1022734512959865976 stripped RectTransform: @@ -322,6 +298,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6680311043411922550} m_Modifications: - target: {fileID: 150096, guid: 77a5e6287119b8043aae927a857e4864, type: 3} @@ -385,6 +362,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 77a5e6287119b8043aae927a857e4864, type: 3} --- !u!4 &2919806417658097992 stripped Transform: @@ -401,6 +381,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6680311043411922550} m_Modifications: - target: {fileID: 138012, guid: 12b4881e50528bb41b2a8973a5ad4ddc, type: 3} @@ -460,6 +441,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12b4881e50528bb41b2a8973a5ad4ddc, type: 3} --- !u!4 &2919806417922723276 stripped Transform: @@ -476,6 +460,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6680311043411922550} m_Modifications: - target: {fileID: 129202, guid: 7565b74ae17e96041944e8a5b69d3b2b, type: 3} @@ -539,6 +524,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7565b74ae17e96041944e8a5b69d3b2b, type: 3} --- !u!1 &2919806418527338963 stripped GameObject: diff --git a/Assets/Resources/Rifts/Interactables/PurpleRift_Interactable.prefab b/Assets/Resources/Rifts/Interactables/PurpleRift_Interactable.prefab index f3206915..98450eaf 100644 --- a/Assets/Resources/Rifts/Interactables/PurpleRift_Interactable.prefab +++ b/Assets/Resources/Rifts/Interactables/PurpleRift_Interactable.prefab @@ -9,8 +9,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8636287697318190962} - - component: {fileID: 6531403782428062601} - - component: {fileID: 2968798842515188760} - component: {fileID: 2968798842515188761} - component: {fileID: 2968798842515188766} m_Layer: 10 @@ -40,45 +38,6 @@ Transform: - {fileID: 2090080711976426372} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6531403782428062601 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8636287697318190960} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 2968798842515188760} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &2968798842515188760 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8636287697318190960} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 1 - m_UseLocal: 1 --- !u!114 &2968798842515188761 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Rifts/Interactables/RedRift_Interactable.prefab b/Assets/Resources/Rifts/Interactables/RedRift_Interactable.prefab index 756ab2f1..18db11e9 100644 --- a/Assets/Resources/Rifts/Interactables/RedRift_Interactable.prefab +++ b/Assets/Resources/Rifts/Interactables/RedRift_Interactable.prefab @@ -9,8 +9,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7862206477445923117} - - component: {fileID: 4639376013330935254} - - component: {fileID: 3743933938050003527} - component: {fileID: 3743933938050003526} - component: {fileID: 3743933938050003521} m_Layer: 10 @@ -40,45 +38,6 @@ Transform: - {fileID: 1699677669602674784} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4639376013330935254 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7862206477445923119} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 3743933938050003527} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &3743933938050003527 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7862206477445923119} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 1 - m_UseLocal: 1 --- !u!114 &3743933938050003526 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Rifts/Interactables/YellowRift_Interactable.prefab b/Assets/Resources/Rifts/Interactables/YellowRift_Interactable.prefab index 8ae6d92f..d376ed4f 100644 --- a/Assets/Resources/Rifts/Interactables/YellowRift_Interactable.prefab +++ b/Assets/Resources/Rifts/Interactables/YellowRift_Interactable.prefab @@ -9,8 +9,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7798188472162008719} - - component: {fileID: 4703675407692288628} - - component: {fileID: 3661901689948753381} - component: {fileID: 3661901689948753380} - component: {fileID: 3661901689948753379} m_Layer: 10 @@ -27,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7798188472162008717} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 2.5} @@ -38,47 +37,7 @@ Transform: - {fileID: 4520764136508732545} - {fileID: 3719572612005349961} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4703675407692288628 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7798188472162008717} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 3661901689948753381} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &3661901689948753381 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7798188472162008717} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 1 - m_UseLocal: 1 --- !u!114 &3661901689948753380 MonoBehaviour: m_ObjectHideFlags: 0 @@ -122,8 +81,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7798188472162008717} 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: 2 m_Radius: 0.85 m_Height: 3 m_Direction: 1 @@ -133,6 +101,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7798188472162008719} m_Modifications: - target: {fileID: 921287751983194665, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} @@ -236,6 +205,9 @@ PrefabInstance: value: MinimapCanvas objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} --- !u!224 &4520764136508732545 stripped RectTransform: @@ -247,6 +219,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7798188472162008719} m_Modifications: - target: {fileID: 111464, guid: 5a475346633453a4eab9cac634ce5aa4, type: 3} @@ -310,6 +283,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5a475346633453a4eab9cac634ce5aa4, type: 3} --- !u!1 &2818747000844483776 stripped GameObject: @@ -326,6 +302,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7798188472162008719} m_Modifications: - target: {fileID: 118138, guid: 6dc1d657a81446e4ab4621b109b578b1, type: 3} @@ -389,6 +366,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6dc1d657a81446e4ab4621b109b578b1, type: 3} --- !u!1 &2818747001539800180 stripped GameObject: @@ -405,6 +385,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7798188472162008719} m_Modifications: - target: {fileID: 181626, guid: 220408bf957d7d941ae64bf85c18ddc6, type: 3} @@ -464,6 +445,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 220408bf957d7d941ae64bf85c18ddc6, type: 3} --- !u!4 &2818747002384546281 stripped Transform: @@ -480,6 +464,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7798188472162008719} m_Modifications: - target: {fileID: 273957096685082160, guid: 192fe42b654ad7144b59bf436410b8b6, type: 3} @@ -535,6 +520,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 192fe42b654ad7144b59bf436410b8b6, type: 3} --- !u!4 &3719572612005349961 stripped Transform: diff --git a/Assets/Resources/Rifts/PurpleRift.prefab b/Assets/Resources/Rifts/PurpleRift.prefab index 90c5e3cc..39df8bc3 100644 --- a/Assets/Resources/Rifts/PurpleRift.prefab +++ b/Assets/Resources/Rifts/PurpleRift.prefab @@ -23,13 +23,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1148999312519878059} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2763071159906543841} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1814519467588173490 GameObject: @@ -54,13 +54,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1814519467588173490} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2763071159906543841} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1849209154868738176 GameObject: @@ -85,6 +85,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1849209154868738176} + 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} @@ -99,7 +100,6 @@ Transform: - {fileID: 8685251621542609879} - {fileID: 198502874912764580} m_Father: {fileID: 8587943234009667576} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3006724296066665844 GameObject: @@ -124,13 +124,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3006724296066665844} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2763071159906543841} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4477281009381055203 GameObject: @@ -155,13 +155,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4477281009381055203} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2763071159906543841} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4597221169477671425 GameObject: @@ -187,13 +187,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4597221169477671425} + 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: 8587943234009667576} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4852357875177757950 MonoBehaviour: @@ -234,13 +234,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5407099370629536803} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2763071159906543841} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7224655620343453485 GameObject: @@ -265,13 +265,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7224655620343453485} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2763071159906543841} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8587943234009667578 GameObject: @@ -283,8 +283,6 @@ GameObject: m_Component: - component: {fileID: 8587943234009667576} - component: {fileID: 8587943234009667577} - - component: {fileID: 6507969859134159619} - - component: {fileID: 8564378770350749303} m_Layer: 0 m_Name: PurpleRift m_TagString: Untagged @@ -299,6 +297,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8587943234009667578} + 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} @@ -311,7 +310,6 @@ Transform: - {fileID: 2763071159906543841} - {fileID: 3971084238262692604} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8587943234009667577 MonoBehaviour: @@ -352,46 +350,6 @@ MonoBehaviour: - {fileID: 4912849502703565345} - {fileID: 8685251621542609879} - {fileID: 198502874912764580} ---- !u!114 &6507969859134159619 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8587943234009667578} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 8587943234009667577} - - {fileID: 8564378770350749303} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &8564378770350749303 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8587943234009667578} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 1 - m_UseLocal: 1 --- !u!1 &8967382379565600747 GameObject: m_ObjectHideFlags: 0 @@ -415,13 +373,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8967382379565600747} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2763071159906543841} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9110460067002357053 GameObject: @@ -446,19 +404,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9110460067002357053} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2763071159906543841} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1922895274375935490 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8587943234009667576} m_Modifications: - target: {fileID: 921287751983194665, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} @@ -562,6 +521,9 @@ PrefabInstance: value: MinimapCanvas objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} --- !u!224 &3971084238262692604 stripped RectTransform: @@ -573,6 +535,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8587943234009667576} m_Modifications: - target: {fileID: 149916, guid: ce483cb9a671e384191a95c0c32adcc1, type: 3} @@ -636,6 +599,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ce483cb9a671e384191a95c0c32adcc1, type: 3} --- !u!1 &3581964227030038800 stripped GameObject: @@ -652,6 +618,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8587943234009667576} m_Modifications: - target: {fileID: 104922, guid: 4caaae2897c6836438838e1a44287ce7, type: 3} @@ -711,6 +678,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4caaae2897c6836438838e1a44287ce7, type: 3} --- !u!1 &3581964227521330063 stripped GameObject: @@ -727,6 +697,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8587943234009667576} m_Modifications: - target: {fileID: 148590, guid: 10f140d776af7b64491601c099764123, type: 3} @@ -790,6 +761,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 10f140d776af7b64491601c099764123, type: 3} --- !u!1 &3581964228063459394 stripped GameObject: diff --git a/Assets/Resources/Rifts/RedRift.prefab b/Assets/Resources/Rifts/RedRift.prefab index 3742aae2..0410ad30 100644 --- a/Assets/Resources/Rifts/RedRift.prefab +++ b/Assets/Resources/Rifts/RedRift.prefab @@ -23,13 +23,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 86308347757839095} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4011635367054401209} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1051565873109109124 GameObject: @@ -54,13 +54,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051565873109109124} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4011635367054401209} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4198549051845094330 GameObject: @@ -85,13 +85,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4198549051845094330} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4011635367054401209} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4980279743644536783 GameObject: @@ -116,13 +116,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4980279743644536783} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4011635367054401209} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5370872192444709540 GameObject: @@ -147,13 +147,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5370872192444709540} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4011635367054401209} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6347094476598123760 GameObject: @@ -178,13 +178,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6347094476598123760} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4011635367054401209} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6427786854028095933 GameObject: @@ -209,13 +209,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6427786854028095933} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4011635367054401209} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6501750753993293558 GameObject: @@ -227,8 +227,6 @@ GameObject: m_Component: - component: {fileID: 6501750753993293556} - component: {fileID: 6501750753993293557} - - component: {fileID: 8594186511192920591} - - component: {fileID: 6248645942881869642} m_Layer: 0 m_Name: RedRift m_TagString: Untagged @@ -243,6 +241,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6501750753993293558} + 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} @@ -255,7 +254,6 @@ Transform: - {fileID: 4011635367054401209} - {fileID: 7982862436599513211} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6501750753993293557 MonoBehaviour: @@ -296,46 +294,6 @@ MonoBehaviour: - {fileID: 7043232855666207793} - {fileID: 4385907929796405768} - {fileID: 3299787930564319544} ---- !u!114 &8594186511192920591 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6501750753993293558} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 6501750753993293557} - - {fileID: 6248645942881869642} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &6248645942881869642 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6501750753993293558} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 1 - m_UseLocal: 1 --- !u!1 &6611294311988369008 GameObject: m_ObjectHideFlags: 0 @@ -359,13 +317,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6611294311988369008} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4011635367054401209} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9018301315563189386 GameObject: @@ -390,6 +348,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9018301315563189386} + 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} @@ -404,7 +363,6 @@ Transform: - {fileID: 4385907929796405768} - {fileID: 3299787930564319544} m_Father: {fileID: 6501750753993293556} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9142599949101768226 GameObject: @@ -430,13 +388,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9142599949101768226} + 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: 6501750753993293556} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4934510172918101624 MonoBehaviour: @@ -459,6 +417,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6501750753993293556} m_Modifications: - target: {fileID: 118508, guid: 1f60700ee6f51c140b78e95349e06637, type: 3} @@ -522,6 +481,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1f60700ee6f51c140b78e95349e06637, type: 3} --- !u!4 &2063187934415201509 stripped Transform: @@ -538,6 +500,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6501750753993293556} m_Modifications: - target: {fileID: 127902, guid: 27856c31c3afe6244a0f17a4fef0905a, type: 3} @@ -597,6 +560,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 27856c31c3afe6244a0f17a4fef0905a, type: 3} --- !u!1 &2063187934433234997 stripped GameObject: @@ -613,6 +579,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6501750753993293556} m_Modifications: - target: {fileID: 130970, guid: ccb3e311f4a463d48882902db30e02ec, type: 3} @@ -676,6 +643,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ccb3e311f4a463d48882902db30e02ec, type: 3} --- !u!1 &2063187934547424313 stripped GameObject: @@ -692,6 +662,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6501750753993293556} m_Modifications: - target: {fileID: 921287751983194665, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} @@ -795,6 +766,9 @@ PrefabInstance: value: MinimapCanvas objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} --- !u!224 &7982862436599513211 stripped RectTransform: diff --git a/Assets/Resources/Rifts/YellowRift.prefab b/Assets/Resources/Rifts/YellowRift.prefab index d9947e3e..1726e23a 100644 --- a/Assets/Resources/Rifts/YellowRift.prefab +++ b/Assets/Resources/Rifts/YellowRift.prefab @@ -23,13 +23,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1509801217112205643} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3616276927428326939} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1591046707346833546 GameObject: @@ -54,13 +54,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1591046707346833546} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3616276927428326939} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1696041293865748965 GameObject: @@ -72,8 +72,6 @@ GameObject: m_Component: - component: {fileID: 1696041293865748967} - component: {fileID: 1696041293865748966} - - component: {fileID: 4249137829847590172} - - component: {fileID: 1955933783706691765} m_Layer: 0 m_Name: YellowRift m_TagString: Untagged @@ -88,6 +86,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1696041293865748965} + 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} @@ -100,7 +99,6 @@ Transform: - {fileID: 3616276927428326939} - {fileID: 2259034303347278720} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1696041293865748966 MonoBehaviour: @@ -141,46 +139,6 @@ MonoBehaviour: - {fileID: 5010537445606940586} - {fileID: 9053742664014628458} - {fileID: 7936021666854167888} ---- !u!114 &4249137829847590172 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1696041293865748965} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 1696041293865748966} - - {fileID: 1955933783706691765} - sceneViewId: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &1955933783706691765 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1696041293865748965} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 1 - m_UseLocal: 1 --- !u!1 &1709023719902908129 GameObject: m_ObjectHideFlags: 0 @@ -204,13 +162,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1709023719902908129} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3616276927428326939} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3949611784486085246 GameObject: @@ -235,13 +193,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3949611784486085246} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3616276927428326939} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4021973663839082319 GameObject: @@ -266,6 +224,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4021973663839082319} + 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} @@ -280,7 +239,6 @@ Transform: - {fileID: 9053742664014628458} - {fileID: 7936021666854167888} m_Father: {fileID: 1696041293865748967} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4123162640418798158 GameObject: @@ -305,13 +263,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4123162640418798158} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3616276927428326939} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4727198581538363038 GameObject: @@ -337,13 +295,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4727198581538363038} + 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: 1696041293865748967} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5358454695415842324 MonoBehaviour: @@ -384,13 +342,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7751226877358015064} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3616276927428326939} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7751395397154652771 GameObject: @@ -415,13 +373,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7751395397154652771} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3616276927428326939} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8913627391862757037 GameObject: @@ -446,19 +404,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8913627391862757037} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3616276927428326939} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3669005128877694846 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1696041293865748967} m_Modifications: - target: {fileID: 921287751983194665, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} @@ -562,6 +521,9 @@ PrefabInstance: value: MinimapCanvas objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} --- !u!224 &2259034303347278720 stripped RectTransform: @@ -573,6 +535,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1696041293865748967} m_Modifications: - target: {fileID: 111464, guid: 5a475346633453a4eab9cac634ce5aa4, type: 3} @@ -636,6 +599,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5a475346633453a4eab9cac634ce5aa4, type: 3} --- !u!1 &5841939681118875177 stripped GameObject: @@ -652,6 +618,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1696041293865748967} m_Modifications: - target: {fileID: 181626, guid: 220408bf957d7d941ae64bf85c18ddc6, type: 3} @@ -711,6 +678,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 220408bf957d7d941ae64bf85c18ddc6, type: 3} --- !u!1 &5841939681755274367 stripped GameObject: @@ -727,6 +697,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1696041293865748967} m_Modifications: - target: {fileID: 118138, guid: 6dc1d657a81446e4ab4621b109b578b1, type: 3} @@ -790,6 +761,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6dc1d657a81446e4ab4621b109b578b1, type: 3} --- !u!1 &5841939682100988993 stripped GameObject: diff --git a/Assets/Scenes/2-CharacterList.unity b/Assets/Scenes/2-CharacterList.unity index 9bd22916..84419347 100644 --- a/Assets/Scenes/2-CharacterList.unity +++ b/Assets/Scenes/2-CharacterList.unity @@ -3940,9 +3940,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 694588457} - m_TargetAssemblyTypeName: LoadNextScene, Assembly-CSharp - m_MethodName: LoadNext + - m_Target: {fileID: 11400000, guid: e229e437d86ab0048bd49fa41f680b4d, type: 2} + m_TargetAssemblyTypeName: GameEvent, Assembly-CSharp + m_MethodName: Raise m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/Assets/Scenes/2-CreateCharacter.unity b/Assets/Scenes/2-CreateCharacter.unity index fa1a4dd5..3fc0adc4 100644 --- a/Assets/Scenes/2-CreateCharacter.unity +++ b/Assets/Scenes/2-CreateCharacter.unity @@ -2067,7 +2067,6 @@ GameObject: m_Component: - component: {fileID: 335241986} - component: {fileID: 335241988} - - component: {fileID: 335241987} m_Layer: 26 m_Name: Camera m_TagString: Untagged @@ -2090,14 +2089,6 @@ Transform: m_Children: [] m_Father: {fileID: 1917200360} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!81 &335241987 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 335241985} - m_Enabled: 1 --- !u!20 &335241988 Camera: m_ObjectHideFlags: 0 @@ -6176,7 +6167,6 @@ GameObject: m_Component: - component: {fileID: 803341041} - component: {fileID: 803341043} - - component: {fileID: 803341042} m_Layer: 23 m_Name: Camera m_TagString: Untagged @@ -6199,14 +6189,6 @@ Transform: m_Children: [] m_Father: {fileID: 640718288} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!81 &803341042 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 803341040} - m_Enabled: 1 --- !u!20 &803341043 Camera: m_ObjectHideFlags: 0 @@ -6474,7 +6456,6 @@ GameObject: m_Component: - component: {fileID: 817610394} - component: {fileID: 817610396} - - component: {fileID: 817610395} m_Layer: 27 m_Name: Camera m_TagString: Untagged @@ -6497,14 +6478,6 @@ Transform: m_Children: [] m_Father: {fileID: 418321840} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!81 &817610395 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 817610393} - m_Enabled: 1 --- !u!20 &817610396 Camera: m_ObjectHideFlags: 0 @@ -7257,7 +7230,6 @@ GameObject: m_Component: - component: {fileID: 848424077} - component: {fileID: 848424079} - - component: {fileID: 848424078} m_Layer: 26 m_Name: Camera m_TagString: Untagged @@ -7280,14 +7252,6 @@ Transform: m_Children: [] m_Father: {fileID: 527800953} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!81 &848424078 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 848424076} - m_Enabled: 1 --- !u!20 &848424079 Camera: m_ObjectHideFlags: 0 @@ -7349,7 +7313,6 @@ GameObject: m_Component: - component: {fileID: 854522780} - component: {fileID: 854522782} - - component: {fileID: 854522781} m_Layer: 25 m_Name: Camera m_TagString: Untagged @@ -7372,14 +7335,6 @@ Transform: m_Children: [] m_Father: {fileID: 1047157239} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!81 &854522781 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 854522779} - m_Enabled: 1 --- !u!20 &854522782 Camera: m_ObjectHideFlags: 0 @@ -8616,7 +8571,6 @@ GameObject: m_Component: - component: {fileID: 1167980924} - component: {fileID: 1167980926} - - component: {fileID: 1167980925} m_Layer: 27 m_Name: Camera m_TagString: Untagged @@ -8639,14 +8593,6 @@ Transform: m_Children: [] m_Father: {fileID: 831703393} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!81 &1167980925 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1167980923} - m_Enabled: 1 --- !u!20 &1167980926 Camera: m_ObjectHideFlags: 0 @@ -9477,9 +9423,9 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 694588457} - m_TargetAssemblyTypeName: LoadNextScene, Assembly-CSharp - m_MethodName: LoadNext + - m_Target: {fileID: 11400000, guid: e229e437d86ab0048bd49fa41f680b4d, type: 2} + m_TargetAssemblyTypeName: GameEvent, Assembly-CSharp + m_MethodName: Raise m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -12792,7 +12738,6 @@ GameObject: m_Component: - component: {fileID: 1841750375} - component: {fileID: 1841750377} - - component: {fileID: 1841750376} m_Layer: 28 m_Name: Camera m_TagString: Untagged @@ -12815,14 +12760,6 @@ Transform: m_Children: [] m_Father: {fileID: 78738296} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!81 &1841750376 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1841750374} - m_Enabled: 1 --- !u!20 &1841750377 Camera: m_ObjectHideFlags: 0 @@ -12889,7 +12826,6 @@ GameObject: m_Component: - component: {fileID: 1879654406} - component: {fileID: 1879654408} - - component: {fileID: 1879654407} m_Layer: 24 m_Name: Camera m_TagString: Untagged @@ -12912,14 +12848,6 @@ Transform: m_Children: [] m_Father: {fileID: 1892752761} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!81 &1879654407 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1879654405} - m_Enabled: 1 --- !u!20 &1879654408 Camera: m_ObjectHideFlags: 0 @@ -12981,7 +12909,6 @@ GameObject: m_Component: - component: {fileID: 1883662881} - component: {fileID: 1883662883} - - component: {fileID: 1883662882} m_Layer: 25 m_Name: Camera m_TagString: Untagged @@ -13004,14 +12931,6 @@ Transform: m_Children: [] m_Father: {fileID: 532745504} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!81 &1883662882 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1883662880} - m_Enabled: 1 --- !u!20 &1883662883 Camera: m_ObjectHideFlags: 0 @@ -14430,7 +14349,6 @@ GameObject: m_Component: - component: {fileID: 2024366153} - component: {fileID: 2024366155} - - component: {fileID: 2024366154} m_Layer: 23 m_Name: Camera m_TagString: Untagged @@ -14453,14 +14371,6 @@ Transform: m_Children: [] m_Father: {fileID: 1666791343} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!81 &2024366154 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2024366152} - m_Enabled: 1 --- !u!20 &2024366155 Camera: m_ObjectHideFlags: 0 diff --git a/Assets/Scriptables/Events/OnCharacterReady.asset b/Assets/Scriptables/Events/OnCharacterReady.asset new file mode 100644 index 00000000..486c132e --- /dev/null +++ b/Assets/Scriptables/Events/OnCharacterReady.asset @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83fe5321976e21d4b96c6d7182a5b8e2, type: 3} + m_Name: OnCharacterReady + m_EditorClassIdentifier: diff --git a/Assets/Scriptables/Events/OnCharacterReady.asset.meta b/Assets/Scriptables/Events/OnCharacterReady.asset.meta new file mode 100644 index 00000000..032838f2 --- /dev/null +++ b/Assets/Scriptables/Events/OnCharacterReady.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e229e437d86ab0048bd49fa41f680b4d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Events/OnPlayerSpawned.asset b/Assets/Scriptables/Events/OnPlayerSpawned.asset index 031767bc..8a9560e1 100644 --- a/Assets/Scriptables/Events/OnPlayerSpawned.asset +++ b/Assets/Scriptables/Events/OnPlayerSpawned.asset @@ -9,6 +9,6 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fbe7e86c7a11a444e9965b58f830c20d, type: 3} + m_Script: {fileID: 11500000, guid: 133a43cf408a0824aa1d6619a3e516b5, type: 3} m_Name: OnPlayerSpawned m_EditorClassIdentifier: diff --git a/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs b/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs index 4c50e201..235c265a 100644 --- a/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs +++ b/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs @@ -33,11 +33,11 @@ public class InstantValueEffect : BaseEffect if (target == null) continue; //Debug.Log($"Applied instant effect of {GetCorrectValueSign(user, target)} to target {target.name}"); - if(applyToClassResourceInstead) + if (applyToClassResourceInstead) { if (user.IsMinion()) return; - if(applyToSelfResourceInsteadOfHit) + if (applyToSelfResourceInsteadOfHit) { classResource = user.GetComponent(); classResource.ChangeValue(GetCorrectValueSign(user, user)); @@ -45,9 +45,10 @@ public class InstantValueEffect : BaseEffect else { classResource = target.GetComponent(); - classResource.ChangeValue(GetCorrectValueSign(user, target)); + if (classResource != null) + classResource.ChangeValue(GetCorrectValueSign(user, target)); } - + } else { @@ -98,7 +99,7 @@ public class InstantValueEffect : BaseEffect { finalValue += stat.Value * statInfluence.percentInfluence; } - else if(stats.secondaryStatsDictionary.TryGetValue(statInfluence.statTag.name.ToLower(), out CharacterStat secondaryStat)) + else if (stats.secondaryStatsDictionary.TryGetValue(statInfluence.statTag.name.ToLower(), out CharacterStat secondaryStat)) { finalValue += secondaryStat.Value * statInfluence.percentInfluence; } diff --git a/Assets/Scripts/Editor/FindMissingScriptsRecursivelyAndRemove.cs b/Assets/Scripts/Editor/FindMissingScriptsRecursivelyAndRemove.cs new file mode 100644 index 00000000..a9bec6a0 --- /dev/null +++ b/Assets/Scripts/Editor/FindMissingScriptsRecursivelyAndRemove.cs @@ -0,0 +1,90 @@ +using UnityEditor; +using UnityEngine; + +namespace FLGCoreEditor.Utilities +{ + public class FindMissingScriptsRecursivelyAndRemove : EditorWindow + { + private static int _goCount; + private static int _componentsCount; + private static int _missingCount; + + private static bool _bHaveRun; + + [MenuItem("FLGCore/Editor/Utility/FindMissingScriptsRecursivelyAndRemove")] + public static void ShowWindow() + { + GetWindow(typeof(FindMissingScriptsRecursivelyAndRemove)); + } + + public void OnGUI() + { + if (GUILayout.Button("Find Missing Scripts in selected GameObjects")) + { + FindInSelected(); + } + + if (!_bHaveRun) return; + + EditorGUILayout.TextField($"{_goCount} GameObjects Selected"); + if (_goCount > 0) EditorGUILayout.TextField($"{_componentsCount} Components"); + if (_goCount > 0) EditorGUILayout.TextField($"{_missingCount} Deleted"); + } + + private static void FindInSelected() + { + var go = Selection.gameObjects; + _goCount = 0; + _componentsCount = 0; + _missingCount = 0; + foreach (var g in go) + { + FindInGo(g); + } + + _bHaveRun = true; + Debug.Log($"Searched {_goCount} GameObjects, {_componentsCount} components, found {_missingCount} missing"); + + AssetDatabase.SaveAssets(); + } + + private static void FindInGo(GameObject g) + { + _goCount++; + var components = g.GetComponents(); + + var r = 0; + + for (var i = 0; i < components.Length; i++) + { + _componentsCount++; + if (components[i] != null) continue; + _missingCount++; + var s = g.name; + var t = g.transform; + while (t.parent != null) + { + s = t.parent.name + "/" + s; + t = t.parent; + } + + Debug.Log($"{s} has a missing script at {i}", g); + + var serializedObject = new SerializedObject(g); + + var prop = serializedObject.FindProperty("m_Component"); + + prop.DeleteArrayElementAtIndex(i - r); + GameObjectUtility.RemoveMonoBehavioursWithMissingScript(g); + r++; + + serializedObject.ApplyModifiedProperties(); + } + + foreach (Transform childT in g.transform) + { + FindInGo(childT.gameObject); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Editor/FindMissingScriptsRecursivelyAndRemove.cs.meta b/Assets/Scripts/Editor/FindMissingScriptsRecursivelyAndRemove.cs.meta new file mode 100644 index 00000000..2ed5a14f --- /dev/null +++ b/Assets/Scripts/Editor/FindMissingScriptsRecursivelyAndRemove.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 96b900009d3649f4c8a0105c69e7ee83 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Networking/NetworkManager.cs b/Assets/Scripts/Networking/NetworkManager.cs index 026a26f0..718609a0 100644 --- a/Assets/Scripts/Networking/NetworkManager.cs +++ b/Assets/Scripts/Networking/NetworkManager.cs @@ -16,6 +16,7 @@ public class NetworkManager : MonoBehaviour [SerializeField] private GameEvent onJoinedRoom; [SerializeField] private GameEvent onLeftRoom; + [SerializeField] private GameEventListener onCharacterConfirmed; [SerializeField] private GameEventListener_ZoneData onGameSceneLoaded; [SerializeField] private GameEventListener_JobInstance onJobSelected; [SerializeField] private GameEventListener_RiftPlayer onPlayerSpawned; @@ -40,6 +41,8 @@ public class NetworkManager : MonoBehaviour { DontDestroyOnLoad(this); + onCharacterConfirmed.Response.AddListener(OnJoinedRoom); + onGameSceneLoaded.Response.AddListener(OnGameSceneLoaded); onMapReady.Response.AddListener(OnMapReady); onInfoPanelClosed.Response.AddListener(() => @@ -72,12 +75,9 @@ public class NetworkManager : MonoBehaviour public void OnJoinedRoom() { - if (!SceneManager.GetActiveScene().name.Contains(GameConstants.Scenes.HuntersInn)) { - SceneManager.LoadScene(GameConstants.Scenes.HuntersInn); - } onJoinedRoom.Raise(); } diff --git a/Assets/Scripts/Networking/NetworkedDrainProjectile.cs b/Assets/Scripts/Networking/NetworkedDrainProjectile.cs index 9317cc4f..8b923159 100644 --- a/Assets/Scripts/Networking/NetworkedDrainProjectile.cs +++ b/Assets/Scripts/Networking/NetworkedDrainProjectile.cs @@ -47,11 +47,10 @@ public class NetworkedDrainProjectile : MonoBehaviour { if (waitingForDestroy) return; - target = other.GetComponentInParent(); if (target == null) return; - if (target == ownerTag) return; + if (target != ownerTag) return; hitPositionCorrected = target.transform.position; hitPositionCorrected.y = this.transform.position.y;