龙腾猫跃 před 4 roky
rodič
revize
18769f4fc7

+ 1 - 9
Assets/Localization/String Localization Shared Data.asset

@@ -14,15 +14,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_TableCollectionName: String Localization
   m_TableCollectionNameGuidString: e3f186d36085a4c16a16dd9c5dead58e
-  m_Entries:
-  - m_Id: 145542393880576
-    m_Key: SceneMain/UI/UI Button/Text
-    m_Metadata:
-      m_Items: []
-  - m_Id: 147212595093504
-    m_Key: SceneMain/UI/UI Button
-    m_Metadata:
-      m_Items: []
+  m_Entries: []
   m_Metadata:
     m_Items: []
   m_KeyGenerator:

+ 1 - 9
Assets/Localization/String Localization_en-US.asset

@@ -17,15 +17,7 @@ MonoBehaviour:
   m_SharedData: {fileID: 11400000, guid: e3f186d36085a4c16a16dd9c5dead58e, type: 2}
   m_Metadata:
     m_Items: []
-  m_TableData:
-  - m_Id: 147212595093504
-    m_Localized: '#coin English'
-    m_Metadata:
-      m_Items: []
-  - m_Id: 145542393880576
-    m_Localized: English Button
-    m_Metadata:
-      m_Items: []
+  m_TableData: []
   references:
     version: 2
     RefIds: []

+ 1 - 9
Assets/Localization/String Localization_zh-CN.asset

@@ -17,15 +17,7 @@ MonoBehaviour:
   m_SharedData: {fileID: 11400000, guid: e3f186d36085a4c16a16dd9c5dead58e, type: 2}
   m_Metadata:
     m_Items: []
-  m_TableData:
-  - m_Id: 147212595093504
-    m_Localized: "#coin \u4E2D\u6587"
-    m_Metadata:
-      m_Items: []
-  - m_Id: 145542393880576
-    m_Localized: "\u4E2D\u6587\u6309\u94AE"
-    m_Metadata:
-      m_Items: []
+  m_TableData: []
   references:
     version: 2
     RefIds: []

+ 11 - 0
Assets/Resources/Entities/Material.physicsMaterial2D

@@ -0,0 +1,11 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!62 &6200000
+PhysicsMaterial2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Material
+  friction: 0
+  bounciness: 0

+ 3 - 3
Assets/Resources/Map/Tiles.meta → Assets/Resources/Entities/Material.physicsMaterial2D.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: f933de2e0c920144297213e98ed7590d
-folderAsset: yes
-DefaultImporter:
+guid: 6a9410bb3043e384eba63a5622b25c09
+NativeFormatImporter:
   externalObjects: {}
+  mainObjectFileID: 6200000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 0 - 0
Assets/Resources/Map/Tiles/Floor.asset → Assets/Resources/Map/Floor.asset


+ 0 - 0
Assets/Resources/Map/Tiles/Floor.asset.meta → Assets/Resources/Map/Floor.asset.meta


+ 0 - 0
Assets/Resources/Map/Tiles/Floor.png → Assets/Resources/Map/Floor.png


+ 0 - 0
Assets/Resources/Map/Tiles/Floor.png.meta → Assets/Resources/Map/Floor.png.meta


+ 0 - 0
Assets/Resources/Map/Tiles/TilePalette.prefab → Assets/Resources/Map/TilePalette.prefab


+ 0 - 0
Assets/Resources/Map/Tiles/TilePalette.prefab.meta → Assets/Resources/Map/TilePalette.prefab.meta


+ 0 - 0
Assets/Resources/Map/Tiles/Wall.asset → Assets/Resources/Map/Wall.asset


+ 0 - 0
Assets/Resources/Map/Tiles/Wall.asset.meta → Assets/Resources/Map/Wall.asset.meta


+ 0 - 0
Assets/Resources/Map/Tiles/Wall.png → Assets/Resources/Map/Wall.png


+ 0 - 0
Assets/Resources/Map/Tiles/Wall.png.meta → Assets/Resources/Map/Wall.png.meta


+ 27 - 5
Assets/Resources/System/PlayerController.cs

@@ -5,17 +5,39 @@ using System.Collections.Generic;
 using UnityEngine;
 
 public class PlayerController : MonoBehaviour {
-
-    public float movementSpeed = 5f;
-
     private Rigidbody2D rb;
+    public LayerMask groundLayer;
     void Start() {
         rb = GetComponent<Rigidbody2D>();
     }
 
+    public string keyLeft = "a", keyRight = "d", keyJump = "w", keyDown = "s";
+    public float movementSpeed = 10f, jumpForce = 20f, horizontalF = 0.9f, horizontalA = 0.3f, jumpThreshold = 0.1f, jumpDetectHeight = 0.8f;
+    public float jumpBufferTime = 0.2f, jumpWolfTime = 0.2f; private float jumpBuffer = 0f, jumpWolf = 0f;
     void FixedUpdate() {
-        // 移动
-        rb.velocity = new Vector2(Input.GetAxis("Horizontal") * movementSpeed, Input.GetAxis("Vertical") * movementSpeed);
+        // 获取当前情况
+        float speedX = rb.velocity.x, speedY = rb.velocity.y;
+        bool isGround = Physics2D.OverlapCircle(transform.position - new Vector3(0, jumpDetectHeight, 0), jumpThreshold, groundLayer);
+        bool isDown = Input.GetKey(keyDown) && isGround;
+        int moveHorizontal = isDown ? 0 : // 没有下蹲
+            (Input.GetKey(keyLeft) == Input.GetKey(keyRight) ? 0 : // 没有同时按住左右
+            (Input.GetKey(keyLeft) ? -1 : 1)); // 获取方向
+        // 判断跳跃
+        jumpBuffer -= Time.fixedDeltaTime;
+        if (Input.GetKeyDown(keyJump)) jumpBuffer = jumpBufferTime;
+        jumpWolf -= Time.fixedDeltaTime;
+        if (isGround) jumpWolf = jumpWolfTime;
+        if (!isDown && jumpBuffer > 0 && jumpWolf > 0) { // 在地面、没有蹲下
+            speedY = jumpForce;
+            jumpBuffer = 0;
+        }
+        // 横向移动
+        if (moveHorizontal != 0) {
+            speedX = speedX * (1 - horizontalA) + movementSpeed * horizontalA * moveHorizontal;
+        }
+        speedX *= horizontalF;
+        // 设置
+        rb.velocity = new Vector2(speedX, speedY);
     }
 
 }

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 190 - 353
Assets/Scenes/SceneMain.unity


+ 1 - 1
ProjectSettings/Physics2DSettings.asset

@@ -4,7 +4,7 @@
 Physics2DSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 5
-  m_Gravity: {x: 0, y: 0}
+  m_Gravity: {x: 0, y: -30}
   m_DefaultMaterial: {fileID: 0}
   m_VelocityIterations: 8
   m_PositionIterations: 3

+ 2 - 2
ProjectSettings/TagManager.asset

@@ -12,8 +12,8 @@ TagManager:
   - Water
   - UI
   - Camera
-  - 
-  - 
+  - Player
+  - Enemy
   - 
   - 
   - 

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů