diff --git a/Plunderblock/Assets/Kevin Animation.meta b/Plunderblock/Assets/Kevin Animation.meta new file mode 100644 index 0000000..d20b9cc --- /dev/null +++ b/Plunderblock/Assets/Kevin Animation.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 01b0314ab44e6a04cad951bade5c2d5c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plunderblock/Assets/Kevin Animation/New Animation.anim b/Plunderblock/Assets/Kevin Animation/New Animation.anim new file mode 100644 index 0000000..aa588a9 --- /dev/null +++ b/Plunderblock/Assets/Kevin Animation/New Animation.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Animation + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Plunderblock/Assets/Kevin Animation/New Animation.anim.meta b/Plunderblock/Assets/Kevin Animation/New Animation.anim.meta new file mode 100644 index 0000000..1e25de1 --- /dev/null +++ b/Plunderblock/Assets/Kevin Animation/New Animation.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f1b4db8d6246765468a3ff9b00c4038f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plunderblock/Assets/PrefabsJan/Player.prefab b/Plunderblock/Assets/PrefabsJan/Player.prefab index 4882b25..0fe47fe 100644 --- a/Plunderblock/Assets/PrefabsJan/Player.prefab +++ b/Plunderblock/Assets/PrefabsJan/Player.prefab @@ -1,80 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1204420241108331646 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1613608804500870044} - - component: {fileID: 2956885785757515831} - - component: {fileID: 443753822875148266} - m_Layer: 10 - m_Name: AmmoImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1613608804500870044 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1204420241108331646} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.3094, y: 1.3094, z: 1.3094} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8234077612602293382} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -365, y: -191} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2956885785757515831 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1204420241108331646} - m_CullTransparentMesh: 1 ---- !u!114 &443753822875148266 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1204420241108331646} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 321c168a99aa45e42a02720f22419d39, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &2733685271872555805 GameObject: m_ObjectHideFlags: 0 @@ -369,85 +294,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &7566297578841152737 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2355847910073875648} - - component: {fileID: 3332157730834607231} - - component: {fileID: 1464316800582670505} - m_Layer: 10 - m_Name: Ammo - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2355847910073875648 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7566297578841152737} - 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: 8234077612602293382} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -265, y: -231} - m_SizeDelta: {x: 134.5, y: 109.16} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3332157730834607231 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7566297578841152737} - m_CullTransparentMesh: 1 ---- !u!114 &1464316800582670505 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7566297578841152737} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 46 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 6 - m_MaxSize: 60 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 0 --- !u!1 &8948127678283011642 GameObject: m_ObjectHideFlags: 0 @@ -543,80 +389,6 @@ AudioListener: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8948127678283011642} m_Enabled: 0 ---- !u!1001 &1940982227445255951 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 8477437862324887214} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 1fff7b948b9df454094acebb1a250420, type: 3} - propertyPath: m_Name - value: TestGun - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1fff7b948b9df454094acebb1a250420, type: 3} ---- !u!4 &2118231622859221220 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} - m_PrefabInstance: {fileID: 1940982227445255951} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3506481795036953501 PrefabInstance: m_ObjectHideFlags: 0 @@ -625,38 +397,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5950832400214244271} m_Modifications: - - target: {fileID: 95360399556382469, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 2052943883049938302, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3852534801679810867, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 4664400905834316538, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - propertyPath: m_UiScaleMode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4766397035718395917, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - propertyPath: dataBullet - value: - objectReference: {fileID: 11400000, guid: cafd241bae342f446ae8141cc5d72daf, type: 2} - - target: {fileID: 5727695039551963900, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - propertyPath: m_LocalPosition.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5727695039551963900, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - propertyPath: m_AnchoredPosition.x - value: 333 - objectReference: {fileID: 0} - - target: {fileID: 5727695039551963900, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - propertyPath: m_AnchoredPosition.y - value: 182 - objectReference: {fileID: 0} - target: {fileID: 5863193481701293955, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -697,39 +437,13 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7027964462908259073, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - target: {fileID: 8142714974886293319, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} propertyPath: m_Name value: UI_Manager objectReference: {fileID: 0} - - target: {fileID: 8142714974886293319, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 8625755030761962559, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - propertyPath: m_LocalPosition.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8625755030761962559, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - propertyPath: m_AnchoredPosition.x - value: 432.4 - objectReference: {fileID: 0} - - target: {fileID: 8625755030761962559, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - propertyPath: m_AnchoredPosition.y - value: 153.6 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 4822466156586256155, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - insertIndex: -1 - addedObject: {fileID: 2355847910073875648} - - targetCorrespondingSourceObject: {fileID: 4822466156586256155, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - insertIndex: -1 - addedObject: {fileID: 1613608804500870044} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} --- !u!4 &7059315404903924766 stripped @@ -737,11 +451,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5863193481701293955, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} m_PrefabInstance: {fileID: 3506481795036953501} m_PrefabAsset: {fileID: 0} ---- !u!224 &8234077612602293382 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4822466156586256155, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - m_PrefabInstance: {fileID: 3506481795036953501} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7466933759953658907 PrefabInstance: m_ObjectHideFlags: 0 @@ -750,110 +459,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5950832400214244271} m_Modifications: - - target: {fileID: 1169450665700565, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: schussInterval - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 686265786403669914, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalPosition.x - value: 0.388 - objectReference: {fileID: 0} - - target: {fileID: 686265786403669914, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalPosition.y - value: 0.271 - objectReference: {fileID: 0} - - target: {fileID: 686265786403669914, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalPosition.z - value: 0.033 - objectReference: {fileID: 0} - - target: {fileID: 686265786403669914, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalRotation.w - value: 0.65452266 - objectReference: {fileID: 0} - - target: {fileID: 686265786403669914, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 686265786403669914, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalRotation.y - value: 0.7560424 - objectReference: {fileID: 0} - - target: {fileID: 686265786403669914, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalRotation.z - value: -0.000000008381901 - objectReference: {fileID: 0} - - target: {fileID: 686265786403669914, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 98.233 - objectReference: {fileID: 0} - - target: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalScale.x - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalScale.y - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalScale.z - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalPosition.x - value: -0.02 - objectReference: {fileID: 0} - - target: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalPosition.y - value: 0.32 - objectReference: {fileID: 0} - - target: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalPosition.z - value: 0.05 - objectReference: {fileID: 0} - - target: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7324241 - objectReference: {fileID: 0} - - target: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalRotation.y - value: -0.6808487 - objectReference: {fileID: 0} - - target: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -85.82 - objectReference: {fileID: 0} - - target: {fileID: 2326864918050230340, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalPosition.x - value: 0.408 - objectReference: {fileID: 0} - - target: {fileID: 2326864918050230340, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalPosition.y - value: 0.62 - objectReference: {fileID: 0} - - target: {fileID: 2326864918050230340, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalPosition.z - value: -0.21 - objectReference: {fileID: 0} - - target: {fileID: 2494636701005268105, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3929927056536112425, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_LocalScale.x - value: 0.46 - objectReference: {fileID: 0} - target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} propertyPath: m_LocalPosition.x value: 0.42874753 @@ -894,29 +499,13 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 7.29 objectReference: {fileID: 0} - - target: {fileID: 7971593296632072563, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - target: {fileID: 8363807481264483936, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} propertyPath: m_Name value: Gun objectReference: {fileID: 0} - - target: {fileID: 8363807481264483936, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 3410127534591597247, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - m_RemovedGameObjects: - - {fileID: 6867957792503530889, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - - {fileID: 1347957038587155653, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - - {fileID: 4531622071966824957, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - - {fileID: 4478152415905981846, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - insertIndex: -1 - addedObject: {fileID: 2118231622859221220} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} --- !u!4 &4163468239720933169 stripped @@ -924,8 +513,3 @@ Transform: m_CorrespondingSourceObject: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} m_PrefabInstance: {fileID: 7466933759953658907} m_PrefabAsset: {fileID: 0} ---- !u!4 &8477437862324887214 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - m_PrefabInstance: {fileID: 7466933759953658907} - m_PrefabAsset: {fileID: 0} diff --git a/Plunderblock/Assets/PrefabsKevin/Bullet/MuzzlePartical/MuzzleParticalSystem.prefab b/Plunderblock/Assets/PrefabsKevin/Bullet/MuzzlePartical/MuzzleParticalSystem.prefab index e49304c..2ad4aa2 100644 --- a/Plunderblock/Assets/PrefabsKevin/Bullet/MuzzlePartical/MuzzleParticalSystem.prefab +++ b/Plunderblock/Assets/PrefabsKevin/Bullet/MuzzlePartical/MuzzleParticalSystem.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 6557869798269101976} - component: {fileID: 430484790216468074} - component: {fileID: 7292470550242442} - m_Layer: 0 + m_Layer: 10 m_Name: MuzzleParticalSystem m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Plunderblock/Assets/PrefabsKevin/Gun/Gun.prefab b/Plunderblock/Assets/PrefabsKevin/Gun/Gun.prefab index 67e923c..3306adb 100644 --- a/Plunderblock/Assets/PrefabsKevin/Gun/Gun.prefab +++ b/Plunderblock/Assets/PrefabsKevin/Gun/Gun.prefab @@ -1,254 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1347957038587155653 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5780878549155511367} - - component: {fileID: 5308018459376071910} - - component: {fileID: 8252694048649272144} - m_Layer: 0 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5780878549155511367 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1347957038587155653} - 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: 1313371464610265781} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5308018459376071910 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1347957038587155653} - m_Mesh: {fileID: -5495902117074765545, guid: 1fff7b948b9df454094acebb1a250420, type: 3} ---- !u!23 &8252694048649272144 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1347957038587155653} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: -876546973899608171, guid: 1fff7b948b9df454094acebb1a250420, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &4478152415905981846 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1936349321533376672} - - component: {fileID: 5555460724314563768} - - component: {fileID: 6630209723659434613} - m_Layer: 0 - m_Name: Cube.002 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1936349321533376672 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4478152415905981846} - 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: 1313371464610265781} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5555460724314563768 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4478152415905981846} - m_Mesh: {fileID: -1550514412580984892, guid: 1fff7b948b9df454094acebb1a250420, type: 3} ---- !u!23 &6630209723659434613 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4478152415905981846} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: -876546973899608171, guid: 1fff7b948b9df454094acebb1a250420, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &4531622071966824957 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 433655013816737700} - - component: {fileID: 6858427813007926475} - - component: {fileID: 355728317239431683} - m_Layer: 0 - m_Name: Cube.001 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &433655013816737700 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4531622071966824957} - 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: 1313371464610265781} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6858427813007926475 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4531622071966824957} - m_Mesh: {fileID: 4493585093827132993, guid: 1fff7b948b9df454094acebb1a250420, type: 3} ---- !u!23 &355728317239431683 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4531622071966824957} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: -876546973899608171, guid: 1fff7b948b9df454094acebb1a250420, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &7971593296632072563 GameObject: m_ObjectHideFlags: 0 @@ -258,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1313371464610265781} - m_Layer: 0 + m_Layer: 10 m_Name: GunMesh m_TagString: Untagged m_Icon: {fileID: 0} @@ -273,16 +24,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7971593296632072563} 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_LocalRotation: {x: 0, y: -0.6808487, z: 0, w: 0.7324241} + m_LocalPosition: {x: -0.02, y: 0.32, z: 0.05} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5780878549155511367} - - {fileID: 433655013816737700} - - {fileID: 1936349321533376672} + - {fileID: 6705012398610737716} m_Father: {fileID: 6798321073873421098} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -85.82, z: 0} --- !u!1 &8363807481264483936 GameObject: m_ObjectHideFlags: 0 @@ -293,7 +42,7 @@ GameObject: m_Component: - component: {fileID: 6798321073873421098} - component: {fileID: 1169450665700565} - m_Layer: 0 + m_Layer: 10 m_Name: Gun m_TagString: Untagged m_Icon: {fileID: 0} @@ -310,7 +59,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.26252607, z: 0, w: 0.96492493} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.46, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1313371464610265781} @@ -333,8 +82,9 @@ MonoBehaviour: spawnpoint: {fileID: 0} bullet: {fileID: 939049122039926632, guid: 5bd04146a95212e41bc2c52b7079e131, type: 3} dataBullet: {fileID: 11400000, guid: cafd241bae342f446ae8141cc5d72daf, type: 2} + uI_Manager: {fileID: 0} reloadTime: 3 - schussInterval: 0 + schussInterval: 0.3 --- !u!1001 &5945913481014272002 PrefabInstance: m_ObjectHideFlags: 0 @@ -345,31 +95,31 @@ PrefabInstance: m_Modifications: - target: {fileID: 6557869798269101976, guid: 0d96e9e78ab544a4a98b8af026c4d9de, type: 3} propertyPath: m_LocalPosition.x - value: 0.50000054 + value: 0.388 objectReference: {fileID: 0} - target: {fileID: 6557869798269101976, guid: 0d96e9e78ab544a4a98b8af026c4d9de, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.271 objectReference: {fileID: 0} - target: {fileID: 6557869798269101976, guid: 0d96e9e78ab544a4a98b8af026c4d9de, type: 3} propertyPath: m_LocalPosition.z - value: -0 + value: 0.033 objectReference: {fileID: 0} - target: {fileID: 6557869798269101976, guid: 0d96e9e78ab544a4a98b8af026c4d9de, type: 3} propertyPath: m_LocalRotation.w - value: 0.70710677 + value: 0.65452266 objectReference: {fileID: 0} - target: {fileID: 6557869798269101976, guid: 0d96e9e78ab544a4a98b8af026c4d9de, type: 3} propertyPath: m_LocalRotation.x - value: 0.0000000037252894 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6557869798269101976, guid: 0d96e9e78ab544a4a98b8af026c4d9de, type: 3} propertyPath: m_LocalRotation.y - value: 0.70710677 + value: 0.7560424 objectReference: {fileID: 0} - target: {fileID: 6557869798269101976, guid: 0d96e9e78ab544a4a98b8af026c4d9de, type: 3} propertyPath: m_LocalRotation.z - value: -0.0000000030267977 + value: -0.000000008381901 objectReference: {fileID: 0} - target: {fileID: 6557869798269101976, guid: 0d96e9e78ab544a4a98b8af026c4d9de, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -377,7 +127,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6557869798269101976, guid: 0d96e9e78ab544a4a98b8af026c4d9de, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 90 + value: 98.233 objectReference: {fileID: 0} - target: {fileID: 6557869798269101976, guid: 0d96e9e78ab544a4a98b8af026c4d9de, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -397,3 +147,77 @@ Transform: m_CorrespondingSourceObject: {fileID: 6557869798269101976, guid: 0d96e9e78ab544a4a98b8af026c4d9de, type: 3} m_PrefabInstance: {fileID: 5945913481014272002} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6522976139201547743 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1313371464610265781} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 1fff7b948b9df454094acebb1a250420, type: 3} + propertyPath: m_Name + value: TestGun + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1fff7b948b9df454094acebb1a250420, type: 3} +--- !u!4 &6705012398610737716 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1fff7b948b9df454094acebb1a250420, type: 3} + m_PrefabInstance: {fileID: 6522976139201547743} + m_PrefabAsset: {fileID: 0} diff --git a/Plunderblock/Assets/PrefabsKevin/UI_Manager/UI_Manager.prefab b/Plunderblock/Assets/PrefabsKevin/UI_Manager/UI_Manager.prefab index 6e966ad..7c4b839 100644 --- a/Plunderblock/Assets/PrefabsKevin/UI_Manager/UI_Manager.prefab +++ b/Plunderblock/Assets/PrefabsKevin/UI_Manager/UI_Manager.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 5727695039551963900} - component: {fileID: 2434469387728785561} - component: {fileID: 2960011039421145447} - m_Layer: 5 + m_Layer: 10 m_Name: KillCounterImage m_TagString: Untagged m_Icon: {fileID: 0} @@ -26,7 +26,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 95360399556382469} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 0.51208, y: 0.51208, z: 0.51208} m_ConstrainProportionsScale: 0 m_Children: [] @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 474.6, y: 117.7} + m_AnchoredPosition: {x: 333, y: 182} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2434469387728785561 @@ -87,7 +87,7 @@ GameObject: - component: {fileID: 5479680313431462804} - component: {fileID: 4664400905834316538} - component: {fileID: 4267197517538283848} - m_Layer: 5 + m_Layer: 10 m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} @@ -109,6 +109,8 @@ RectTransform: - {fileID: 5727695039551963900} - {fileID: 8122374582367623759} - {fileID: 8625755030761962559} + - {fileID: 2959477609618284830} + - {fileID: 8291322521655549519} m_Father: {fileID: 5863193481701293955} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -151,7 +153,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 800, y: 600} @@ -190,7 +192,7 @@ GameObject: - component: {fileID: 8625755030761962559} - component: {fileID: 5976581110861851310} - component: {fileID: 3849697490979796718} - m_Layer: 5 + m_Layer: 10 m_Name: AnzahlKills m_TagString: Untagged m_Icon: {fileID: 0} @@ -205,7 +207,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3852534801679810867} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -213,7 +215,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 571.9, y: 86.9} + m_AnchoredPosition: {x: 432.4, y: 153.6} m_SizeDelta: {x: 134.5, y: 109.16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5976581110861851310 @@ -258,6 +260,81 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 0 +--- !u!1 &6068399790036257050 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8291322521655549519} + - component: {fileID: 1975687654998357338} + - component: {fileID: 2964539384639410256} + m_Layer: 10 + m_Name: AmmoImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8291322521655549519 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6068399790036257050} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.3094, y: 1.3094, z: 1.3094} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4822466156586256155} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -365, y: -191} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1975687654998357338 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6068399790036257050} + m_CullTransparentMesh: 1 +--- !u!114 &2964539384639410256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6068399790036257050} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 321c168a99aa45e42a02720f22419d39, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7027964462908259073 GameObject: m_ObjectHideFlags: 0 @@ -269,7 +346,7 @@ GameObject: - component: {fileID: 8122374582367623759} - component: {fileID: 2398027968399591841} - component: {fileID: 5955711930342696203} - m_Layer: 5 + m_Layer: 10 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -343,7 +420,7 @@ GameObject: m_Component: - component: {fileID: 5863193481701293955} - component: {fileID: 4766397035718395917} - m_Layer: 0 + m_Layer: 10 m_Name: UI_Manager m_TagString: Manager m_Icon: {fileID: 0} @@ -358,14 +435,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8142714974886293319} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0.6770687, z: -0, w: 0.73591983} + m_LocalRotation: {x: 0, y: -0.6770687, z: 0, w: 0.73591983} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4822466156586256155} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -85.23, z: 0} --- !u!114 &4766397035718395917 MonoBehaviour: m_ObjectHideFlags: 0 @@ -378,3 +455,83 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1271dbd420eb5b14dae4b24f833bb965, type: 3} m_Name: m_EditorClassIdentifier: + dataBullet: {fileID: 11400000, guid: cafd241bae342f446ae8141cc5d72daf, type: 2} +--- !u!1 &8432880909156175924 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2959477609618284830} + - component: {fileID: 8299924432777270250} + - component: {fileID: 5658134784964783748} + m_Layer: 10 + m_Name: Ammo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2959477609618284830 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8432880909156175924} + 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: 4822466156586256155} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -265, y: -231} + m_SizeDelta: {x: 134.5, y: 109.16} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8299924432777270250 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8432880909156175924} + m_CullTransparentMesh: 1 +--- !u!114 &5658134784964783748 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8432880909156175924} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 46 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 6 + m_MaxSize: 60 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 0 diff --git a/Plunderblock/Assets/Scenes/KevinSceneGun.unity b/Plunderblock/Assets/Scenes/KevinSceneGun.unity index 6e8442e..ee07a14 100644 --- a/Plunderblock/Assets/Scenes/KevinSceneGun.unity +++ b/Plunderblock/Assets/Scenes/KevinSceneGun.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} + m_IndirectSpecularColor: {r: 0.43930015, g: 0.48760659, b: 0.5678543, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1423,7 +1423,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!108 &1827603664 Light: m_ObjectHideFlags: 0