RobiiAragon/FueraDeEscala
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add some extra assets FX and SFX

Browse Source
This commit is contained in:
Robii Aragon
2026-03-29 23:03:14 -07:00
parent 6ef3eb1535
commit 24dc66a81e
10142 changed files with 2535978 additions and 36608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/Slice System/cuttingModeSystem.cs.meta
View File

@@ -13,8 +13,9 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/Slice
System/cuttingModeSystem.cs
uploadId: 814740
uploadId: 889948

17
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/Slice System/runtimeShatterRecursive.cs
View File

@@ -24,6 +24,9 @@ public class runtimeShatterRecursive : MonoBehaviour
public bool useCustomShatterPosition;
public Transform customShatterPosition;
public bool useRandomRadiusOnShatterPosition;
public float randomRadiusOnShatter;
[Space]
[Header ("Tag and Layer Settings")]
[Space]
@@ -120,6 +123,13 @@ public class runtimeShatterRecursive : MonoBehaviour
}
}
public void addObjectsToShatter (GameObject newObject)
{
if (!objectsToShatter.Contains (newObject)) {
objectsToShatter.Add (newObject);
}
}
public GameObject [] randomShatterSingle (GameObject objectToShatter)
{
Vector3 shatterPosition = objectToShatter.transform.position;
@@ -128,6 +138,13 @@ public class runtimeShatterRecursive : MonoBehaviour
shatterPosition = customShatterPosition.position;
}
if (useRandomRadiusOnShatterPosition) {
Vector2 circlePosition = Random.insideUnitCircle * randomRadiusOnShatter;
Vector3 newSpawnPosition = new Vector3 (circlePosition.x, circlePosition.y, 0);
shatterPosition += newSpawnPosition;
}
GameObject [] shatters = sliceSystemUtils.shatterObject (objectToShatter, shatterPosition, crossSectionMaterial);
if (shatters != null && shatters.Length > 0) {

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/Slice System/runtimeShatterRecursive.cs.meta
View File

@@ -13,8 +13,9 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/Slice
System/runtimeShatterRecursive.cs
uploadId: 814740
uploadId: 889948

376
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/Slice System/simpleSliceSystem.cs
View File

@@ -5,241 +5,247 @@ using UnityEngine.Events;
public class simpleSliceSystem : MonoBehaviour
{
[Header ("Main Settings")]
[Space]
[Header ("Main Settings")]
[Space]
public bool sliceEnabled = true;
public bool sliceEnabled = true;
public GameObject objectToSlice;
public GameObject objectToSlice;
public GameObject alternatePrefab;
public GameObject alternatePrefab;
public Material infillMaterial;
public Material infillMaterial;
public surfaceToSlice mainSurfaceToSlice;
public surfaceToSlice mainSurfaceToSlice;
public Transform[] severables = new Transform[0];
public Transform [] severables = new Transform [0];
[Space]
[Header ("Slice Ragdoll Settings")]
[Space]
[Space]
[Header ("Slice Ragdoll Settings")]
[Space]
public string prefabsPath = "";
public string prefabsPath = "";
public Material sliceMaterial;
public Material sliceMaterial;
public bool setTagOnSkeletonRigidbodies = true;
public bool setTagOnSkeletonRigidbodies = true;
public string tagOnSkeletonRigidbodies = "box";
public string tagOnSkeletonRigidbodies = "box";
[Space]
[Header ("Physics Settings")]
[Space]
[Space]
[Header ("Physics Settings")]
[Space]
public bool ignoreUpdateLastObjectSpeed;
public bool ignoreUpdateLastObjectSpeed;
[Space]
[Header ("Other Settings")]
[Space]
[Space]
[Header ("Other Settings")]
[Space]
public bool ignoreDestroyOriginalObject;
public bool ignoreDestroyOriginalObject;
public UnityEvent eventsOnIgnoreDestroyOriginalObject;
public UnityEvent eventsOnIgnoreDestroyOriginalObject;
[Space]
[Space]
public bool setCustomIDOnSliceSpieces;
public bool setCustomIDOnSliceSpieces;
[Space]
[Header ("Debug")]
[Space]
[Space]
[Header ("Debug")]
[Space]
public bool showDebugPrint;
public bool sliceInitialized;
public bool showDebugPrint;
public bool sliceInitialized;
const string glyphs = "abcdefghijklmnopqrstuvwxyz0123456789";
const string glyphs = "abcdefghijklmnopqrstuvwxyz0123456789";
string randomString = "";
string randomString = "";
public string getRandomString ()
{
return randomString;
}
public string getRandomString ()
{
return randomString;
}
public void setRandomString (string newValue)
{
if (randomString.Equals ("")) {
randomString = newValue;
}
}
public void setRandomString (string newValue)
{
if (randomString.Equals ("")) {
randomString = newValue;
}
}
public void setRandomString ()
{
if (setCustomIDOnSliceSpieces) {
if (randomString.Equals ("")) {
int charAmount = UnityEngine.Random.Range (10, 20); //set those to the minimum and maximum length of your string
public void setRandomString ()
{
if (setCustomIDOnSliceSpieces) {
if (randomString.Equals ("")) {
int charAmount = UnityEngine.Random.Range (10, 20); //set those to the minimum and maximum length of your string
for (int i = 0; i < charAmount; i++) {
randomString += glyphs [UnityEngine.Random.Range (0, glyphs.Length)];
}
}
}
}
for (int i = 0; i < charAmount; i++) {
randomString += glyphs [UnityEngine.Random.Range (0, glyphs.Length)];
}
}
}
}
public void destroyAllSlicedPiecesByRandomString ()
{
if (setCustomIDOnSliceSpieces && randomString != "") {
sliceSystemUtils.destroyAllSlicedPiecesByRandomString (randomString, gameObject);
}
}
public void destroyAllSlicedPiecesByRandomString ()
{
if (setCustomIDOnSliceSpieces && randomString != "") {
sliceSystemUtils.destroyAllSlicedPiecesByRandomString (randomString, gameObject);
}
}
void Awake ()
{
if (sliceEnabled) {
initializeValuesOnHackableComponent ();
}
}
void Awake ()
{
if (sliceEnabled) {
initializeValuesOnHackableComponent ();
}
}
public void initializeValuesOnHackableComponent ()
{
if (sliceInitialized) {
return;
}
public void initializeValuesOnHackableComponent ()
{
if (sliceInitialized) {
return;
}
sliceSystemUtils.initializeValuesOnHackableComponent (gameObject, this);
sliceInitialized = true;
}
sliceSystemUtils.initializeValuesOnHackableComponent (gameObject, this);
public void setDestructionPending (bool state)
{
sliceSystemUtils.setDestructionPending (gameObject, state);
}
sliceInitialized = true;
}
public void activateSlice (Collider objectCollider, Vector3 newNormalInWorldSpaceValue,
Vector3 positionInWorldSpace, Vector3 slicePosition, bool updateLastObjectSpeed, Vector3 lastSpeed)
{
if (!sliceEnabled) {
return;
}
public void setDestructionPending (bool state)
{
sliceSystemUtils.setDestructionPending (gameObject, state);
}
Vector3 point = objectCollider.ClosestPointOnBounds (positionInWorldSpace);
public void activateSlice (Collider objectCollider, Vector3 newNormalInWorldSpaceValue,
Vector3 positionInWorldSpace, Vector3 slicePosition, bool updateLastObjectSpeed, Vector3 lastSpeed)
{
if (!sliceEnabled) {
return;
}
if (mainSurfaceToSlice.useParticlesOnSlice) {
Quaternion particlesRotation = Quaternion.LookRotation (newNormalInWorldSpaceValue);
Vector3 point = objectCollider.ClosestPointOnBounds (positionInWorldSpace);
Instantiate (mainSurfaceToSlice.particlesOnSlicePrefab, slicePosition, particlesRotation);
}
if (mainSurfaceToSlice.useParticlesOnSlice) {
Quaternion particlesRotation = Quaternion.LookRotation (newNormalInWorldSpaceValue);
sliceSystemUtils.sliceCharacter (objectToSlice, point, newNormalInWorldSpaceValue, updateLastObjectSpeed, lastSpeed);
Instantiate (mainSurfaceToSlice.particlesOnSlicePrefab, slicePosition, particlesRotation);
}
if (showDebugPrint) {
print ("Activate Slice on Character " + objectToSlice.name);
}
}
sliceSystemUtils.sliceCharacter (objectToSlice, point, newNormalInWorldSpaceValue, updateLastObjectSpeed, lastSpeed);
public void searchBodyParts ()
{
if (objectToSlice == null) {
objectToSlice = gameObject;
}
if (showDebugPrint) {
print ("Activate Slice on Character " + objectToSlice.name);
}
}
List<GameObject> bodyPartsList = new List<GameObject> ();
Component[] childrens = objectToSlice.GetComponentsInChildren (typeof(Rigidbody));
int childrensLength = childrens.Length;
for (int i = 0; i < childrensLength; i++) {
Rigidbody child = childrens [i] as Rigidbody;
Collider currentCollider = child.GetComponent<Collider> ();
if (currentCollider != null && !currentCollider.isTrigger) {
bodyPartsList.Add (child.gameObject);
}
}
severables = new Transform[bodyPartsList.Count];
for (int i = 0; i < bodyPartsList.Count; i++) {
severables [i] = bodyPartsList [i].transform;
}
if (!Application.isPlaying) {
updateComponent ();
}
}
public void setTagOnBodyParts (string newTag)
{
for (int i = 0; i < severables.Length; i++) {
if (severables [i] != null) {
severables [i].tag = newTag;
}
}
}
public GameObject getMainAlternatePrefab ()
{
return alternatePrefab;
}
public Transform[] getSeverables ()
{
return severables;
}
public void searchBodyParts ()
{
if (objectToSlice == null) {
objectToSlice = gameObject;
}
public void setNewSeverablesList (GameObject newObject)
{
if (newObject != null) {
genericRagdollBuilder currentGenericRagdollBuilder = newObject.GetComponent<genericRagdollBuilder> ();
List<GameObject> bodyPartsList = new List<GameObject> ();
if (currentGenericRagdollBuilder != null) {
int bonesCount = currentGenericRagdollBuilder.bones.Count;
Component [] childrens = objectToSlice.GetComponentsInChildren (typeof (Rigidbody));
severables = new Transform[bonesCount];
int childrensLength = childrens.Length;
for (int i = 0; i < bonesCount; i++) {
severables [i] = currentGenericRagdollBuilder.bones [i].anchor;
}
}
}
}
for (int i = 0; i < childrensLength; i++) {
public void createRagdollPrefab ()
{
if (alternatePrefab == null) {
prefabsPath = pathInfoValues.getSliceObjectsPrefabsPath ();
Rigidbody child = childrens [i] as Rigidbody;
alternatePrefab = GKC_Utils.createSliceRagdollPrefab (objectToSlice, prefabsPath, sliceMaterial, setTagOnSkeletonRigidbodies, tagOnSkeletonRigidbodies);
}
}
Collider currentCollider = child.GetComponent<Collider> ();
public void setSliceEnabledState (bool state)
{
sliceEnabled = state;
if (currentCollider != null && !currentCollider.isTrigger) {
if (sliceEnabled) {
initializeValuesOnHackableComponent ();
}
}
bodyPartsList.Add (child.gameObject);
}
}
severables = new Transform [bodyPartsList.Count];
for (int i = 0; i < bodyPartsList.Count; i++) {
severables [i] = bodyPartsList [i].transform;
}
if (!Application.isPlaying) {
updateComponent ();
}
}
public void setTagOnBodyParts (string newTag)
{
for (int i = 0; i < severables.Length; i++) {
if (severables [i] != null) {
severables [i].tag = newTag;
}
}
}
public void setSliceEnabledStateFromEditor (bool state)
{
sliceEnabled = state;
public GameObject getMainAlternatePrefab ()
{
return alternatePrefab;
}
updateComponent ();
}
public Transform [] getSeverables ()
{
return severables;
}
void updateComponent ()
{
GKC_Utils.updateComponent (this);
public void setNewSeverablesList (GameObject newObject)
{
if (newObject != null) {
genericRagdollBuilder currentGenericRagdollBuilder = newObject.GetComponent<genericRagdollBuilder> ();
GKC_Utils.updateDirtyScene ("Update Simple Slice System " + gameObject.name, gameObject);
}
if (currentGenericRagdollBuilder != null) {
int bonesCount = currentGenericRagdollBuilder.bones.Count;
severables = new Transform [bonesCount];
for (int i = 0; i < bonesCount; i++) {
severables [i] = currentGenericRagdollBuilder.bones [i].anchor;
}
}
}
}
public void createRagdollPrefab ()
{
if (alternatePrefab == null) {
prefabsPath = pathInfoValues.getSliceObjectsPrefabsPath ();
alternatePrefab = GKC_Utils.createSliceRagdollPrefab (objectToSlice, prefabsPath, sliceMaterial, setTagOnSkeletonRigidbodies, tagOnSkeletonRigidbodies);
}
}
public void setSliceEnabledState (bool state)
{
sliceEnabled = state;
if (sliceEnabled) {
initializeValuesOnHackableComponent ();
}
}
public void setMainSurfaceToSlice (surfaceToSlice newSurface)
{
mainSurfaceToSlice = newSurface;
}
//EDITOR FUNCTIONS
public void setSliceEnabledStateFromEditor (bool state)
{
sliceEnabled = state;
updateComponent ();
}
void updateComponent ()
{
GKC_Utils.updateComponent (this);
GKC_Utils.updateDirtyScene ("Update Simple Slice System " + gameObject.name, gameObject);
}
}

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/Slice System/simpleSliceSystem.cs.meta
View File

@@ -13,8 +13,9 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/Slice
System/simpleSliceSystem.cs
uploadId: 814740
uploadId: 889948

9
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/Slice System/sliceSystem.cs
View File

@@ -394,6 +394,8 @@ public class sliceSystem : MonoBehaviour
currentSurfaceToSlice.checkEventBeforeSlice ();
currentSurfaceToSlice.checkEventsOnIgnoreDestroyOriginalObject ();
currentSurfaceToSlice.getMainSimpleSliceSystem ().activateSlice (objectCollider, positionInWorldSpace,
normalInWorldSpace, slicePosition, updateLastObjectSpeed, lastSpeed);
@@ -418,6 +420,8 @@ public class sliceSystem : MonoBehaviour
currentSurfaceToSlice.checkEventBeforeSlice ();
currentSurfaceToSlice.checkEventsOnIgnoreDestroyOriginalObject ();
obj = currentSurfaceToSlice.getMainSurfaceToSlice ();
sliceSystemUtils.sliceObject (currentCutPosition, obj, currentCutUp, crossSectionMaterial, ref objectSliced, ref object1, ref object2);
@@ -542,6 +546,11 @@ public class sliceSystem : MonoBehaviour
}
obj.SetActive (false);
if (currentSurfaceToSlice.useEventToSendNewSlicedParts) {
currentSurfaceToSlice.eventToSendNewSlicedParts.Invoke (object1);
currentSurfaceToSlice.eventToSendNewSlicedParts.Invoke (object2);
}
}
}
}

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/Slice System/sliceSystem.cs.meta
View File

