Skip to content

Commit 43ee2e0

Browse files
ControlplazaControlplaza
committed
WJAEHFSDAHASDF
1 parent 6ad1794 commit 43ee2e0

File tree

7 files changed

+139
-129
lines changed

7 files changed

+139
-129
lines changed

‎Assets/Scenes/ZekeScene.unity

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -712,19 +712,19 @@ PrefabInstance:
712712
serializedVersion: 2
713713
m_Modification:
714714
serializedVersion: 3
715-
m_TransformParent: {fileID: 1947219582}
715+
m_TransformParent: {fileID: 2063722737}
716716
m_Modifications:
717717
- target: {fileID: 2100700028279475007, guid: cccce841402240341957f05c794924e0, type: 3}
718718
propertyPath: m_LocalPosition.x
719-
value: 0.4405124
719+
value: 0.57
720720
objectReference: {fileID: 0}
721721
- target: {fileID: 2100700028279475007, guid: cccce841402240341957f05c794924e0, type: 3}
722722
propertyPath: m_LocalPosition.y
723-
value: 1.11
723+
value: 0.11
724724
objectReference: {fileID: 0}
725725
- target: {fileID: 2100700028279475007, guid: cccce841402240341957f05c794924e0, type: 3}
726726
propertyPath: m_LocalPosition.z
727-
value: -1.3
727+
value: 0.3
728728
objectReference: {fileID: 0}
729729
- target: {fileID: 2100700028279475007, guid: cccce841402240341957f05c794924e0, type: 3}
730730
propertyPath: m_LocalRotation.w
@@ -758,6 +758,14 @@ PrefabInstance:
758758
propertyPath: m_Name
759759
value: ToothPick
760760
objectReference: {fileID: 0}
761+
- target: {fileID: 9001917916007347773, guid: cccce841402240341957f05c794924e0, type: 3}
762+
propertyPath: m_IsActive
763+
value: 1
764+
objectReference: {fileID: 0}
765+
- target: {fileID: 9001917916007347773, guid: cccce841402240341957f05c794924e0, type: 3}
766+
propertyPath: m_TagString
767+
value: ToothPick
768+
objectReference: {fileID: 0}
761769
m_RemovedComponents: []
762770
m_RemovedGameObjects: []
763771
m_AddedGameObjects: []
@@ -1135,6 +1143,11 @@ Transform:
11351143
m_CorrespondingSourceObject: {fileID: 8013944403051678321, guid: ed2aaa61619dab447aadb7d68937d47e, type: 3}
11361144
m_PrefabInstance: {fileID: 2252980332609448255}
11371145
m_PrefabAsset: {fileID: 0}
1146+
--- !u!4 &2063722737 stripped
1147+
Transform:
1148+
m_CorrespondingSourceObject: {fileID: 5386649857062818090, guid: ed2aaa61619dab447aadb7d68937d47e, type: 3}
1149+
m_PrefabInstance: {fileID: 2252980332609448255}
1150+
m_PrefabAsset: {fileID: 0}
11381151
--- !u!1 &2117096160
11391152
GameObject:
11401153
m_ObjectHideFlags: 0
@@ -1237,6 +1250,10 @@ PrefabInstance:
12371250
serializedVersion: 3
12381251
m_TransformParent: {fileID: 0}
12391252
m_Modifications:
1253+
- target: {fileID: 2540216404086064671, guid: ed2aaa61619dab447aadb7d68937d47e, type: 3}
1254+
propertyPath: ToothPick
1255+
value:
1256+
objectReference: {fileID: 1404907031}
12401257
- target: {fileID: 2540216404086064671, guid: ed2aaa61619dab447aadb7d68937d47e, type: 3}
12411258
propertyPath: Projectile
12421259
value:
@@ -1298,13 +1315,13 @@ PrefabInstance:
12981315
m_AddedGameObjects:
12991316
- targetCorrespondingSourceObject: {fileID: 8013944403051678321, guid: ed2aaa61619dab447aadb7d68937d47e, type: 3}
13001317
insertIndex: 0
1301-
addedObject: {fileID: 1404907030}
1302-
- targetCorrespondingSourceObject: {fileID: 8013944403051678321, guid: ed2aaa61619dab447aadb7d68937d47e, type: 3}
1303-
insertIndex: 1
13041318
addedObject: {fileID: 642762412}
13051319
- targetCorrespondingSourceObject: {fileID: 8013944403051678321, guid: ed2aaa61619dab447aadb7d68937d47e, type: 3}
13061320
insertIndex: -1
13071321
addedObject: {fileID: 1934819418}
1322+
- targetCorrespondingSourceObject: {fileID: 5386649857062818090, guid: ed2aaa61619dab447aadb7d68937d47e, type: 3}
1323+
insertIndex: -1
1324+
addedObject: {fileID: 1404907030}
13081325
m_AddedComponents: []
13091326
m_SourcePrefab: {fileID: 100100000, guid: ed2aaa61619dab447aadb7d68937d47e, type: 3}
13101327
--- !u!1660057539 &9223372036854775807

