diff --git a/MoCha/Assets/Materials/Monster.mat b/MoCha/Assets/Materials/Monster.mat new file mode 100644 index 0000000..e9a4979 Binary files /dev/null and b/MoCha/Assets/Materials/Monster.mat differ diff --git a/MoCha/Assets/Materials/Monster.mat.meta b/MoCha/Assets/Materials/Monster.mat.meta new file mode 100644 index 0000000..b5c38fe --- /dev/null +++ b/MoCha/Assets/Materials/Monster.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7f5b45f167ce0c74a94cde52fb5c09e7 +timeCreated: 1523987555 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Materials/Running Man.mat b/MoCha/Assets/Materials/Running Man.mat new file mode 100644 index 0000000..f6e341d Binary files /dev/null and b/MoCha/Assets/Materials/Running Man.mat differ diff --git a/MoCha/Assets/Materials/Running Man.mat.meta b/MoCha/Assets/Materials/Running Man.mat.meta new file mode 100644 index 0000000..c248843 --- /dev/null +++ b/MoCha/Assets/Materials/Running Man.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2c8009114361c9045a3d3f8fb310c3ec +timeCreated: 1523987549 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Objects/running_man.fbx b/MoCha/Assets/Objects/running_man.fbx new file mode 100644 index 0000000..4287520 Binary files /dev/null and b/MoCha/Assets/Objects/running_man.fbx differ diff --git a/MoCha/Assets/Objects/running_man.fbx.meta b/MoCha/Assets/Objects/running_man.fbx.meta new file mode 100644 index 0000000..2e43358 --- /dev/null +++ b/MoCha/Assets/Objects/running_man.fbx.meta @@ -0,0 +1,95 @@ +fileFormatVersion: 2 +guid: c60d37a70064cec47b89518256491de4 +timeCreated: 1523987201 +licenseType: Free +ModelImporter: + serializedVersion: 22 + fileIDToRecycleName: + 100000: node_id3 + 100002: //RootNode + 400000: node_id3 + 400002: //RootNode + 2100000: Material_53 + 2300000: node_id3 + 3300000: node_id3 + 4300000: node_id3 + externalObjects: {} + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Scenes/Main.unity b/MoCha/Assets/Scenes/Main.unity index 9241a6d..75757aa 100644 Binary files a/MoCha/Assets/Scenes/Main.unity and b/MoCha/Assets/Scenes/Main.unity differ diff --git a/MoCha/Assets/Scenes/Stats.unity b/MoCha/Assets/Scenes/Stats.unity index 88ec168..fad3fc1 100644 Binary files a/MoCha/Assets/Scenes/Stats.unity and b/MoCha/Assets/Scenes/Stats.unity differ diff --git a/MoCha/Assets/Scripts/RunningMan.cs b/MoCha/Assets/Scripts/RunningMan.cs new file mode 100644 index 0000000..746bdae Binary files /dev/null and b/MoCha/Assets/Scripts/RunningMan.cs differ diff --git a/MoCha/Assets/Scripts/RunningMan.cs.meta b/MoCha/Assets/Scripts/RunningMan.cs.meta new file mode 100644 index 0000000..549eafb --- /dev/null +++ b/MoCha/Assets/Scripts/RunningMan.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: a60f552af79ad464ea5ece09289bec43 +timeCreated: 1523991007 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Scripts/SpinningCube.cs b/MoCha/Assets/Scripts/SpinningCube.cs index 57c8847..2c4d0cb 100644 --- a/MoCha/Assets/Scripts/SpinningCube.cs +++ b/MoCha/Assets/Scripts/SpinningCube.cs @@ -2,9 +2,10 @@ using System.Collections; public class SpinningCube : MonoBehaviour { - public float m_Speed = 20f; + public float m_Speed = 100f; + public float faster = 1f; - private Vector3 m_RotationDirection = Vector3.up; + private Vector3 m_RotationDirection = Vector3.right; public void ToggleRotationDirection() { @@ -22,6 +23,7 @@ public class SpinningCube : MonoBehaviour { void Update() { - transform.Rotate(m_RotationDirection * Time.deltaTime * m_Speed); + Time.timeScale = 5; + transform.Rotate(m_RotationDirection * (Mathf.Sin(Time.time) / 20f) * m_Speed); } }