Large diffs are not rendered by default.

@@ -1,6 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
public class player_movment : MonoBehaviour,IDamageable {
public float speed;
public controller controller;
@@ -89,6 +90,10 @@ public void takeDamage(int damageTaken, int pointgain, player_movment player)
lives -= 1;
player.points += pointgain;
}
if(lives <= 0)
{
SceneManager.LoadScene("lose");
}
}
void respawn()
{
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

@@ -42,10 +42,10 @@ MonoBehaviour:
y: 30
width: 1920
height: 948
m_MinSize: {x: 708, y: 492}
m_MinSize: {x: 683, y: 492}
m_MaxSize: {x: 14004, y: 14042}
vertical: 0
controlID: 75
controlID: 10
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -60,19 +60,19 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1263
x: 1261
y: 0
width: 657
width: 659
height: 948
m_MinSize: {x: 302, y: 381}
m_MinSize: {x: 277, y: 71}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 16}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 16}
- {fileID: 15}
- {fileID: 14}
- {fileID: 13}
m_Selected: 0
m_Selected: 2
m_LastSelected: 1
--- !u!114 &4
MonoBehaviour:
@@ -90,7 +90,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 406
width: 404
height: 621
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
@@ -115,7 +115,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 621
width: 1263
width: 1261
height: 327
m_MinSize: {x: 232, y: 271}
m_MaxSize: {x: 10002, y: 10021}
@@ -207,7 +207,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1263
width: 1261
height: 948
m_MinSize: {x: 406, y: 492}
m_MaxSize: {x: 10002, y: 14042}
@@ -231,7 +231,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1263
width: 1261
height: 621
m_MinSize: {x: 406, y: 221}
m_MaxSize: {x: 8006, y: 4021}
@@ -251,20 +251,20 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 406
x: 404
y: 0
width: 857
height: 621
m_MinSize: {x: 204, y: 221}
m_MaxSize: {x: 4004, y: 4021}
m_ActualView: {fileID: 20}
m_ActualView: {fileID: 21}
m_Panes:
- {fileID: 17}
- {fileID: 20}
- {fileID: 17}
- {fileID: 21}
- {fileID: 12}
m_Selected: 1
m_LastSelected: 3
m_Selected: 2
m_LastSelected: 0
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -287,20 +287,22 @@ MonoBehaviour:
m_DepthBufferBits: 0
m_Pos:
serializedVersion: 2
x: -865
x: 406
y: 91
width: 496
height: 1150
width: 853
height: 600
m_ViewPositions:
m_KeySerializationHelper:
- {fileID: 1107683054910151436, guid: 00f25f03b6e8f174bb6553be1b5284f0, type: 2}
- {fileID: 1107889498345214088, guid: 6d1d07de7e459a34ba03ee53672ca328, type: 2}
m_ValueSerializationHelper:
- {x: 247.6, y: 394}
- {x: 463.80002, y: 39.600037}
m_PreviewAnimator: {fileID: 0}
m_AnimatorController: {fileID: 9100000, guid: 00f25f03b6e8f174bb6553be1b5284f0,
m_AnimatorController: {fileID: 9100000, guid: 6d1d07de7e459a34ba03ee53672ca328,
type: 2}
m_BreadCrumbs:
- m_Target: {fileID: 1107683054910151436, guid: 00f25f03b6e8f174bb6553be1b5284f0,
- m_Target: {fileID: 1107889498345214088, guid: 6d1d07de7e459a34ba03ee53672ca328,
type: 2}
m_ScrollPosition: {x: 0, y: 0}
stateMachineGraph: {fileID: 0}
@@ -310,7 +312,7 @@ MonoBehaviour:
m_AutoLiveLink: 1
m_MiniTool: 0
m_SerializedLocked: 0
m_CurrentEditor: 0
m_CurrentEditor: 1
m_LayerEditor:
m_SelectedLayerIndex: 0
--- !u!114 &13
@@ -361,11 +363,11 @@ MonoBehaviour:
m_DepthBufferBits: 0
m_Pos:
serializedVersion: 2
x: 1265
x: 1263
y: 91
width: 655
width: 657
height: 927
m_ScrollPosition: {x: 0, y: 0}
m_ScrollPosition: {x: 0, y: 135.95508}
m_InspectorMode: 0
m_PreviewResizer:
m_CachedPref: 239
@@ -446,10 +448,10 @@ MonoBehaviour:
m_DepthBufferBits: 0
m_Pos:
serializedVersion: 2
x: 394
x: 406
y: 91
width: 1146
height: 682
width: 853
height: 600
--- !u!114 &18
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -474,7 +476,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 712
width: 1261
width: 1259
height: 306
m_SearchFilter:
m_NameFilter:
@@ -497,24 +499,24 @@ MonoBehaviour:
m_LastProjectPath: C:\Users\s179057\Desktop\doom-candy\doom candy
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 75}
m_SelectedIDs: e8260000
m_LastClickedID: 9960
m_ExpandedIDs: 00000000a2260000ec260000cc270000522a0000fa2a000000ca9a3bffffff7f
scrollPos: {x: 0, y: 0}
m_SelectedIDs: ea260000
m_LastClickedID: 9962
m_ExpandedIDs: 00000000a4260000ea260000ee260000ce270000562a000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: Art
m_OriginalName: Art
m_Name:
m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 10892
m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 5}
m_SearchString:
@@ -528,7 +530,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000a2260000ec260000cc270000522a0000fa2a0000
m_ExpandedIDs: 00000000a4260000ee260000ce270000562a0000fe2a0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -556,7 +558,7 @@ MonoBehaviour:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000ee2a00003a2b000086f9dfff
m_ExpandedInstanceIDs: c6230000ee2a00003a2b000086f9dfff202a000016280000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -580,7 +582,7 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_NewAssetIndexInList: -1
m_ScrollPosition: {x: 0, y: 13}
m_ScrollPosition: {x: 0, y: 37}
m_GridSize: 64
m_DirectoriesAreaWidth: 115
--- !u!114 &19
@@ -607,13 +609,13 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 91
width: 404
width: 402
height: 600
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 6c17fcffd0a1fcfff2d9fbff
m_LastClickedID: -271886
m_ExpandedIDs: f4d9fbff6e17fcffd2a1fcff3867feff506afffff678ffff1afcffff0000000012310000
m_SelectedIDs: ae290000
m_LastClickedID: 0
m_ExpandedIDs: 6eaafcff34ebfeff38ebfeff70ebfeff74ebfeff7aebfeff8aebfeff8cebfefffa06ffff6c07ffff8c0cffff6aa9ffff36abffff1afcffff00000000f83d0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -658,19 +660,19 @@ MonoBehaviour:
m_DepthBufferBits: 32
m_Pos:
serializedVersion: 2
x: 408
x: 406
y: 91
width: 853
height: 600
m_SceneLighting: 1
lastFramingTime: 168.92539397869612
lastFramingTime: 592.6135254383488
m_2DMode: 0
m_isRotationLocked: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: -28.943842, y: -68.34246, z: -183.80663}
m_Target: {x: -86.335556, y: 59.86084, z: -47.893227}
speed: 2
m_Value: {x: -28.943842, y: -68.34246, z: -183.80663}
m_Value: {x: -86.335556, y: 59.86084, z: -47.893227}
m_RenderMode: 0
m_ValidateTrueMetals: 0
m_SceneViewState:
@@ -693,18 +695,18 @@ MonoBehaviour:
speed: 2
m_Value: 0
m_Rotation:
m_Target: {x: -0.06083379, y: -0.91306156, z: 0.37508816, w: -0.14807723}
m_Target: {x: -0.24195111, y: -0.72193474, z: 0.30547178, w: -0.5718014}
speed: 2
m_Value: {x: -0.06083379, y: -0.91306156, z: 0.37508816, w: -0.14807723}
m_Value: {x: -0.24195111, y: -0.72193474, z: 0.30547178, w: -0.5718014}
m_Size:
m_Target: 223.13795
m_Target: 3.8669417
speed: 2
m_Value: 223.13795
m_Value: 3.8669417
m_Ortho:
m_Target: 0
speed: 2
m_Value: 0
m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0}
m_LastSceneViewRotation: {x: -0.004318643, y: 0.9954893, z: -0.056590408, w: -0.07602611}
m_LastSceneViewOrtho: 0
m_ReplacementShader: {fileID: 0}
m_ReplacementString:
@@ -732,10 +734,10 @@ MonoBehaviour:
m_DepthBufferBits: 32
m_Pos:
serializedVersion: 2
x: 394
x: 406
y: 91
width: 1146
height: 656
width: 853
height: 600
m_MaximizeOnPlay: 0
m_Gizmos: 0
m_Stats: 0
@@ -744,45 +746,45 @@ MonoBehaviour:
m_ZoomArea:
m_HRangeLocked: 0
m_VRangeLocked: 0
m_HBaseRangeMin: -573
m_HBaseRangeMax: 573
m_VBaseRangeMin: -319.5
m_VBaseRangeMax: 319.5
m_HBaseRangeMin: -426.5
m_HBaseRangeMax: 426.5
m_VBaseRangeMin: -291.5
m_VBaseRangeMax: 291.5
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
m_VAllowExceedBaseRangeMax: 1
m_ScaleWithWindow: 0
m_HSlider: 0
m_VSlider: 0
m_HSlider: 1
m_VSlider: 1
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 0
m_EnableMouseInput: 1
m_EnableSliderZoom: 0
m_UniformScale: 1
m_UpDirection: 1
m_DrawArea:
serializedVersion: 2
x: 0
y: 17
width: 1146
height: 639
m_Scale: {x: 1, y: 1}
m_Translation: {x: 573, y: 319.5}
width: 853
height: 583
m_Scale: {x: 1.0609, y: 1.0609}
m_Translation: {x: 412.96567, y: 290.78854}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -573
y: -319.5
width: 1146
height: 639
x: -389.25977
y: -274.0961
width: 804.0343
height: 549.53345
m_MinimalGUI: 1
m_defaultScale: 1
m_TargetTexture: {fileID: 0}
m_CurrentColorSpace: 0
m_LastWindowPixelSize: {x: 1146, y: 656}
m_LastWindowPixelSize: {x: 853, y: 600}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000100000100
@@ -810,5 +812,5 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 712
width: 1261
width: 1259
height: 306
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN +2.41 KB (100%) doom candy/Library/assetDatabase3
Binary file not shown.
BIN +0 Bytes (100%) doom candy/Library/expandedItems
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,2 +1,12 @@
Base path: C:/Program Files/Unity2017/Editor/Data
Cmd: initializeCompiler
Cmd: compileSnippet
api=4 type=0 insize=13607 outsize=1818 kw=DIRECTIONAL pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME ok=1
Cmd: compileSnippet
api=4 type=1 insize=13607 outsize=1262 kw=DIRECTIONAL pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME ok=1
Cmd: compileSnippet
api=4 type=0 insize=3902 outsize=1150 kw=DIRECTIONAL pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME ok=1
Cmd: compileSnippet
api=4 type=1 insize=3902 outsize=1190 kw=DIRECTIONAL pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME ok=1
Cmd: compileSnippet
api=4 type=0 insize=1468 outsize=2094 kw=DIRECTIONAL DIRLIGHTMAP_COMBINED DYNAMICLIGHTMAP_ON VERTEXLIGHT_ON _ALPHAPREMULTIPLY_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME ok=1