@@ -13,8 +13,9 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/Slice
System/sliceSystem.cs
uploadId: 814740
uploadId: 889948

135
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/Slice System/sliceSystemUtils.cs
View File

@@ -2,84 +2,84 @@
using System.Collections.Generic;
using UnityEngine;
//using EzySlice;
using EzySlice;
//using NobleMuffins.LimbHacker.Guts;
//using NobleMuffins.LimbHacker;
using NobleMuffins.LimbHacker.Guts;
using NobleMuffins.LimbHacker;
public class sliceSystemUtils : MonoBehaviour
{
public static void sliceObject (Vector3 slicePosition, GameObject objectToSlice, Vector3 cutDirection, Material crossSectionMaterial, ref bool objectSliced, ref GameObject object1, ref GameObject object2)
{
//SlicedHull hull = objectToSlice.SliceObject (slicePosition, cutDirection, crossSectionMaterial);
SlicedHull hull = objectToSlice.SliceObject (slicePosition, cutDirection, crossSectionMaterial);
//if (hull != null) {
if (hull != null) {
// objectSliced = true;
objectSliced = true;
// object1 = hull.CreateLowerHull (objectToSlice, crossSectionMaterial);
// object2 = hull.CreateUpperHull (objectToSlice, crossSectionMaterial);
//}
object1 = hull.CreateLowerHull (objectToSlice, crossSectionMaterial);
object2 = hull.CreateUpperHull (objectToSlice, crossSectionMaterial);
}
}
public static surfaceToSlice getSurfaceToSlice (GameObject currentSurface)
{
//ChildOfHackable currentChildOfHackable = currentSurface.GetComponent<ChildOfHackable> ();
ChildOfHackable currentChildOfHackable = currentSurface.GetComponent<ChildOfHackable> ();
//if (currentChildOfHackable != null) {
// return currentChildOfHackable.parentHackable.mainSurfaceToSlice;
//}
if (currentChildOfHackable != null) {
return currentChildOfHackable.parentHackable.mainSurfaceToSlice;
}
return null;
}
public static void initializeValuesOnHackableComponent (GameObject objectToUse, simpleSliceSystem currentSimpleSliceSystem)
{
//Hackable currentHackable = objectToUse.GetComponent<Hackable> ();
Hackable currentHackable = objectToUse.GetComponent<Hackable> ();
//if (currentHackable == null) {
// currentHackable = objectToUse.AddComponent<Hackable> ();
//}
if (currentHackable == null) {
currentHackable = objectToUse.AddComponent<Hackable> ();
}
//currentHackable.mainSurfaceToSlice = currentSimpleSliceSystem.mainSurfaceToSlice;
currentHackable.mainSurfaceToSlice = currentSimpleSliceSystem.mainSurfaceToSlice;
//currentHackable.alternatePrefab = currentSimpleSliceSystem.getMainAlternatePrefab ();
currentHackable.alternatePrefab = currentSimpleSliceSystem.getMainAlternatePrefab ();
//currentHackable.objectToSlice = currentSimpleSliceSystem.objectToSlice;
currentHackable.objectToSlice = currentSimpleSliceSystem.objectToSlice;
//currentHackable.infillMaterial = currentSimpleSliceSystem.infillMaterial;
currentHackable.infillMaterial = currentSimpleSliceSystem.infillMaterial;
//currentHackable.severables = currentSimpleSliceSystem.getSeverables ();
currentHackable.severables = currentSimpleSliceSystem.getSeverables ();
//currentHackable.ignoreUpdateLastObjectSpeed = currentSimpleSliceSystem.ignoreUpdateLastObjectSpeed;
currentHackable.ignoreUpdateLastObjectSpeed = currentSimpleSliceSystem.ignoreUpdateLastObjectSpeed;
//currentHackable.ignoreDestroyOriginalObject = currentSimpleSliceSystem.ignoreDestroyOriginalObject;
currentHackable.ignoreDestroyOriginalObject = currentSimpleSliceSystem.ignoreDestroyOriginalObject;
//currentHackable.eventsOnIgnoreDestroyOriginalObject = currentSimpleSliceSystem.eventsOnIgnoreDestroyOriginalObject;
currentHackable.eventsOnIgnoreDestroyOriginalObject = currentSimpleSliceSystem.eventsOnIgnoreDestroyOriginalObject;
//currentHackable.setCustomIDOnSliceSpieces = currentSimpleSliceSystem.setCustomIDOnSliceSpieces;
currentHackable.setCustomIDOnSliceSpieces = currentSimpleSliceSystem.setCustomIDOnSliceSpieces;
//if (currentSimpleSliceSystem.setCustomIDOnSliceSpieces) {
// currentSimpleSliceSystem.setRandomString ();
if (currentSimpleSliceSystem.setCustomIDOnSliceSpieces) {
currentSimpleSliceSystem.setRandomString ();
// currentHackable.setRandomString (currentSimpleSliceSystem.getRandomString ());
//}
currentHackable.setRandomString (currentSimpleSliceSystem.getRandomString ());
}
//currentHackable.initializeValues ();
currentHackable.initializeValues ();
}
public static void setDestructionPending (GameObject objectToUse, bool state)
{
//Hackable currentHackable = objectToUse.GetComponent<Hackable> ();
Hackable currentHackable = objectToUse.GetComponent<Hackable> ();
//if (currentHackable == null) {
// currentHackable = objectToUse.AddComponent<Hackable> ();
//}
if (currentHackable == null) {
currentHackable = objectToUse.AddComponent<Hackable> ();
}
//if (currentHackable != null) {
// currentHackable.setDestructionPending (state);
//}
if (currentHackable != null) {
currentHackable.setDestructionPending (state);
}
}
public static void sliceCharacter (GameObject objectToSlice, Vector3 point, Vector3 newNormalInWorldSpaceValue,
@@ -89,46 +89,46 @@ public class sliceSystemUtils : MonoBehaviour
return;
}
//Hackable currentHackable = objectToSlice.GetComponent<Hackable> ();
Hackable currentHackable = objectToSlice.GetComponent<Hackable> ();
//if (currentHackable != null) {
// currentHackable.activateSlice (objectToSlice, point, newNormalInWorldSpaceValue, updateLastObjectSpeed, lastSpeed);
//}
if (currentHackable != null) {
currentHackable.activateSlice (objectToSlice, point, newNormalInWorldSpaceValue, updateLastObjectSpeed, lastSpeed);
}
}
public static GameObject[] shatterObject (GameObject obj, Vector3 shatterPosition, Material crossSectionMaterial = null, bool shaterActive = true)
{
//if (shaterActive) {
// return obj.SliceInstantiate (getRandomPlane (shatterPosition, obj.transform.localScale),
// new TextureRegion (0.0f, 0.0f, 1.0f, 1.0f),
// crossSectionMaterial);
//}
if (shaterActive) {
return obj.SliceInstantiate (getRandomPlane (shatterPosition, obj.transform.localScale),
new TextureRegion (0.0f, 0.0f, 1.0f, 1.0f),
crossSectionMaterial);
}
return null;
}
//public static EzySlice.Plane getRandomPlane (Vector3 positionOffset, Vector3 scaleOffset)
//{
// Vector3 randomPosition = Random.insideUnitSphere;
// Vector3 randomDirection = Random.insideUnitSphere.normalized;
public static EzySlice.Plane getRandomPlane (Vector3 positionOffset, Vector3 scaleOffset)
{
Vector3 randomPosition = Random.insideUnitSphere;
Vector3 randomDirection = Random.insideUnitSphere.normalized;
// return new EzySlice.Plane (randomPosition, randomDirection);
//}
return new EzySlice.Plane (randomPosition, randomDirection);
}
public static void destroyAllSlicedPiecesByRandomString (string stringValue, GameObject mainObjectToIgnore)
{
//Hackable[] HackableList = FindObjectsOfType<Hackable> ();
Hackable[] HackableList = FindObjectsOfType<Hackable> ();
//int HackableListLength = HackableList.Length;
int HackableListLength = HackableList.Length;
//for (int i = 0; i < HackableListLength; i++) {
// Hackable currentHackable = HackableList [i] as Hackable;
for (int i = 0; i < HackableListLength; i++) {
Hackable currentHackable = HackableList [i] as Hackable;
// if (mainObjectToIgnore != currentHackable.gameObject && currentHackable.getRandomString ().Equals (stringValue)) {
// Destroy (currentHackable.gameObject);
// }
//}
if (mainObjectToIgnore != currentHackable.gameObject && currentHackable.getRandomString ().Equals (stringValue)) {
Destroy (currentHackable.gameObject);
}
}
}
@@ -220,7 +220,9 @@ public class sliceSystemUtils : MonoBehaviour
Debug.DrawRay (rayDirection1, rayDirection2, Color.blue, 5);
}
currentSurfaceToSlice.checkEventBeforeSlice ();
currentSurfaceToSlice.checkEventsOnIgnoreDestroyOriginalObject ();
currentSurfaceToSlice.checkEventBeforeSlice ();
currentSurfaceToSlice.getMainSimpleSliceSystem ().activateSlice (objectCollider, positionInWorldSpace,
normalInWorldSpace, slicePosition, true, lastSpeed);
@@ -240,6 +242,8 @@ public class sliceSystemUtils : MonoBehaviour
sliceDirection = Quaternion.Euler (Random.Range (0, 361) * sliceForwardDirection) * sliceDirection;
}
currentSurfaceToSlice.checkEventsOnIgnoreDestroyOriginalObject ();
currentSurfaceToSlice.checkEventBeforeSlice ();
objectToCheck = currentSurfaceToSlice.getMainSurfaceToSlice ();
@@ -349,7 +353,12 @@ public class sliceSystemUtils : MonoBehaviour
}
objectToCheck.SetActive (false);
}
if (currentSurfaceToSlice.useEventToSendNewSlicedParts) {
currentSurfaceToSlice.eventToSendNewSlicedParts.Invoke (object1);
currentSurfaceToSlice.eventToSendNewSlicedParts.Invoke (object2);
}
}
}
}

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/Slice System/sliceSystemUtils.cs.meta
View File

