优化移动方式防止出界

StockRunning/Assets/#A1_Scenes/DemoScenes.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
+  m_IndirectSpecularColor: {r: 0.37311992, g: 0.38074034, b: 0.35872713, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &4
 LightmapSettings:
@@ -3167,6 +3167,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 479222338709968933, guid: 919382978f5e2684ba83e6daf6491458,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6064464677632144689, guid: 919382978f5e2684ba83e6daf6491458,
         type: 3}
       propertyPath: m_Name

StockRunning/Assets/#A2_Scripts/Battle/UI/BattleUI.cs

@@ -355,15 +355,15 @@ public class BattleUI : MonoBehaviour
     public void ShowJoystick()
     {
         print("显示摇杆");
-        m_joystickImage.color = Color.white;
-        m_thumbImage.color = Color.white;
+        //m_joystickImage.color = Color.white;
+        //m_thumbImage.color = Color.white;
     }
     //摇杆图标隐藏
     public void HideJoystick()
     {
         print("隐藏摇杆");
-        m_joystickImage.color = Color.clear;
-        m_thumbImage.color = Color.clear;
+        //m_joystickImage.color = Color.clear;
+        //m_thumbImage.color = Color.clear;
     }
     public void UpdateScore()
     {

StockRunning/Assets/#A2_Scripts/Camera/FollowTarget.cs

@@ -36,22 +36,30 @@ public class FollowTarget : MonoBehaviour
     public float upDis= 8.77f;
     //public float smood=10;
 
-    private Transform target;
+    public Transform target;
 
     private void Start()
     {
-        target = GameObject.FindGameObjectWithTag("Player").transform;
-        
-}
+        //target = GameObject.FindGameObjectWithTag("Player").transform;
+        //target.position = new Vector3(0,target.position.y,target.position.z);//摄像机不左右看。
+
+
+    }
     private void LateUpdate()
     {
+       
         //读取配置文件数据
         backDis = ConfigurationFile.instance.backDis;
         upDis = ConfigurationFile.instance.upDis;
-
-        Vector3 followPoint = target.position + Vector3.up * upDis - target.forward * backDis;
+        
+        //Vector3 followPoint = target.position + Vector3.up * upDis - target.forward * backDis;
+        //transform.position = followPoint;
+        //transform.position = Vector3.Lerp(transform.position, followPoint,Time.deltaTime*smood);//平滑移动
+        //transform.LookAt(target);
+        
+        Vector3 followPoint = new Vector3(0,0, target.position.z) + Vector3.up * upDis - target.forward * backDis;//照相机不左右移动
         transform.position = followPoint;
-        //transform.position = Vector3.Lerp(transform.position, followPoint,Time.deltaTime*smood);
-        transform.LookAt(target);
+        transform.position = followPoint;
+        
     }
 }

StockRunning/Assets/#B2_Graphics.meta

+fileFormatVersion: 2
+guid: 317d19313d1d7204e9bbc37122116e7f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

StockRunning/Assets/#Z1_Tabs.meta

+fileFormatVersion: 2
+guid: ca40beb7fc6998f40a6e15a59c6ab599
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

StockRunning/Assets/#Z2_Documents.meta

+fileFormatVersion: 2
+guid: 325c11e064841204bbd6de7c85bebef6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

StockRunning/Assets/#Z3_WebAPI.meta

+fileFormatVersion: 2
+guid: aa43ce62596b0784081ec9bd0abc8516
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

StockRunning/Assets/#Z4_Icons.meta

+fileFormatVersion: 2
+guid: 2e117c0bfc6741e4ebc4a8c8aebc0b8a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

StockRunning/Assets/#Z4_Previews.meta

+fileFormatVersion: 2
+guid: 55c4962f2a6593c4b9c1bb6003b1ff08
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

StockRunning/Assets/My/Scripts/AI/AIMove.cs

