Conjure/VZ
6
0
Fork 0
mirror of https://github.com/ConjureETS/VZ.git synced 2026-03-24 02:11:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Updated Human prefab

Browse Source 
- Updated scene Integration
- Updated VampireSquadPrefab
- Updated scene Squad
This commit is contained in:
samJa 2015-08-21 15:03:26 -04:00
parent f32a2faa5d
commit ae2750836d
14 changed files with 16850 additions and 9424 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Assets/Prefabs/HPCanvas.prefab
View File

@ -45,6 +45,7 @@ GameObject:
- 223: {fileID: 22333740} - 223: {fileID: 22333740}
- 114: {fileID: 11427060} - 114: {fileID: 11427060}
- 114: {fileID: 11497496} - 114: {fileID: 11497496}
- 114: {fileID: 11493852}
m_Layer: 0 m_Layer: 0
m_Name: HPCanvas m_Name: HPCanvas
m_TagString: Untagged m_TagString: Untagged
@ -115,6 +116,18 @@ MonoBehaviour:
m_FillAmount: 1 m_FillAmount: 1
m_FillClockwise: 1 m_FillClockwise: 1
m_FillOrigin: 0 m_FillOrigin: 0
--- !u!114 &11493852
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 174992}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ee7477dacce28f94aba6c7b0edc4da87, type: 3}
m_Name:
m_EditorClassIdentifier:
TargetCamera: {fileID: 0}
--- !u!114 &11497496 --- !u!114 &11497496
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1

2592
Assets/Prefabs/Human.prefab
View File

File diff suppressed because it is too large Load Diff

4
Assets/Prefabs/Human.prefab.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 4cf1614d9b46f2848a2b47afe79f2f56 guid: b9ac83faf6cd8994a9d277d9c950be6e
timeCreated: 1439652850 timeCreated: 1440182904
licenseType: Free licenseType: Free
NativeFormatImporter: NativeFormatImporter:
userData: userData:

2637
Assets/Prefabs/VampireSquad.prefab
View File

File diff suppressed because it is too large Load Diff

2
Assets/Prefabs/VampireSquad.prefab.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 399d6675ad4fa384096256e051a3e131 guid: 399d6675ad4fa384096256e051a3e131
timeCreated: 1440178689 timeCreated: 1440179661
licenseType: Free licenseType: Free
NativeFormatImporter: NativeFormatImporter:
userData: userData:

2743
Assets/Prefabs/ZombieSquad.prefab
View File

File diff suppressed because it is too large Load Diff

2
Assets/Prefabs/ZombieSquad.prefab.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 7f5390bf3f9aa514eac25888e0bd7723 guid: 7f5390bf3f9aa514eac25888e0bd7723
timeCreated: 1440178699 timeCreated: 1440179663
licenseType: Free licenseType: Free
NativeFormatImporter: NativeFormatImporter:
userData: userData:

1413
Assets/Scenes/Integration.unity
View File

File diff suppressed because it is too large Load Diff

40
Assets/Scenes/sam_UI.unity
View File

@ -313,38 +313,42 @@ Prefab:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 436582, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2} - target: {fileID: 460096, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 10 value: 10
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 436582, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2} - target: {fileID: 460096, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 436582, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2} - target: {fileID: 460096, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 436582, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2} - target: {fileID: 460096, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 436582, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2} - target: {fileID: 460096, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: -.707106829 value: -.707106829
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 436582, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2} - target: {fileID: 460096, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 436582, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2} - target: {fileID: 460096, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: .707106709 value: .707106709
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 436582, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2} - target: {fileID: 460096, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 5 value: 5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 11423354, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2}
propertyPath: TargetCamera
value:
objectReference: {fileID: 272569012}
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2} m_ParentPrefab: {fileID: 100100000, guid: 7f5390bf3f9aa514eac25888e0bd7723, type: 2}
m_IsPrefabParent: 0 m_IsPrefabParent: 0
@ -498,38 +502,42 @@ Prefab:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 459524, guid: 399d6675ad4fa384096256e051a3e131, type: 2} - target: {fileID: 433518, guid: 399d6675ad4fa384096256e051a3e131, type: 2}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 459524, guid: 399d6675ad4fa384096256e051a3e131, type: 2} - target: {fileID: 433518, guid: 399d6675ad4fa384096256e051a3e131, type: 2}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 459524, guid: 399d6675ad4fa384096256e051a3e131, type: 2} - target: {fileID: 433518, guid: 399d6675ad4fa384096256e051a3e131, type: 2}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 459524, guid: 399d6675ad4fa384096256e051a3e131, type: 2} - target: {fileID: 433518, guid: 399d6675ad4fa384096256e051a3e131, type: 2}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 459524, guid: 399d6675ad4fa384096256e051a3e131, type: 2} - target: {fileID: 433518, guid: 399d6675ad4fa384096256e051a3e131, type: 2}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: .707106829 value: .707106829
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 459524, guid: 399d6675ad4fa384096256e051a3e131, type: 2} - target: {fileID: 433518, guid: 399d6675ad4fa384096256e051a3e131, type: 2}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 459524, guid: 399d6675ad4fa384096256e051a3e131, type: 2} - target: {fileID: 433518, guid: 399d6675ad4fa384096256e051a3e131, type: 2}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: .707106709 value: .707106709
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 459524, guid: 399d6675ad4fa384096256e051a3e131, type: 2} - target: {fileID: 433518, guid: 399d6675ad4fa384096256e051a3e131, type: 2}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 4 value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 11447052, guid: 399d6675ad4fa384096256e051a3e131, type: 2}
propertyPath: TargetCamera
value:
objectReference: {fileID: 272569012}
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 399d6675ad4fa384096256e051a3e131, type: 2} m_ParentPrefab: {fileID: 100100000, guid: 399d6675ad4fa384096256e051a3e131, type: 2}
m_IsPrefabParent: 0 m_IsPrefabParent: 0

16790
Assets/Scenes/sam_squad.unity
View File

File diff suppressed because it is too large Load Diff

1
Assets/Scripts/Squad.cs
View File

@ -9,6 +9,7 @@ public class Squad : Unit
#region class members #region class members
public float TimeBetweenAttacks = 0.5f; public float TimeBetweenAttacks = 0.5f;
public string TeamTag; public string TeamTag;
/// <summary> /// <summary>
/// List of non attackable units. /// List of non attackable units.
/// </summary> /// </summary>

3
Assets/Scripts/SquadMovement.cs
View File

@ -104,7 +104,8 @@ public class SquadMovement : MonoBehaviour {
} }
catch (NullReferenceException ex) catch (NullReferenceException ex)
{ {
Debug.LogError(ex); //Debug.LogError(ex);
Debug.LogError("Error in method SquadMovement.getNewBuffer()! \n: " + ex);
} }
} }
} }

22
Assets/Scripts/UICamera.cs Normal file
View File

@ -0,0 +1,22 @@
using UnityEngine;
using System.Collections;
public class UICamera : MonoBehaviour
{
public Camera TargetCamera;
void Awake()
{
//TargetCamera = GetComponent<>()
//TODO find a way to target the player 1 camera and player 2 camera
// example if my parent is player 1 then I target at camera1 else, target at camera2
}
// Update is called once per frame
void Update ()
{
transform.LookAt(
transform.position + TargetCamera.transform.rotation * Vector3.back,
TargetCamera.transform.rotation * Vector3.up
);
}
}

12
Assets/Scripts/UICamera.cs.meta Normal file
View File

@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: ee7477dacce28f94aba6c7b0edc4da87
timeCreated: 1440179376
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: