diff --git a/Assets/Prefabs/Character/Enemy.prefab b/Assets/Prefabs/Character/Enemy.prefab index d8bb5e9..99eb8d4 100644 --- a/Assets/Prefabs/Character/Enemy.prefab +++ b/Assets/Prefabs/Character/Enemy.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4600110157238723777, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} @@ -17,7 +18,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4600110157238723781, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} propertyPath: m_Layer - value: 6 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4600110157238723781, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} propertyPath: m_TagString @@ -25,7 +26,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4600110157238723790, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} propertyPath: GlobalObjectIdHash - value: 951099334 + value: 3885025524 objectReference: {fileID: 0} - target: {fileID: 4600110157238723791, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} propertyPath: m_RootOrder @@ -77,4 +78,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 4600110157238723776, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} diff --git a/Assets/Prefabs/Character/Imp.prefab b/Assets/Prefabs/Character/Imp.prefab index 0075669..500d32c 100644 --- a/Assets/Prefabs/Character/Imp.prefab +++ b/Assets/Prefabs/Character/Imp.prefab @@ -5,16 +5,105 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3713729372785093434} m_Modifications: - target: {fileID: 234724737205816310, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} propertyPath: m_Controller value: objectReference: {fileID: 22100000, guid: 0406729e6e1c12e4d99fd34970073cd0, type: 2} + - target: {fileID: 407135044797064432, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 498946207220608313, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 611112424166957242, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 646291673400352715, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 648856390995237855, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1044040725551930694, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1117255374528129725, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1721864362952965409, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2305735426247598617, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2515439155540822592, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2709964662078048919, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2878418782891618275, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2944606013742350740, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3175255563160051248, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3234663375062857281, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 3687104631385136546, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 90 objectReference: {fileID: 0} + - target: {fileID: 4018734965573483563, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4496376489146882154, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4775188677227620137, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5072378273490795345, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5486201909205077198, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5724120770187545441, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6008862408397283552, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 6170428688339538316, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} propertyPath: m_RootOrder value: 0 @@ -59,15 +148,77 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6222219035656846348, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6368638567633865268, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6601419689214245050, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6835698931474275143, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 6839301660383890230, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} propertyPath: m_Name value: ImpGraphics objectReference: {fileID: 0} + - target: {fileID: 6839301660383890230, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7108127146651356877, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7144171279034270638, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7826629151241597408, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8005647249789065143, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_ClientCharacter + value: + objectReference: {fileID: 3121817358174221070} - target: {fileID: 8005647249789065143, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} propertyPath: m_ClientCharacterVisualization value: objectReference: {fileID: 3121817358174221070} + - target: {fileID: 8060606548627479175, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8078403042024613293, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8085303078217024342, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8397462235754238418, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 9080214680554043463, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6839301660383890230, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} + insertIndex: -1 + addedObject: {fileID: 5401475423617019972} m_SourcePrefab: {fileID: 100100000, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3} --- !u!95 &929086692793228630 stripped Animator: @@ -102,6 +253,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e8d0727d5ae3244e3b569694d3912374, type: 3} m_Name: m_EditorClassIdentifier: + TransitionStateInfoList: [] m_Animator: {fileID: 929086692793228630} --- !u!4 &6486568539699693356 stripped Transform: @@ -113,6 +265,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1632591904850424414, guid: 64cfd098f62285f42918875fef849e88, type: 3} @@ -145,7 +298,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3288448142974003546, guid: 64cfd098f62285f42918875fef849e88, type: 3} propertyPath: GlobalObjectIdHash - value: 951099334 + value: 36723199 objectReference: {fileID: 0} - target: {fileID: 3288448142974003546, guid: 64cfd098f62285f42918875fef849e88, type: 3} propertyPath: PrefabHashGenerator @@ -251,6 +404,10 @@ PrefabInstance: propertyPath: m_CharacterClass value: objectReference: {fileID: 11400000, guid: fa81aca63f2fce545a3b9e046b6e42e7, type: 2} + - target: {fileID: 8398944656959553575, guid: 64cfd098f62285f42918875fef849e88, type: 3} + propertyPath: m_ClientCharacter + value: + objectReference: {fileID: 3121817358174221070} - target: {fileID: 8398944656959553575, guid: 64cfd098f62285f42918875fef849e88, type: 3} propertyPath: m_ClientVisualization value: @@ -272,6 +429,15 @@ PrefabInstance: value: 0.8 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3288448142974003547, guid: 64cfd098f62285f42918875fef849e88, type: 3} + insertIndex: -1 + addedObject: {fileID: 6486568539699693356} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3288448142974003537, guid: 64cfd098f62285f42918875fef849e88, type: 3} + insertIndex: -1 + addedObject: {fileID: -4570750241117365215} m_SourcePrefab: {fileID: 100100000, guid: 64cfd098f62285f42918875fef849e88, type: 3} --- !u!114 &827948680237315002 stripped MonoBehaviour: @@ -304,9 +470,9 @@ MonoBehaviour: m_DisplayHealth: 1 m_DisplayName: 0 m_UIStatePrefab: {fileID: -1943162842029199943, guid: 2b07482491a17964380023240087ce16, type: 3} - m_NetworkNameState: {fileID: 0} + m_UIState: {fileID: 0} m_NetworkHealthState: {fileID: 827948680237315002} - m_ServerCharacter: {fileID: 0} + m_NetworkNameState: {fileID: 0} m_BaseHP: {fileID: 11400000, guid: 95633dc134a4e654f863831b22b5681a, type: 2} m_TransformToTrack: {fileID: 6486568539699693356} m_VerticalWorldOffset: 2.2 diff --git a/Assets/Prefabs/Character/ImpBoss.prefab b/Assets/Prefabs/Character/ImpBoss.prefab index 7dae503..fcfa26b 100644 --- a/Assets/Prefabs/Character/ImpBoss.prefab +++ b/Assets/Prefabs/Character/ImpBoss.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1632591904850424414, guid: 64cfd098f62285f42918875fef849e88, type: 3} @@ -29,7 +30,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3288448142974003546, guid: 64cfd098f62285f42918875fef849e88, type: 3} propertyPath: GlobalObjectIdHash - value: 951099334 + value: 591709222 objectReference: {fileID: 0} - target: {fileID: 3288448142974003546, guid: 64cfd098f62285f42918875fef849e88, type: 3} propertyPath: PrefabHashGenerator @@ -135,6 +136,10 @@ PrefabInstance: propertyPath: m_CharacterClass value: objectReference: {fileID: 11400000, guid: 1fdbcd02edb11484a91de118f5ef44b3, type: 2} + - target: {fileID: 8398944656959553575, guid: 64cfd098f62285f42918875fef849e88, type: 3} + propertyPath: m_ClientCharacter + value: + objectReference: {fileID: 5970403413429264330} - target: {fileID: 8398944656959553575, guid: 64cfd098f62285f42918875fef849e88, type: 3} propertyPath: m_ClientVisualization value: @@ -156,6 +161,21 @@ PrefabInstance: value: 4 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3288448142974003547, guid: 64cfd098f62285f42918875fef849e88, type: 3} + insertIndex: -1 + addedObject: {fileID: 2561745155600296936} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3288448142974003537, guid: 64cfd098f62285f42918875fef849e88, type: 3} + insertIndex: -1 + addedObject: {fileID: 3035161527766636097} + - targetCorrespondingSourceObject: {fileID: 3288448142974003537, guid: 64cfd098f62285f42918875fef849e88, type: 3} + insertIndex: -1 + addedObject: {fileID: 7653970338354900554} + - targetCorrespondingSourceObject: {fileID: 3288448142974003537, guid: 64cfd098f62285f42918875fef849e88, type: 3} + insertIndex: -1 + addedObject: {fileID: 8073394427373638825} m_SourcePrefab: {fileID: 100100000, guid: 64cfd098f62285f42918875fef849e88, type: 3} --- !u!114 &848206395698055335 stripped MonoBehaviour: @@ -193,9 +213,9 @@ MonoBehaviour: m_DisplayHealth: 1 m_DisplayName: 0 m_UIStatePrefab: {fileID: -1943162842029199943, guid: 2b07482491a17964380023240087ce16, type: 3} - m_NetworkNameState: {fileID: 0} + m_UIState: {fileID: 0} m_NetworkHealthState: {fileID: 848206395698055335} - m_ServerCharacter: {fileID: 0} + m_NetworkNameState: {fileID: 0} m_BaseHP: {fileID: 11400000, guid: f393c51c2bce455478a0b995b8d4e3dd, type: 2} m_TransformToTrack: {fileID: 2561745155600296936} m_VerticalWorldOffset: 0 @@ -243,20 +263,145 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3688950541947916327} m_Modifications: - target: {fileID: 234724737205816310, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} propertyPath: m_Controller value: objectReference: {fileID: 22100000, guid: 8edd57abbb5551d47b79195d80822b16, type: 2} + - target: {fileID: 407135044797064432, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 498946207220608313, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 611112424166957242, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 646291673400352715, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 648856390995237855, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 775266086053624783, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 983588574236569988, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 90 objectReference: {fileID: 0} + - target: {fileID: 1044040725551930694, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1068372622812833242, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1117255374528129725, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1721864362952965409, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1762617975049005522, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2305735426247598617, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2515439155540822592, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2709964662078048919, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2878418782891618275, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2944606013742350740, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3175255563160051248, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3433454451077976829, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3903178743315383978, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4018734965573483563, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4277448026072466078, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4496376489146882154, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4538447335436592133, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_ClientCharacter + value: + objectReference: {fileID: 5970403413429264330} - target: {fileID: 4538447335436592133, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} propertyPath: m_ClientCharacterVisualization value: objectReference: {fileID: 5970403413429264330} + - target: {fileID: 4775188677227620137, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5053290200876353757, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5072378273490795345, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5280946331505908947, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5486201909205077198, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5633512146638568367, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5724120770187545441, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6021122921197727959, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 6170428688339538316, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} propertyPath: m_RootOrder value: 0 @@ -301,11 +446,93 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6222219035656846348, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6344480113249635135, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6368638567633865268, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6601419689214245050, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6648557906260056851, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6835698931474275143, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 6839301660383890230, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} propertyPath: m_Name value: BossGraphics objectReference: {fileID: 0} + - target: {fileID: 6839301660383890230, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7108127146651356877, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7144171279034270638, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7826629151241597408, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7921433989559061702, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8060606548627479175, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8078403042024613293, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8082649731380229066, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8085303078217024342, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8158816072511535493, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8397462235754238418, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8688334555175241679, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 9080214680554043463, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6839301660383890230, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} + insertIndex: -1 + addedObject: {fileID: 2816369992019265630} m_SourcePrefab: {fileID: 100100000, guid: 1e8ae28d24c5683478548d7e96e5ba55, type: 3} --- !u!4 &2561745155600296936 stripped Transform: @@ -329,6 +556,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e8d0727d5ae3244e3b569694d3912374, type: 3} m_Name: m_EditorClassIdentifier: + TransitionStateInfoList: [] m_Animator: {fileID: 8461429659892969874} --- !u!114 &5970403413429264330 stripped MonoBehaviour: diff --git a/Assets/Prefabs/Character/Mysto_V2.prefab b/Assets/Prefabs/Character/Mysto_V2.prefab index ef3b5de..14e40e0 100644 --- a/Assets/Prefabs/Character/Mysto_V2.prefab +++ b/Assets/Prefabs/Character/Mysto_V2.prefab @@ -8,6 +8,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -8969417572210971711, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8707241393673669972, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8699787447509501512, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -48,14 +60,170 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8236615327842799068, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8175127548591214388, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8139853090755257685, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -7774620517717459388, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -7484682678926922151, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -7037130781614892758, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -6851848838197607830, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -6360735721235083178, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -6116727749810235759, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -5956947741087532221, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -5424213705957445524, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -4979834573570412896, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -4501201811031430588, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: -4379569206756028908, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 9f7761630364dfb48a2020e6a0145868, type: 2} + - target: {fileID: -3638193520734090830, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -3244476056490683178, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -2598182969042596370, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -2453550708452717748, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -2141135503258565833, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -2025596174578173375, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1930578328450875381, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1731024231264914805, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1693546492923637869, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1107101525102980484, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1091752635582583252, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1033859536177898853, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -641257812432895841, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 661651720426966144, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} propertyPath: m_Name value: Mysto_V2 objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1166754175604888097, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1617399745748130172, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2085122041757578371, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2430876001099946699, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2464098630957027937, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2657195002283232437, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3897462237488877691, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3974671095192526231, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4108234674411243596, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4280359472741655279, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4311629582287283170, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 4979718348992894074, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -64,6 +232,54 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: baefab5a061080c449801d219bfadd74, type: 2} + - target: {fileID: 5470694928252452566, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6386480451222621022, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6499889929296628410, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6534160855740820065, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6584186306538760244, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7036213049465896255, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7372134353506958267, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7891850266450665243, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8352526780231734871, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8493651545096302793, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8916979045543815761, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 9088872756827976528, guid: 0b73dce48b30d2348aa8cb29b99b70a1, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Prefabs/Character/PersistentPlayer.prefab b/Assets/Prefabs/Character/PersistentPlayer.prefab index d9af488..a36dd90 100644 --- a/Assets/Prefabs/Character/PersistentPlayer.prefab +++ b/Assets/Prefabs/Character/PersistentPlayer.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: -5536186819612961332} - component: {fileID: 8450381715082006755} - component: {fileID: 596945379875709001} - m_Layer: 0 + m_Layer: 3 m_Name: PersistentPlayer m_TagString: Untagged m_Icon: {fileID: 0} @@ -27,13 +27,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4927145850774787080} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5202563697772659352 MonoBehaviour: @@ -47,11 +47,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} m_Name: m_EditorClassIdentifier: - GlobalObjectIdHash: 951099334 + GlobalObjectIdHash: 1319132807 + InScenePlacedSourceGlobalObjectIdHash: 0 AlwaysReplicateAsRoot: 0 SynchronizeTransform: 0 ActiveSceneSynchronization: 0 SceneMigrationSynchronization: 1 + SpawnWithObservers: 1 DontDestroyWithOwner: 0 AutoObjectParentSync: 1 --- !u!114 &-5536186819612961332 diff --git a/Assets/Prefabs/Character/PlayerAvatar.prefab b/Assets/Prefabs/Character/PlayerAvatar.prefab index 0de7131..15868e3 100644 --- a/Assets/Prefabs/Character/PlayerAvatar.prefab +++ b/Assets/Prefabs/Character/PlayerAvatar.prefab @@ -120,6 +120,10 @@ PrefabInstance: propertyPath: m_Name value: AbilityIndicator objectReference: {fileID: 0} + - target: {fileID: 3894374618083898175, guid: 63d404b949e644e4a92db7444ae88671, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 3894374618083898175, guid: 63d404b949e644e4a92db7444ae88671, type: 3} propertyPath: m_IsActive value: 0 @@ -159,6 +163,14 @@ PrefabInstance: propertyPath: m_NetworkAnimator value: objectReference: {fileID: 4639653625902786935} + - target: {fileID: 745390554272530562, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} + propertyPath: m_Radius + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 745390554272530562, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4600110157238723776, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} propertyPath: m_AoePrefab value: diff --git a/Assets/Prefabs/Character/VandalImp.prefab b/Assets/Prefabs/Character/VandalImp.prefab index ef208da..2e9219c 100644 --- a/Assets/Prefabs/Character/VandalImp.prefab +++ b/Assets/Prefabs/Character/VandalImp.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 176558388678216186} m_Modifications: - target: {fileID: -1890528778572688093, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} @@ -15,6 +16,98 @@ PrefabInstance: propertyPath: GlobalObjectIdHash value: 951099334 objectReference: {fileID: 0} + - target: {fileID: 219699962399563328, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 407135044797064432, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 498946207220608313, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 611112424166957242, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 646291673400352715, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 648856390995237855, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1044040725551930694, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1117255374528129725, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1721864362952965409, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2305735426247598617, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2515439155540822592, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2709964662078048919, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2878418782891618275, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2944606013742350740, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3175255563160051248, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3234663375062857281, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4018734965573483563, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4496376489146882154, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4775188677227620137, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5072378273490795345, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5486201909205077198, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5724120770187545441, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6008862408397283552, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 6030569013059244219, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} propertyPath: m_Animator value: @@ -63,11 +156,66 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6222219035656846348, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6368638567633865268, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6601419689214245050, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6835698931474275143, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 6839301660383890230, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} propertyPath: m_Name value: VandalImpGraphics objectReference: {fileID: 0} + - target: {fileID: 6839301660383890230, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7108127146651356877, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7144171279034270638, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7826629151241597408, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8060606548627479175, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8078403042024613293, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8085303078217024342, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8397462235754238418, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 9080214680554043463, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3} --- !u!95 &1397358572536670155 stripped Animator: @@ -106,6 +254,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1632591904850424414, guid: 64cfd098f62285f42918875fef849e88, type: 3} @@ -118,7 +267,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3288448142974003546, guid: 64cfd098f62285f42918875fef849e88, type: 3} propertyPath: GlobalObjectIdHash - value: 951099334 + value: 3952065690 objectReference: {fileID: 0} - target: {fileID: 3288448142974003547, guid: 64cfd098f62285f42918875fef849e88, type: 3} propertyPath: m_RootOrder @@ -176,6 +325,10 @@ PrefabInstance: propertyPath: m_CharacterClass value: objectReference: {fileID: 11400000, guid: 686e97a1c3abaf243a72ce1c5a9d7a9f, type: 2} + - target: {fileID: 8398944656959553575, guid: 64cfd098f62285f42918875fef849e88, type: 3} + propertyPath: m_ClientCharacter + value: + objectReference: {fileID: 3806176119258990995} - target: {fileID: 8398944656959553575, guid: 64cfd098f62285f42918875fef849e88, type: 3} propertyPath: m_ClientVisualization value: @@ -185,6 +338,15 @@ PrefabInstance: value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3288448142974003547, guid: 64cfd098f62285f42918875fef849e88, type: 3} + insertIndex: -1 + addedObject: {fileID: 5009206627901439409} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3288448142974003537, guid: 64cfd098f62285f42918875fef849e88, type: 3} + insertIndex: -1 + addedObject: {fileID: 2273131261567159713} m_SourcePrefab: {fileID: 100100000, guid: 64cfd098f62285f42918875fef849e88, type: 3} --- !u!1 &176558388678216176 stripped GameObject: @@ -206,6 +368,7 @@ MonoBehaviour: m_DisplayHealth: 1 m_DisplayName: 0 m_UIStatePrefab: {fileID: -1943162842029199943, guid: 2b07482491a17964380023240087ce16, type: 3} + m_UIState: {fileID: 0} m_NetworkHealthState: {fileID: 4217591550483468666} m_NetworkNameState: {fileID: 0} m_BaseHP: {fileID: 11400000, guid: f41e9bb72a80c694d81c8038aaa732a6, type: 2} diff --git a/Assets/Prefabs/Character/Wizard.prefab b/Assets/Prefabs/Character/Wizard.prefab index e335a5c..33c5a31 100644 --- a/Assets/Prefabs/Character/Wizard.prefab +++ b/Assets/Prefabs/Character/Wizard.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7263482938116797786} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftHandRing3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -42,7 +42,7 @@ GameObject: m_Component: - component: {fileID: 6769994715365864839} - component: {fileID: 9076229719686895781} - m_Layer: 0 + m_Layer: 3 m_Name: hat m_TagString: Untagged m_Icon: {fileID: 0} @@ -175,7 +175,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8724150079913839959} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightHandRing1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -207,7 +207,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9192292515688143747} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftHandThumb4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -238,7 +238,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1585966129844805763} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightToe_End m_TagString: Untagged m_Icon: {fileID: 0} @@ -269,7 +269,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5531178833010034162} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -301,7 +301,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5079505108512690382} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftUpLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -333,7 +333,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5279488241323532522} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightHandThumb2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -365,7 +365,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4403576922486654758} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightForeArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -398,7 +398,7 @@ GameObject: m_Component: - component: {fileID: 2158879392026317912} - component: {fileID: 5410456523969007138} - m_Layer: 0 + m_Layer: 3 m_Name: Wizard m_TagString: Untagged m_Icon: {fileID: 0} @@ -453,7 +453,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8016162498319464291} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightHandIndex2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -485,7 +485,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8563426826667393399} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:Spine1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -517,7 +517,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3113688868246903908} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:Hips m_TagString: Untagged m_Icon: {fileID: 0} @@ -551,7 +551,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8398031649911447866} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftHandThumb1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -583,7 +583,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5092118746730979017} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftHandRing2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -615,7 +615,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7150131324451917227} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftFoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -647,7 +647,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3577542169989504922} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -679,7 +679,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9112959072264631928} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:Head m_TagString: Untagged m_Icon: {fileID: 0} @@ -711,7 +711,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8740739456992484666} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightHandRing4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -742,7 +742,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5118359291160892938} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftHand m_TagString: Untagged m_Icon: {fileID: 0} @@ -776,7 +776,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4257494105117534653} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftHandIndex3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -808,7 +808,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3356914834077206063} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftHandThumb2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -840,7 +840,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5309755635953227943} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:HeadTop_End m_TagString: Untagged m_Icon: {fileID: 0} @@ -871,7 +871,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3677992626880304217} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftHandIndex4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -902,7 +902,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2064530745273240713} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightHandIndex3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -934,7 +934,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5648384096632244507} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftHandIndex1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -966,7 +966,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3959888332707661728} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftToe_End m_TagString: Untagged m_Icon: {fileID: 0} @@ -997,7 +997,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2219546091287869650} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftForeArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1029,7 +1029,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6894482134630283576} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightHandRing3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1061,7 +1061,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3004000711784766759} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftHandRing4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1092,7 +1092,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4652036793274573888} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftHandRing1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1124,7 +1124,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3035836410489936671} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightUpLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -1156,7 +1156,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 755005665410242044} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:Spine m_TagString: Untagged m_Icon: {fileID: 0} @@ -1188,7 +1188,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8531167274856680822} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightHandThumb1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1221,7 +1221,7 @@ GameObject: m_Component: - component: {fileID: 5240452332822078257} - component: {fileID: 6151465727296953981} - m_Layer: 0 + m_Layer: 3 m_Name: coat.001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1354,7 +1354,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2731676014614767012} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1386,7 +1386,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3054503157012144586} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightToeBase m_TagString: Untagged m_Icon: {fileID: 0} @@ -1418,7 +1418,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5212393621470171428} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightShoulder m_TagString: Untagged m_Icon: {fileID: 0} @@ -1450,7 +1450,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 786829148085868096} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1482,7 +1482,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2767688741127597269} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightFoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -1514,7 +1514,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7337912116974475325} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightHandThumb4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1545,7 +1545,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4120945928206669024} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightHandThumb3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1577,7 +1577,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2980607507395473515} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftShoulder m_TagString: Untagged m_Icon: {fileID: 0} @@ -1609,7 +1609,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2240361542389669292} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftHandIndex2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1641,7 +1641,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3848801325277858075} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightHandIndex4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1672,7 +1672,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4253350612242366363} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightHand m_TagString: Untagged m_Icon: {fileID: 0} @@ -1706,7 +1706,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4251182194601489274} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:Spine2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1740,7 +1740,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7363886710108434762} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftHandThumb3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1772,7 +1772,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7095928109286822181} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightHandRing2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1804,7 +1804,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7009065623834068166} - m_Layer: 0 + m_Layer: 3 m_Name: Armature m_TagString: Untagged m_Icon: {fileID: 0} @@ -1836,7 +1836,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4619489621841658095} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:RightHandIndex1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1868,7 +1868,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7253025371800852154} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:Neck m_TagString: Untagged m_Icon: {fileID: 0} @@ -1900,7 +1900,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5671045143208603791} - m_Layer: 0 + m_Layer: 3 m_Name: mixamorig:LeftToeBase m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Scenes/BossRoom.unity b/Assets/Scenes/BossRoom.unity index fe6bc16..0e07577 100644 --- a/Assets/Scenes/BossRoom.unity +++ b/Assets/Scenes/BossRoom.unity @@ -197,7 +197,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1657,7 +1657,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -9309,11 +9309,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1676734515771252668, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalRotation.w - value: 0.85294455 + value: 0.8529446 objectReference: {fileID: 0} - target: {fileID: 1676734515771252668, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalRotation.x - value: 0.3943448 + value: 0.39434478 objectReference: {fileID: 0} - target: {fileID: 1676734515771252668, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalRotation.y @@ -9321,7 +9321,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1676734515771252668, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalRotation.z - value: -0.14352979 + value: -0.14352977 objectReference: {fileID: 0} - target: {fileID: 1676734516302391364, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_UpdateMethod @@ -9353,11 +9353,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1676734516695783279, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalRotation.y - value: 0.3097298 + value: 0.30972984 objectReference: {fileID: 0} - target: {fileID: 1676734516695783279, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalRotation.z - value: -0.14506969 + value: -0.1450697 objectReference: {fileID: 0} - target: {fileID: 1676734516724634599, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalPosition.z @@ -9516,15 +9516,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 203267159508449512, guid: 36b3ee75677a1544191c0ddaaadd8140, type: 3} propertyPath: m_LocalRotation.x - value: 0.39434484 + value: 0.3943448 objectReference: {fileID: 0} - target: {fileID: 203267159508449512, guid: 36b3ee75677a1544191c0ddaaadd8140, type: 3} propertyPath: m_LocalRotation.y - value: 0.3104465 + value: 0.31044644 objectReference: {fileID: 0} - target: {fileID: 203267159508449512, guid: 36b3ee75677a1544191c0ddaaadd8140, type: 3} propertyPath: m_LocalRotation.z - value: -0.1435298 + value: -0.14352976 objectReference: {fileID: 0} - target: {fileID: 203267159508449512, guid: 36b3ee75677a1544191c0ddaaadd8140, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -10280,7 +10280,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -233778,7 +233778,7 @@ Transform: m_GameObject: {fileID: 904100739971862020} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.46, y: -0.42, z: 0.72} + m_LocalPosition: {x: 1.92, y: -0.42, z: 6.72} m_LocalScale: {x: 0.42, y: 0.42, z: 0.42} m_ConstrainProportionsScale: 1 m_Children: diff --git a/Assets/Scenes/BossRoom/DungeonEntrance.unity b/Assets/Scenes/BossRoom/DungeonEntrance.unity index f172f3b..dea289d 100644 --- a/Assets/Scenes/BossRoom/DungeonEntrance.unity +++ b/Assets/Scenes/BossRoom/DungeonEntrance.unity @@ -316,6 +316,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1415641641} - {fileID: 3169561862507413951} - {fileID: 1326862948614608678} - {fileID: 6996768595326639848} @@ -1212,12 +1213,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1415641637} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.4553, y: -0.14, z: -1.0268} m_LocalScale: {x: 2.1429026, y: 1.2077, z: 2.595087} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 286165427} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1463337822 GameObject: @@ -2876,4 +2877,3 @@ SceneRoots: - {fileID: 2085312387} - {fileID: 949745749} - {fileID: 286165427} - - {fileID: 1415641641}