@@ -68,11 +68,14 @@ public class AIMove : MonoBehaviour
     }
     private void OnTriggerEnter(Collider other)
     {
-        if (other.tag == "Gold")
+        if (other.tag == "Gold" )
         {
-            SpeedLevel += 1;
-            BattleCtrl.instance.Score++;
-            BattleCtrl.instance.updateScore?.Invoke();
+            if(SpeedLevel < 3)
+            {
+                SpeedLevel += 1;
+                BattleCtrl.instance.Score++;
+                BattleCtrl.instance.updateScore?.Invoke();
+            }
             Destroy(other.gameObject);
         }
         else if (other.tag == "Prickle")
@@ -110,7 +113,7 @@ public class AIMove : MonoBehaviour
     }
     void OnTouchStart()
     {
-        print("触碰开始。");
+        //print("触碰开始。");
         float varX = (Input.mousePosition.x - Screen.width / 2f) / (Screen.width / GlobalConfig.NormalWidth);
         float varY = (Input.mousePosition.y - Screen.height / 2f) / (Screen.width / GlobalConfig.NormalWidth);
         Vector2 varVec2 = GameServices.inputService.joyStick.gameObject.transform.localPosition;
@@ -216,7 +219,7 @@ public class AIMove : MonoBehaviour
             print("跑出跑道。");
             //m_rigidBody.constraints = RigidbodyConstraints.FreezeRotationX | RigidbodyConstraints.FreezeRotationY | RigidbodyConstraints.FreezeRotationZ;
             timer += Time.deltaTime;  //用来记时，1.5秒后如果player的y值小于-1.0f就判定游戏失败。
-            if (timer >= 1.5f && transform.position.y <= -1.0f)
+            if (timer >= 1.5f && transform.position.y <= -1.0f) //-9.49
             {
                 //不在跑道上，并且y<-1.0f。游戏失败
                 BattleCtrl.instance.OnBattleFail();

StockRunning/Assets/My/Scripts/Player/PlayerMove.cs

@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using UnityEngine;
 using DG.Tweening;
 using DG.Tweening.Core;
+using HedgehogTeam.EasyTouch;
+
 public enum MoveType
 {
     MoveType1=1,
@@ -44,6 +46,14 @@ public class PlayerMove : MonoBehaviour
     private bool isGround2 = true;
     private bool isAddSpeed = true;
     private float timer = 0.0f;
+
+    //输入控制player移动的中间变量
+    private float addXTemp = 0;
+    private float targetX;
+    private Vector3 movement = Vector3.zero;
+    private float _vertSpeed = 0.0f;
+    private float xDelta=0.0f;
+
     //眩晕时长
     private float timerVertigo = 0.0f;
     //动画
@@ -53,9 +63,12 @@ public class PlayerMove : MonoBehaviour
     private bool Grounded = false;
 
 
+
     // Start is called before the first frame update
     void Start()
     {
+       
+        
 
         //从配置文件ConfigurationFile中获取数据
         //VSpeed = ConfigurationFile.instance.VSpeed;
@@ -85,10 +98,13 @@ public class PlayerMove : MonoBehaviour
         //print("OnTriggerEnter:"+other.name);
         if (other.tag == "Gold")
         {
-            SpeedLevel += 1;
-            BattleCtrl.instance.Score++;
-            BattleCtrl.instance.updateScore?.Invoke();
             Destroy(other.gameObject);
+            if (SpeedLevel < 3)
+            {
+                SpeedLevel += 1;
+                BattleCtrl.instance.Score++;
+                BattleCtrl.instance.updateScore?.Invoke();
+            }
         }
         else if (other.tag== "Prickle")
         {
@@ -122,7 +138,7 @@ public class PlayerMove : MonoBehaviour
     }
     void OnTouchStart()
     {
-        print("触碰开始。");
+        //print("触碰开始。");
         float varX = (Input.mousePosition.x - Screen.width / 2f) / (Screen.width / GlobalConfig.NormalWidth);
         float varY = (Input.mousePosition.y - Screen.height / 2f) / (Screen.width / GlobalConfig.NormalWidth);
         Vector2 varVec2 = GameServices.inputService.joyStick.gameObject.transform.localPosition;
@@ -138,7 +154,7 @@ public class PlayerMove : MonoBehaviour
     // 抬起回调
     void OnTouchUp()
     {
-        print("触碰结束。");
+        //print("触碰结束。");
         if (!BattleCtrl.instance.isStartBattle)
         {
             return;
@@ -197,6 +213,21 @@ public class PlayerMove : MonoBehaviour
         animator.SetFloat("MoveSpeed", MoveSpeed);
         animator.SetBool("Grounded", Grounded);
 
+        
+        
+        if (!Grounded)
+        {
+            _vertSpeed += -9.8f * 5 * Time.deltaTime;
+            if (_vertSpeed < -10.0f)
+            {
+                _vertSpeed = -10.0f;
+            }
+        }
+        movement.y = _vertSpeed;
+        //movement *= Time.deltaTime;
+        //characterController.Move(movement);   
+
+
 
         //射线检测。
         //Debug.DrawRay(transform.position, Vector3.down * 10f, Color.red);
@@ -251,6 +282,7 @@ public class PlayerMove : MonoBehaviour
             
         }
         
+        
     }
 
     //摇杆控制
@@ -312,17 +344,69 @@ public class PlayerMove : MonoBehaviour
     }
     public void MoveType3()
     {
-        characterController.SimpleMove(transform.forward * MoveSpeed);
+        //characterController.SimpleMove(transform.forward * MoveSpeed);
+
+        
+
+
+        //movement += transform.forward * MoveSpeed;
+
+        //movement *= Time.deltaTime;
+        //characterController.Move(movement);
+
+        //characterController.SimpleMove(movement);
+
         if (isGround1 || isGround2)
         {
-            //在地面上才能控制移动
-            transform.position += transform.right * GameServices.inputService.joyStick.axisX.axisValue * HSpeed * Time.deltaTime;
+            //transform.position += transform.right * GameServices.inputService.joyStick.axisX.axisValue * HSpeed * Time.deltaTime;
+            Gesture currentGesture = EasyTouch.current;
+            if (currentGesture != null && (currentGesture.type == EasyTouch.EvtType.On_Drag)) //if (currentGesture != null && (currentGesture.type==EasyTouch.EvtType.On_Swipe|| currentGesture.type == EasyTouch.EvtType.On_Drag))
+            {
+                //transform.position += transform.right * currentGesture.deltaPosition.x / Screen.width * HSpeed;   //马路宽14 （HSpeed=14）
+                xDelta = currentGesture.deltaPosition.x / Screen.width * HSpeed;
+
+                //characterController.Move(transform.right * currentGesture.deltaPosition.x / Screen.width * HSpeed);
+
+                //addXTemp += (transform.right * currentGesture.deltaPosition.x / Screen.width * HSpeed).x;
+                //targetX += addXTemp;
+            }
+            //else if (currentGesture != null && (currentGesture.type == EasyTouch.EvtType.On_DragEnd))
+            //{
+            //    addXTemp = 0;
+            //}
+
+            //Gesture currentGesture = EasyTouch.current;
+            //if (currentGesture == null) { } 
+            //else if (currentGesture.type == EasyTouch.EvtType.On_DragStart)
+            //{
+            //    print("111111");
+            //    addXTemp = 0;
+            //    targetX = transform.position.x;
+            //}
+            //else if(currentGesture.type == EasyTouch.EvtType.On_Drag) //if (currentGesture != null && (currentGesture.type==EasyTouch.EvtType.On_Swipe|| currentGesture.type == EasyTouch.EvtType.On_Drag))
+            //{
+            //    print("22222");
+            //    //transform.position += transform.right * currentGesture.deltaPosition.x / Screen.width * HSpeed;   //马路宽14 （HSpeed=14）
+            //    addXTemp += currentGesture.deltaPosition.x / Screen.width * HSpeed; ;
+            //    targetX += addXTemp;
+            //}
+            //else if (currentGesture.type == EasyTouch.EvtType.On_DragEnd)
+            //{
+            //    print("333333333");
+            //    addXTemp = 0;
+            //    targetX = transform.position.x;
+            //}
+            ////transform.position = new Vector3(Mathf.Lerp(transform.position.x, targetX, 1f), transform.position.y, transform.position.z);
+            //characterController.Move()
         }
+        characterController.Move((transform.forward * MoveSpeed + new Vector3(0, _vertSpeed, 0)) * Time.deltaTime+(new Vector3(xDelta, 0,0)));
+
 
-       
-        
     }
 
+
+
+
     /// <summary>
     /// 调整速度方向为路面的正向。
     /// </summary>

StockRunning/Assets/My/Test/Test.unity

@@ -226,7 +226,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 291339882}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 302f094fe9e75cb4cbc0ebddc6c24c98, type: 3}
   m_Name: 
@@ -513,6 +513,7 @@ GameObject:
   - component: {fileID: 441394225}
   - component: {fileID: 441394224}
   - component: {fileID: 441394223}
+  - component: {fileID: 441394226}
   m_Layer: 0
   m_Name: Start1
   m_TagString: Untagged
@@ -594,6 +595,18 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 441394221}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &441394226
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 441394221}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 45b864dd5621c044d92aa9ab676979d3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &464851984
 GameObject:
   m_ObjectHideFlags: 0
