RMIT
/
Project_Junker
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

-added reset button: "r"; 

-fixed player follow
master
Joshua Reason 8 years ago
parent
a7316e435c
commit
735556fade
11 changed files with 348 additions and 1 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +9
    -0
      unity_Project/Assets/Animations.meta
  2. +9
    -0
      unity_Project/Assets/Animations/Materials.meta
  3. BIN
      unity_Project/Assets/Animations/Materials/lambert1.mat
  4. +8
    -0
      unity_Project/Assets/Animations/Materials/lambert1.mat.meta
  5. BIN
      unity_Project/Assets/Animations/walk_Cycle_New_01.fbx
  6. +315
    -0
      unity_Project/Assets/Animations/walk_Cycle_New_01.fbx.meta
  7. +2
    -0
      unity_Project/Assets/Scripts/playerFollow.cs
  8. +4
    -0
      unity_Project/Assets/Scripts/sceneController.cs
  9. +1
    -1
      unity_Project/Assets/Scripts/thirdPersonController.cs
  10. BIN
      unity_Project/Assets/_Scenes/MainLevel.unity
  11. BIN
      unity_Project/Assets/prefabs/wall_cube.prefab

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

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

+ 9
- 0
unity_Project/Assets/Animations/Materials.meta View File

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

BIN
unity_Project/Assets/Animations/Materials/lambert1.mat View File


+ 8
- 0
unity_Project/Assets/Animations/Materials/lambert1.mat.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3a952be803ab3b54e852e3947bd90b5d
timeCreated: 1442034296
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

BIN
unity_Project/Assets/Animations/walk_Cycle_New_01.fbx View File


+ 315
- 0
unity_Project/Assets/Animations/walk_Cycle_New_01.fbx.meta View File

