diff --git a/Assets/DefaultNetworkPrefabs.asset b/Assets/DefaultNetworkPrefabs.asset index 3954007f..9539b702 100644 --- a/Assets/DefaultNetworkPrefabs.asset +++ b/Assets/DefaultNetworkPrefabs.asset @@ -24,3 +24,8 @@ MonoBehaviour: SourcePrefabToOverride: {fileID: 0} SourceHashToOverride: 0 OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 100000, guid: 0cd47707143f91346868bfc349e4c4e0, type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} diff --git a/Assets/Prefabs/Player/Player.prefab b/Assets/Prefabs/Player/Player.prefab index cb19ac90..86b92b62 100644 --- a/Assets/Prefabs/Player/Player.prefab +++ b/Assets/Prefabs/Player/Player.prefab @@ -1,5 +1,96 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &211504524078169162 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 425108118890909732} + - component: {fileID: 641669166220653710} + m_Layer: 0 + m_Name: Prop_R + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &425108118890909732 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 211504524078169162} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 876336192716036432} + m_Father: {fileID: 7709863043280880487} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &641669166220653710 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 211504524078169162} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 04570063543744548b5cc95cea8bbff6, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Synty.Tools.SyntyPropBoneTool.PropBone + _wasSpawnedBySyntyTool: 1 +--- !u!1 &5510832058398597268 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 876336192716036432} + - component: {fileID: 5875348249504489215} + m_Layer: 0 + m_Name: Prop_R_Socket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &876336192716036432 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5510832058398597268} + serializedVersion: 2 + m_LocalRotation: {x: 0.000000048428777, y: -0.000000026077034, z: 0.70619637, w: -0.70801604} + m_LocalPosition: {x: -4.9871373, y: -4.999995, z: 0.000009025123} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 425108118890909732} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5875348249504489215 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5510832058398597268} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 04570063543744548b5cc95cea8bbff6, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Synty.Tools.SyntyPropBoneTool.PropBone + _wasSpawnedBySyntyTool: 1 --- !u!1 &6473031571298860035 GameObject: m_ObjectHideFlags: 0 @@ -23,6 +114,7 @@ GameObject: - component: {fileID: 1242716222252539497} - component: {fileID: 3552488436187204500} - component: {fileID: -5132198055668300151} + - component: {fileID: -6410357568507457303} m_Layer: 0 m_Name: Player m_TagString: Player @@ -317,6 +409,7 @@ MonoBehaviour: - {fileID: 0} skillController: {fileID: 6912018896034183004} networkController: {fileID: 0} + weaponEquipment: {fileID: 0} --- !u!114 &1242716222252539497 MonoBehaviour: m_ObjectHideFlags: 0 @@ -369,6 +462,26 @@ MonoBehaviour: baseValue: 100 spirit: baseValue: 100 +--- !u!114 &-6410357568507457303 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6473031571298860035} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3bebed6d2255dfc459748938470407c2, type: 3} + m_Name: + m_EditorClassIdentifier: Colosseum.Game::Colosseum.Weapons.WeaponEquipment + ShowTopMostFoldoutHeaderGroup: 1 + characterStats: {fileID: -5132198055668300151} + rightHandName: Prop_R_Socket + leftHandName: Hand_L + backName: Spine + hipName: Hip + twoHandedName: + startingWeapon: {fileID: 11400000, guid: 646964ccbda84e947b97537d7f7813aa, type: 2} --- !u!1001 &7705728874586931617 PrefabInstance: m_ObjectHideFlags: 0 @@ -377,6 +490,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4340744812167131579} m_Modifications: + - target: {fileID: 1121787054825102, guid: 0b61a3665c5cd5142bf27be7c52500cf, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1265346787747520, guid: 0b61a3665c5cd5142bf27be7c52500cf, type: 3} propertyPath: m_Name value: Chr_FantasyHero_Preset_14 @@ -421,9 +538,50 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] + - target: {fileID: 933129746491078306, guid: 0b61a3665c5cd5142bf27be7c52500cf, type: 3} + propertyPath: m_LocalPosition.x + value: -6.583011 + objectReference: {fileID: 0} + - target: {fileID: 933129746491078306, guid: 0b61a3665c5cd5142bf27be7c52500cf, type: 3} + propertyPath: m_LocalPosition.y + value: -6.5999885 + objectReference: {fileID: 0} + - target: {fileID: 933129746491078306, guid: 0b61a3665c5cd5142bf27be7c52500cf, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00000084909516 + objectReference: {fileID: 0} + - target: {fileID: 4083275338838575672, guid: 0b61a3665c5cd5142bf27be7c52500cf, type: 3} + propertyPath: m_LocalPosition.x + value: 6.6 + objectReference: {fileID: 0} + - target: {fileID: 4083275338838575672, guid: 0b61a3665c5cd5142bf27be7c52500cf, type: 3} + propertyPath: m_LocalPosition.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4083275338838575672, guid: 0b61a3665c5cd5142bf27be7c52500cf, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6854449968133871964, guid: 0b61a3665c5cd5142bf27be7c52500cf, type: 3} + propertyPath: propBoneConfig + value: + objectReference: {fileID: 11400000, guid: 711015ea15f411b4292b25e68fe06e2d, type: 2} + - target: {fileID: 6854449968133871964, guid: 0b61a3665c5cd5142bf27be7c52500cf, type: 3} + propertyPath: _propBoneBindings.Array.data[0].bone + value: + objectReference: {fileID: 425108118890909732} + - target: {fileID: 6854449968133871964, guid: 0b61a3665c5cd5142bf27be7c52500cf, type: 3} + propertyPath: _propBoneBindings.Array.data[0].socket + value: + objectReference: {fileID: 876336192716036432} + m_RemovedComponents: + - {fileID: -5600325556184611898, guid: 0b61a3665c5cd5142bf27be7c52500cf, type: 3} + m_RemovedGameObjects: + - {fileID: 5663282852335883768, guid: 0b61a3665c5cd5142bf27be7c52500cf, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4169362731877062, guid: 0b61a3665c5cd5142bf27be7c52500cf, type: 3} + insertIndex: -1 + addedObject: {fileID: 425108118890909732} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0b61a3665c5cd5142bf27be7c52500cf, type: 3} --- !u!4 &7701595578038390519 stripped @@ -431,3 +589,8 @@ Transform: m_CorrespondingSourceObject: {fileID: 4978357419315030, guid: 0b61a3665c5cd5142bf27be7c52500cf, type: 3} m_PrefabInstance: {fileID: 7705728874586931617} m_PrefabAsset: {fileID: 0} +--- !u!4 &7709863043280880487 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4169362731877062, guid: 0b61a3665c5cd5142bf27be7c52500cf, type: 3} + m_PrefabInstance: {fileID: 7705728874586931617} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/Test.unity b/Assets/Scenes/Test.unity index d9652e07..00feb805 100644 --- a/Assets/Scenes/Test.unity +++ b/Assets/Scenes/Test.unity @@ -165,6 +165,17 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -315} m_SizeDelta: {x: 800, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &214410881 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6949205239376088310, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + m_PrefabInstance: {fileID: 1990079618} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4a49d1cf004a0c944be905fe6fabf936, type: 3} + m_Name: + m_EditorClassIdentifier: Colosseum.Game::Colosseum.Enemy.BossEnemy --- !u!1 &260528172 GameObject: m_ObjectHideFlags: 0 @@ -1679,6 +1690,77 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 678443229} m_SourcePrefab: {fileID: 100100000, guid: 2122b1e1b36684a40978673f272f200e, type: 3} +--- !u!1 &1324642681 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1324642684} + - component: {fileID: 1324642683} + - component: {fileID: 1324642682} + m_Layer: 0 + m_Name: BossArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1324642682 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1324642681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1735054b0ca6d674b99668aeb74ba273, type: 3} + m_Name: + m_EditorClassIdentifier: Colosseum.Game::Colosseum.Enemy.BossArea + boss: {fileID: 214410881} + bossHealthBarUI: {fileID: 678443229} + hideOnExit: 0 + showOnceOnly: 0 + debugMode: 1 +--- !u!65 &1324642683 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1324642681} + 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: 3 + m_Size: {x: 50, y: 2, z: 50} + m_Center: {x: 0, y: 0, z: 0} +--- !u!4 &1324642684 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1324642681} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1425382920 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1229044099469274636, guid: 2122b1e1b36684a40978673f272f200e, type: 3} @@ -2033,6 +2115,67 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1001 &1990079618 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8365735130060185995, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: GlobalObjectIdHash + value: 860882280 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalPosition.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalPosition.z + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5581648761285601425, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_Name + value: TestBoss + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} --- !u!1 &2122318093 GameObject: m_ObjectHideFlags: 0 @@ -2175,67 +2318,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 7078605118272955058, guid: 54087b4bd46db9e4fb7da13cf7a6cc69, type: 3} m_PrefabInstance: {fileID: 437791323} m_PrefabAsset: {fileID: 0} ---- !u!1001 &7439438707585285505 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8365735130060185995, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} - propertyPath: GlobalObjectIdHash - value: 3958201435 - objectReference: {fileID: 0} - - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} - propertyPath: m_LocalPosition.z - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5581648761285601425, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} - propertyPath: m_Name - value: TestBoss - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -2247,4 +2329,5 @@ SceneRoots: - {fileID: 1822286634} - {fileID: 1797510781} - {fileID: 260528176} - - {fileID: 7439438707585285505} + - {fileID: 1990079618} + - {fileID: 1324642684}