@@ -815,7 +828,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &801551184
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1034,7 +1047,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1508803903
 RectTransform:
   m_ObjectHideFlags: 0

StockRunning/Assets/My/Test/TestEtc.cs

-using System.Collections;
+using HedgehogTeam.EasyTouch;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -41,4 +42,10 @@ public class TestEtc : MonoBehaviour
     {
         print(aa);
     }
+   
+
+    private void OnDestroy()
+    {
+       
+    }
 }

StockRunning/Assets/My/Test/TestOnDrag.cs

+using HedgehogTeam.EasyTouch;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class TestOnDrag : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        //EasyTouch.On_Swipe += OnDrag;
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        Gesture currentGesture = EasyTouch.current;
+        //将输入的手势与系统的手势类型进行对比
+        //当没有输入时（没有触摸屏幕时）EasyTouch.current会返回null
+        //if (currentGesture != null && EasyTouch.EvtType.On_TouchStart == currentGesture.type)
+        //{ 
+        //}
+        if (currentGesture != null )
+        {
+            print(currentGesture.type);
+            if(currentGesture.type== EasyTouch.EvtType.On_Drag)
+            {
+                On_Drag(currentGesture);
+            }
+        }
+
+    }
+
+    public void On_Drag(Gesture gesture)
+    {
+        transform.Translate(new Vector3(gesture.deltaPosition.x/Screen.width*10, gesture.deltaPosition.y / Screen.width*10, 0));
+    }
+    public void OnDrag(Gesture gesture)
+    {
+        print("OnDrag---");
+    }
+
+    //private void OnDestroy()
+    //{
+    //    EasyTouch.On_Swipe -= OnDrag;
+    //}
+}

