diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Battery/P_R00018_01.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Battery/P_R00018_01.prefab index 74e6e590590..8f821c29125 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Battery/P_R00018_01.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Battery/P_R00018_01.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6069663631527812317} + - component: {fileID: 5252797512849581403} m_Layer: 0 m_Name: P_R00018_01 m_TagString: Untagged @@ -32,6 +33,48 @@ Transform: - {fileID: 347035776495341139} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5252797512849581403 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4406831583778301465} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7cd51460125cbe446b2d92098fefc749, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 2 + outSlope: 2 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + duration: 1 + autoPlay: 0 + loop: 0 + fadeAlphaPropertyName: _fadeAlpha + currentTime: 0 + isPlaying: 0 --- !u!1001 &241596026201713080 PrefabInstance: m_ObjectHideFlags: 0 @@ -94,7 +137,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: f4ca9d456b07a2447a7446ff58756e56, type: 2} + objectReference: {fileID: 2100000, guid: 0d5e5892018a7af45b6308e41f3ca8c6, type: 2} - target: {fileID: -2642675314672429579, guid: db2b456a8d8a5774d81fc6b055fb0b95, type: 3} propertyPath: m_LocalRotation.w @@ -115,6 +158,12 @@ PrefabInstance: propertyPath: m_Name value: R00018 objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: db2b456a8d8a5774d81fc6b055fb0b95, + type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 22100000, guid: ab03f4611470bc840a29604d41a2c3b9, + type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Battery/P_R00018_02.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Battery/P_R00018_02.prefab index 6809a5dc48c..de40887db2b 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Battery/P_R00018_02.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Battery/P_R00018_02.prefab @@ -8,31 +8,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1160612550558312703, guid: 6f0797cd58cb22846a1b83507800b0e4, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 0d5e5892018a7af45b6308e41f3ca8c6, type: 2} - target: {fileID: 4406831583778301465, guid: 6f0797cd58cb22846a1b83507800b0e4, type: 3} propertyPath: m_Name value: P_R00018_02 objectReference: {fileID: 0} - - target: {fileID: 6069663631527812317, guid: 6f0797cd58cb22846a1b83507800b0e4, - type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6069663631527812317, guid: 6f0797cd58cb22846a1b83507800b0e4, - type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6069663631527812317, guid: 6f0797cd58cb22846a1b83507800b0e4, - type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - target: {fileID: 6069663631527812317, guid: 6f0797cd58cb22846a1b83507800b0e4, type: 3} propertyPath: m_LocalPosition.x @@ -86,57 +66,5 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 4406831583778301465, guid: 6f0797cd58cb22846a1b83507800b0e4, - type: 3} - insertIndex: -1 - addedObject: {fileID: 7047241102180212429} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6f0797cd58cb22846a1b83507800b0e4, type: 3} ---- !u!1 &4298448018265583775 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4406831583778301465, guid: 6f0797cd58cb22846a1b83507800b0e4, - type: 3} - m_PrefabInstance: {fileID: 472616590339233414} - m_PrefabAsset: {fileID: 0} ---- !u!114 &7047241102180212429 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4298448018265583775} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7cd51460125cbe446b2d92098fefc749, type: 3} - m_Name: - m_EditorClassIdentifier: - fadeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 2 - outSlope: 2 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - duration: 1 - autoPlay: 0 - loop: 0 - fadeAlphaPropertyName: _fadeAlpha - currentTime: 0 - isPlaying: 0