‎Assets/Scripts/PlayerScript.cs

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ public class PlayerScript : MonoBehaviour
1212
public Camera playerCamera;
1313
public float lookSpeed = 2.0f;
1414
public float lookXLimit = 45.0f;
15+
public GameObject ToothPick;
16+
public Animator ToothPickAnimation;
1517

1618
[Header("Dash Settings")]
1719
public float DashSpeed = 10;
@@ -91,14 +93,17 @@ void Update()
9193

9294
if (Input.GetButtonDown("Fire1"))
9395
{
94-
if (MeleeWeapon == true)
95-
{
96-
MeleeWeaponUse();
97-
}
98-
else
99-
{
100-
ShootProjectile();
101-
}
96+
ShootProjectile();
97+
}
98+
99+
if (Input.GetButtonDown("Fire2"))
100+
{
101+
MeleeWeaponUse();
102+
}
103+
104+
if (Input.GetButtonUp("Fire2"))
105+
{
106+
ToothPickAnimation.SetBool("IsPoking", false);
102107
}
103108
}
104109

@@ -121,7 +126,14 @@ private void ShootProjectile()
121126

122127
public void MeleeWeaponUse()
123128
{
129+
ToothPick.SetActive(true);
130+
ToothPickAnimation.SetBool("IsPoking", true);
131+
}
124132

133+
IEnumerator SetANimtoFalse()
134+
{
135+
yield return new WaitForSeconds(2);
136+
ToothPickAnimation.SetBool("IsPoking", false);
125137
}
126138

127139
void InstantiateProjectile(Transform firePoint)