StockRunning/Assets/My/Test/TestOnDrag.cs.meta

+fileFormatVersion: 2
+guid: 45b864dd5621c044d92aa9ab676979d3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

StockRunning/Assets/Prefabs/Level2My.prefab

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &18666501
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 18666503}
+  - component: {fileID: 18666502}
+  m_Layer: 0
+  m_Name: Easytouch
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &18666503
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 18666501}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 3837569216805053198}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &18666502
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 18666501}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 42241010c6f9ddc46b78abdc21d505c5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  enable: 1
+  enableRemote: 0
+  gesturePriority: 0
+  StationaryTolerance: 15
+  longTapTime: 1
+  swipeTolerance: 0.85
+  minPinchLength: 0
+  minTwistAngle: 0
+  doubleTapDetection: 0
+  doubleTapTime: 0.3
+  alwaysSendSwipe: 0
+  enable2FingersGesture: 1
+  enableTwist: 1
+  enablePinch: 1
+  enable2FingersSwipe: 1
+  twoFingerPickMethod: 0
+  touchCameras: []
+  autoSelect: 1
+  pickableLayers3D:
+    serializedVersion: 2
+    m_Bits: 1
+  enable2D: 0
+  pickableLayers2D:
+    serializedVersion: 2
+    m_Bits: 1
+  autoUpdatePickedObject: 0
+  allowUIDetection: 1
+  enableUIMode: 1
+  autoUpdatePickedUI: 0
+  enabledNGuiMode: 0
+  nGUILayers:
+    serializedVersion: 2
+    m_Bits: 0
+  nGUICameras: []
+  enableSimulation: 1
+  twistKey: 308
+  swipeKey: 306
+  showGuiInspector: 1
+  showSelectInspector: 1
+  showGestureInspector: 0
+  showTwoFingerInspector: 0
+  showSecondFingerInspector: 0
+  secondFingerTexture: {fileID: 0}
 --- !u!1 &95854532
 GameObject:
   m_ObjectHideFlags: 0
@@ -24,7 +110,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 95854532}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.091, y: 0.5035, z: -0.45500183}
+  m_LocalPosition: {x: 0.091, y: 0.40100002, z: -0.45500183}
   m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
   m_Children: []
   m_Father: {fileID: 9066730885846526947}
@@ -363,7 +449,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1273825213}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0.277, y: 0.5035, z: -0.45500183}
+  m_LocalPosition: {x: -0.277, y: 0.401, z: -0.45500183}
   m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
   m_Children: []
   m_Father: {fileID: 9066730885846526947}
@@ -607,14 +693,14 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 541645531084013779}
   m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
