Merge branch 'master' of https://github.com/AnonymusRaccoon/Goulag

2025-12-06 06:36:29 +00:00 · 2018-10-06 21:36:40 +02:00
parent 386b276221 55cf04b8a5
commit e4535f7106
6 changed files with 405 additions and 2 deletions
--- a/Assets/Player
+++ b/Assets/Player
@@ -0,0 +1,150 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1295779273530774}
+  m_IsPrefabAsset: 1
+--- !u!1 &1295779273530774
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4345067943353424}
+  - component: {fileID: 212465444373585022}
+  - component: {fileID: 114482567245020594}
+  - component: {fileID: 50129134328127070}
+  - component: {fileID: 61796892765236492}
+  m_Layer: 9
+  m_Name: Player 1
+  m_TagString: Player
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4345067943353424
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1295779273530774}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -1.538, y: -0.6385, z: 0}
+  m_LocalScale: {x: 3.5722172, y: 3.5545542, z: 3.2728415}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!50 &50129134328127070
+Rigidbody2D:
+  serializedVersion: 4
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1295779273530774}
+  m_BodyType: 0
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDrag: 0
+  m_AngularDrag: 0.05
+  m_GravityScale: 1
+  m_Material: {fileID: 0}
+  m_Interpolate: 1
+  m_SleepingMode: 0
+  m_CollisionDetection: 1
+  m_Constraints: 4
+--- !u!61 &61796892765236492
+BoxCollider2D:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1295779273530774}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0.5, y: 0.5}
+    oldSize: {x: 0.2, y: 0.2}
+    newSize: {x: 0.2, y: 0.2}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.2, y: 0.2}
+  m_EdgeRadius: 0
+--- !u!114 &114482567245020594
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1295779273530774}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3e70fe696fea60d4f8e268e58a1e361f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  sensiX: 10
+  sensiY: 15
+  DownDetector: 1
+--- !u!212 &212465444373585022
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1295779273530774}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 0.2, y: 0.2}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
--- a/1.prefab.meta
+++ b/1.prefab.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f5eee23f42e32c740a46ae6b64fb96e1
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -179,6 +179,105 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1001 &294427600
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4345067943353424, guid: f5eee23f42e32c740a46ae6b64fb96e1, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: -1.538
+      objectReference: {fileID: 0}
+    - target: {fileID: 4345067943353424, guid: f5eee23f42e32c740a46ae6b64fb96e1, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: -0.6385
+      objectReference: {fileID: 0}
+    - target: {fileID: 4345067943353424, guid: f5eee23f42e32c740a46ae6b64fb96e1, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4345067943353424, guid: f5eee23f42e32c740a46ae6b64fb96e1, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4345067943353424, guid: f5eee23f42e32c740a46ae6b64fb96e1, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4345067943353424, guid: f5eee23f42e32c740a46ae6b64fb96e1, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4345067943353424, guid: f5eee23f42e32c740a46ae6b64fb96e1, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4345067943353424, guid: f5eee23f42e32c740a46ae6b64fb96e1, type: 2}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 1295779273530774, guid: f5eee23f42e32c740a46ae6b64fb96e1, type: 2}
+      propertyPath: m_Name
+      value: Player
+      objectReference: {fileID: 0}
+    - target: {fileID: 114482567245020594, guid: f5eee23f42e32c740a46ae6b64fb96e1,
+        type: 2}
+      propertyPath: sensiX
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 50129134328127070, guid: f5eee23f42e32c740a46ae6b64fb96e1,
+        type: 2}
+      propertyPath: m_CollisionDetection
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 50129134328127070, guid: f5eee23f42e32c740a46ae6b64fb96e1,
+        type: 2}
+      propertyPath: m_Interpolate
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 114482567245020594, guid: f5eee23f42e32c740a46ae6b64fb96e1,
+        type: 2}
+      propertyPath: sensiY
+      value: 15
+      objectReference: {fileID: 0}
+    - target: {fileID: 114482567245020594, guid: f5eee23f42e32c740a46ae6b64fb96e1,
+        type: 2}
+      propertyPath: layerMask.m_Bits
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1295779273530774, guid: f5eee23f42e32c740a46ae6b64fb96e1, type: 2}
+      propertyPath: m_Layer
+      value: 9
+      objectReference: {fileID: 0}
+    - target: {fileID: 1295779273530774, guid: f5eee23f42e32c740a46ae6b64fb96e1, type: 2}
+      propertyPath: m_TagString
+      value: Player
+      objectReference: {fileID: 0}
+    - target: {fileID: 114482567245020594, guid: f5eee23f42e32c740a46ae6b64fb96e1,
+        type: 2}
+      propertyPath: DownDetector
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 212465444373585022, guid: f5eee23f42e32c740a46ae6b64fb96e1,
+        type: 2}
+      propertyPath: m_FlipX
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 212465444373585022, guid: f5eee23f42e32c740a46ae6b64fb96e1,
+        type: 2}
+      propertyPath: m_FlipY
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 212465444373585022, guid: f5eee23f42e32c740a46ae6b64fb96e1,
+        type: 2}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f5eee23f42e32c740a46ae6b64fb96e1, type: 2}
+  m_IsPrefabAsset: 0
 --- !u!1 &403186791
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Script/PlayerController.cs
+++ b/Assets/Script/PlayerController.cs
@@ -0,0 +1,135 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+
+public class PlayerController : MonoBehaviour {
+    Rigidbody2D rb2;
+    [SerializeField]
+    float sensiX = 1;
+    [SerializeField]
+    float sensiY = 1;
+    private float vertical;
+    [SerializeField]
+    float DownDetector = 1;
+    
+    int layerMask = 1 << 9;
+    private bool IsGrounded = true;
+    RaycastHit2D hit;
+    SpriteRenderer rend;
+    bool flip_flop = false;
+
+    // Use this for initialization
+    void Start () {
+        rb2 = gameObject.GetComponent<Rigidbody2D>();
+        layerMask = ~layerMask;
+        rend = gameObject.GetComponent<SpriteRenderer>();
+    }
+	
+	// Update is called once per frame
+	void Update () {
+        DectectInput();
+
+    }
+    void OnCollisionStay2D(Collision2D other)
+    {
+        
+        if (other.transform != null && hit.transform !=null)
+        {
+            if (other.transform.name == hit.transform.name)
+            {
+                IsGrounded = true;
+               
+            }
+        }
+    }
+    void DectectInput()
+    {
+        float horizontal =  Input.GetAxisRaw("Horizontal")*sensiX;
+        
+        float rawtical = Input.GetAxisRaw("Vertical")*sensiY;
+
+        if (flip_flop == true)
+        {
+            vertical = 0;
+        }
+
+        switch (Mathf.RoundToInt(Input.GetAxisRaw("Vertical")))
+        {
+            case 1:
+                
+                vertical = 1 * sensiY;
+                flip_flop = true;
+                
+                break;
+            case -1:
+               
+                break;
+            case 0:
+            
+                vertical = 0;
+                flip_flop = false;
+                break;
+            default:
+                Debug.LogWarning("Somehow getaxis did not return -1,0,1");
+                break;
+        }
+      
+        
+      
+
+
+        hit = Physics2D.Raycast(transform.position, Vector2.down, DownDetector, layerMask);
+        
+        if(hit.collider == null)
+        
+        {
+            
+                IsGrounded = false;
+               
+        }
+        
+       
+
+        if (IsGrounded == false)
+        {
+           
+            vertical = 0;
+        }
+       
+        
+
+        Move(horizontal, vertical);
+       
+    }
+    private void Move(float horizontal, float vertical)
+    {
+         if (horizontal == 0)
+        {
+            rb2.velocity = new Vector2(0, rb2.velocity.y);
+        }
+
+
+        if (horizontal > 0)
+        {
+            rend.flipX = true;
+        }else if (horizontal < 0)
+        {
+            rend.flipX = false;
+        }
+
+        if(vertical > 0)
+        {
+             rend.flipY = true;
+        }
+        else
+        {
+            rend.flipY = false;
+        }
+
+        rb2.AddForce(new Vector2(horizontal, vertical)*Time.deltaTime, ForceMode2D.Impulse);
+
+    }
+
+
+}
--- a/Assets/Script/PlayerController.cs.meta
+++ b/Assets/Script/PlayerController.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3e70fe696fea60d4f8e268e58a1e361f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -16,7 +16,7 @@ TagManager:
  - 
  - 
  - PostProcessing
-  - 
+  - Player
  - 
  - 
  -