Skip to content
Snippets Groups Projects
Commit 00fc09dc authored by Kelvin Rayhan's avatar Kelvin Rayhan
Browse files

Merge branch 'feat/swordrigging' into 'staging'

Feat/swordrigging

See merge request !44
parents 6f284f1e a86dcd91
Branches
Tags
3 merge requests!78RELEASE,!44Feat/swordrigging,!30feat: import models
...@@ -13,76 +13,8 @@ AnimationClip: ...@@ -13,76 +13,8 @@ AnimationClip:
m_UseHighQualityCurve: 1 m_UseHighQualityCurve: 1
m_RotationCurves: [] m_RotationCurves: []
m_CompressedRotationCurves: [] m_CompressedRotationCurves: []
m_EulerCurves: m_EulerCurves: []
- curve: m_PositionCurves: []
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -5.34, y: 0, z: -9.92}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.46666667
value: {x: -84.2, y: -110.7, z: 2.1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: -5.34, y: 0, z: -9.92}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: RightHand
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.09, y: -0.13, z: 0.013}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.46666667
value: {x: 0.09, y: -0.17, z: 0.013}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: 0.09, y: -0.13, z: 0.013}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: RightHand
m_ScaleCurves: [] m_ScaleCurves: []
m_FloatCurves: [] m_FloatCurves: []
m_PPtrCurves: [] m_PPtrCurves: []
...@@ -92,25 +24,7 @@ AnimationClip: ...@@ -92,25 +24,7 @@ AnimationClip:
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant: m_ClipBindingConstant:
genericBindings: genericBindings: []
- serializedVersion: 2
path: 1979272496
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 1979272496
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: [] pptrCurveMapping: []
m_AnimationClipSettings: m_AnimationClipSettings:
serializedVersion: 2 serializedVersion: 2
...@@ -132,260 +46,8 @@ AnimationClip: ...@@ -132,260 +46,8 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0 m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0 m_HeightFromFeet: 0
m_Mirror: 0 m_Mirror: 0
m_EditorCurves: m_EditorCurves: []
- serializedVersion: 2 m_EulerEditorCurves: []
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.09
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0.09
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: RightHand
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.13
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.46666667
value: -0.17
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: -0.13
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: RightHand
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.013
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0.013
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: RightHand
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -5.34
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.46666667
value: -84.2
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: -5.34
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.x
path: RightHand
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.46666667
value: -110.7
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.y
path: RightHand
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -9.92
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.46666667
value: 2.1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: -9.92
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.z
path: RightHand
classID: 4
script: {fileID: 0}
flags: 0
m_EulerEditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: RightHand
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: RightHand
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: RightHand
classID: 4
script: {fileID: 0}
flags: 0
m_HasGenericRootTransform: 0 m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0 m_HasMotionFloatCurves: 0
m_Events: [] m_Events: []
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: sword point
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers: []
fileFormatVersion: 2
guid: 6573b1a46b132de4b97981fc4362867e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
...@@ -151,6 +151,7 @@ MonoBehaviour: ...@@ -151,6 +151,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
camera: {fileID: 4007702334622639587} camera: {fileID: 4007702334622639587}
xSensitivity: 30 xSensitivity: 30
joint: {fileID: 0}
--- !u!114 &3685380106286336052 --- !u!114 &3685380106286336052
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -5725,14 +5726,14 @@ Transform: ...@@ -5725,14 +5726,14 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1173201642207969453} m_GameObject: {fileID: 1173201642207969453}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0.085482955, y: 0.26862562, z: -0.63416946, w: -0.71997374}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: -0.05348526, y: 0.09953043, z: -0.007831864}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 7741384077319559111} - {fileID: 7741384077319559111}
- {fileID: 8556840527007043379} - {fileID: 8556840527007043379}
m_Father: {fileID: 3012092206240433389} m_Father: {fileID: 1256419198411177137}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2977138485782000962 --- !u!114 &2977138485782000962
MonoBehaviour: MonoBehaviour:
...@@ -7112,6 +7113,7 @@ Transform: ...@@ -7112,6 +7113,7 @@ Transform:
- {fileID: 8527118315788936309} - {fileID: 8527118315788936309}
- {fileID: 9070266575381239687} - {fileID: 9070266575381239687}
- {fileID: 1199073455432382806} - {fileID: 1199073455432382806}
- {fileID: 6956568164975881537}
m_Father: {fileID: 3119095382694229713} m_Father: {fileID: 3119095382694229713}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3405555908406051188 --- !u!1 &3405555908406051188
...@@ -7272,6 +7274,40 @@ Transform: ...@@ -7272,6 +7274,40 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 4160102637162550722} m_Father: {fileID: 4160102637162550722}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3800475319379080896
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7309504134161503187}
m_Layer: 0
m_Name: sword point
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7309504134161503187
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3800475319379080896}
serializedVersion: 2
m_LocalRotation: {x: 0.000000044703487, y: 0.00000002019806, z: -0.0000000038053263,
w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1129536838893933469}
- {fileID: 3203592775059058920}
m_Father: {fileID: 1762508641954980733}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3854663264587428308 --- !u!1 &3854663264587428308
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -7692,6 +7728,37 @@ Transform: ...@@ -7692,6 +7728,37 @@ Transform:
- {fileID: 7703040536625527524} - {fileID: 7703040536625527524}
m_Father: {fileID: 1762508641954980733} m_Father: {fileID: 1762508641954980733}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5070273245029924728
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1129536838893933469}
m_Layer: 0
m_Name: TargetRight
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1129536838893933469
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5070273245029924728}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -1.4745257e-17, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7309504134161503187}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5143535994161079547 --- !u!1 &5143535994161079547
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -7792,7 +7859,6 @@ Transform: ...@@ -7792,7 +7859,6 @@ Transform:
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: m_Children:
- {fileID: 4653765559072431271} - {fileID: 4653765559072431271}
- {fileID: 6956568164975881537}
- {fileID: 6432097732635094937} - {fileID: 6432097732635094937}
- {fileID: 804848384132378636} - {fileID: 804848384132378636}
m_Father: {fileID: 1199073455432382806} m_Father: {fileID: 1199073455432382806}
...@@ -8407,6 +8473,37 @@ Transform: ...@@ -8407,6 +8473,37 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 3012092206240433389} m_Father: {fileID: 3012092206240433389}
m_LocalEulerAnglesHint: {x: -0.1, y: -70.2, z: 45.3} m_LocalEulerAnglesHint: {x: -0.1, y: -70.2, z: 45.3}
--- !u!1 &6147909412143035825
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3203592775059058920}
m_Layer: 0
m_Name: TargetLeft
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3203592775059058920
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6147909412143035825}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -1.4745257e-17, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7309504134161503187}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6247721263744405403 --- !u!1 &6247721263744405403
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -19019,6 +19116,7 @@ Transform: ...@@ -19019,6 +19116,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 995001058696680214} - {fileID: 995001058696680214}
- {fileID: 7309504134161503187}
m_Father: {fileID: 5145376001409546133} m_Father: {fileID: 5145376001409546133}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8514638539117560005 --- !u!1 &8514638539117560005
......
...@@ -132,7 +132,8 @@ public class GunSystem : MonoBehaviour ...@@ -132,7 +132,8 @@ public class GunSystem : MonoBehaviour
private void SwordAttack() private void SwordAttack()
{ {
gameObject.GetComponent<Animator>().SetTrigger("Swing"); Debug.Log("SWING");
GameObject.FindGameObjectWithTag("SwordPoint").GetComponent<Animator>().SetTrigger("Swing");
gameObject.GetComponent<Collider>().enabled = true; gameObject.GetComponent<Collider>().enabled = true;
StartCoroutine(AttackFinished()); StartCoroutine(AttackFinished());
GlobalPreference.Instance.BulletShot(); GlobalPreference.Instance.BulletShot();
......
...@@ -9,6 +9,7 @@ public class Sword : MonoBehaviour ...@@ -9,6 +9,7 @@ public class Sword : MonoBehaviour
Debug.Log(collision.gameObject.name); Debug.Log(collision.gameObject.name);
if (collision.gameObject.CompareTag("Enemy")) if (collision.gameObject.CompareTag("Enemy"))
{ {
Debug.Log("MUSUH");
int damage = gameObject.GetComponent<GunSystem>().damage; int damage = gameObject.GetComponent<GunSystem>().damage;
collision.gameObject.GetComponent<Enemy>().TakeDamage(damage); collision.gameObject.GetComponent<Enemy>().TakeDamage(damage);
GlobalPreference.Instance.BulletHit(); GlobalPreference.Instance.BulletHit();
......
...@@ -93,12 +93,12 @@ public class WeaponManager : MonoBehaviour ...@@ -93,12 +93,12 @@ public class WeaponManager : MonoBehaviour
if (index == 2) if (index == 2)
{ {
player.GetComponent<RigBuilder>().enabled = true; player.GetComponent<RigBuilder>().enabled = true;
weapons[index].GetComponentInChildren<Rig>().enabled = true; player.GetComponentInChildren<Rig>().enabled = true;
} }
else else
{ {
player.GetComponent<RigBuilder>().enabled= false; player.GetComponent<RigBuilder>().enabled= false;
weapons[2].GetComponentInChildren<Rig>().enabled = false; player.GetComponentInChildren<Rig>().enabled = false;
} }
currentWeapon = weapons[index]; currentWeapon = weapons[index];
currentWeaponName.SetText(currentWeapon.name); currentWeaponName.SetText(currentWeapon.name);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment