Pasha/Inter-Face-Off
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made damage do damage

Browse Source
This commit is contained in:
Pasha Bibko
2026-01-29 10:49:18 +00:00
parent aff8f8e4e7
commit d351eefe0e
5 changed files with 290 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
Assets/Redbubble.mat Normal file
View 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
View File

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

132
Assets/Scenes/WorldScene.unity
View File

@@ -240,6 +240,12 @@ Transform:
m_Children: []
m_Father: {fileID: 1909908770}
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
Transform:
m_CorrespondingSourceObject: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
@@ -613,6 +619,126 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
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
GameObject:
m_ObjectHideFlags: 0
@@ -754,6 +880,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1003288350}
- {fileID: 774003953}
- {fileID: 479830775}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1103,6 +1230,11 @@ PrefabInstance:
propertyPath: m_OnDidEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 880466090}
- target: {fileID: 6524590693600647859, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: HittyThingThatSkyDidntWantMeToNameItLikeThisAndInsteadNameItPropely
value:
objectReference: {fileID: 112955761}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []

15
Assets/Scripts/LifeThingTrackerThing.cs
View File

@@ -10,6 +10,7 @@ namespace InterfaceOff.WorldScene
[SerializeField] private GameObject HurtOverlay;
[SerializeField] private Slider SliderThing;
[SerializeField] private WindowSpawner Spawner;
[SerializeField] private GameObject HittyThingThatSkyDidntWantMeToNameItLikeThisAndInsteadNameItPropely;
[field: SerializeField] public int HitsTaken { get; private set; }
@@ -24,6 +25,20 @@ namespace InterfaceOff.WorldScene
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)

4
Assets/Scripts/WindowSpawner.cs
View File

@@ -95,7 +95,7 @@ namespace InterfaceOff
public void AlertOfDespawnedWindow() => SpawnedWindowCount--;
private int SpawnyThingyMajig = 900; // Sky chose dis
private int SpawnyThingyMajig = 9000; // Sky chose dis
private void FixedUpdate()
{
@@ -106,7 +106,7 @@ namespace InterfaceOff
if (SpawnyThingyMajig == 0)
{
PasswordField.SetActive(true);
SpawnyThingyMajig = Random.Range(200, 1000);
SpawnyThingyMajig = Random.Range(2000, 10000);
}
else
{