Compare commits

..

1 Commits

Author SHA1 Message Date
StudentJW
e71a5300cf Final Changes - Side Bar Sprites 2026-01-29 12:04:47 +00:00
11 changed files with 98 additions and 629 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 532 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 9646e64abbfa4094a8921eac54f39b3a guid: 4f61678c17cc4804d93ce1351b931926
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}
@@ -50,7 +50,7 @@ TextureImporter:
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: 0 spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1 alphaUsage: 1
alphaIsTransparency: 1 alphaIsTransparency: 1
spriteTessellationDetail: -1 spriteTessellationDetail: -1
@@ -93,6 +93,19 @@ 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

View File

@@ -1,36 +1,5 @@
%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
@@ -41,7 +10,6 @@ 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
@@ -65,8 +33,6 @@ 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
@@ -87,114 +53,6 @@ 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
@@ -245,89 +103,6 @@ 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

View File

@@ -1,133 +0,0 @@
%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: []

View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 0baf358898575fa4d900ce93178b905b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -240,12 +240,6 @@ 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,
@@ -554,11 +548,6 @@ 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
@@ -619,126 +608,6 @@ 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
@@ -880,7 +749,6 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1003288350} - {fileID: 1003288350}
- {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}
@@ -997,18 +865,6 @@ 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
@@ -1022,26 +878,11 @@ 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
@@ -1092,21 +933,11 @@ 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
@@ -1117,11 +948,6 @@ 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
@@ -1209,7 +1035,7 @@ PrefabInstance:
- target: {fileID: 3006133537337724145, guid: e29ce1fe47a855c4e907d4312c9e9d6e, - target: {fileID: 3006133537337724145, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3614641596273148411, guid: e29ce1fe47a855c4e907d4312c9e9d6e, - target: {fileID: 3614641596273148411, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3} type: 3}
@@ -1282,11 +1108,52 @@ PrefabInstance:
propertyPath: m_FontData.m_FontStyle propertyPath: m_FontData.m_FontStyle
value: 2 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4620066715855999926, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.b
value: 0.9215687
objectReference: {fileID: 0}
- target: {fileID: 4620066715855999926, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.g
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4620066715855999926, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.r
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: 5590707661276647801, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Type
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5590707661276647801, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 4f61678c17cc4804d93ce1351b931926,
type: 3}
- target: {fileID: 5590707661276647801, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.b
value: 0.9215687
objectReference: {fileID: 0}
- target: {fileID: 5590707661276647801, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.g
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5590707661276647801, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.r
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6436671234165154367, guid: e29ce1fe47a855c4e907d4312c9e9d6e, - target: {fileID: 6436671234165154367, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3} type: 3}
propertyPath: m_Text propertyPath: m_Text
@@ -1308,6 +1175,21 @@ PrefabInstance:
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7706612935984237646, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7706612935984237646, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.g
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7706612935984237646, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.r
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7754510385818033532, guid: e29ce1fe47a855c4e907d4312c9e9d6e, - target: {fileID: 7754510385818033532, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3} type: 3}
propertyPath: m_FontData.m_Font propertyPath: m_FontData.m_Font
@@ -1325,6 +1207,21 @@ PrefabInstance:
value: value:
objectReference: {fileID: 12800000, guid: 23083100b5ae4944fa609bceebf28322, objectReference: {fileID: 12800000, guid: 23083100b5ae4944fa609bceebf28322,
type: 3} type: 3}
- target: {fileID: 8353401941762149960, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.b
value: 0.9607844
objectReference: {fileID: 0}
- target: {fileID: 8353401941762149960, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.g
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8353401941762149960, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.r
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8522275853895335114, guid: e29ce1fe47a855c4e907d4312c9e9d6e, - target: {fileID: 8522275853895335114, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3} type: 3}
propertyPath: m_FontData.m_Font propertyPath: m_FontData.m_Font
@@ -1336,6 +1233,12 @@ PrefabInstance:
propertyPath: m_FontData.m_FontStyle propertyPath: m_FontData.m_FontStyle
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9079472155845500738, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 4f61678c17cc4804d93ce1351b931926,
type: 3}
- target: {fileID: 9220167798849807280, guid: e29ce1fe47a855c4e907d4312c9e9d6e, - target: {fileID: 9220167798849807280, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3} type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
@@ -1417,11 +1320,6 @@ 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
@@ -1482,26 +1380,11 @@ 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
@@ -1737,11 +1620,6 @@ 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

View File

@@ -11,14 +11,10 @@ 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;
@@ -35,13 +31,6 @@ namespace InterfaceOff.WorldScene
/* Updates the death state */ /* Updates the death state */
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)
@@ -61,28 +50,6 @@ 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()

View File

@@ -6,11 +6,10 @@ 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 - Thing.HitsTaken) - Spawner.SpawnedWindowCount) * 5f; float scale = (20 - Spawner.SpawnedWindowCount) * 5f;
scale = Mathf.Clamp(scale, 0f, Mathf.Infinity); scale = Mathf.Clamp(scale, 0f, Mathf.Infinity);
if (!Spawner.AutoSpawn) if (!Spawner.AutoSpawn)

View File

@@ -10,7 +10,6 @@ namespace InterfaceOff.WorldScene
[SerializeField] private GameObject HurtOverlay; [SerializeField] private GameObject HurtOverlay;
[SerializeField] private Slider SliderThing; [SerializeField] private Slider SliderThing;
[SerializeField] private WindowSpawner Spawner; [SerializeField] private WindowSpawner Spawner;
[SerializeField] private GameObject HittyThingThatSkyDidntWantMeToNameItLikeThisAndInsteadNameItPropely;
[field: SerializeField] public int HitsTaken { get; private set; } [field: SerializeField] public int HitsTaken { get; private set; }
@@ -21,24 +20,10 @@ namespace InterfaceOff.WorldScene
body = GetComponent<Rigidbody>(); body = GetComponent<Rigidbody>();
Vector3 pos = transform.localPosition; Vector3 pos = transform.localPosition;
pos.y = 100f; pos.y = Mathf.Infinity;
transform.localPosition = pos; 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() void LateUpdate()
{ {
if (Spawner.AutoSpawn) if (Spawner.AutoSpawn)
@@ -74,7 +59,7 @@ namespace InterfaceOff.WorldScene
private IEnumerator DisplayHurtOverlay() private IEnumerator DisplayHurtOverlay()
{ {
HurtOverlay.SetActive(true); HurtOverlay.SetActive(true);
yield return new WaitForSecondsRealtime(time: 0.4f); yield return new WaitForSecondsRealtime(time: 0.1f);
HurtOverlay.SetActive(false); HurtOverlay.SetActive(false);
} }
} }

View File

@@ -95,24 +95,17 @@ 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 */ /* Has a random choice for the PasswordField to show up */
if (SpawnyThingyMajig == 0) if (Random.Range(0, 1000) == 500)
{ {
PasswordField.SetActive(true); PasswordField.SetActive(true);
SpawnyThingyMajig = Random.Range(2000, 10000);
} }
else
{
SpawnyThingyMajig--;
}
/* Calculates the current max spawn time */ /* 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;