Compare commits
22 Commits
9432d2d776
...
Pasha
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
42113c9ff5 | ||
|
|
ab67608192 | ||
|
|
d351eefe0e | ||
|
|
aff8f8e4e7 | ||
|
|
96a75af6a1 | ||
|
|
2e75a1323d | ||
|
|
5e6828c2ee | ||
|
|
e2c73f031c | ||
|
|
ab2e211de7 | ||
|
|
9417a3315e | ||
|
|
10e6dab93e | ||
|
|
6f01cd5e71 | ||
|
|
50156a799e | ||
|
|
195e1a5a46 | ||
|
|
e46f0fff00 | ||
|
|
f27720eee1 | ||
|
|
f74648931e | ||
|
|
1c66e3743f | ||
| 879d74da61 | |||
| 60e8d237c8 | |||
| c99dfd898c | |||
| 3c08b15c9e |
BIN
Assets/Images/HurtyScreen.png
Normal file
BIN
Assets/Images/HurtyScreen.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 532 KiB |
@@ -1,12 +1,12 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 213844b4ac8198948b4bff81ce3304e0
|
guid: 9646e64abbfa4094a8921eac54f39b3a
|
||||||
TextureImporter:
|
TextureImporter:
|
||||||
internalIDToNameTable: []
|
internalIDToNameTable: []
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
serializedVersion: 13
|
serializedVersion: 13
|
||||||
mipmaps:
|
mipmaps:
|
||||||
mipMapMode: 0
|
mipMapMode: 0
|
||||||
enableMipMap: 1
|
enableMipMap: 0
|
||||||
sRGBTexture: 1
|
sRGBTexture: 1
|
||||||
linearTexture: 0
|
linearTexture: 0
|
||||||
fadeOut: 0
|
fadeOut: 0
|
||||||
@@ -37,24 +37,24 @@ TextureImporter:
|
|||||||
filterMode: 1
|
filterMode: 1
|
||||||
aniso: 1
|
aniso: 1
|
||||||
mipBias: 0
|
mipBias: 0
|
||||||
wrapU: 0
|
wrapU: 1
|
||||||
wrapV: 0
|
wrapV: 1
|
||||||
wrapW: 0
|
wrapW: 0
|
||||||
nPOTScale: 1
|
nPOTScale: 0
|
||||||
lightmap: 0
|
lightmap: 0
|
||||||
compressionQuality: 50
|
compressionQuality: 50
|
||||||
spriteMode: 0
|
spriteMode: 1
|
||||||
spriteExtrude: 1
|
spriteExtrude: 1
|
||||||
spriteMeshType: 1
|
spriteMeshType: 1
|
||||||
alignment: 0
|
alignment: 0
|
||||||
spritePivot: {x: 0.5, y: 0.5}
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
spritePixelsToUnits: 100
|
spritePixelsToUnits: 100
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
spriteGenerateFallbackPhysicsShape: 0
|
||||||
alphaUsage: 1
|
alphaUsage: 1
|
||||||
alphaIsTransparency: 0
|
alphaIsTransparency: 1
|
||||||
spriteTessellationDetail: -1
|
spriteTessellationDetail: -1
|
||||||
textureType: 0
|
textureType: 8
|
||||||
textureShape: 1
|
textureShape: 1
|
||||||
singleChannelComponent: 0
|
singleChannelComponent: 0
|
||||||
flipbookRows: 1
|
flipbookRows: 1
|
||||||
@@ -93,19 +93,6 @@ TextureImporter:
|
|||||||
ignorePlatformSupport: 0
|
ignorePlatformSupport: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: iPhone
|
|
||||||
maxTextureSize: 2048
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
buildTarget: WebGL
|
buildTarget: WebGL
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
@@ -125,7 +112,7 @@ TextureImporter:
|
|||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
spriteID:
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
internalID: 0
|
internalID: 0
|
||||||
vertices: []
|
vertices: []
|
||||||
indices:
|
indices:
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 29 KiB |
@@ -1,5 +1,36 @@
|
|||||||
%YAML 1.1
|
%YAML 1.1
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &5267565487114909786
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 7535033525592749140}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Head
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &7535033525592749140
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5267565487114909786}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 1.3, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 4184610175437431037}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &6036120470499022404
|
--- !u!1 &6036120470499022404
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -10,6 +41,7 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 4184610175437431037}
|
- component: {fileID: 4184610175437431037}
|
||||||
- component: {fileID: 7257751258790706911}
|
- component: {fileID: 7257751258790706911}
|
||||||
|
- component: {fileID: -9221525753854194669}
|
||||||
- component: {fileID: 2977458355001038690}
|
- component: {fileID: 2977458355001038690}
|
||||||
- component: {fileID: 7857222963333444775}
|
- component: {fileID: 7857222963333444775}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
@@ -33,6 +65,8 @@ Transform:
|
|||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 5716334693996993623}
|
- {fileID: 5716334693996993623}
|
||||||
|
- {fileID: 8603276045789782056}
|
||||||
|
- {fileID: 7535033525592749140}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!114 &7257751258790706911
|
--- !u!114 &7257751258790706911
|
||||||
@@ -53,6 +87,114 @@ MonoBehaviour:
|
|||||||
RendererObject: {fileID: 4908730847485413101}
|
RendererObject: {fileID: 4908730847485413101}
|
||||||
ExplosionPrefab: {fileID: 1620140131458704099, guid: 57e5b83dfee152a47aedf7d83c83e9f5,
|
ExplosionPrefab: {fileID: 1620140131458704099, guid: 57e5b83dfee152a47aedf7d83c83e9f5,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
BulletTracer: {fileID: -9221525753854194669}
|
||||||
|
GunStart: {fileID: 8270452186064913122}
|
||||||
|
Head: {fileID: 5267565487114909786}
|
||||||
|
--- !u!120 &-9221525753854194669
|
||||||
|
LineRenderer:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6036120470499022404}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_CastShadows: 1
|
||||||
|
m_ReceiveShadows: 1
|
||||||
|
m_DynamicOccludee: 1
|
||||||
|
m_StaticShadowCaster: 0
|
||||||
|
m_MotionVectors: 0
|
||||||
|
m_LightProbeUsage: 0
|
||||||
|
m_ReflectionProbeUsage: 0
|
||||||
|
m_RayTracingMode: 0
|
||||||
|
m_RayTraceProcedural: 0
|
||||||
|
m_RenderingLayerMask: 1
|
||||||
|
m_RendererPriority: 0
|
||||||
|
m_Materials:
|
||||||
|
- {fileID: 2100000, guid: 50cdbdcead3599b4bbe44be4e89ca8a1, type: 2}
|
||||||
|
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_Positions:
|
||||||
|
- {x: 0, y: 0, z: 0}
|
||||||
|
- {x: 0, y: 0, z: 1}
|
||||||
|
- {x: 0, y: 0, z: 1}
|
||||||
|
m_Parameters:
|
||||||
|
serializedVersion: 3
|
||||||
|
widthMultiplier: 1
|
||||||
|
widthCurve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0.034187317
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
colorGradient:
|
||||||
|
serializedVersion: 2
|
||||||
|
key0: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
key1: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
key2: {r: 0, g: 0, b: 0, a: 0}
|
||||||
|
key3: {r: 0, g: 0, b: 0, a: 0}
|
||||||
|
key4: {r: 0, g: 0, b: 0, a: 0}
|
||||||
|
key5: {r: 0, g: 0, b: 0, a: 0}
|
||||||
|
key6: {r: 0, g: 0, b: 0, a: 0}
|
||||||
|
key7: {r: 0, g: 0, b: 0, a: 0}
|
||||||
|
ctime0: 0
|
||||||
|
ctime1: 65535
|
||||||
|
ctime2: 0
|
||||||
|
ctime3: 0
|
||||||
|
ctime4: 0
|
||||||
|
ctime5: 0
|
||||||
|
ctime6: 0
|
||||||
|
ctime7: 0
|
||||||
|
atime0: 0
|
||||||
|
atime1: 65535
|
||||||
|
atime2: 0
|
||||||
|
atime3: 0
|
||||||
|
atime4: 0
|
||||||
|
atime5: 0
|
||||||
|
atime6: 0
|
||||||
|
atime7: 0
|
||||||
|
m_Mode: 0
|
||||||
|
m_ColorSpace: -1
|
||||||
|
m_NumColorKeys: 2
|
||||||
|
m_NumAlphaKeys: 2
|
||||||
|
numCornerVertices: 0
|
||||||
|
numCapVertices: 0
|
||||||
|
alignment: 0
|
||||||
|
textureMode: 0
|
||||||
|
textureScale: {x: 1, y: 1}
|
||||||
|
shadowBias: 0.5
|
||||||
|
generateLightingData: 0
|
||||||
|
m_MaskInteraction: 0
|
||||||
|
m_UseWorldSpace: 1
|
||||||
|
m_Loop: 0
|
||||||
|
m_ApplyActiveColorSpace: 1
|
||||||
--- !u!54 &2977458355001038690
|
--- !u!54 &2977458355001038690
|
||||||
Rigidbody:
|
Rigidbody:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -103,6 +245,89 @@ CapsuleCollider:
|
|||||||
m_Height: 1.5
|
m_Height: 1.5
|
||||||
m_Direction: 1
|
m_Direction: 1
|
||||||
m_Center: {x: 0, y: 0.75, z: 0}
|
m_Center: {x: 0, y: 0.75, z: 0}
|
||||||
|
--- !u!1 &8270452186064913122
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 8603276045789782056}
|
||||||
|
- component: {fileID: 2226222746097487326}
|
||||||
|
- component: {fileID: 2311615718499464800}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: BulletTracerStart
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &8603276045789782056
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8270452186064913122}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0.2021, y: 0.9986, z: 0.3362}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 4184610175437431037}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!33 &2226222746097487326
|
||||||
|
MeshFilter:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8270452186064913122}
|
||||||
|
m_Mesh: {fileID: -4867730633553790618, guid: 703cd189b868d4c42a8be20b38d92906, type: 3}
|
||||||
|
--- !u!23 &2311615718499464800
|
||||||
|
MeshRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8270452186064913122}
|
||||||
|
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: 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: 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!1001 &5250697314440575932
|
--- !u!1001 &5250697314440575932
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ MonoBehaviour:
|
|||||||
m_Alignment: 4
|
m_Alignment: 4
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: NEW TEXT - 88
|
m_Text: NEW TEXT - 88
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -72,6 +72,7 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 1807660236798938897}
|
- component: {fileID: 1807660236798938897}
|
||||||
- component: {fileID: 1013965729963872153}
|
- component: {fileID: 1013965729963872153}
|
||||||
|
- component: {fileID: 1783748808844086845}
|
||||||
- component: {fileID: 7220179918976106526}
|
- component: {fileID: 7220179918976106526}
|
||||||
- component: {fileID: 7410036744236083586}
|
- component: {fileID: 7410036744236083586}
|
||||||
- component: {fileID: 9011244016352067911}
|
- component: {fileID: 9011244016352067911}
|
||||||
@@ -133,6 +134,19 @@ MonoBehaviour:
|
|||||||
- {fileID: 8300000, guid: 413764415f5bf42429d26861fc5e82cf, type: 3}
|
- {fileID: 8300000, guid: 413764415f5bf42429d26861fc5e82cf, type: 3}
|
||||||
- {fileID: 8300000, guid: 21713b7ac8710bf4fb3b949bbbebb67a, type: 3}
|
- {fileID: 8300000, guid: 21713b7ac8710bf4fb3b949bbbebb67a, type: 3}
|
||||||
PlayerAudioSource: {fileID: 3380663186425371797}
|
PlayerAudioSource: {fileID: 3380663186425371797}
|
||||||
|
--- !u!114 &1783748808844086845
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5082956827802089079}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: ab982c94ab064b944947c4792e623299, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
cam: {fileID: 7220179918976106526}
|
||||||
--- !u!20 &7220179918976106526
|
--- !u!20 &7220179918976106526
|
||||||
Camera:
|
Camera:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -303,7 +303,7 @@ RectTransform:
|
|||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 80, y: 0}
|
m_AnchoredPosition: {x: 80, y: 0}
|
||||||
m_SizeDelta: {x: 50, y: 50}
|
m_SizeDelta: {x: 75, y: 75}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &136706123813087175
|
--- !u!114 &136706123813087175
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@@ -345,7 +345,7 @@ MonoBehaviour:
|
|||||||
m_SelectedTrigger: Selected
|
m_SelectedTrigger: Selected
|
||||||
m_DisabledTrigger: Disabled
|
m_DisabledTrigger: Disabled
|
||||||
m_Interactable: 1
|
m_Interactable: 1
|
||||||
m_TargetGraphic: {fileID: 0}
|
m_TargetGraphic: {fileID: 2488940302629846799}
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls:
|
m_Calls:
|
||||||
|
|||||||
133
Assets/Redbubble.mat
Normal file
133
Assets/Redbubble.mat
Normal file
@@ -0,0 +1,133 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &-7702689013975500546
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 11
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
version: 7
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 8
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Redbubble
|
||||||
|
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||||
|
m_Parent: {fileID: 0}
|
||||||
|
m_ModifiedSerializedProperties: 0
|
||||||
|
m_ValidKeywords: []
|
||||||
|
m_InvalidKeywords: []
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap:
|
||||||
|
RenderType: Opaque
|
||||||
|
disabledShaderPasses: []
|
||||||
|
m_LockedProperties:
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BaseMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _SpecGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_Lightmaps:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_LightmapsInd:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_ShadowMasks:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Ints: []
|
||||||
|
m_Floats:
|
||||||
|
- _AlphaClip: 0
|
||||||
|
- _AlphaToMask: 0
|
||||||
|
- _Blend: 0
|
||||||
|
- _BlendModePreserveSpecular: 1
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _ClearCoatMask: 0
|
||||||
|
- _ClearCoatSmoothness: 0
|
||||||
|
- _Cull: 2
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailAlbedoMapScale: 1
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 0
|
||||||
|
- _DstBlendAlpha: 0
|
||||||
|
- _EnvironmentReflections: 1
|
||||||
|
- _GlossMapScale: 0
|
||||||
|
- _Glossiness: 0
|
||||||
|
- _GlossyReflections: 0
|
||||||
|
- _Metallic: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.005
|
||||||
|
- _QueueOffset: 0
|
||||||
|
- _ReceiveShadows: 1
|
||||||
|
- _Smoothness: 0.5
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _SrcBlendAlpha: 1
|
||||||
|
- _Surface: 0
|
||||||
|
- _WorkflowMode: 1
|
||||||
|
- _ZWrite: 1
|
||||||
|
m_Colors:
|
||||||
|
- _BaseColor: {r: 1, g: 0, b: 0, a: 1}
|
||||||
|
- _Color: {r: 1, g: 0, b: 0, a: 1}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
|
m_BuildTextureStacks: []
|
||||||
8
Assets/Redbubble.mat.meta
Normal file
8
Assets/Redbubble.mat.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0baf358898575fa4d900ce93178b905b
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -240,6 +240,12 @@ Transform:
|
|||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1909908770}
|
m_Father: {fileID: 1909908770}
|
||||||
m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0}
|
||||||
|
--- !u!1 &112955761 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 1136887245978327216, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 774003952}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!4 &135452471 stripped
|
--- !u!4 &135452471 stripped
|
||||||
Transform:
|
Transform:
|
||||||
m_CorrespondingSourceObject: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
m_CorrespondingSourceObject: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
@@ -548,6 +554,11 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: ShieldBar
|
value: ShieldBar
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 582498797338587669, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: Thing
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 1108141262}
|
||||||
- target: {fileID: 582498797338587669, guid: c0a03ce6c4f39224299267b83719ceb7,
|
- target: {fileID: 582498797338587669, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: Spawner
|
propertyPath: Spawner
|
||||||
@@ -608,6 +619,126 @@ PrefabInstance:
|
|||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
m_AddedComponents: []
|
m_AddedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: c0a03ce6c4f39224299267b83719ceb7, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: c0a03ce6c4f39224299267b83719ceb7, type: 3}
|
||||||
|
--- !u!1001 &774003952
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransformParent: {fileID: 782229191}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 228621501325938318, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: NotShieldBar
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 582498797338587669, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: Thing
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 1108141262}
|
||||||
|
- target: {fileID: 582498797338587669, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: Spawner
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 447617108}
|
||||||
|
- target: {fileID: 850249494288935909, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalScale.x
|
||||||
|
value: 90
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 850249494288935909, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalScale.z
|
||||||
|
value: 90
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 850249494288935909, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 850249494288935909, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 850249494288935909, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1979013790829498698, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Materials.Array.data[0]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2100000, guid: 0baf358898575fa4d900ce93178b905b, type: 2}
|
||||||
|
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: -3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 4
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 9
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: -0.7071068
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: 0.7071068
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 270
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4744786306066409975, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents:
|
||||||
|
- {fileID: 582498797338587669, guid: c0a03ce6c4f39224299267b83719ceb7, type: 3}
|
||||||
|
m_RemovedGameObjects: []
|
||||||
|
m_AddedGameObjects: []
|
||||||
|
m_AddedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: c0a03ce6c4f39224299267b83719ceb7, type: 3}
|
||||||
|
--- !u!4 &774003953 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 774003952}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1 &782229187
|
--- !u!1 &782229187
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -749,7 +880,7 @@ Transform:
|
|||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 1003288350}
|
- {fileID: 1003288350}
|
||||||
- {fileID: 1557857216}
|
- {fileID: 774003953}
|
||||||
- {fileID: 479830775}
|
- {fileID: 479830775}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
@@ -866,6 +997,18 @@ Transform:
|
|||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 8020063586600593708}
|
m_PrefabInstance: {fileID: 8020063586600593708}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!114 &1108141262 stripped
|
||||||
|
MonoBehaviour:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 6524590693600647859, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 1758685209}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: d84633c3f717e0d4f834bb2514e64c35, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!1001 &1141151236
|
--- !u!1001 &1141151236
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -879,11 +1022,26 @@ PrefabInstance:
|
|||||||
propertyPath: Player
|
propertyPath: Player
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 1207293318}
|
objectReference: {fileID: 1207293318}
|
||||||
|
- target: {fileID: 955093943477058985, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3622400547687289163, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 4196511694219924786, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
- target: {fileID: 4196511694219924786, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: Player
|
propertyPath: Player
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 1207293318}
|
objectReference: {fileID: 1207293318}
|
||||||
|
- target: {fileID: 4868572707395745782, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
- target: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
@@ -934,11 +1092,21 @@ PrefabInstance:
|
|||||||
propertyPath: m_LocalEulerAnglesHint.z
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5355413975483509338, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6206983139588420677, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
- target: {fileID: 6206983139588420677, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: Player
|
propertyPath: Player
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 1207293318}
|
objectReference: {fileID: 1207293318}
|
||||||
|
- target: {fileID: 7016484527804669150, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 7240180351567446257, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
- target: {fileID: 7240180351567446257, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: Player
|
propertyPath: Player
|
||||||
@@ -949,6 +1117,11 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: Corridor-FakeB
|
value: Corridor-FakeB
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8436299661722214638, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 9020267387182154433, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
- target: {fileID: 9020267387182154433, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: Player
|
propertyPath: Player
|
||||||
@@ -989,100 +1162,6 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
--- !u!1001 &1557857215
|
|
||||||
PrefabInstance:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Modification:
|
|
||||||
serializedVersion: 3
|
|
||||||
m_TransformParent: {fileID: 782229191}
|
|
||||||
m_Modifications:
|
|
||||||
- target: {fileID: 3265567963809100238, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: AttachedCamera
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 782229189}
|
|
||||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalPosition.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalPosition.z
|
|
||||||
value: 8
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalRotation.w
|
|
||||||
value: 0.7071068
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalRotation.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalRotation.y
|
|
||||||
value: -0.7071068
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalRotation.z
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalEulerAnglesHint.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalEulerAnglesHint.y
|
|
||||||
value: -90
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalEulerAnglesHint.z
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 7297418410848169550, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalPosition.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 7297418410848169550, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalPosition.y
|
|
||||||
value: -0.9
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 7297418410848169550, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalPosition.z
|
|
||||||
value: -0.45
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 7563216493506774349, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: Cursor
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
|
||||||
m_RemovedGameObjects: []
|
|
||||||
m_AddedGameObjects: []
|
|
||||||
m_AddedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 15c9da29f34c88d4c82acf24cc874e3b, type: 3}
|
|
||||||
--- !u!4 &1557857216 stripped
|
|
||||||
Transform:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
|
||||||
type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 1557857215}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1001 &1758685209
|
--- !u!1001 &1758685209
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -1091,11 +1170,37 @@ PrefabInstance:
|
|||||||
serializedVersion: 3
|
serializedVersion: 3
|
||||||
m_TransformParent: {fileID: 0}
|
m_TransformParent: {fileID: 0}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1912500691838987139, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2020022267469913571, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
- target: {fileID: 2020022267469913571, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: GameCanvas
|
value: GameCanvas
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2347158115666318496, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Sprite
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 21300000, guid: 9646e64abbfa4094a8921eac54f39b3a,
|
||||||
|
type: 3}
|
||||||
|
- target: {fileID: 2433458770277224157, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMax.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2433458770277224157, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2433458770277224157, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2841827207845239115, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
- target: {fileID: 2841827207845239115, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||||
@@ -1151,11 +1256,31 @@ PrefabInstance:
|
|||||||
propertyPath: m_LocalEulerAnglesHint.z
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3895835492900507208, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMax.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3895835492900507208, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 4797822364417701868, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
- target: {fileID: 4797822364417701868, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_OnDidEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
propertyPath: m_OnDidEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 880466090}
|
objectReference: {fileID: 880466090}
|
||||||
|
- target: {fileID: 6456657860247816393, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6524590693600647859, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: HittyThingThatSkyDidntWantMeToNameItLikeThisAndInsteadNameItPropely
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 112955761}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
m_RemovedGameObjects: []
|
||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
@@ -1227,6 +1352,11 @@ PrefabInstance:
|
|||||||
propertyPath: Player
|
propertyPath: Player
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 1207293318}
|
objectReference: {fileID: 1207293318}
|
||||||
|
- target: {fileID: 3622400547687289163, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 4196511694219924786, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
- target: {fileID: 4196511694219924786, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: Player
|
propertyPath: Player
|
||||||
@@ -1287,11 +1417,26 @@ PrefabInstance:
|
|||||||
propertyPath: m_LocalEulerAnglesHint.z
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5355413975483509338, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5982579570784807018, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6206983139588420677, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
- target: {fileID: 6206983139588420677, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: Player
|
propertyPath: Player
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 1207293318}
|
objectReference: {fileID: 1207293318}
|
||||||
|
- target: {fileID: 7016484527804669150, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 7240180351567446257, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
- target: {fileID: 7240180351567446257, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: Player
|
propertyPath: Player
|
||||||
@@ -1459,6 +1604,11 @@ PrefabInstance:
|
|||||||
propertyPath: m_StaticEditorFlags
|
propertyPath: m_StaticEditorFlags
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 955093943477058985, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1171570022577841326, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
- target: {fileID: 1171570022577841326, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_StaticEditorFlags
|
propertyPath: m_StaticEditorFlags
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ namespace InterfaceOff.MainMenu
|
|||||||
{
|
{
|
||||||
public class DifficultyManager : MonoBehaviour
|
public class DifficultyManager : MonoBehaviour
|
||||||
{
|
{
|
||||||
public static float DifficultyMultiplier { get; private set; } = 1;
|
public static float DifficultyMultiplier { get; private set; } = 1f;
|
||||||
public static float DifficultyEffect => Mathf.Pow(f: DifficultyMultiplier, p: 2);
|
public static float DifficultyEffect => Mathf.Pow(f: DifficultyMultiplier, p: 2);
|
||||||
|
|
||||||
[SerializeField] private Slider DifficultySlider;
|
[SerializeField] private Slider DifficultySlider;
|
||||||
|
|||||||
@@ -11,10 +11,14 @@ namespace InterfaceOff.WorldScene
|
|||||||
[SerializeField] private Rigidbody Body;
|
[SerializeField] private Rigidbody Body;
|
||||||
[SerializeField] private GameObject RendererObject;
|
[SerializeField] private GameObject RendererObject;
|
||||||
[SerializeField] private GameObject ExplosionPrefab;
|
[SerializeField] private GameObject ExplosionPrefab;
|
||||||
|
[SerializeField] private LineRenderer BulletTracer;
|
||||||
|
[SerializeField] private GameObject GunStart;
|
||||||
|
[SerializeField] private GameObject Head;
|
||||||
|
|
||||||
private Quaternion StartRotation;
|
private Quaternion StartRotation;
|
||||||
private Vector3 StartPosition;
|
private Vector3 StartPosition;
|
||||||
|
|
||||||
|
private bool StartedShooting;
|
||||||
private bool WasAliveLastFrame;
|
private bool WasAliveLastFrame;
|
||||||
private bool Alive = true;
|
private bool Alive = true;
|
||||||
|
|
||||||
@@ -32,6 +36,13 @@ namespace InterfaceOff.WorldScene
|
|||||||
WasAliveLastFrame = Alive;
|
WasAliveLastFrame = Alive;
|
||||||
Alive = DeathIndex >= Player.FrameIndex;
|
Alive = DeathIndex >= Player.FrameIndex;
|
||||||
|
|
||||||
|
/* Checks if it is about to die or kill */
|
||||||
|
if (DeathIndex == (Player.FrameIndex + 10) && !StartedShooting)
|
||||||
|
{
|
||||||
|
StartCoroutine(routine: ShootyShooty());
|
||||||
|
StartedShooting = true;
|
||||||
|
}
|
||||||
|
|
||||||
/* Checks if it just died */
|
/* Checks if it just died */
|
||||||
if (!Alive && WasAliveLastFrame)
|
if (!Alive && WasAliveLastFrame)
|
||||||
{
|
{
|
||||||
@@ -50,6 +61,28 @@ namespace InterfaceOff.WorldScene
|
|||||||
RendererObject.SetActive(true);
|
RendererObject.SetActive(true);
|
||||||
Body.Sleep();
|
Body.Sleep();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Check for resurrection */
|
||||||
|
if (Alive && !WasAliveLastFrame)
|
||||||
|
{
|
||||||
|
StartedShooting = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private IEnumerator ShootyShooty()
|
||||||
|
{
|
||||||
|
BulletTracer.enabled = true;
|
||||||
|
|
||||||
|
for (int i = 0; i < 10; i++)
|
||||||
|
{
|
||||||
|
BulletTracer.SetPosition(0, Head.transform.position);
|
||||||
|
BulletTracer.SetPosition(1, Player.transform.position);
|
||||||
|
BulletTracer.SetPosition(2, GunStart.transform.position);
|
||||||
|
|
||||||
|
yield return new WaitForFixedUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
BulletTracer.enabled = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private IEnumerator Suicide()
|
private IEnumerator Suicide()
|
||||||
|
|||||||
@@ -1,27 +0,0 @@
|
|||||||
using UnityEngine;
|
|
||||||
|
|
||||||
public class FakeCursor : MonoBehaviour
|
|
||||||
{
|
|
||||||
public Camera AttachedCamera;
|
|
||||||
|
|
||||||
private void Start()
|
|
||||||
{
|
|
||||||
Cursor.visible = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Update()
|
|
||||||
{
|
|
||||||
Vector3 absolutePosition = new()
|
|
||||||
{
|
|
||||||
x = Input.mousePosition.x / Screen.width * 1920,
|
|
||||||
y = Input.mousePosition.y / Screen.height * 1080,
|
|
||||||
z = 5f
|
|
||||||
};
|
|
||||||
transform.position = AttachedCamera.ScreenToWorldPoint(absolutePosition);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnDestroy()
|
|
||||||
{
|
|
||||||
Cursor.visible = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -6,10 +6,11 @@ namespace InterfaceOff.WorldScene
|
|||||||
{
|
{
|
||||||
public Transform HealthBarObject;
|
public Transform HealthBarObject;
|
||||||
public WindowSpawner Spawner;
|
public WindowSpawner Spawner;
|
||||||
|
public LifeThingTrackerThing Thing;
|
||||||
|
|
||||||
private void Update()
|
private void Update()
|
||||||
{
|
{
|
||||||
float scale = (20 - Spawner.SpawnedWindowCount) * 5f;
|
float scale = ((20 - Thing.HitsTaken) - Spawner.SpawnedWindowCount) * 5f;
|
||||||
scale = Mathf.Clamp(scale, 0f, Mathf.Infinity);
|
scale = Mathf.Clamp(scale, 0f, Mathf.Infinity);
|
||||||
|
|
||||||
if (!Spawner.AutoSpawn)
|
if (!Spawner.AutoSpawn)
|
||||||
|
|||||||
81
Assets/Scripts/LifeThingTrackerThing.cs
Normal file
81
Assets/Scripts/LifeThingTrackerThing.cs
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using JetBrains.Annotations;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace InterfaceOff.WorldScene
|
||||||
|
{
|
||||||
|
public class LifeThingTrackerThing : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] private GameObject HurtOverlay;
|
||||||
|
[SerializeField] private Slider SliderThing;
|
||||||
|
[SerializeField] private WindowSpawner Spawner;
|
||||||
|
[SerializeField] private GameObject HittyThingThatSkyDidntWantMeToNameItLikeThisAndInsteadNameItPropely;
|
||||||
|
|
||||||
|
[field: SerializeField] public int HitsTaken { get; private set; }
|
||||||
|
|
||||||
|
private Rigidbody body;
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
body = GetComponent<Rigidbody>();
|
||||||
|
|
||||||
|
Vector3 pos = transform.localPosition;
|
||||||
|
pos.y = 100f;
|
||||||
|
transform.localPosition = pos;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Update()
|
||||||
|
{
|
||||||
|
float kjjjjgkjdfh = HitsTaken * 5f;
|
||||||
|
kjjjjgkjdfh = Mathf.Clamp(kjjjjgkjdfh, 0f, 100);
|
||||||
|
|
||||||
|
if (!Spawner.AutoSpawn)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
HittyThingThatSkyDidntWantMeToNameItLikeThisAndInsteadNameItPropely.transform.localScale =
|
||||||
|
new Vector3(90, kjjjjgkjdfh, 90);
|
||||||
|
}
|
||||||
|
|
||||||
|
void LateUpdate()
|
||||||
|
{
|
||||||
|
if (Spawner.AutoSpawn)
|
||||||
|
{
|
||||||
|
Vector3 pos = transform.localPosition;
|
||||||
|
pos.y = Mathf.Clamp(pos.y, 0, 10);
|
||||||
|
|
||||||
|
if (Mathf.Approximately(pos.y, 0.0f))
|
||||||
|
{
|
||||||
|
StartCoroutine(routine: DisplayHurtOverlay());
|
||||||
|
HitsTaken++;
|
||||||
|
|
||||||
|
body.velocity = Vector3.zero;
|
||||||
|
pos.y = 10.0f;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Mathf.Approximately(pos.y, 10.0f))
|
||||||
|
{
|
||||||
|
body.velocity = Vector3.zero;
|
||||||
|
}
|
||||||
|
|
||||||
|
transform.localPosition = pos;
|
||||||
|
SliderThing.value = pos.y;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[UsedImplicitly] public void AddForceUp()
|
||||||
|
{
|
||||||
|
Vector3 vel = body.velocity;
|
||||||
|
body.AddForce(Vector3.up * 500f, ForceMode.Force);
|
||||||
|
}
|
||||||
|
|
||||||
|
private IEnumerator DisplayHurtOverlay()
|
||||||
|
{
|
||||||
|
HurtOverlay.SetActive(true);
|
||||||
|
yield return new WaitForSecondsRealtime(time: 0.4f);
|
||||||
|
HurtOverlay.SetActive(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 353f192b40556e34dada2d432a9ffa85
|
guid: d84633c3f717e0d4f834bb2514e64c35
|
||||||
MonoImporter:
|
MonoImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
60
Assets/Scripts/PasswordScriptThing.cs
Normal file
60
Assets/Scripts/PasswordScriptThing.cs
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
using System;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace InterfaceOff.WorldScene
|
||||||
|
{
|
||||||
|
public class PasswordScriptThing : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] private Text PasswordText;
|
||||||
|
|
||||||
|
private void OnEnable()
|
||||||
|
{
|
||||||
|
PasswordText.text = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool IsAnyKeyPressed()
|
||||||
|
{
|
||||||
|
return Input.GetKeyDown(KeyCode.A) ||
|
||||||
|
Input.GetKeyDown(KeyCode.B) ||
|
||||||
|
Input.GetKeyDown(KeyCode.C) ||
|
||||||
|
Input.GetKeyDown(KeyCode.D) ||
|
||||||
|
Input.GetKeyDown(KeyCode.E) ||
|
||||||
|
Input.GetKeyDown(KeyCode.F) ||
|
||||||
|
Input.GetKeyDown(KeyCode.G) ||
|
||||||
|
Input.GetKeyDown(KeyCode.H) ||
|
||||||
|
Input.GetKeyDown(KeyCode.I) ||
|
||||||
|
Input.GetKeyDown(KeyCode.J) ||
|
||||||
|
Input.GetKeyDown(KeyCode.K) ||
|
||||||
|
Input.GetKeyDown(KeyCode.L) ||
|
||||||
|
Input.GetKeyDown(KeyCode.M) ||
|
||||||
|
Input.GetKeyDown(KeyCode.N) ||
|
||||||
|
Input.GetKeyDown(KeyCode.O) ||
|
||||||
|
Input.GetKeyDown(KeyCode.P) ||
|
||||||
|
Input.GetKeyDown(KeyCode.Q) ||
|
||||||
|
Input.GetKeyDown(KeyCode.R) ||
|
||||||
|
Input.GetKeyDown(KeyCode.S) ||
|
||||||
|
Input.GetKeyDown(KeyCode.T) ||
|
||||||
|
Input.GetKeyDown(KeyCode.U) ||
|
||||||
|
Input.GetKeyDown(KeyCode.V) ||
|
||||||
|
Input.GetKeyDown(KeyCode.W) ||
|
||||||
|
Input.GetKeyDown(KeyCode.X) ||
|
||||||
|
Input.GetKeyDown(KeyCode.Y) ||
|
||||||
|
Input.GetKeyDown(KeyCode.Z) ||
|
||||||
|
Input.GetKeyDown(KeyCode.Space);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Update()
|
||||||
|
{
|
||||||
|
if (IsAnyKeyPressed())
|
||||||
|
{
|
||||||
|
PasswordText.text += '*';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (PasswordText.text.Length > 12)
|
||||||
|
{
|
||||||
|
transform.parent.gameObject.SetActive(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Scripts/PasswordScriptThing.cs.meta
Normal file
11
Assets/Scripts/PasswordScriptThing.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 4eca7ed9833dbad44b3e2e8f144ebd1a
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -46,7 +46,7 @@ namespace InterfaceOff
|
|||||||
|
|
||||||
private IEnumerator Load(Action loadAction)
|
private IEnumerator Load(Action loadAction)
|
||||||
{
|
{
|
||||||
Vector2 maxSize = new(2000f, 2000f);
|
Vector2 maxSize = new(5000f, 5000f);
|
||||||
Vector2 minSize = Vector2.zero;
|
Vector2 minSize = Vector2.zero;
|
||||||
|
|
||||||
float startRotation = ImageRectOverlay.eulerAngles.z;
|
float startRotation = ImageRectOverlay.eulerAngles.z;
|
||||||
|
|||||||
@@ -7,7 +7,8 @@ using UnityEngine.UI;
|
|||||||
|
|
||||||
namespace InterfaceOff.WorldScene
|
namespace InterfaceOff.WorldScene
|
||||||
{
|
{
|
||||||
[System.Serializable] public struct PlayerScore
|
[System.Serializable]
|
||||||
|
public struct PlayerScore
|
||||||
{
|
{
|
||||||
public string PlayerName;
|
public string PlayerName;
|
||||||
public float Score;
|
public float Score;
|
||||||
@@ -38,8 +39,7 @@ namespace InterfaceOff.WorldScene
|
|||||||
private bool StoredCurrentScore = false;
|
private bool StoredCurrentScore = false;
|
||||||
private float Score;
|
private float Score;
|
||||||
|
|
||||||
#if UNITY_STANDALONE_WIN
|
#if UNITY_STANDALONE_WIN
|
||||||
|
|
||||||
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
|
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
|
||||||
private static void OnStart()
|
private static void OnStart()
|
||||||
{
|
{
|
||||||
@@ -66,7 +66,6 @@ namespace InterfaceOff.WorldScene
|
|||||||
string json = JsonUtility.ToJson(dmp, prettyPrint: false);
|
string json = JsonUtility.ToJson(dmp, prettyPrint: false);
|
||||||
File.WriteAllText(Path.Combine(Application.persistentDataPath, "scores.json"), contents: json);
|
File.WriteAllText(Path.Combine(Application.persistentDataPath, "scores.json"), contents: json);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // UNITY_STANDALONE_WIN
|
#endif // UNITY_STANDALONE_WIN
|
||||||
|
|
||||||
public static float CurrentScore()
|
public static float CurrentScore()
|
||||||
|
|||||||
@@ -22,6 +22,8 @@ namespace InterfaceOff
|
|||||||
[field: SerializeField] private GameObject DeathInfo { get; set; }
|
[field: SerializeField] private GameObject DeathInfo { get; set; }
|
||||||
[field: SerializeField] private SpawnableWindowType[] WindowTypes { get; set; }
|
[field: SerializeField] private SpawnableWindowType[] WindowTypes { get; set; }
|
||||||
[field: SerializeField] private GameObject Parent { get; set; }
|
[field: SerializeField] private GameObject Parent { get; set; }
|
||||||
|
[field: SerializeField] private GameObject PasswordField { get; set; }
|
||||||
|
[field: SerializeField] private GameObject LeaderboardObject { get; set; }
|
||||||
private int TotalSpawnWeight { get; set; }
|
private int TotalSpawnWeight { get; set; }
|
||||||
|
|
||||||
[field: SerializeField] public int SpawnedWindowCount { get; private set; }
|
[field: SerializeField] public int SpawnedWindowCount { get; private set; }
|
||||||
@@ -93,16 +95,30 @@ namespace InterfaceOff
|
|||||||
|
|
||||||
public void AlertOfDespawnedWindow() => SpawnedWindowCount--;
|
public void AlertOfDespawnedWindow() => SpawnedWindowCount--;
|
||||||
|
|
||||||
|
private int SpawnyThingyMajig = 9000; // Sky chose dis
|
||||||
|
|
||||||
private void FixedUpdate()
|
private void FixedUpdate()
|
||||||
{
|
{
|
||||||
/* Spawns new windows whilst active */
|
/* Spawns new windows whilst active */
|
||||||
if (AutoSpawn)
|
if (AutoSpawn)
|
||||||
{
|
{
|
||||||
|
/* Has a random choice for the PasswordField to show up */
|
||||||
|
if (SpawnyThingyMajig == 0)
|
||||||
|
{
|
||||||
|
PasswordField.SetActive(true);
|
||||||
|
SpawnyThingyMajig = Random.Range(2000, 10000);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SpawnyThingyMajig--;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Calculates the current max spawn time */
|
||||||
const int TICKS_PER_SECOND = 20; // Unity constant
|
const int TICKS_PER_SECOND = 20; // Unity constant
|
||||||
const int MIN_SPAWN_TIME = 2 * TICKS_PER_SECOND;
|
const int MIN_SPAWN_TIME = 2 * TICKS_PER_SECOND;
|
||||||
const int MAX_SPAWN_TIME = 5 * TICKS_PER_SECOND;
|
const int MAX_SPAWN_TIME = 5 * TICKS_PER_SECOND;
|
||||||
|
|
||||||
int currentMaxSpawnTime = MAX_SPAWN_TIME - (int)(ScoreTracker.CurrentScore() / DifficultyManager.DifficultyEffect);
|
int currentMaxSpawnTime = MAX_SPAWN_TIME - (int)(ScoreTracker.CurrentScore() * DifficultyManager.DifficultyEffect);
|
||||||
currentMaxSpawnTime = Math.Clamp(currentMaxSpawnTime, MIN_SPAWN_TIME + 1, MAX_SPAWN_TIME);
|
currentMaxSpawnTime = Math.Clamp(currentMaxSpawnTime, MIN_SPAWN_TIME + 1, MAX_SPAWN_TIME);
|
||||||
|
|
||||||
/* Decreases the spawn counter and spawns if at 0 */
|
/* Decreases the spawn counter and spawns if at 0 */
|
||||||
@@ -110,20 +126,26 @@ namespace InterfaceOff
|
|||||||
if (TimeTillNextSpawn == 0)
|
if (TimeTillNextSpawn == 0)
|
||||||
{
|
{
|
||||||
float difficulty = DifficultyManager.DifficultyMultiplier;
|
float difficulty = DifficultyManager.DifficultyMultiplier;
|
||||||
TimeTillNextSpawn = Random.Range((int)(MIN_SPAWN_TIME * difficulty), (int)(currentMaxSpawnTime * difficulty));
|
TimeTillNextSpawn = Random.Range((int)(MIN_SPAWN_TIME * difficulty), (int)(currentMaxSpawnTime / difficulty));
|
||||||
SpawnNewRandomWindow();
|
SpawnNewRandomWindow();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Else checks if it should reload the scene */
|
else
|
||||||
else if (Input.GetKey(KeyCode.Space))
|
|
||||||
{
|
{
|
||||||
SceneController.ReloadScene();
|
/* Makes sure the password overlay does not interfere */
|
||||||
}
|
PasswordField.SetActive(false);
|
||||||
|
|
||||||
else if (Input.GetKey(KeyCode.Tab))
|
/* Else checks if it should change the active scene */
|
||||||
{
|
if (Input.GetKey(KeyCode.Space) && !LeaderboardObject.activeSelf)
|
||||||
SceneController.Load(name: "MenuScene");
|
{
|
||||||
|
SceneController.ReloadScene();
|
||||||
|
}
|
||||||
|
|
||||||
|
else if (Input.GetKey(KeyCode.Tab) && !LeaderboardObject.activeSelf)
|
||||||
|
{
|
||||||
|
SceneController.Load(name: "MenuScene");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -157,7 +157,7 @@ namespace InterfaceOff
|
|||||||
""Cyanide"",
|
""Cyanide"",
|
||||||
""Ricin""
|
""Ricin""
|
||||||
],
|
],
|
||||||
""answer"": ""Flour""
|
""answer"": ""Flour / Wheat""
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
""question"": ""How many pyramids are there in Egypt?"",
|
""question"": ""How many pyramids are there in Egypt?"",
|
||||||
|
|||||||
35
Assets/tmp.cs
Normal file
35
Assets/tmp.cs
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class tmp : MonoBehaviour
|
||||||
|
{
|
||||||
|
public Camera cam;
|
||||||
|
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
float targetAspect = 16f / 9f;
|
||||||
|
float windowAspect = (float)Screen.width / Screen.height;
|
||||||
|
float scale = windowAspect / targetAspect;
|
||||||
|
|
||||||
|
if (scale < 1f)
|
||||||
|
{
|
||||||
|
cam.rect = new Rect(
|
||||||
|
0,
|
||||||
|
(1f - scale) / 2f,
|
||||||
|
1f,
|
||||||
|
scale
|
||||||
|
);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
float width = 1f / scale;
|
||||||
|
cam.rect = new Rect(
|
||||||
|
(1f - width) / 2f,
|
||||||
|
0,
|
||||||
|
width,
|
||||||
|
1f
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/tmp.cs.meta
Normal file
11
Assets/tmp.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ab982c94ab064b944947c4792e623299
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Reference in New Issue
Block a user