@ -0,0 +1,315 @@
fileFormatVersion: 2
guid: 73812d657454cfc4fa9e240fa141f440
timeCreated: 1442034296
licenseType: Free
ModelImporter:
serializedVersion: 18
fileIDToRecycleName:
100000: Character_Advanced_01_0004:Backpack
100002: Character_Advanced_01_0004:Character_new_06:Character_new_06:polySurface50
100004: Character_Advanced_01_0004:Character_new_06:ikHandle10
100006: Character_Advanced_01_0004:Character_new_06:ikHandle11
100008: Character_Advanced_01_0004:Character_new_06:ikHandle5
100010: Character_Advanced_01_0004:Character_new_06:ikHandle6
100012: Character_Advanced_01_0004:Character_new_06:ikHandle7
100014: Character_Advanced_01_0004:Character_new_06:ikHandle9
100016: Character_Advanced_01_0004:Character_new_06:transform30
100018: Character_Advanced_01_0004:Face
100020: Character_Advanced_01_0004:face_Controller
100022: Character_Advanced_01_0004:Feet_Controller
100024: Character_Advanced_01_0004:Hand_Controllers
100026: Character_Advanced_01_0004:Head
100028: Character_Advanced_01_0004:Head_Controller
100030: Character_Advanced_01_0004:head_Locator
100032: Character_Advanced_01_0004:head_upNode
100034: Character_Advanced_01_0004:Hip
100036: Character_Advanced_01_0004:Hip_Controller
100038: Character_Advanced_01_0004:l_Elbow
100040: Character_Advanced_01_0004:l_Fist_Controller
100042: Character_Advanced_01_0004:l_Foot_Controller
100044: Character_Advanced_01_0004:l_Hand
100046: Character_Advanced_01_0004:l_Hand_Controls
100048: Character_Advanced_01_0004:l_Heel
100050: Character_Advanced_01_0004:l_Hip
100052: Character_Advanced_01_0004:l_Index_1
100054: Character_Advanced_01_0004:l_Index_2
100056: Character_Advanced_01_0004:l_Index_3
100058: Character_Advanced_01_0004:l_Index_4
100060: Character_Advanced_01_0004:l_Index_Controller
100062: Character_Advanced_01_0004:l_Knee
100064: Character_Advanced_01_0004:l_Middle_1
100066: Character_Advanced_01_0004:l_Middle_2
100068: Character_Advanced_01_0004:l_Middle_3
100070: Character_Advanced_01_0004:l_Middle_4
100072: Character_Advanced_01_0004:l_Middle_Controller
100074: Character_Advanced_01_0004:l_Pinky_1
100076: Character_Advanced_01_0004:l_Pinky_2
100078: Character_Advanced_01_0004:l_Pinky_3
100080: Character_Advanced_01_0004:l_Pinky_4
100082: Character_Advanced_01_0004:l_Pinky_Controller
100084: Character_Advanced_01_0004:l_Ring_1
100086: Character_Advanced_01_0004:l_Ring_2
100088: Character_Advanced_01_0004:l_Ring_3
100090: Character_Advanced_01_0004:l_Ring_4
100092: Character_Advanced_01_0004:l_Ring_Controller
100094: Character_Advanced_01_0004:l_Shoulder
100096: Character_Advanced_01_0004:l_Thumb_1
100098: Character_Advanced_01_0004:l_Thumb_2
100100: Character_Advanced_01_0004:l_Thumb_Controller
100102: Character_Advanced_01_0004:l_Toe
100104: Character_Advanced_01_0004:l_Toe_Controller
100106: Character_Advanced_01_0004:l_Wrist_Controller
100108: Character_Advanced_01_0004:Master
100110: Character_Advanced_01_0004:MASTER_CONTROLLER
100112: Character_Advanced_01_0004:Mid_Controller
100114: Character_Advanced_01_0004:Neck
100116: Character_Advanced_01_0004:Neck_Controller
100118: Character_Advanced_01_0004:r_Elbow
100120: Character_Advanced_01_0004:r_Fist_Controller
100122: Character_Advanced_01_0004:r_Foot_Controller
100124: Character_Advanced_01_0004:r_Hand
100126: Character_Advanced_01_0004:r_Hand_Controls
100128: Character_Advanced_01_0004:r_Heel
100130: Character_Advanced_01_0004:r_Hip
100132: Character_Advanced_01_0004:r_Index_1
100134: Character_Advanced_01_0004:r_Index_2
100136: Character_Advanced_01_0004:r_Index_3
100138: Character_Advanced_01_0004:r_Index_4
100140: Character_Advanced_01_0004:r_Index_Controller
100142: Character_Advanced_01_0004:r_Knee
100144: Character_Advanced_01_0004:r_Middle_1
100146: Character_Advanced_01_0004:r_Middle_2
100148: Character_Advanced_01_0004:r_Middle_3
100150: Character_Advanced_01_0004:r_Middle_4
100152: Character_Advanced_01_0004:r_Middle_Controller
100154: Character_Advanced_01_0004:r_Pinky_1
100156: Character_Advanced_01_0004:r_Pinky_2
100158: Character_Advanced_01_0004:r_Pinky_3
100160: Character_Advanced_01_0004:r_Pinky_4
100162: Character_Advanced_01_0004:r_Pinky_Controller
100164: Character_Advanced_01_0004:r_Ring_1
100166: Character_Advanced_01_0004:r_Ring_2
100168: Character_Advanced_01_0004:r_Ring_3
100170: Character_Advanced_01_0004:r_Ring_4
100172: Character_Advanced_01_0004:r_Ring_Controller
100174: Character_Advanced_01_0004:r_Shoulder
100176: Character_Advanced_01_0004:r_Thumb_1
100178: Character_Advanced_01_0004:r_Thumb_2
100180: Character_Advanced_01_0004:r_Thumb_Controller
100182: Character_Advanced_01_0004:r_Toe
100184: Character_Advanced_01_0004:r_Toe_Controller
100186: Character_Advanced_01_0004:r_Wrist_Controller
100188: Character_Advanced_01_0004:Spine_Bot
100190: Character_Advanced_01_0004:Spine_Mid
100192: Character_Advanced_01_0004:Spine_Top
100194: Character_Advanced_01_0004:Staff1
100196: Character_Advanced_02:Character_Advanced_01_0004:Character_new_06:Character_new_06:polySurface50
100198: Character_Advanced_02:Character_Advanced_01_0004:Character_new_06:transform30
100200: Character_Advanced_02:Character_Advanced_01_0004:Hand_Controllers
100202: Character_Advanced_02:Character_Advanced_01_0004:l_Hand_Controls
100204: Character_Advanced_02:Character_Advanced_01_0004:r_Hand_Controls
100206: curve1
100208: imagePlane1
100210: joint3
100212: locator1
100214: locator2
100216: nurbsCircle1
100218: nurbsCircle2
100220: nurbsCircle3
100222: nurbsCircle4
100224: nurbsCircle5
100226: nurbsSquare1
100228: nurbsSquare2
100230: nurbsSquare3
100232: polySurface1
100234: staff_bot
100236: staff_top
100238: //RootNode
400000: Character_Advanced_01_0004:Backpack
400002: Character_Advanced_01_0004:Character_new_06:Character_new_06:polySurface50
400004: Character_Advanced_01_0004:Character_new_06:ikHandle10
400006: Character_Advanced_01_0004:Character_new_06:ikHandle11
400008: Character_Advanced_01_0004:Character_new_06:ikHandle5
400010: Character_Advanced_01_0004:Character_new_06:ikHandle6
400012: Character_Advanced_01_0004:Character_new_06:ikHandle7
400014: Character_Advanced_01_0004:Character_new_06:ikHandle9
400016: Character_Advanced_01_0004:Character_new_06:transform30
400018: Character_Advanced_01_0004:Face
400020: Character_Advanced_01_0004:face_Controller
400022: Character_Advanced_01_0004:Feet_Controller
400024: Character_Advanced_01_0004:Hand_Controllers
400026: Character_Advanced_01_0004:Head
400028: Character_Advanced_01_0004:Head_Controller
400030: Character_Advanced_01_0004:head_Locator
400032: Character_Advanced_01_0004:head_upNode
400034: Character_Advanced_01_0004:Hip
400036: Character_Advanced_01_0004:Hip_Controller
400038: Character_Advanced_01_0004:l_Elbow
400040: Character_Advanced_01_0004:l_Fist_Controller
400042: Character_Advanced_01_0004:l_Foot_Controller
400044: Character_Advanced_01_0004:l_Hand
400046: Character_Advanced_01_0004:l_Hand_Controls
400048: Character_Advanced_01_0004:l_Heel
400050: Character_Advanced_01_0004:l_Hip
400052: Character_Advanced_01_0004:l_Index_1
400054: Character_Advanced_01_0004:l_Index_2
400056: Character_Advanced_01_0004:l_Index_3
400058: Character_Advanced_01_0004:l_Index_4
400060: Character_Advanced_01_0004:l_Index_Controller
400062: Character_Advanced_01_0004:l_Knee
400064: Character_Advanced_01_0004:l_Middle_1
400066: Character_Advanced_01_0004:l_Middle_2
400068: Character_Advanced_01_0004:l_Middle_3
400070: Character_Advanced_01_0004:l_Middle_4
400072: Character_Advanced_01_0004:l_Middle_Controller
400074: Character_Advanced_01_0004:l_Pinky_1
400076: Character_Advanced_01_0004:l_Pinky_2
400078: Character_Advanced_01_0004:l_Pinky_3
400080: Character_Advanced_01_0004:l_Pinky_4
400082: Character_Advanced_01_0004:l_Pinky_Controller
400084: Character_Advanced_01_0004:l_Ring_1
400086: Character_Advanced_01_0004:l_Ring_2
400088: Character_Advanced_01_0004:l_Ring_3
400090: Character_Advanced_01_0004:l_Ring_4
400092: Character_Advanced_01_0004:l_Ring_Controller
400094: Character_Advanced_01_0004:l_Shoulder
400096: Character_Advanced_01_0004:l_Thumb_1
400098: Character_Advanced_01_0004:l_Thumb_2
400100: Character_Advanced_01_0004:l_Thumb_Controller
400102: Character_Advanced_01_0004:l_Toe
400104: Character_Advanced_01_0004:l_Toe_Controller
400106: Character_Advanced_01_0004:l_Wrist_Controller
400108: Character_Advanced_01_0004:Master
400110: Character_Advanced_01_0004:MASTER_CONTROLLER
400112: Character_Advanced_01_0004:Mid_Controller
400114: Character_Advanced_01_0004:Neck
400116: Character_Advanced_01_0004:Neck_Controller
400118: Character_Advanced_01_0004:r_Elbow
400120: Character_Advanced_01_0004:r_Fist_Controller
400122: Character_Advanced_01_0004:r_Foot_Controller
400124: Character_Advanced_01_0004:r_Hand
400126: Character_Advanced_01_0004:r_Hand_Controls
400128: Character_Advanced_01_0004:r_Heel
400130: Character_Advanced_01_0004:r_Hip
400132: Character_Advanced_01_0004:r_Index_1
400134: Character_Advanced_01_0004:r_Index_2
400136: Character_Advanced_01_0004:r_Index_3
400138: Character_Advanced_01_0004:r_Index_4
400140: Character_Advanced_01_0004:r_Index_Controller
400142: Character_Advanced_01_0004:r_Knee
400144: Character_Advanced_01_0004:r_Middle_1
400146: Character_Advanced_01_0004:r_Middle_2
400148: Character_Advanced_01_0004:r_Middle_3
400150: Character_Advanced_01_0004:r_Middle_4
400152: Character_Advanced_01_0004:r_Middle_Controller
400154: Character_Advanced_01_0004:r_Pinky_1
400156: Character_Advanced_01_0004:r_Pinky_2
400158: Character_Advanced_01_0004:r_Pinky_3
400160: Character_Advanced_01_0004:r_Pinky_4
400162: Character_Advanced_01_0004:r_Pinky_Controller
400164: Character_Advanced_01_0004:r_Ring_1
400166: Character_Advanced_01_0004:r_Ring_2
400168: Character_Advanced_01_0004:r_Ring_3
400170: Character_Advanced_01_0004:r_Ring_4
400172: Character_Advanced_01_0004:r_Ring_Controller
400174: Character_Advanced_01_0004:r_Shoulder
400176: Character_Advanced_01_0004:r_Thumb_1
400178: Character_Advanced_01_0004:r_Thumb_2
400180: Character_Advanced_01_0004:r_Thumb_Controller
400182: Character_Advanced_01_0004:r_Toe
400184: Character_Advanced_01_0004:r_Toe_Controller
400186: Character_Advanced_01_0004:r_Wrist_Controller
400188: Character_Advanced_01_0004:Spine_Bot
400190: Character_Advanced_01_0004:Spine_Mid
400192: Character_Advanced_01_0004:Spine_Top
400194: Character_Advanced_01_0004:Staff1
400196: Character_Advanced_02:Character_Advanced_01_0004:Character_new_06:Character_new_06:polySurface50
400198: Character_Advanced_02:Character_Advanced_01_0004:Character_new_06:transform30
400200: Character_Advanced_02:Character_Advanced_01_0004:Hand_Controllers
400202: Character_Advanced_02:Character_Advanced_01_0004:l_Hand_Controls
400204: Character_Advanced_02:Character_Advanced_01_0004:r_Hand_Controls
400206: curve1
400208: imagePlane1
400210: joint3
400212: locator1
400214: locator2
400216: nurbsCircle1
400218: nurbsCircle2
400220: nurbsCircle3
400222: nurbsCircle4
400224: nurbsCircle5
400226: nurbsSquare1
400228: nurbsSquare2
400230: nurbsSquare3
400232: polySurface1
400234: staff_bot
400236: staff_top
400238: //RootNode
4300000: Character_Advanced_01_0004:Staff1
4300002: polySurface1
7400000: Take 001
9500000: //RootNode
13700000: Character_Advanced_01_0004:Staff1
13700002: polySurface1
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
optimizeGameObjects: 0
motionNodeName:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
animationCompression: 1
animationRotationError: .5
animationPositionError: .5
animationScaleError: .5
animationWrapMode: 0
extraExposedTransformPaths: []
clipAnimations: []
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
importBlendShapes: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0
weldVertices: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
splitTangentsAcrossUV: 1
normalImportMode: 0
tangentImportMode: 1
importAnimation: 1
copyAvatar: 0
humanDescription:
human: []
skeleton: []
armTwist: .5
foreArmTwist: .5
upperLegTwist: .5
legTwist: .5
armStretch: .0500000007
legStretch: .0500000007
feetSpacing: 0
rootMotionBoneName:
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

+ 2
- 0
unity_Project/Assets/Scripts/playerFollow.cs View File

@ -53,6 +53,8 @@ public class playerFollow : MonoBehaviour {
direction.Normalize ();
rigidbody.AddForce (direction * playerController.movementSpeed * Time.deltaTime);
} else {
playerController.applyGrip ();
}
}

+ 4
- 0
unity_Project/Assets/Scripts/sceneController.cs View File

@ -55,6 +55,10 @@ public class sceneController : MonoBehaviour {
void Update () {
swapCharacters ();
pointAtOther ();
if (Input.GetKeyDown(KeyCode.R))
Application.LoadLevel(Application.loadedLevel);
}
private void swapCharacters(){

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

@ -125,7 +125,7 @@ public class thirdPersonController : MonoBehaviour {
}
private void applyGrip(){
public void applyGrip(){
float localVelX = transform.InverseTransformDirection (rigidbody.velocity).x;
float localVelZ = transform.InverseTransformDirection (rigidbody.velocity).z;
//Debug.Log ("velocity.y: " + localVelZ);

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


BIN
unity_Project/Assets/prefabs/wall_cube.prefab View File


Write Preview
Loading…
Cancel
Save