@@ -13,8 +13,9 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/Slice
System/sliceSystemUtils.cs
uploadId: 814740
uploadId: 889948

4
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/airAttackToLandSystem.cs
View File

@@ -15,6 +15,10 @@ public class airAttackToLandSystem : MonoBehaviour
public float minDistanceToDetectGround;
[Space]
[Header ("Debug")]
[Space]
public bool attackLandingInProcess;
[Space]

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/airAttackToLandSystem.cs.meta
View File

@@ -13,7 +13,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/airAttackToLandSystem.cs
uploadId: 814740
uploadId: 889948

191
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/dualWieldMeleeWeaponObjectSystem.cs
View File

@@ -4,141 +4,148 @@ using UnityEngine;
public class dualWieldMeleeWeaponObjectSystem : MonoBehaviour
{
[Space]
[Header ("Components")]
[Space]
[Space]
[Header ("Components")]
[Space]
public hitCombat mainHitCombat;
public hitCombat mainHitCombat;
public grabbedObjectMeleeAttackSystem currentGrabbedObjectMeleeAttackSystem;
public grabbedObjectMeleeAttackSystem currentGrabbedObjectMeleeAttackSystem;
public Transform meleeWeaponObject;
public Transform meleeWeaponObject;
public Transform meleeWeaponParent;
public Transform meleeWeaponParent;
public Transform meleeWeaponHandTransformReference;
public Transform meleeWeaponHandTransformReference;
public Transform meleeWeaponTransformReference;
public Transform meleeWeaponTransformReference;
public Transform raycastCheckTransfrom;
public Transform raycastCheckTransfrom;
public Transform mainDamagePositionTransform;
public Transform mainDamagePositionTransform;
[Space]
[Header ("Cutting Mode Settings")]
[Space]
[Space]
[Header ("Cutting Mode Settings")]
[Space]
public Transform cutPositionTransform;
public Transform cutDirectionTransform;
public Transform cutPositionTransform;
public Transform cutDirectionTransform;
public Transform planeDefiner1;
public Transform planeDefiner2;
public Transform planeDefiner3;
public Transform planeDefiner1;
public Transform planeDefiner2;
public Transform planeDefiner3;
[Space]
[Header ("Damage Detection Settings")]
[Space]
[Space]
[Header ("Damage Detection Settings")]
[Space]
public List<Transform> raycastCheckTransfromList = new List<Transform> ();
public List<Transform> raycastCheckTransfromList = new List<Transform> ();
Vector3 originalHitCombatColliderSize;
Vector3 originalHitCombatColliderSize;
BoxCollider currentHitCombatBoxCollider;
BoxCollider currentHitCombatBoxCollider;
Vector3 originalHitCombatColliderCenter;
Vector3 originalHitCombatColliderCenter;
Transform leftHandMountPoint;
Transform leftHandMountPoint;
public void enableDualWieldMeleeweapobObject (grabbedObjectMeleeAttackSystem newGrabbedObjectMeleeAttackSystem, bool useEventsOnDamageDetected)
{
currentGrabbedObjectMeleeAttackSystem = newGrabbedObjectMeleeAttackSystem;
public void enableDualWieldMeleeweapobObject (grabbedObjectMeleeAttackSystem newGrabbedObjectMeleeAttackSystem, bool useEventsOnDamageDetected)
{
currentGrabbedObjectMeleeAttackSystem = newGrabbedObjectMeleeAttackSystem;
if (currentGrabbedObjectMeleeAttackSystem.useCustomLayerToDetectSurfaces) {
mainHitCombat.setCustomLayerMask (currentGrabbedObjectMeleeAttackSystem.customLayerToDetectSurfaces);
}
if (currentGrabbedObjectMeleeAttackSystem.useCustomLayerToDetectSurfaces) {
mainHitCombat.setCustomLayerMask (currentGrabbedObjectMeleeAttackSystem.customLayerToDetectSurfaces);
}
if (currentGrabbedObjectMeleeAttackSystem.useCustomIgnoreTags) {
mainHitCombat.setCustomTagsToIgnore (currentGrabbedObjectMeleeAttackSystem.customTagsToIgnoreList);
} else {
mainHitCombat.setCustomTagsToIgnore (null);
}
if (currentGrabbedObjectMeleeAttackSystem.useCustomIgnoreTags) {
mainHitCombat.setCustomTagsToIgnore (currentGrabbedObjectMeleeAttackSystem.customTagsToIgnoreList);
} else {
mainHitCombat.setCustomTagsToIgnore (null);
}
mainHitCombat.setCustomDamageCanBeBlockedState (true);
mainHitCombat.setCustomDamageCanBeBlockedState (true);
currentHitCombatBoxCollider = mainHitCombat.getMainCollider ().GetComponent<BoxCollider> ();
currentHitCombatBoxCollider = mainHitCombat.getMainCollider ().GetComponent<BoxCollider> ();
originalHitCombatColliderCenter = currentHitCombatBoxCollider.center;
originalHitCombatColliderCenter = currentHitCombatBoxCollider.center;
originalHitCombatColliderSize = currentHitCombatBoxCollider.size;
originalHitCombatColliderSize = currentHitCombatBoxCollider.size;
mainHitCombat.getOwner (currentGrabbedObjectMeleeAttackSystem.playerControllerGameObject);
mainHitCombat.getOwner (currentGrabbedObjectMeleeAttackSystem.playerControllerGameObject);
mainHitCombat.setMainColliderEnabledState (true);
mainHitCombat.setMainColliderEnabledState (true);
mainHitCombat.setSendMessageOnDamageDetectedState (useEventsOnDamageDetected);
mainHitCombat.setSendMessageOnDamageDetectedState (useEventsOnDamageDetected);
if (useEventsOnDamageDetected) {
mainHitCombat.setCustomObjectToSendMessage (currentGrabbedObjectMeleeAttackSystem.gameObject);
}
if (useEventsOnDamageDetected) {
mainHitCombat.setCustomObjectToSendMessage (currentGrabbedObjectMeleeAttackSystem.gameObject);
}
leftHandMountPoint = currentGrabbedObjectMeleeAttackSystem.getLeftHandMountPoint ();
leftHandMountPoint = currentGrabbedObjectMeleeAttackSystem.getLeftHandMountPoint ();
meleeWeaponObject.SetParent (leftHandMountPoint);
meleeWeaponObject.SetParent (leftHandMountPoint);
Vector3 localPosition = meleeWeaponHandTransformReference.localPosition;
Quaternion localRotation = meleeWeaponHandTransformReference.localRotation;
Vector3 localPosition = meleeWeaponHandTransformReference.localPosition;
Quaternion localRotation = meleeWeaponHandTransformReference.localRotation;
meleeWeaponObject.localPosition = localPosition;
meleeWeaponObject.localRotation = localRotation;
meleeWeaponObject.localPosition = localPosition;
meleeWeaponObject.localRotation = localRotation;
enableOrDisableDualWieldMeleeWeaponObject (true);
}
enableOrDisableDualWieldMeleeWeaponObject (true);
}
public void enableOrDisableDualWieldMeleeWeaponObject (bool state)
{
if (meleeWeaponObject.gameObject.activeSelf != state) {
meleeWeaponObject.gameObject.SetActive (state);
}
}
public void enableOrDisableDualWieldMeleeWeaponObject (bool state)
{
if (meleeWeaponObject.gameObject.activeSelf != state) {
meleeWeaponObject.gameObject.SetActive (state);
}
}
public void disableDualWieldMeleeweapobObject ()
{
mainHitCombat.setMainColliderEnabledState (false);
public void disableDualWieldMeleeweapobObject ()
{
mainHitCombat.setMainColliderEnabledState (false);
enableOrDisableDualWieldMeleeWeaponObject (true);
enableOrDisableDualWieldMeleeWeaponObject (true);
meleeWeaponObject.SetParent (meleeWeaponParent);
meleeWeaponObject.SetParent (meleeWeaponParent);
Vector3 localPosition = meleeWeaponTransformReference.localPosition;
Quaternion localRotation = meleeWeaponTransformReference.localRotation;
Vector3 localPosition = meleeWeaponTransformReference.localPosition;
Quaternion localRotation = meleeWeaponTransformReference.localRotation;
meleeWeaponObject.localPosition = localPosition;
meleeWeaponObject.localRotation = localRotation;
}
meleeWeaponObject.localPosition = localPosition;
meleeWeaponObject.localRotation = localRotation;
}
public void setHitCombatScale (Vector3 newScale)
{
if (currentHitCombatBoxCollider != null) {
currentHitCombatBoxCollider.size = newScale;
}
}
public void setHitCombatScale (Vector3 newScale)
{
if (currentHitCombatBoxCollider != null) {
currentHitCombatBoxCollider.size = newScale;
}
}
public void setHitCombatOffset (Vector3 newValue)
{
if (currentHitCombatBoxCollider != null) {
currentHitCombatBoxCollider.center = newValue;
}
}
public void setHitCombatScaleMultiplier (float newMultiplier)
{
if (currentHitCombatBoxCollider != null) {
currentHitCombatBoxCollider.size *= newMultiplier;
}
}
public void setOriginalHitCombatScale ()
{
setHitCombatScale (originalHitCombatColliderSize);
}
public void setHitCombatOffset (Vector3 newValue)
{
if (currentHitCombatBoxCollider != null) {
currentHitCombatBoxCollider.center = newValue;
}
}
public void setOriginalHitCombatOffset ()
{
setHitCombatOffset (originalHitCombatColliderCenter);
}
public void setOriginalHitCombatScale ()
{
setHitCombatScale (originalHitCombatColliderSize);
}
public void setOriginalHitCombatOffset ()
{
setHitCombatOffset (originalHitCombatColliderCenter);
}
}

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/dualWieldMeleeWeaponObjectSystem.cs.meta
View File