‎Assets/Scripts/RatController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ private void OnTriggerEnter(Collider other)
2929
{
3030
var item = other.GetComponent<Item>();
3131

32-
if (other.CompareTag("Spray"))
32+
if (other.CompareTag("Spray") || other.CompareTag("ToothPick"))
3333
{
3434
Debug.Log("Rathit");
3535
TryDropItem();

‎Assets/Zeke/PokeToothPick.anim renamed to ‎Assets/Zeke/PickToothBoy.anim

Lines changed: 14 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ AnimationClip:
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
9-
m_Name: PokeToothPick
9+
m_Name: PickToothBoy
1010
serializedVersion: 7
1111
m_Legacy: 0
1212
m_Compressed: 0
@@ -20,25 +20,16 @@ AnimationClip:
2020
m_Curve:
2121
- serializedVersion: 3
2222
time: 0
23-
value: {x: 0.4405124, y: 1.11, z: -1.3}
23+
value: {x: 0.57, y: 0.11, z: 0.3}
2424
inSlope: {x: 0, y: 0, z: 0}
2525
outSlope: {x: 0, y: 0, z: 0}
2626
tangentMode: 0
2727
weightedMode: 0
2828
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
2929
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
3030
- serializedVersion: 3
31-
time: 0.33333334
32-
value: {x: 0.44051245, y: 1.11, z: 1.35}
33-
inSlope: {x: 0, y: 0, z: 0}
34-
outSlope: {x: 0, y: 0, z: 0}
35-
tangentMode: 0
36-
weightedMode: 0
37-
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
38-
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
39-
- serializedVersion: 3
40-
time: 0.65
41-
value: {x: 0.4405124, y: 1.11, z: -1.3}
31+
time: 0.48333332
32+
value: {x: 0.57, y: 0.11, z: 2.19}
4233
inSlope: {x: 0, y: 0, z: 0}
4334
outSlope: {x: 0, y: 0, z: 0}
4435
tangentMode: 0
@@ -74,7 +65,7 @@ AnimationClip:
7465
m_AdditiveReferencePoseClip: {fileID: 0}
7566
m_AdditiveReferencePoseTime: 0
7667
m_StartTime: 0
77-
m_StopTime: 0.65
68+
m_StopTime: 0.48333332
7869
m_OrientationOffsetY: 0
7970
m_Level: 0
8071
m_CycleOffset: 0
@@ -96,25 +87,16 @@ AnimationClip:
9687
m_Curve:
9788
- serializedVersion: 3
9889
time: 0
99-
value: 0.4405124
100-
inSlope: 0
101-
outSlope: 0
102-
tangentMode: 136
103-
weightedMode: 0
104-
inWeight: 0.33333334
105-
outWeight: 0.33333334
106-
- serializedVersion: 3
107-
time: 0.33333334
108-
value: 0.44051245
90+
value: 0.57
10991
inSlope: 0
11092
outSlope: 0
11193
tangentMode: 136
11294
weightedMode: 0
11395
inWeight: 0.33333334
11496
outWeight: 0.33333334
11597
- serializedVersion: 3
116-
time: 0.65
117-
value: 0.4405124
98+
time: 0.48333332
99+
value: 0.57
118100
inSlope: 0
119101
outSlope: 0
120102
tangentMode: 136
@@ -135,25 +117,16 @@ AnimationClip:
135117
m_Curve:
136118
- serializedVersion: 3
137119
time: 0
138-
value: 1.11
120+
value: 0.11
139121
inSlope: 0
140122
outSlope: 0
141123
tangentMode: 136
142124
weightedMode: 0
143125
inWeight: 0.33333334
144126
outWeight: 0.33333334
145127
- serializedVersion: 3
146-
time: 0.33333334
147-
value: 1.11
148-
inSlope: 0
149-
outSlope: 0
150-
tangentMode: 136
151-
weightedMode: 0
152-
inWeight: 0.33333334
153-
outWeight: 0.33333334
154-
- serializedVersion: 3
155-
time: 0.65
156-
value: 1.11
128+
time: 0.48333332
129+
value: 0.11
157130
inSlope: 0
158131
outSlope: 0
159132
tangentMode: 136
@@ -174,25 +147,16 @@ AnimationClip:
174147
m_Curve:
175148
- serializedVersion: 3
176149
time: 0
177-
value: -1.3
178-
inSlope: 0
179-
outSlope: 0
180-
tangentMode: 136
181-
weightedMode: 0
182-
inWeight: 0.33333334
183-
outWeight: 0.33333334
184-
- serializedVersion: 3
185-
time: 0.33333334
186-
value: 1.35
150+
value: 0.3
187151
inSlope: 0
188152
outSlope: 0
189153
tangentMode: 136
190154
weightedMode: 0
191155
inWeight: 0.33333334
192156
outWeight: 0.33333334
193157
- serializedVersion: 3
194-
time: 0.65
195-
value: -1.3
158+
time: 0.48333332
159+
value: 2.19
196160
inSlope: 0
197161
outSlope: 0
198162
tangentMode: 136

‎Assets/Zeke/PokeToothPick.anim.meta renamed to ‎Assets/Zeke/PickToothBoy.anim.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)