Browse Source

added crane functionality,

added pully functionality,
fixed black texture bug.
master
Joshua Reason 9 years ago
parent
commit
e0aaa7a256
21 changed files with 200 additions and 1126 deletions
  1. BIN
      Experiment Files/Assignment2_Demo_Data/mainData
  2. +105
    -1119
      Experiment Files/Assignment2_Demo_Data/output_log.txt
  3. BIN
      Experiment Files/Assignment2_Demo_Data/sharedassets0.assets
  4. BIN
      Experiment Files/Assignment2_Demo_Data/sharedassets0.resource
  5. +8
    -4
      unity_Project/Assets/Character/4-10_Character_Animation_03_Clean.fbx.meta
  6. BIN
      unity_Project/Assets/Character/Character_Animation.controller
  7. +15
    -0
      unity_Project/Assets/Scripts/Serialization.cs
  8. +12
    -0
      unity_Project/Assets/Scripts/Serialization.cs.meta
  9. +1
    -1
      unity_Project/Assets/Scripts/magnetGun.cs
  10. +1
    -1
      unity_Project/Assets/Scripts/sceneController.cs
  11. BIN
      unity_Project/Assets/_Scenes/MainLevel.unity
  12. +9
    -0
      unity_Project/Assets/openingScene.meta
  13. BIN
      unity_Project/Assets/openingScene/CameraAnimation.anim
  14. +8
    -0
      unity_Project/Assets/openingScene/CameraAnimation.anim.meta
  15. BIN
      unity_Project/Assets/openingScene/openScene.controller
  16. +8
    -0
      unity_Project/Assets/openingScene/openScene.controller.meta
  17. +20
    -0
      unity_Project/Assets/openingScene/openingScene.cs
  18. +12
    -0
      unity_Project/Assets/openingScene/openingScene.cs.meta
  19. BIN
      unity_Project/Assets/prefabs/Small Crate.prefab
  20. BIN
      unity_Project/ProjectSettings/ProjectSettings.asset
  21. +1
    -1
      unity_Project/ProjectSettings/ProjectVersion.txt

BIN
Experiment Files/Assignment2_Demo_Data/mainData View File


+ 105
- 1119
Experiment Files/Assignment2_Demo_Data/output_log.txt
File diff suppressed because it is too large
View File


BIN
Experiment Files/Assignment2_Demo_Data/sharedassets0.assets View File


BIN
Experiment Files/Assignment2_Demo_Data/sharedassets0.resource View File


+ 8
- 4
unity_Project/Assets/Character/4-10_Character_Animation_03_Clean.fbx.meta View File

@ -239,6 +239,10 @@ ModelImporter:
bakeSimulation: 0 bakeSimulation: 0
optimizeGameObjects: 0 optimizeGameObjects: 0
motionNodeName: motionNodeName:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
animationCompression: 1 animationCompression: 1
animationRotationError: .5 animationRotationError: .5
animationPositionError: .5 animationPositionError: .5
@ -1200,7 +1204,7 @@ ModelImporter:
level: 0 level: 0
cycleOffset: 0 cycleOffset: 0
loop: 0 loop: 0
loopTime: 0
loopTime: 1
loopBlend: 0 loopBlend: 0
loopBlendOrientation: 0 loopBlendOrientation: 0
loopBlendPositionY: 0 loopBlendPositionY: 0
@ -1429,8 +1433,8 @@ ModelImporter:
- serializedVersion: 16 - serializedVersion: 16
name: Falling name: Falling
takeName: Take 001 takeName: Take 001
firstFrame: 115
lastFrame: 115
firstFrame: 114
lastFrame: 116
wrapMode: 0 wrapMode: 0
orientationOffsetY: 0 orientationOffsetY: 0
level: 0 level: 0
@ -2137,7 +2141,7 @@ ModelImporter:
- serializedVersion: 16 - serializedVersion: 16
name: Dead name: Dead
takeName: Take 001 takeName: Take 001
firstFrame: 250
firstFrame: 249
lastFrame: 250 lastFrame: 250
wrapMode: 0 wrapMode: 0
orientationOffsetY: 0 orientationOffsetY: 0

BIN
unity_Project/Assets/Character/Character_Animation.controller View File


+ 15
- 0
unity_Project/Assets/Scripts/Serialization.cs View File

@ -0,0 +1,15 @@
using UnityEngine;
using System.Collections;
public class Serialization : MonoBehaviour {
// Use this for initialization
void Start () {
}
// Update is called once per frame
void Update () {
}
}

+ 12
- 0
unity_Project/Assets/Scripts/Serialization.cs.meta View File

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

+ 1
- 1
unity_Project/Assets/Scripts/magnetGun.cs View File

@ -84,7 +84,7 @@ public class magnetGun : MonoBehaviour {
} }
} }
updateColors (target);
//updateColors (target);
if (getAxisDown (L_TRIGGER_INPUT)) { if (getAxisDown (L_TRIGGER_INPUT)) {
Debug.Log ("axis down"); Debug.Log ("axis down");

+ 1
- 1
unity_Project/Assets/Scripts/sceneController.cs View File

@ -79,7 +79,7 @@ public class sceneController : MonoBehaviour {
Debug.Log("swappy Swap"); Debug.Log("swappy Swap");
activeP1 = !activeP1; activeP1 = !activeP1;
activeP2 = !activeP2; activeP2 = !activeP2;
_playerSoundScript.PlaySwitch(); //Play "Switch Character" sound function
//_playerSoundScript.PlaySwitch(); //Play "Switch Character" sound function
if (activeP1){ if (activeP1){

BIN
unity_Project/Assets/_Scenes/MainLevel.unity View File


+ 9
- 0
unity_Project/Assets/openingScene.meta View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: ffa93e08a028507468e51c18218472b6
folderAsset: yes
timeCreated: 1444267042
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

BIN
unity_Project/Assets/openingScene/CameraAnimation.anim View File


+ 8
- 0
unity_Project/Assets/openingScene/CameraAnimation.anim.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e2c7d7b2d441b484f8a3ce3074c602e2
timeCreated: 1444267067
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

BIN
unity_Project/Assets/openingScene/openScene.controller View File


+ 8
- 0
unity_Project/Assets/openingScene/openScene.controller.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5df6360b3cf4e1a458a1c7de89482aa0
timeCreated: 1444266609
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

+ 20
- 0
unity_Project/Assets/openingScene/openingScene.cs View File

@ -0,0 +1,20 @@
using UnityEngine;
using System.Collections;
public class openingScene : MonoBehaviour {
public GameObject player1;
public GameObject player2;
public GameObject openCam;
// Use this for initialization
void Start () {
}
// Update is called once per frame
void Update () {
}
}

+ 12
- 0
unity_Project/Assets/openingScene/openingScene.cs.meta View File

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

BIN
unity_Project/Assets/prefabs/Small Crate.prefab View File


BIN
unity_Project/ProjectSettings/ProjectSettings.asset View File


+ 1
- 1
unity_Project/ProjectSettings/ProjectVersion.txt View File

@ -1,2 +1,2 @@
m_EditorVersion: 5.0.1f1
m_EditorVersion: 5.1.2f1
m_StandardAssetsVersion: 0 m_StandardAssetsVersion: 0

Loading…
Cancel
Save