@@ -13,7 +13,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/dualWieldMeleeWeaponObjectSystem.cs
uploadId: 814740
uploadId: 889948

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/hiddenMeleeSurface.cs.meta
View File

@@ -13,7 +13,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/hiddenMeleeSurface.cs
uploadId: 814740
uploadId: 889948

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeAttackSurfaceInfo.cs.meta
View File

@@ -13,7 +13,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeAttackSurfaceInfo.cs
uploadId: 814740
uploadId: 889948

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeCombatAttackStartState.cs.meta
View File

@@ -13,7 +13,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeCombatAttackStartState.cs
uploadId: 814740
uploadId: 889948

5
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeCombatThrowReturnWeaponSystem.cs
View File

@@ -2442,6 +2442,11 @@ public class meleeCombatThrowReturnWeaponSystem : MonoBehaviour
return continueObjecThrowActivated;
}
public bool isReturningThrownObject ()
{
return returningThrownObject;
}
public float getLastTimeObjectThrown ()
{
return lastTimeObjectThrown;

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeCombatThrowReturnWeaponSystem.cs.meta
View File

@@ -13,7 +13,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeCombatThrowReturnWeaponSystem.cs
uploadId: 814740
uploadId: 889948

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeShieldObjectSystem.cs.meta
View File

@@ -13,7 +13,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeShieldObjectSystem.cs
uploadId: 814740
uploadId: 889948

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeUISystem.cs.meta
View File

@@ -12,7 +12,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeUISystem.cs
uploadId: 814740
uploadId: 889948

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponAttackInfo.cs.meta
View File

@@ -13,7 +13,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponAttackInfo.cs
uploadId: 814740
uploadId: 889948

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponAttackListInfoSocket.cs.meta
View File

@@ -13,7 +13,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponAttackListInfoSocket.cs
uploadId: 814740
uploadId: 889948

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponAttackListInfoSocketEditor.cs.meta
View File

@@ -13,7 +13,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponAttackListInfoSocketEditor.cs
uploadId: 814740
uploadId: 889948

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponInfo.cs.meta
View File

@@ -13,7 +13,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponInfo.cs
uploadId: 814740
uploadId: 889948

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponRangeAttacksManager.cs.meta
View File

@@ -13,7 +13,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponRangeAttacksManager.cs
uploadId: 814740
uploadId: 889948

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponRangeAttacksSystem.cs.meta
View File

@@ -13,7 +13,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponRangeAttacksSystem.cs
uploadId: 814740
uploadId: 889948

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponTransformData.cs.meta
View File

@@ -13,7 +13,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponTransformData.cs
uploadId: 814740
uploadId: 889948

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponTransformInfoSystem.cs.meta
View File

@@ -13,7 +13,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponTransformInfoSystem.cs
uploadId: 814740
uploadId: 889948

115
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponsGrabbedManager.cs
View File

@@ -147,6 +147,11 @@ public class meleeWeaponsGrabbedManager : MonoBehaviour
public bool fullBodyAwarenessActive;
[Space]
public bool customMeleeWeaponMeshScaleActive;
public float customMeleeWeaponMeshScale = 0;
[Space]
[Header ("Components")]
[Space]
@@ -375,6 +380,8 @@ public class meleeWeaponsGrabbedManager : MonoBehaviour
newMeleeWeaponGrabbedInfo.weaponPrefabIndex = currentMeleeWeaponPrefabInfo.weaponPrefabIndex;
meleeWeaponGrabbedInfoList.Add (newMeleeWeaponGrabbedInfo);
//print (newMeleeWeaponGrabbedInfo.Name);
} else {
if (showDebugPrint) {
print ("melee weapon was already on the initial list");
@@ -402,6 +409,8 @@ public class meleeWeaponsGrabbedManager : MonoBehaviour
if (currentMeleeWeaponPrefabInfo != null) {
currentMeleeWeaponGrabbedInfo.weaponStored = (GameObject)Instantiate (currentMeleeWeaponPrefabInfo.weaponPrefab, Vector3.up * 1000, Quaternion.identity);
checkMeleeWeaponScale (currentMeleeWeaponGrabbedInfo.weaponStored.transform);
currentMeleeWeaponGrabbedInfo.weaponPrefabIndex = currentMeleeWeaponPrefabInfo.weaponPrefabIndex;
bool hideWeaponMeshResult = checkIfHideWeaponMeshWhenNotUsed (currentMeleeWeaponGrabbedInfo.hideWeaponMeshWhenNotUsed);
@@ -616,6 +625,8 @@ public class meleeWeaponsGrabbedManager : MonoBehaviour
if (currentMeleeWeaponPrefabInfo != null) {
currentMeleeWeaponGrabbedInfo.weaponStored = (GameObject)Instantiate (currentMeleeWeaponPrefabInfo.weaponPrefab, Vector3.up * 1000, Quaternion.identity);
checkMeleeWeaponScale (currentMeleeWeaponGrabbedInfo.weaponStored.transform);
currentMeleeWeaponGrabbedInfo.weaponPrefabIndex = currentMeleeWeaponPrefabInfo.weaponPrefabIndex;
grabPhysicalObjectSystem currentGrabPhysicalObjectSystem = currentMeleeWeaponGrabbedInfo.weaponStored.GetComponent<grabPhysicalObjectSystem> ();
@@ -750,6 +761,8 @@ public class meleeWeaponsGrabbedManager : MonoBehaviour
if (!meleeWeaponsGrabbedManagerActive) {
currentMeleeWeaponSheathedOrCarried = false;
}
mainGrabbedObjectMeleeAttackSystem.checkResetAttackInputStack ();
}
public void setDrawMeleeWeaponsPausedState (bool state)
@@ -872,7 +885,11 @@ public class meleeWeaponsGrabbedManager : MonoBehaviour
currentMeleeWeaponGrabbedInfo.weaponMesh = (GameObject)Instantiate (weaponMeshToInstantiate, Vector3.zero, Quaternion.identity);
currentMeleeWeaponGrabbedInfo.weaponMesh.transform.localScale = currentGrabPhysicalObjectMeleeAttackSystem.weaponMesh.transform.localScale;
if (customMeleeWeaponMeshScaleActive) {
currentMeleeWeaponGrabbedInfo.weaponMesh.transform.localScale = Vector3.one * customMeleeWeaponMeshScale;
} else {
currentMeleeWeaponGrabbedInfo.weaponMesh.transform.localScale = currentGrabPhysicalObjectMeleeAttackSystem.weaponMesh.transform.localScale;
}
weaponMeshCreated = true;
}
@@ -1009,7 +1026,9 @@ public class meleeWeaponsGrabbedManager : MonoBehaviour
meleeWeaponGrabbedInfo newMeleeWeaponGrabbedInfo = new meleeWeaponGrabbedInfo ();
newMeleeWeaponGrabbedInfo.Name = weaponName;
newMeleeWeaponGrabbedInfo.isCurrentWeapon = true;
newMeleeWeaponGrabbedInfo.carryingWeapon = true;
currentMeleeWeaponSheathedOrCarried = true;
@@ -1018,6 +1037,8 @@ public class meleeWeaponsGrabbedManager : MonoBehaviour
newMeleeWeaponGrabbedInfo.weaponStored = weaponGameObject;
checkMeleeWeaponScale (newMeleeWeaponGrabbedInfo.weaponStored.transform);
grabPhysicalObjectMeleeAttackSystem currentGrabPhysicalObjectMeleeAttackSystem = newMeleeWeaponGrabbedInfo.weaponStored.GetComponent<grabPhysicalObjectMeleeAttackSystem> ();
bool hideWeaponMeshResult = checkIfHideWeaponMeshWhenNotUsed (currentGrabPhysicalObjectMeleeAttackSystem.hideWeaponMeshWhenNotUsed);
@@ -1028,6 +1049,8 @@ public class meleeWeaponsGrabbedManager : MonoBehaviour
meleeWeaponGrabbedInfoList.Add (newMeleeWeaponGrabbedInfo);
//print (newMeleeWeaponGrabbedInfo.Name);
currentNumberOfWeaponsAvailable = getCurrentNumberOfWeaponsAvailable ();
currentWeaponIndex = meleeWeaponGrabbedInfoList.Count - 1;
@@ -1092,6 +1115,7 @@ public class meleeWeaponsGrabbedManager : MonoBehaviour
for (int k = 0; k < meleeWeaponGrabbedInfoList.Count; k++) {
if (weaponIndex == k) {
meleeWeaponGrabbedInfoList [k].isCurrentWeapon = true;
meleeWeaponGrabbedInfoList [k].carryingWeapon = true;
currentMeleeWeaponSheathedOrCarried = true;
@@ -1119,6 +1143,8 @@ public class meleeWeaponsGrabbedManager : MonoBehaviour
}
currentMeleeWeaponGrabbedInfo.weaponStored = weaponGameObject;
checkMeleeWeaponScale (currentMeleeWeaponGrabbedInfo.weaponStored.transform);
}
}
}
@@ -1599,6 +1625,8 @@ public class meleeWeaponsGrabbedManager : MonoBehaviour
newMeleeWeaponGrabbedInfo.weaponStored = newWeaponToCarry;
checkMeleeWeaponScale (newMeleeWeaponGrabbedInfo.weaponStored.transform);
newMeleeWeaponGrabbedInfo.carryingWeapon = true;
if (newMeleeWeaponGrabbedInfo.weaponStored.activeSelf) {
@@ -1794,6 +1822,18 @@ public class meleeWeaponsGrabbedManager : MonoBehaviour
return "";
}
bool useEquipShieldCheckWhenActivatingShield;
public bool isUseEquipShieldCheckWhenActivatingShieldActive ()
{
return useEquipShieldCheckWhenActivatingShield;
}
public void setUseEquipShieldCheckWhenActivatingShieldState (bool state)
{
useEquipShieldCheckWhenActivatingShield = state;
}
public bool equipShield (string shieldName)
{
return setShieldActiveState (true, shieldName);
@@ -1942,19 +1982,6 @@ public class meleeWeaponsGrabbedManager : MonoBehaviour
mainGrabbedObjectMeleeAttackSystem.setShieldActiveState (state);
if (state) {
// string currentShieldName = getCurrentShieldName ();
//
// int weaponIndex = meleeWeaponPrefabInfoList.FindIndex (s => s.Name.Equals (currentShieldName));
//
// if (weaponIndex > -1) {
//
// grabPhysicalObjectMeleeAttackSystem currentShieldAttackSystem = meleeWeaponPrefabInfoList [weaponIndex].weaponPrefab.GetComponent<grabPhysicalObjectMeleeAttackSystem> ();
//
// if (currentShieldAttackSystem != null) {
// mainGrabbedObjectMeleeAttackSystem.setShieldProtectionValues (currentShieldAttackSystem.blockDamageProtectionAmount, currentShieldAttackSystem.reducedBlockDamageProtectionAmount);
// }
// }
if (currentShieldGrabbedInfo.mainMeleeShieldObjectSystem != null) {
mainGrabbedObjectMeleeAttackSystem.setShieldProtectionValues (
currentShieldGrabbedInfo.mainMeleeShieldObjectSystem.blockDamageProtectionAmount,
@@ -2017,14 +2044,16 @@ public class meleeWeaponsGrabbedManager : MonoBehaviour
currentMeleeWeaponSheathedOrCarried = false;
}
drawOrSheatheShield (shieldState, shieldName);
drawOrSheatheShield (shieldState, shieldName, false);
// print (shieldState + " " + shieldName);
}
public void drawOrSheatheShield (bool state, string shieldName)
public void drawOrSheatheShield (bool state, string shieldName, bool ignoreSetShieldActiveState)
{
setShieldActiveState (true, shieldName);
if (!ignoreSetShieldActiveState) {
setShieldActiveState (true, shieldName);
}
mainGrabbedObjectMeleeAttackSystem.drawOrSheatheShield (state);
@@ -2856,6 +2885,58 @@ public class meleeWeaponsGrabbedManager : MonoBehaviour
}
}
void checkMeleeWeaponScale (Transform weaponTransform)
{
if (customMeleeWeaponMeshScaleActive) {
weaponTransform.localScale = Vector3.one * customMeleeWeaponMeshScale;
}
}
public void setCustomMeleeWeaponMeshScaleActive (float newValue)
{
customMeleeWeaponMeshScale = newValue;
customMeleeWeaponMeshScaleActive = (customMeleeWeaponMeshScale != 0);
}
public void setWeaponMeshScaleOnAllWeapons (float newValue)
{
setCustomMeleeWeaponMeshScaleActive (newValue);
if (meleeWeaponsGrabbedManagerActive) {
int meleeWeaponGrabbedInfoListCount = meleeWeaponGrabbedInfoList.Count;
for (int k = 0; k < meleeWeaponGrabbedInfoListCount; k++) {
meleeWeaponGrabbedInfo currentMeleeWeaponGrabbedInfo = meleeWeaponGrabbedInfoList [k];
if (currentMeleeWeaponGrabbedInfo.carryingWeapon && currentMeleeWeaponGrabbedInfo.weaponStored != null) {
//grabPhysicalObjectMeleeAttackSystem currentGrabPhysicalObjectMeleeAttackSystem =
// currentMeleeWeaponGrabbedInfo.weaponStored.GetComponent<grabPhysicalObjectMeleeAttackSystem> ();
//if (currentGrabPhysicalObjectMeleeAttackSystem != null) {
//}
currentMeleeWeaponGrabbedInfo.weaponStored.transform.localScale = Vector3.one * newValue;
}
if (currentMeleeWeaponGrabbedInfo.weaponMesh != null) {
currentMeleeWeaponGrabbedInfo.weaponMesh.transform.localScale = Vector3.one * newValue;
}
}
}
}
public void setPlaceTriggerInFrontOfCharacterOnAllAttacksState (bool state)
{
mainGrabbedObjectMeleeAttackSystem.setPlaceTriggerInFrontOfCharacterOnAllAttacksState (state);
}
public void setExtraTriggerMultiplierScaleOnAllMeleeAttacksActiveState (bool state, float value)
{
mainGrabbedObjectMeleeAttackSystem.setExtraTriggerMultiplierScaleOnAllMeleeAttacksActiveState (state, value);
}
//EDITOR FUNCTIONS
void updateComponent ()
{

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponsGrabbedManager.cs.meta
View File

@@ -13,7 +13,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/meleeWeaponsGrabbedManager.cs
uploadId: 814740
uploadId: 889948

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/objectToFollowOnThrowMeleeWeapon.cs.meta
View File

@@ -13,7 +13,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/objectToFollowOnThrowMeleeWeapon.cs
uploadId: 814740
uploadId: 889948

7
Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/searchMeleeSurfaceSystem.cs.meta
View File

@@ -13,7 +13,8 @@ MonoImporter:
AssetOrigin:
serializedVersion: 1
productId: 40995
packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
packageVersion: 3.77g
packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
2.5D
packageVersion: 3.77h
assetPath: Assets/Game Kit Controller/Scripts/Combat System/Melee Combat System/searchMeleeSurfaceSystem.cs
uploadId: 814740
uploadId: 889948