-  m_LocalPosition: {x: 4.967, y: 3.75, z: 14.999}
+  m_LocalPosition: {x: 4.967, y: 1, z: 14.999}
   m_LocalScale: {x: 3.2785354, y: 3.2785354, z: 3.2785354}
   m_Children:
   - {fileID: 3529393628854795021}
   - {fileID: 5973950144676157315}
   - {fileID: 4003800267747061407}
   m_Father: {fileID: 9039545889760583447}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!143 &7555941342989138702
 CharacterController:
@@ -633,7 +719,7 @@ CharacterController:
   m_StepOffset: 0.3
   m_SkinWidth: 0.005
   m_MinMoveDistance: 0.001
-  m_Center: {x: 0, y: -0.32, z: 0}
+  m_Center: {x: 0, y: 0.49, z: 0}
 --- !u!114 &6163533530568546797
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -793,7 +879,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1310453812678665676}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -0.773, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1834412659367951201}
@@ -854,7 +940,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2415638398739372507}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -0.773, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 8879217644583962479}
@@ -1488,9 +1574,9 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 6558040878248959445}
   - {fileID: 1301929387574185764}
   - {fileID: 8432598096120910063}
+  - {fileID: 6558040878248959445}
   m_Father: {fileID: 1363895892748677954}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1736,15 +1822,15 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3460594025581368203}
-  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
-  m_LocalPosition: {x: 1.177, y: 3.75, z: 14.999}
+  m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
+  m_LocalPosition: {x: 1.177, y: 1, z: 14.999001}
   m_LocalScale: {x: 3.2785354, y: 3.2785354, z: 3.2785354}
   m_Children:
   - {fileID: 6973498718420831543}
   - {fileID: 7530888367484452495}
   - {fileID: 8579933057036190613}
   m_Father: {fileID: 9039545889760583447}
-  m_RootOrder: 0
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!143 &7847303891952861914
 CharacterController:
@@ -1763,7 +1849,7 @@ CharacterController:
   m_StepOffset: 0.3
   m_SkinWidth: 0.005
   m_MinMoveDistance: 0.001
-  m_Center: {x: 0, y: -0.22, z: 0}
+  m_Center: {x: 0, y: 0.47, z: 0}
 --- !u!114 &7006646106134737244
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1950,6 +2036,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   backDis: 6.390015
   upDis: 6.64
+  target: {fileID: 9066730885846526947}
 --- !u!1 &3837569216639476273
 GameObject:
   m_ObjectHideFlags: 0
@@ -2076,6 +2163,7 @@ Transform:
   - {fileID: 3837569217343095459}
   - {fileID: 5457626314367672030}
   - {fileID: 5763146333060947634}
+  - {fileID: 18666503}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2282,14 +2370,14 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4825482254551959764}
   m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
-  m_LocalPosition: {x: 3.1507, y: 3.75, z: 13.275}
+  m_LocalPosition: {x: 3.1507, y: 1, z: 13.275}
   m_LocalScale: {x: 3.2785354, y: 3.2785354, z: 3.2785354}
   m_Children:
   - {fileID: 611077812003865918}
   - {fileID: 592326527558753562}
   - {fileID: 4894836580427100229}
   m_Father: {fileID: 9039545889760583447}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!143 &1878362987761000785
 CharacterController:
@@ -2308,7 +2396,7 @@ CharacterController:
   m_StepOffset: 0.3
   m_SkinWidth: 0.005
   m_MinMoveDistance: 0.001
-  m_Center: {x: 0, y: -0.32, z: 0}
+  m_Center: {x: 0, y: 0.45, z: 0}
 --- !u!114 &3828473405406870884
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2525,7 +2613,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5172682971482912188}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -0.773, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 6520246519727873281}
@@ -3245,7 +3333,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9066730885846792887}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.278, y: 1.1100001, z: -42.48999}
+  m_LocalPosition: {x: -0.278, y: 1, z: -42.48999}
   m_LocalScale: {x: 2, y: 2, z: 2}
   m_Children:
   - {fileID: 8198971087353062533}
@@ -3271,7 +3359,7 @@ CharacterController:
   m_StepOffset: 0.3
   m_SkinWidth: 0.08
   m_MinMoveDistance: 0.001
-  m_Center: {x: 0, y: 0.51, z: 0}
+  m_Center: {x: 0, y: 0.44, z: 0}
 --- !u!114 &1387209929
 MonoBehaviour:
   m_ObjectHideFlags: 0