mirror of
https://github.com/frizbee19/FebGameJam.git
synced 2026-09-11 08:17:01 +00:00
progress recovered
This commit is contained in:
Rizvee committed
1 parent
d49638100e
commit
0629824797
23 files changed
+4372
-543
No files matched your search
@@ -161,7 +161,7 @@ AnimatorStateMachine:
|
||||
m_Position: {x: 410, y: -320, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_StateMachine: {fileID: 2725725133087353897}
|
||||
m_Position: {x: 140, y: -320, z: 0}
|
||||
m_Position: {x: 140, y: -310, z: 0}
|
||||
m_AnyStateTransitions:
|
||||
- {fileID: 5226731004042896544}
|
||||
- {fileID: -8928688994004155217}
|
||||
|
||||
@@ -92,7 +92,7 @@ TextureImporter:
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
textureCompression: 0
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
@@ -104,7 +104,7 @@ TextureImporter:
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
textureCompression: 0
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
|
||||
+171
-41
@@ -41,7 +41,7 @@ Texture2D:
|
||||
m_ColorSpace: 0
|
||||
m_PlatformBlob:
|
||||
image data: 1048576
|
||||
_typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020507080e11131310090907030608090d0f100f09090703030709090d0f0f0c07070401000000000000000000000000000000000306070707070707070707070707070707070707070707070707070707070707070707070707070707070706050300000000000000000000000000000000000003060707060400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020507080b0e101212131312100d0a06060300000000000000000000000000000000000000000000000000000000000005080a0b13110d08080602000000000000000000000000000000000000000000000000000000000000000000000000030608090b080705020000000000000000000000000000000000000000000000000000000000000000000001040707080707040100000000000000000000000000000000000000000000000000000000000000000000000000000307090911130f07060400000000000000000000000105090b0b11100a090704000000000000000000000000000000000307090911130f0706040000000000000000000406070d100e0808060200000000000000000407090a111310080705020000000000000000000000000000000000000000000000010406070b0f11121312110e0a070603020507081013110a09070400000000000000000000000000000000000000030709090f0d07060400000000000000000000000000000000000000000000000000000000000002060a0c0d13110c0706040000000000000000000000000002070a0c0d12120e070604000000000000000000000000000000000000000306060b101213131313131313121212111111100f0f0e0d0c0a09070705010000000000000000000000000000000000000000000000000000000000000000030608090d0f1112131212100d0a07060400000000000000000000000000000000000000000000000000000000000000000000000000000000010406070b0d10111213131312100f0c09070603000000000000000000000000000000000000000000000000000003080b0d0e1312100a0a080400000000000000000000000000000000000000000000000000000306060e13110a090704000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000406070d100e080705020000000000000000000000000000000000000000000000000000000000020507080b0e101112131312100e0b070704010000000000000000000000000000000000000000000000000000000406070f12120a0a08040000000000000000000000000000000000000000010406070d1110090806030000000000000000000000000000000000000002090e1214151b1e201f1d1615130f1215151a1c1d1c1615130f0f1315161a1b1c191413110d0801000000000000000000000000060c1012131414141414141414141414141414141414141414141414141414141414141414141414141414141413120f0b060000000000000000000000000000060b1012131313100c0700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003080e111414181b1d1e1f201f1e1d1a1613120f0b060000000000000000000000000000000000000000000000000000060c111517181f1e1a1514120e09030000000000000000000000000000000000000000000000000000000000000000030a0f121515181514120e090300000000000000000000000000000000000000000000000000000000000002080d111314151413110d080100000000000000000000000000000000000000000000000000000000000000000000040a0f1315161e1f1b1313100c070000000000000000060c111517181e1d171614100b05000000000000000000000000040a0f1315161e1f1c1413100c070100000000070c1012131a1d1b1514120e0903Line truncated
|
||||
_typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020507080e11131310090907030608090d0f100f09090703030709090d0f0f0c07070401000000000000000000000000000000000306070707070707070707070707070707070707070707070707070707070707070707070707070707070706050300000000000000000000000000000000000003060707060400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020507080b0e101212131312100d0a06060300000000000000000000000000000000000000000000000000000000000005080a0b13110d08080602000000000000000000000000000000000000000000000000000000000000000000000000030608090b080705020000000000000000000000000000000000000000000000000000000000000000000001040707080707040100000000000000000000000000000000000000000000000000000000000000000000000000000307090911130f07060400000000000000000000000105090b0b11100a090704000000000000000000000000000000000307090911130f0706040000000000000000000406070d100e0808060200000000000000000407090a111310080705020000000000000000000000000000000000000000000000010406070b0f11121312110e0a070603020507081013110a09070400000000000000000000000000000000000000030709090f0d07060400000000000000000000000000000000000000000000000000000000000002060a0c0d13110c0706040000000000000000000000000002070a0c0d12120e070604000000000000000000000000000000000000000306060b101213131313131313121212111111100f0f0e0d0c0a09070705010000000000000000000000000000000000000000000000000000000000000000030608090d0f1112131212100d0a07060400000000000000000000000000000000000000000000000000000000000000000000000000000000010406070b0d10111213131312100f0c09070603000000000000000000000000000000000000000000000000000003080b0d0e1312100a0a080400000000000000000000000000000000000000000000000000000306060e13110a090704000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000406070d100e080705020000000000000000000000000000000000000000000000000000000000020507080b0e101112131312100e0b070704010000000000000000000000000000000000000000000000000000000406070f12120a0a08040000000000000000000000000000000000000000010406070d1110090806030000000000000000000000000000000000000002090e1214151b1e201f1d1615130f1215151a1c1d1c1615130f0f1315161a1b1c191413110d0801000000000000000000000000060c1012131414141414141414141414141414141414141414141414141414141414141414141414141414141413120f0b060000000000000000000000000000060b1012131313100c0700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003080e111414181b1d1e1f201f1e1d1a1613120f0b060000000000000000000000000000000000000000000000000000060c111517181f1e1a1514120e09030000000000000000000000000000000000000000000000000000000000000000030a0f121515181514120e090300000000000000000000000000000000000000000000000000000000000002080d111314151413110d080100000000000000000000000000000000000000000000000000000000000000000000040a0f1315161e1f1b1313100c070000000000000000060c111517181e1d171614100b05000000000000000000000000040a0f1315161e1f1c1413100c070100000000070c1012131a1d1b1514120e0903Line truncated
|
||||
m_StreamData:
|
||||
serializedVersion: 2
|
||||
offset: 0
|
||||
@@ -775,6 +775,48 @@ MonoBehaviour:
|
||||
m_Height: 9
|
||||
m_Scale: 1
|
||||
m_AtlasIndex: 0
|
||||
- m_Index: 56
|
||||
m_Metrics:
|
||||
m_Width: 59.984375
|
||||
m_Height: 60.078125
|
||||
m_HorizontalBearingX: 2.421875
|
||||
m_HorizontalBearingY: 59.984375
|
||||
m_HorizontalAdvance: 64.734375
|
||||
m_GlyphRect:
|
||||
m_X: 553
|
||||
m_Y: 89
|
||||
m_Width: 61
|
||||
m_Height: 61
|
||||
m_Scale: 1
|
||||
m_AtlasIndex: 0
|
||||
- m_Index: 14
|
||||
m_Metrics:
|
||||
m_Width: 22.1875
|
||||
m_Height: 5.84375
|
||||
m_HorizontalBearingX: 6.59375
|
||||
m_HorizontalBearingY: 32.390625
|
||||
m_HorizontalAdvance: 36.515625
|
||||
m_GlyphRect:
|
||||
m_X: 418
|
||||
m_Y: 119
|
||||
m_Width: 23
|
||||
m_Height: 7
|
||||
m_Scale: 1
|
||||
m_AtlasIndex: 0
|
||||
- m_Index: 192
|
||||
m_Metrics:
|
||||
m_Width: 6.859375
|
||||
m_Height: 59.546875
|
||||
m_HorizontalBearingX: 4.265625
|
||||
m_HorizontalBearingY: 59.984375
|
||||
m_HorizontalAdvance: 17.1875
|
||||
m_GlyphRect:
|
||||
m_X: 215
|
||||
m_Y: 238
|
||||
m_Width: 8
|
||||
m_Height: 60
|
||||
m_Scale: 1
|
||||
m_AtlasIndex: 0
|
||||
m_CharacterTable:
|
||||
- m_ElementType: 1
|
||||
m_Unicode: 32
|
||||
@@ -972,6 +1014,18 @@ MonoBehaviour:
|
||||
m_Unicode: 8230
|
||||
m_GlyphIndex: 98
|
||||
m_Scale: 1
|
||||
- m_ElementType: 1
|
||||
m_Unicode: 87
|
||||
m_GlyphIndex: 56
|
||||
m_Scale: 1
|
||||
- m_ElementType: 1
|
||||
m_Unicode: 45
|
||||
m_GlyphIndex: 14
|
||||
m_Scale: 1
|
||||
- m_ElementType: 1
|
||||
m_Unicode: 33
|
||||
m_GlyphIndex: 192
|
||||
m_Scale: 1
|
||||
m_AtlasTextures:
|
||||
- {fileID: -583831555312551904}
|
||||
m_AtlasTextureIndex: 0
|
||||
@@ -1170,6 +1224,18 @@ MonoBehaviour:
|
||||
m_Y: 79
|
||||
m_Width: 61
|
||||
m_Height: 79
|
||||
- m_X: 543
|
||||
m_Y: 79
|
||||
m_Width: 80
|
||||
m_Height: 80
|
||||
- m_X: 408
|
||||
m_Y: 109
|
||||
m_Width: 42
|
||||
m_Height: 26
|
||||
- m_X: 205
|
||||
m_Y: 228
|
||||
m_Width: 27
|
||||
m_Height: 79
|
||||
m_FreeGlyphRects:
|
||||
- m_X: 100
|
||||
m_Y: 24
|
||||
@@ -1183,10 +1249,6 @@ MonoBehaviour:
|
||||
m_Y: 56
|
||||
m_Width: 11
|
||||
m_Height: 20
|
||||
- m_X: 543
|
||||
m_Y: 53
|
||||
m_Width: 17
|
||||
m_Height: 970
|
||||
- m_X: 283
|
||||
m_Y: 52
|
||||
m_Width: 20
|
||||
@@ -1243,14 +1305,6 @@ MonoBehaviour:
|
||||
m_Y: 206
|
||||
m_Width: 49
|
||||
m_Height: 22
|
||||
- m_X: 205
|
||||
m_Y: 236
|
||||
m_Width: 818
|
||||
m_Height: 787
|
||||
- m_X: 205
|
||||
m_Y: 228
|
||||
m_Width: 31
|
||||
m_Height: 795
|
||||
- m_X: 150
|
||||
m_Y: 307
|
||||
m_Width: 873
|
||||
@@ -1275,46 +1329,62 @@ MonoBehaviour:
|
||||
m_Y: 262
|
||||
m_Width: 8
|
||||
m_Height: 761
|
||||
- m_X: 408
|
||||
m_Y: 109
|
||||
m_Width: 43
|
||||
m_Height: 914
|
||||
- m_X: 508
|
||||
m_Y: 56
|
||||
m_Width: 9
|
||||
m_Height: 967
|
||||
- m_X: 543
|
||||
m_Y: 79
|
||||
m_Width: 300
|
||||
m_Height: 944
|
||||
- m_X: 1020
|
||||
m_Y: 0
|
||||
m_Width: 3
|
||||
m_Height: 1023
|
||||
- m_X: 333
|
||||
m_Y: 135
|
||||
m_Width: 570
|
||||
m_Height: 888
|
||||
- m_X: 279
|
||||
m_Y: 158
|
||||
m_Width: 744
|
||||
m_Height: 865
|
||||
- m_X: 279
|
||||
m_Y: 150
|
||||
m_Width: 624
|
||||
m_Height: 873
|
||||
- m_X: 508
|
||||
m_Y: 132
|
||||
m_Width: 395
|
||||
m_Height: 891
|
||||
- m_X: 543
|
||||
m_Y: 82
|
||||
m_Width: 360
|
||||
m_Height: 941
|
||||
- m_X: 1018
|
||||
m_Y: 79
|
||||
m_Width: 5
|
||||
m_Height: 944
|
||||
- m_X: 543
|
||||
m_Y: 53
|
||||
m_Width: 17
|
||||
m_Height: 26
|
||||
- m_X: 623
|
||||
m_Y: 79
|
||||
m_Width: 220
|
||||
m_Height: 944
|
||||
- m_X: 333
|
||||
m_Y: 135
|
||||
m_Width: 210
|
||||
m_Height: 888
|
||||
- m_X: 279
|
||||
m_Y: 159
|
||||
m_Width: 744
|
||||
m_Height: 864
|
||||
- m_X: 623
|
||||
m_Y: 158
|
||||
m_Width: 400
|
||||
m_Height: 865
|
||||
- m_X: 279
|
||||
m_Y: 150
|
||||
m_Width: 264
|
||||
m_Height: 873
|
||||
- m_X: 508
|
||||
m_Y: 132
|
||||
m_Width: 35
|
||||
m_Height: 891
|
||||
- m_X: 623
|
||||
m_Y: 82
|
||||
m_Width: 280
|
||||
m_Height: 941
|
||||
- m_X: 450
|
||||
m_Y: 109
|
||||
m_Width: 1
|
||||
m_Height: 914
|
||||
- m_X: 232
|
||||
m_Y: 236
|
||||
m_Width: 791
|
||||
m_Height: 787
|
||||
- m_X: 232
|
||||
m_Y: 228
|
||||
m_Width: 4
|
||||
m_Height: 795
|
||||
m_fontInfo:
|
||||
Name:
|
||||
PointSize: 0
|
||||
@@ -2652,6 +2722,66 @@ MonoBehaviour:
|
||||
m_XAdvance: 0
|
||||
m_YAdvance: 0
|
||||
m_FeatureLookupFlags: 0
|
||||
- m_FirstAdjustmentRecord:
|
||||
m_GlyphIndex: 56
|
||||
m_GlyphValueRecord:
|
||||
m_XPlacement: 0
|
||||
m_YPlacement: 0
|
||||
m_XAdvance: -5.1875
|
||||
m_YAdvance: 0
|
||||
m_SecondAdjustmentRecord:
|
||||
m_GlyphIndex: 13
|
||||
m_GlyphValueRecord:
|
||||
m_XPlacement: 0
|
||||
m_YPlacement: 0
|
||||
m_XAdvance: 0
|
||||
m_YAdvance: 0
|
||||
m_FeatureLookupFlags: 0
|
||||
- m_FirstAdjustmentRecord:
|
||||
m_GlyphIndex: 56
|
||||
m_GlyphValueRecord:
|
||||
m_XPlacement: 0
|
||||
m_YPlacement: 0
|
||||
m_XAdvance: -3.390625
|
||||
m_YAdvance: 0
|
||||
m_SecondAdjustmentRecord:
|
||||
m_GlyphIndex: 15
|
||||
m_GlyphValueRecord:
|
||||
m_XPlacement: 0
|
||||
m_YPlacement: 0
|
||||
m_XAdvance: 0
|
||||
m_YAdvance: 0
|
||||
m_FeatureLookupFlags: 0
|
||||
- m_FirstAdjustmentRecord:
|
||||
m_GlyphIndex: 83
|
||||
m_GlyphValueRecord:
|
||||
m_XPlacement: 0
|
||||
m_YPlacement: 0
|
||||
m_XAdvance: -3.828125
|
||||
m_YAdvance: 0
|
||||
m_SecondAdjustmentRecord:
|
||||
m_GlyphIndex: 14
|
||||
m_GlyphValueRecord:
|
||||
m_XPlacement: 0
|
||||
m_YPlacement: 0
|
||||
m_XAdvance: 0
|
||||
m_YAdvance: 0
|
||||
m_FeatureLookupFlags: 0
|
||||
- m_FirstAdjustmentRecord:
|
||||
m_GlyphIndex: 56
|
||||
m_GlyphValueRecord:
|
||||
m_XPlacement: 0
|
||||
m_YPlacement: 0
|
||||
m_XAdvance: -4.4375
|
||||
m_YAdvance: 0
|
||||
m_SecondAdjustmentRecord:
|
||||
m_GlyphIndex: 14
|
||||
m_GlyphValueRecord:
|
||||
m_XPlacement: 0
|
||||
m_YPlacement: 0
|
||||
m_XAdvance: 0
|
||||
m_YAdvance: 0
|
||||
m_FeatureLookupFlags: 0
|
||||
fallbackFontAssets: []
|
||||
m_FallbackFontAssetTable: []
|
||||
m_CreationSettings:
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 65e090635e24dee49962d1fef61d9acc
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,67 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1001 &8985948654193471427
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3273332465898711765, guid: 7ec8f26fbc4fb8e44b45d6746bef71d2, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: BlackBird
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3273332465898711768, guid: 7ec8f26fbc4fb8e44b45d6746bef71d2, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3273332465898711768, guid: 7ec8f26fbc4fb8e44b45d6746bef71d2, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3273332465898711768, guid: 7ec8f26fbc4fb8e44b45d6746bef71d2, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3273332465898711768, guid: 7ec8f26fbc4fb8e44b45d6746bef71d2, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3273332465898711768, guid: 7ec8f26fbc4fb8e44b45d6746bef71d2, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3273332465898711768, guid: 7ec8f26fbc4fb8e44b45d6746bef71d2, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3273332465898711768, guid: 7ec8f26fbc4fb8e44b45d6746bef71d2, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3273332465898711768, guid: 7ec8f26fbc4fb8e44b45d6746bef71d2, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3273332465898711768, guid: 7ec8f26fbc4fb8e44b45d6746bef71d2, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3273332465898711768, guid: 7ec8f26fbc4fb8e44b45d6746bef71d2, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3273332465898711768, guid: 7ec8f26fbc4fb8e44b45d6746bef71d2, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3273332465898711770, guid: 7ec8f26fbc4fb8e44b45d6746bef71d2, type: 3}
|
||||
propertyPath: birdType
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3273332465898711771, guid: 7ec8f26fbc4fb8e44b45d6746bef71d2, type: 3}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: 2330809101688847166, guid: d06424b435e03449d8a18a49e7790beb, type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 7ec8f26fbc4fb8e44b45d6746bef71d2, type: 3}
|
||||
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 252e77ab1b7341045b4689c1a700c16b
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,143 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1001 &5745520443551614522
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 7120480105423891680, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: animator
|
||||
value:
|
||||
objectReference: {fileID: 1890188396}
|
||||
- target: {fileID: 7120480105423891680, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: birdType
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891680, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: despawnTimer
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891681, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: -4105620447730128996, guid: d06424b435e03449d8a18a49e7790beb, type: 3}
|
||||
- target: {fileID: 7120480105423891681, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891681, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_Color.g
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891681, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_Color.r
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891681, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_SortingLayer
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891681, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_SortingLayerID
|
||||
value: 1027733709
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891683, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_Mass
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891684, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_Size.y
|
||||
value: 0.21
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891684, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.oldSize.x
|
||||
value: 1.5625
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891684, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.oldSize.y
|
||||
value: 1.625
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891695, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: BlueBird Variant
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891695, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
--- !u!1 &3273332465898711765 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7120480105423891695, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
m_PrefabInstance: {fileID: 5745520443551614522}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!95 &1890188396
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3273332465898711765}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 9d84d15e07b8148188b6bcbec994dc2a, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7ec8f26fbc4fb8e44b45d6746bef71d2
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,169 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &163317180617266704
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 163317180617266715}
|
||||
- component: {fileID: 163317180617266716}
|
||||
- component: {fileID: 163317180617266717}
|
||||
- component: {fileID: 163317180617266718}
|
||||
- component: {fileID: 163317180617266719}
|
||||
- component: {fileID: 163317180617266714}
|
||||
m_Layer: 7
|
||||
m_Name: Meanbird
|
||||
m_TagString: Enemy
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &163317180617266715
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 163317180617266704}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 3.04, y: -0.36, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &163317180617266716
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 163317180617266704}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||
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: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 1027733709
|
||||
m_SortingLayer: 2
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: 2617103501248111988, guid: d06424b435e03449d8a18a49e7790beb, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!114 &163317180617266717
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 163317180617266704}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e2ac1ab11e649f44588372b17008679c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
animator: {fileID: 163317180617266719}
|
||||
runSpeed: 25
|
||||
detectRange: 6
|
||||
--- !u!50 &163317180617266718
|
||||
Rigidbody2D:
|
||||
serializedVersion: 4
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 163317180617266704}
|
||||
m_BodyType: 0
|
||||
m_Simulated: 1
|
||||
m_UseFullKinematicContacts: 0
|
||||
m_UseAutoMass: 0
|
||||
m_Mass: 1
|
||||
m_LinearDrag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_GravityScale: 0
|
||||
m_Material: {fileID: 0}
|
||||
m_Interpolate: 0
|
||||
m_SleepingMode: 1
|
||||
m_CollisionDetection: 0
|
||||
m_Constraints: 0
|
||||
--- !u!95 &163317180617266719
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 163317180617266704}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 9d84d15e07b8148188b6bcbec994dc2a, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!61 &163317180617266714
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 163317180617266704}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 1
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
oldSize: {x: 1.5625, y: 1.625}
|
||||
newSize: {x: 1, y: 1}
|
||||
adaptiveTilingThreshold: 0.5
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1.5625, y: 1.625}
|
||||
m_EdgeRadius: 0
|
||||
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 24703a164a2a76543a78e4c1a3a3bdcd
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -229,6 +229,7 @@ GameObject:
|
||||
- component: {fileID: 5439994587591701586}
|
||||
- component: {fileID: 5439994587591701613}
|
||||
- component: {fileID: 5439994587591701612}
|
||||
- component: {fileID: 4726786242617749443}
|
||||
m_Layer: 3
|
||||
m_Name: Char Movement
|
||||
m_TagString: Player
|
||||
@@ -277,6 +278,7 @@ MonoBehaviour:
|
||||
m_CeilingCheck: {fileID: 5439994588348099274}
|
||||
m_CrouchDisableCollider: {fileID: 5439994587591701586}
|
||||
m_Grounded: 0
|
||||
m_FacingRight: 1
|
||||
m_Velocity: {x: 0, y: 0, z: 0}
|
||||
OnLandEvent:
|
||||
m_PersistentCalls:
|
||||
@@ -361,8 +363,32 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
controller: {fileID: 5439994587591701584}
|
||||
animator: {fileID: 5439994586602100319}
|
||||
health: {fileID: 0}
|
||||
health: {fileID: 4726786242617749443}
|
||||
healthBarAnimator: {fileID: 0}
|
||||
runSpeed: 40
|
||||
--- !u!114 &4726786242617749443
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5439994587591701614}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0ea69ce370e264d42b693f40a13a25b5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
startingHealth: 3
|
||||
damageTimeout: 1
|
||||
currentHealth: 0
|
||||
isInvincible: 0
|
||||
isDead: 0
|
||||
OnDead:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
OnHit:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &5439994588348099269
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -6,7 +6,8 @@ public class Bird : MonoBehaviour
|
||||
{
|
||||
// Start is called before the first frame update
|
||||
|
||||
public Movement controller;
|
||||
// public Movement controller;
|
||||
public int birdType;
|
||||
public Animator animator;
|
||||
public float horizontalMove = -1f;
|
||||
[SerializeField] float runSpeed = 40f;
|
||||
@@ -23,6 +24,7 @@ public class Bird : MonoBehaviour
|
||||
{
|
||||
m_Rigidbody2D = GetComponent<Rigidbody2D>();
|
||||
horizontalMove *= runSpeed;
|
||||
animator.SetInteger("Animation", birdType);
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class DestroyTrigger : Trigger
|
||||
{
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
public override void Action() {
|
||||
Destroy(this.gameObject);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 63df55f0b85b8794da1ed45e67db5bd2
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -5,7 +5,7 @@ using UnityEngine;
|
||||
public class MeanBird : MonoBehaviour
|
||||
{
|
||||
// Start is called before the first frame update
|
||||
public Movement controller;
|
||||
// public Movement controller;
|
||||
public Animator animator;
|
||||
[SerializeField] float runSpeed = 5.0f;
|
||||
// private Rigidbody2D m_Rigidbody2D;
|
||||
@@ -23,6 +23,7 @@ public class MeanBird : MonoBehaviour
|
||||
void Start()
|
||||
{
|
||||
player = GameObject.FindGameObjectWithTag("Player").transform;
|
||||
animator.SetInteger("Animation", 2);
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
@@ -44,6 +45,7 @@ public class MeanBird : MonoBehaviour
|
||||
direction = player.position - transform.position;
|
||||
if(direction.magnitude < detectRange) {
|
||||
attack = true;
|
||||
animator.SetInteger("Animation", 3);
|
||||
Debug.Log("attack");
|
||||
|
||||
}
|
||||
@@ -60,4 +62,9 @@ public class MeanBird : MonoBehaviour
|
||||
elapsed += Time.fixedDeltaTime;
|
||||
}
|
||||
}
|
||||
private void OnTriggerEnter2D(Collider2D collision) {
|
||||
if (collision.tag == "Player") {
|
||||
collision.GetComponent<Health>().takeHit();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -17,7 +17,9 @@ public class PlayerMovement : MonoBehaviour {
|
||||
void Awake() {
|
||||
if (health == null) {
|
||||
Debug.Log("Health not found! Please attach the Health script to the player so the player can take damage.");
|
||||
} else {
|
||||
}
|
||||
Debug.Log(health);
|
||||
if (health != null) {
|
||||
health.OnHit.AddListener(OnHit);
|
||||
health.OnDead.AddListener(OnDead);
|
||||
}
|
||||
@@ -26,6 +28,10 @@ public class PlayerMovement : MonoBehaviour {
|
||||
// Update is called once per frame
|
||||
void Update() {
|
||||
horizontalMove = Input.GetAxisRaw("Horizontal") * runSpeed;
|
||||
|
||||
if (healthBarAnimator != null) {
|
||||
healthBarAnimator.SetInteger("Health", health.currentHealth);
|
||||
}
|
||||
|
||||
if (Input.GetButtonDown("Jump")) {
|
||||
jump = true;
|
||||
@@ -67,6 +73,10 @@ public class PlayerMovement : MonoBehaviour {
|
||||
if (other.gameObject.tag == "Platform") {
|
||||
transform.parent = other.transform;
|
||||
}
|
||||
// if(other.gameObject.tag == "Enemy") {
|
||||
// Debug.Log("take hit");
|
||||
// health.takeHit();
|
||||
// }
|
||||
// if(other.gameObject.tag == "Detection") {
|
||||
// Debug.Log("detect");
|
||||
// other.gameObject.GetComponent<MeanBird>().Detected(transform.position - other.gameObject.transform.position);
|
||||
|
||||
@@ -63,4 +63,22 @@ public class Platform : MonoBehaviour
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
void OnCollisionEnter2D (Collision2D other) {
|
||||
if (other.gameObject.tag == "Player") {
|
||||
other.gameObject.transform.parent = transform;
|
||||
}
|
||||
// if(other.gameObject.tag == "Enemy") {
|
||||
// Debug.Log("take hit");
|
||||
// health.takeHit();
|
||||
// }
|
||||
// if(other.gameObject.tag == "Detection") {
|
||||
// Debug.Log("detect");
|
||||
// other.gameObject.GetComponent<MeanBird>().Detected(transform.position - other.gameObject.transform.position);
|
||||
// }
|
||||
}
|
||||
void OnCollisionExit2D (Collision2D other) {
|
||||
if (other.gameObject.tag == "Platform") {
|
||||
transform.parent = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -46,7 +46,7 @@ public abstract class Trigger : MonoBehaviour
|
||||
}
|
||||
}
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
public void Update()
|
||||
{
|
||||
// Debug.Log("testr");
|
||||
//checks if conditions are right
|
||||
@@ -57,7 +57,9 @@ public abstract class Trigger : MonoBehaviour
|
||||
{
|
||||
Action();
|
||||
hasOccurred = true;
|
||||
isActive = false;
|
||||
if(!repeatable) {
|
||||
isActive = false;
|
||||
}
|
||||
}
|
||||
//only executes action if input is pressed
|
||||
else
|
||||
|
||||
+151
-469
@@ -136,7 +136,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7572907803847010131, guid: b30f4c52408981c4c9fee33982f969d0, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 5
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7572907803847010131, guid: b30f4c52408981c4c9fee33982f969d0, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@@ -254,7 +254,7 @@ SpriteRenderer:
|
||||
m_SortingLayer: -1
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: 21300000, guid: 0277505f437a91b4981c4caa67567451, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
@@ -278,127 +278,6 @@ Transform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &282791051
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 282791054}
|
||||
- component: {fileID: 282791053}
|
||||
- component: {fileID: 282791052}
|
||||
- component: {fileID: 282791055}
|
||||
m_Layer: 0
|
||||
m_Name: Meanbird
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!114 &282791052
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 282791051}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e2ac1ab11e649f44588372b17008679c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
controller: {fileID: 0}
|
||||
animator: {fileID: 0}
|
||||
runSpeed: 25
|
||||
detectRange: 6
|
||||
--- !u!212 &282791053
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 282791051}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||
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: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!4 &282791054
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 282791051}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 3.28, y: 3.3, z: 0}
|
||||
m_LocalScale: {x: 3, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!50 &282791055
|
||||
Rigidbody2D:
|
||||
serializedVersion: 4
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 282791051}
|
||||
m_BodyType: 0
|
||||
m_Simulated: 1
|
||||
m_UseFullKinematicContacts: 0
|
||||
m_UseAutoMass: 0
|
||||
m_Mass: 1
|
||||
m_LinearDrag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_GravityScale: 0
|
||||
m_Material: {fileID: 0}
|
||||
m_Interpolate: 0
|
||||
m_SleepingMode: 1
|
||||
m_CollisionDetection: 0
|
||||
m_Constraints: 0
|
||||
--- !u!1 &532366117
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -482,36 +361,6 @@ Transform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &606059878
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 606059879}
|
||||
m_Layer: 3
|
||||
m_Name: Ground Check
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &606059879
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 606059878}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: -0.747, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1536876606}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &814501014
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -522,8 +371,8 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 814501017}
|
||||
- component: {fileID: 814501016}
|
||||
- component: {fileID: 814501015}
|
||||
- component: {fileID: 814501018}
|
||||
- component: {fileID: 814501015}
|
||||
m_Layer: 8
|
||||
m_Name: spawntest
|
||||
m_TagString: Event
|
||||
@@ -546,9 +395,9 @@ MonoBehaviour:
|
||||
forceInteract: 1
|
||||
repeatable: 0
|
||||
value: 0
|
||||
despawnTimer: 3
|
||||
entity: {fileID: 1890188395}
|
||||
startPos: {x: 4, y: 1}
|
||||
despawnTimer: 5
|
||||
entity: {fileID: 1489501924}
|
||||
startPos: {x: 0, y: 0}
|
||||
--- !u!61 &814501016
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -587,7 +436,7 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 9
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!50 &814501018
|
||||
Rigidbody2D:
|
||||
@@ -699,185 +548,76 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 4847344a5a8497746b1fabd92e4360ea, type: 3}
|
||||
--- !u!1 &1066164919
|
||||
GameObject:
|
||||
--- !u!1001 &1375110497
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1066164920}
|
||||
m_Layer: 3
|
||||
m_Name: Ceiling Check
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1066164920
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1066164919}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0.767, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1536876606}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1536876600
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1536876606}
|
||||
- component: {fileID: 1536876605}
|
||||
- component: {fileID: 1536876604}
|
||||
- component: {fileID: 1536876603}
|
||||
- component: {fileID: 1536876602}
|
||||
- component: {fileID: 1536876601}
|
||||
m_Layer: 3
|
||||
m_Name: Character
|
||||
m_TagString: Player
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1536876601
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1536876600}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 84aafa4f9de096e4abfe9d463bffd26d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
controller: {fileID: 1536876605}
|
||||
animator: {fileID: 1969245557}
|
||||
health: {fileID: 0}
|
||||
healthBarAnimator: {fileID: 0}
|
||||
runSpeed: 40
|
||||
--- !u!58 &1536876602
|
||||
CircleCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1536876600}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 0.05, y: -0.41}
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.28
|
||||
--- !u!61 &1536876603
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5439994587395572144, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Seiden
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -5.45
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.64
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5439994587591701584, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3}
|
||||
propertyPath: m_JumpForce
|
||||
value: 500
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5439994587591701613, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3}
|
||||
propertyPath: m_IsTrigger
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3}
|
||||
--- !u!1 &1489501924 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 5897945538967143702, guid: 252e77ab1b7341045b4689c1a700c16b, type: 3}
|
||||
m_PrefabInstance: {fileID: 5897945539002975041}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1536876600}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 6200000, guid: 2b77ac6a45b826146a861b65c591e1d2, type: 2}
|
||||
m_IsTrigger: 0
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 0.06, y: 0.31}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0, y: 0}
|
||||
oldSize: {x: 0, y: 0}
|
||||
newSize: {x: 0, y: 0}
|
||||
adaptiveTilingThreshold: 0
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 0.76, y: 0.85}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!50 &1536876604
|
||||
Rigidbody2D:
|
||||
serializedVersion: 4
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1536876600}
|
||||
m_BodyType: 0
|
||||
m_Simulated: 1
|
||||
m_UseFullKinematicContacts: 0
|
||||
m_UseAutoMass: 0
|
||||
m_Mass: 1
|
||||
m_LinearDrag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_GravityScale: 3
|
||||
m_Material: {fileID: 0}
|
||||
m_Interpolate: 0
|
||||
m_SleepingMode: 1
|
||||
m_CollisionDetection: 1
|
||||
m_Constraints: 4
|
||||
--- !u!114 &1536876605
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1536876600}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 90da90214d3bb324a8ed8f5b046ba4b9, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_JumpForce: 500
|
||||
m_CrouchSpeed: 0.4
|
||||
m_MovementSmoothing: 0.05
|
||||
m_AirControl: 1
|
||||
swimming: 0
|
||||
m_WhatIsGround:
|
||||
serializedVersion: 2
|
||||
m_Bits: 695
|
||||
m_GroundCheck: {fileID: 606059879}
|
||||
m_CeilingCheck: {fileID: 1066164920}
|
||||
m_CrouchDisableCollider: {fileID: 1536876603}
|
||||
m_Grounded: 0
|
||||
m_Velocity: {x: 0, y: 0, z: 0}
|
||||
OnLandEvent:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
OnCrouchEvent:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!4 &1536876606
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1536876600}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -7.63, y: 0.7, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1969245559}
|
||||
- {fileID: 1066164920}
|
||||
- {fileID: 606059879}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &1691235117
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -895,7 +635,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7059772333487008124, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 6
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7059772333487008124, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@@ -943,113 +683,63 @@ PrefabInstance:
|
||||
objectReference: {fileID: 532366119}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
|
||||
--- !u!1 &1890188395 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7120480105423891695, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
m_PrefabInstance: {fileID: 7120480105463622328}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1969245556
|
||||
GameObject:
|
||||
--- !u!1001 &163317181084032327
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1969245559}
|
||||
- component: {fileID: 1969245558}
|
||||
- component: {fileID: 1969245557}
|
||||
m_Layer: 3
|
||||
m_Name: Char Art
|
||||
m_TagString: Player
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!95 &1969245557
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1969245556}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 168be8ef52398431fabf32c9fd1e8742, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!212 &1969245558
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1969245556}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||
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: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 1196539433
|
||||
m_SortingLayer: 1
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: 1747070116146791987, guid: 73ae3db8a07b2424caf7884baa7964f8, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 1
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 3.125, y: 3.25}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!4 &1969245559
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1969245556}
|
||||
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_Children: []
|
||||
m_Father: {fileID: 1536876606}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 163317180617266704, guid: 24703a164a2a76543a78e4c1a3a3bdcd, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Meanbird
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 163317180617266715, guid: 24703a164a2a76543a78e4c1a3a3bdcd, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 163317180617266715, guid: 24703a164a2a76543a78e4c1a3a3bdcd, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 3.04
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 163317180617266715, guid: 24703a164a2a76543a78e4c1a3a3bdcd, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.36
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 163317180617266715, guid: 24703a164a2a76543a78e4c1a3a3bdcd, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 163317180617266715, guid: 24703a164a2a76543a78e4c1a3a3bdcd, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 163317180617266715, guid: 24703a164a2a76543a78e4c1a3a3bdcd, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 163317180617266715, guid: 24703a164a2a76543a78e4c1a3a3bdcd, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 163317180617266715, guid: 24703a164a2a76543a78e4c1a3a3bdcd, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 163317180617266715, guid: 24703a164a2a76543a78e4c1a3a3bdcd, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 163317180617266715, guid: 24703a164a2a76543a78e4c1a3a3bdcd, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 163317180617266715, guid: 24703a164a2a76543a78e4c1a3a3bdcd, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 24703a164a2a76543a78e4c1a3a3bdcd, type: 3}
|
||||
--- !u!1001 &252906742070977630
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1131,7 +821,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 252906743233931259, guid: 616bb628e140f2746aa551bed0c95e8f, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 4
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 252906743233931259, guid: 616bb628e140f2746aa551bed0c95e8f, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@@ -1183,68 +873,60 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 616bb628e140f2746aa551bed0c95e8f, type: 3}
|
||||
--- !u!1001 &7120480105463622328
|
||||
--- !u!1001 &5897945539002975041
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 7120480105423891680, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: despawnTimer
|
||||
value: 3
|
||||
- target: {fileID: 5897945538967143702, guid: 252e77ab1b7341045b4689c1a700c16b, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: BlackBird
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
- target: {fileID: 5897945538967143707, guid: 252e77ab1b7341045b4689c1a700c16b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 7
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
- target: {fileID: 5897945538967143707, guid: 252e77ab1b7341045b4689c1a700c16b, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 8.31
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
- target: {fileID: 5897945538967143707, guid: 252e77ab1b7341045b4689c1a700c16b, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.06
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
- target: {fileID: 5897945538967143707, guid: 252e77ab1b7341045b4689c1a700c16b, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
- target: {fileID: 5897945538967143707, guid: 252e77ab1b7341045b4689c1a700c16b, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
- target: {fileID: 5897945538967143707, guid: 252e77ab1b7341045b4689c1a700c16b, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
- target: {fileID: 5897945538967143707, guid: 252e77ab1b7341045b4689c1a700c16b, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
- target: {fileID: 5897945538967143707, guid: 252e77ab1b7341045b4689c1a700c16b, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
- target: {fileID: 5897945538967143707, guid: 252e77ab1b7341045b4689c1a700c16b, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
- target: {fileID: 5897945538967143707, guid: 252e77ab1b7341045b4689c1a700c16b, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
- target: {fileID: 5897945538967143707, guid: 252e77ab1b7341045b4689c1a700c16b, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891695, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Bird
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7120480105423891695, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 252e77ab1b7341045b4689c1a700c16b, type: 3}
|
||||
File diff suppressed because it is too large.
Load diff
+1
-1
@@ -5,7 +5,7 @@ using UnityEngine;
|
||||
public class camMoveUp : MonoBehaviour
|
||||
{
|
||||
public GameObject cam;
|
||||
[Range(0f, 20f)] public float offset;
|
||||
public float offset;
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
|
||||
@@ -8,6 +8,7 @@ TagManager:
|
||||
- Event
|
||||
- Platform
|
||||
- Detection
|
||||
- Enemy
|
||||
layers:
|
||||
- Default
|
||||
- TransparentFX
|
||||
|
||||
@@ -6,7 +6,7 @@ EditorUserSettings:
|
||||
serializedVersion: 4
|
||||
m_ConfigSettings:
|
||||
RecentlyUsedScenePath-0:
|
||||
value: 22424703114646680e0b0227036c7c0219001c396c1c23233967083debf42d
|
||||
value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-1:
|
||||
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663536ebe73c2cf1a71aecf13f33722c0ce6281d
|
||||
|
||||
Reference in new issue
Block a user