CharacterController版本1.0

StockRunning/Assembly-CSharp.csproj

@@ -92,7 +92,6 @@
     <Compile Include="Assets\#A2_Scripts\Battle\UI\TestGestureAround.cs" />
     <Compile Include="Assets\#A2_Scripts\Battle\View\BombView.cs" />
     <Compile Include="Assets\#A2_Scripts\Battle\View\CarView.cs" />
-    <Compile Include="Assets\#A2_Scripts\Battle\View\CarView2.cs" />
     <Compile Include="Assets\#A2_Scripts\Battle\View\ChainDragView.cs" />
     <Compile Include="Assets\#A2_Scripts\Battle\View\ChainRopeView.cs" />
     <Compile Include="Assets\#A2_Scripts\Battle\View\ChainView.cs" />
@@ -262,9 +261,12 @@
     <Compile Include="Assets\EasyTouchBundle\EasyTouchControls\Plugins\ETCInput.cs" />
     <Compile Include="Assets\EasyTouchBundle\EasyTouchControls\Plugins\ETCJoystick.cs" />
     <Compile Include="Assets\EasyTouchBundle\EasyTouchControls\Plugins\ETCTouchPad.cs" />
+    <Compile Include="Assets\My\AI\AIMove.cs" />
     <Compile Include="Assets\My\FloorBoard.cs" />
+    <Compile Include="Assets\My\Gold\Gold.cs" />
+    <Compile Include="Assets\My\Player\PlayerMove.cs" />
     <Compile Include="Assets\My\RandomEnvironment.cs" />
-    <Compile Include="Assets\My\TestEtc.cs" />
+    <Compile Include="Assets\My\Test\TestEtc.cs" />
     <Compile Include="Assets\My\TriggerTurnDir.cs" />
     <Compile Include="Assets\My\Wall.cs" />
     <Compile Include="Assets\Ultimate Game Tools\AutomaticLOD\Scripts\AutomaticLOD.cs" />

StockRunning/Assets/#A1_Scenes/DemoScenes.unity

@@ -377,81 +377,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
-        type: 3}
-      propertyPath: axisX.showInertiaInspector
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
-        type: 3}
-      propertyPath: axisX.isEnertia
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
-        type: 3}
-      propertyPath: axisX.inertia
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
-        type: 3}
-      propertyPath: showEventInspector
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
-        type: 3}
-      propertyPath: showTouchEventInspector
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
-        type: 3}
-      propertyPath: showDownEventInspector
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
-        type: 3}
-      propertyPath: showPressEventInspector
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
-        type: 3}
-      propertyPath: showSpriteInspector
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
-        type: 3}
-      propertyPath: showCameraInspector
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
-        type: 3}
-      propertyPath: axisY.showSimulatinInspector
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
-        type: 3}
-      propertyPath: axisY.showInertiaInspector
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
-        type: 3}
-      propertyPath: axisY.showDirectInspector
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
-        type: 3}
-      propertyPath: axisY.isEnertia
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
-        type: 3}
-      propertyPath: axisY.inertia
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
-        type: 3}
-      propertyPath: useFixedUpdate
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 6064464677632144689, guid: 919382978f5e2684ba83e6daf6491458,
         type: 3}
       propertyPath: m_Name

StockRunning/Assets/#A2_Scripts/Battle/BattleCtrl.cs

@@ -109,7 +109,7 @@ public class BattleCtrl : MonoBehaviour
     /// </summary>
     void StartBattle()
     {
-        print("_IsStartBattle设置为true");
+        //print("_IsStartBattle设置为true");
         _IsStartBattle = true;
 
 

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

@@ -42,6 +42,8 @@ public class BattleUI : MonoBehaviour
     public Slider sliderScore;
     public Text ScoreTex;
 
+    public Text Timer;
+
 
     public Action onStartBtn;
     public Action onPosUpBtn;
@@ -86,6 +88,10 @@ public class BattleUI : MonoBehaviour
         m_joystickImage = GameServices.inputService.joyStick.GetComponent<Image>();
         m_thumbImage = GameServices.inputService.joyStick.thumb.GetComponent<Image>();
     }
+    private void Update()
+    {
+        Timer.text = Time.time.ToString("F1");
+    }
     void SetDragMode()
     {
         BattleCtrl.instance.levelManager.curLevel.chainView.SetDragMode(true);

StockRunning/Assets/#A3_Prefabs/BattleUI.prefab

@@ -1099,6 +1099,159 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1702194949
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1702194950}
+  - component: {fileID: 1702194952}
+  - component: {fileID: 1702194951}
+  m_Layer: 5
+  m_Name: Timer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1702194950
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1702194949}
+  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:
+  - {fileID: 1737215858}
+  m_Father: {fileID: 6064464676328073067}
+  m_RootOrder: 15
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 24.91, y: 716}
+  m_SizeDelta: {x: 220.88156, y: 101.82471}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1702194952
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1702194949}
+  m_CullTransparentMesh: 0
+--- !u!114 &1702194951
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1702194949}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.31764707}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1737215857
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1737215858}
+  - component: {fileID: 1737215860}
+  - component: {fileID: 1737215859}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1737215858
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1737215857}
+  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: 1702194950}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1737215860
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1737215857}
+  m_CullTransparentMesh: 0
+--- !u!114 &1737215859
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1737215857}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 78
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 100
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: 0
 --- !u!1 &1812017393
 GameObject:
   m_ObjectHideFlags: 0
@@ -6848,7 +7001,7 @@ MonoBehaviour:
   allowSimulationStandalone: 0
   visibleOnStandalone: 1
   dPadAxisCount: 0
-  useFixedUpdate: 0
+  useFixedUpdate: 1
   isOnDrag: 0
   isSwipeIn: 0
   isSwipeOut: 0
@@ -6924,7 +7077,7 @@ MonoBehaviour:
       m_PostInfinity: 2
       m_RotationOrder: 4
     isEnertia: 0
-    inertia: 0
+    inertia: 1
     inertiaThreshold: 0.08
     isAutoStab: 0
     autoStabThreshold: 0.01
@@ -6952,7 +7105,7 @@ MonoBehaviour:
     unityAxis: Horizontal
     showGeneralInspector: 1
     showDirectInspector: 1
-    showInertiaInspector: 0
+    showInertiaInspector: 1
     showSimulatinInspector: 0
   axisY:
     name: VerticalLeft
@@ -6971,7 +7124,7 @@ MonoBehaviour:
       m_PostInfinity: 2
       m_RotationOrder: 4
     isEnertia: 0
-    inertia: 0
+    inertia: 1
     inertiaThreshold: 0.08
     isAutoStab: 0
     autoStabThreshold: 0.01
@@ -6998,9 +7151,9 @@ MonoBehaviour:
     isJump: 0
     unityAxis: Vertical
     showGeneralInspector: 1
-    showDirectInspector: 0
-    showInertiaInspector: 0
-    showSimulatinInspector: 0
+    showDirectInspector: 1
+    showInertiaInspector: 1
+    showSimulatinInspector: 1
   thumb: {fileID: 2810382325705922103}
   joystickArea: 1
   userArea: {fileID: 0}
@@ -10029,6 +10182,7 @@ RectTransform:
   - {fileID: 9107797946881246061}
   - {fileID: 6109125632920290557}
   - {fileID: 584139469}
+  - {fileID: 1702194950}
   m_Father: {fileID: 6064464677632144690}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -11992,6 +12146,7 @@ MonoBehaviour:
   m_symbolObj: {fileID: 8615814293053379064}
   sliderScore: {fileID: 584139470}
   ScoreTex: {fileID: 606454945}
+  Timer: {fileID: 1737215859}
 --- !u!114 &1995691973
 MonoBehaviour:
   m_ObjectHideFlags: 0

StockRunning/Assets/My/MyETCTest.unity.meta → StockRunning/Assets/My/AI.meta

 fileFormatVersion: 2
-guid: 1a32f12420100da4ab7ea5ff2bb47bc4
+guid: 045df304258a19b4283e122b36a97ba2
+folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 

StockRunning/Assets/My/AI/AIMove.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using DG.Tweening;
+using DG.Tweening.Core;
+
+public class AIMove : MonoBehaviour
+{
+    [Header("控制移动")]
+    [Tooltip("控制向前的速度。")]
+    public float VSpeed = 40.0f;
+    [Tooltip("控制左右移动的速度。(未实现)")]
+    public float HSpeed = 10.0f;
+    [Tooltip("AI移动方式")]
+    public MoveType moveType = MoveType.MoveType3;
+    [Header("地面检测")]
+    public Transform ray1Pos;
+    public Transform ray2Pos;
+    private RaycastHit RHit;
+    private CharacterController characterController;
+    private int SpeedLevel=1;
+
+
+    private bool m_bIsCanMove = true;//是否能开车
+    private MeshCollider[] m_targetTrans;//所有目标
+    private MeshCollider m_curTargetTrans;//当前抓的目标
+                                          //   private Rigidbody m_rigidBody;//自身刚体
+    private Dictionary<MeshCollider, bool> m_dicBox = new Dictionary<MeshCollider, bool>();
+
+    private bool m_bControlStartMove = false;
+    private RectTransform m_thumbRT;//摇杆
+    private Dictionary<Rigidbody, bool> m_dicRigidDic = new Dictionary<Rigidbody, bool>();
+    private bool isGround1 = true;
+    private bool isGround2 = true;
+    private bool isAddSpeed = true;
+    private float timer = 0.0f;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        characterController = GetComponent<CharacterController>();
+        BattleCtrl.instance.turnDir += TurnDir;
+        //m_rigidBody = GetComponent<Rigidbody>();
+
+
+
+        GameServices.inputService.joyStick.onTouchStart.AddListener(OnTouchStart);
+        GameServices.inputService.joyStick.onTouchUp.AddListener(OnTouchUp);
+        m_thumbRT = GameServices.inputService.joyStick.thumb;
+
+
+    }
+    private void OnTriggerEnter(Collider other)
+    {
+        if (other.tag == "Gold")
+        {
+            SpeedLevel += 1;
+            BattleCtrl.instance.Score++;
+            BattleCtrl.instance.updateScore?.Invoke();
+            Destroy(other.gameObject);
+        }
+
+    }
+    private void OnCollisionExit(Collision other)
+    {
+        if (other.collider.gameObject.CompareTag("Target"))
+        {
+            MeshCollider varBox = other.collider.gameObject.GetComponent<MeshCollider>();
+            //if (m_dicBox.ContainsKey(varBox))
+            //{
+            //    m_dicBox[varBox] = false;
+            //}
+        }
+    }
+    //invoke旋转
+    void RotateInvoke()
+    {
+        CancelRotateInvoke();
+        InvokeRepeating("RotateTarget", 0.5f, 0.5f);
+    }
+    //取消invoke
+    void CancelRotateInvoke()
+    {
+        if (IsInvoking("RotateTarget"))
+        {
+            CancelInvoke("RotateTarget");
+        }
+    }
+    void OnTouchStart()
+    {
+        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;
+        varVec2.x = varX;
+        varVec2.y = varY;
+        GameServices.inputService.joyStick.gameObject.transform.localPosition = varVec2;//控制摇杆的位置。
+        Vector2 varThumb = m_thumbRT.sizeDelta;
+        varThumb.x = 80;
+        varThumb.y = 80;
+        m_thumbRT.sizeDelta = varThumb;
+        BattleCtrl.instance.battleUI.ShowJoystick();
+    }
+    // 抬起回调
+    void OnTouchUp()
+    {
+        print("触碰结束。");
+        if (!BattleCtrl.instance.isStartBattle)
+        {
+            return;
+        }
+        //m_bControlPlay = true;
+
+
+
+        BattleCtrl.instance.battleUI.SetSymbolPos(0, 0);
+
+        //----------摇杆操作
+        BattleCtrl.instance.battleUI.HideJoystick();
+        Vector2 varThumb = m_thumbRT.sizeDelta;
+        varThumb.x = 4000;
+        varThumb.y = 4000;
+        m_thumbRT.sizeDelta = varThumb;
+    }
+
+    void CancelDelayMoveHandle()
+    {
+        if (IsInvoking("DelayMoveHandle"))
+        {
+            CancelInvoke("DelayMoveHandle");
+        }
+    }
+
+
+    private void FixedUpdate()
+    {
+        //print("游戏是否开始："+ BattleCtrl.instance.isStartBattle);
+        //print("游戏是否结束："+ BattleCtrl.instance.isEndBattle);
+        if (!BattleCtrl.instance.isStartBattle)
+        {
+            isAddSpeed = true;
+            return;
+        }
+        if (BattleCtrl.instance.isEndBattle)
+        {
+            isAddSpeed = true;
+            return;
+        }
+
+
+        //射线检测。
+        //Debug.DrawRay(transform.position, Vector3.down * 10f, Color.red);
+        RaycastHit hit;
+        //isGround = Physics.Raycast(transform.position, -Vector3.up, out hit,3.0f);// 可控制投射距离bool grounded = Physics.Raycast(transform.position, -Vector3.up, out hit,100.0);
+        isGround1 = Physics.Raycast(ray1Pos.position, -Vector3.up, out hit, 3.0f);
+        if (hit.collider != null)
+        {
+            RHit = hit;
+        }
+        isGround2 = Physics.Raycast(ray2Pos.position, -Vector3.up, out hit, 3.0f);
+        if (hit.collider != null && RHit.collider != null)
+        {
+            RHit = hit;
+        }
+        if (RHit.collider != null)
+        {
+            //print("正向：" + RHit.collider.gameObject.transform.forward.ToString());
+        }
+
+        if (isGround1 || isGround2)
+        {
+            //在跑道上。
+            timer = 0.0f;
+
+        }
+        else
+        {
+            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)
+            {
+                //不在跑道上，并且y<-1.0f。游戏失败
+                BattleCtrl.instance.OnBattleFail();
+            }
+        }
+
+        if (m_bIsCanMove && !BattleCtrl.instance.isEndBattle)
+        {
+            //AI向前跑。
+            characterController.SimpleMove(transform.forward * VSpeed* SpeedLevel);
+            //UpdateJoystick();   
+        }
+
+    }
+
+    //摇杆控制
+    void UpdateJoystick()
+    {
+        print("摇杆控制左右");
+        switch (moveType)
+        {
+            case MoveType.MoveType1:
+                MoveType1(); //阻尼的形式
+                break;
+            case MoveType.MoveType2:
+                MoveType2(); //乱飘的形式
+                break;
+            case MoveType.MoveType3:
+                MoveType3();   //比较生硬的形式
+                break;
+            default:
+                MoveType3();   //比较生硬的形式
+                break;
+
+        }
+        //MoveType1(); //阻尼的形式
+        //MoveType2(); //乱飘的形式
+        //MoveType3();   //比较生硬的形式
+    }
+
+    public void MoveType1()
+    {
+        //1、rigibody的形式左右移动。
+        float angle = 90 * 0.01f * GameServices.inputService.joyStick.axisX.axisValue;
+        if (angle != 0)
+        {
+            //拖动摇杆改变速度方向
+            //m_rigidBody.velocity = Quaternion.Euler(0, angle, 0) * m_rigidBody.velocity;
+        }
+        else
+        {
+            //松开摇杆恢复速度方向。
+            if (isGround1 || isGround2)
+            {
+                //在地面上保持一定的速度。
+                //m_rigidBody.velocity = Vector3.Lerp(m_rigidBody.velocity, transform.forward * VSpeed, 5 * Time.deltaTime);
+                //m_rigidBody.velocity = transform.forward * VSpeed;
+            }
+
+        }
+    }
+
+    public void MoveType2()
+    {
+        if (isGround1 || isGround2)
+        {
+            //在地面上保持一定的速度。
+            //m_rigidBody.velocity = transform.forward * VSpeed;
+        }
+        //2、改变 速度和transform的方向
+        TurnDir(90 * 0.01f * GameServices.inputService.joyStick.axisX.axisValue);
+    }
+    public void MoveType3()
+    {
+        characterController.SimpleMove(transform.forward * VSpeed*SpeedLevel);
+        if (isGround1 || isGround2)
+        {
+            //在地面上才能控制移动
+            transform.position += transform.right * GameServices.inputService.joyStick.axisX.axisValue * HSpeed * Time.deltaTime;
+        }
+
+
+
+    }
+
+    /// <summary>
+    /// 调整速度方向为路面的正向。
+    /// </summary>
+    public void AutoSpeedDir()
+    {
+        //调整速度方向为路面的正向。
+        if (RHit.collider != null && RHit.collider.gameObject.transform.forward != transform.forward)
+        {
+            TurnDir(Vector3.Angle(transform.forward, RHit.collider.gameObject.transform.forward));
+        }
+    }
+
+
+    //返回剩余物体个数
+    public int GetLeftBoxNum()
+    {
+        int varIndex = 0;
+        if (m_targetTrans != null)
+        {
+            for (int i = 0; i < m_targetTrans.Length; i++)
+            {
+                if (m_targetTrans[i].transform.position.y >= 2.0f)
+                {
+                    varIndex++;
+                }
+            }
+        }
+        return varIndex;
+    }
+    void Clicked()
+    {
+        if (m_bIsCanMove)
+        {
+            return;
+        }
+        Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
+
+        RaycastHit hit = new RaycastHit();
+
+        if (Physics.Raycast(ray, out hit))
+        {
+            if (hit.collider && hit.collider.gameObject.CompareTag("Target"))
+            {
+                for (int i = 0; i < m_targetTrans.Length; i++)
+                {
+                    if (string.Equals(hit.collider.name, m_targetTrans[i].name))
+                    {
+                        m_curTargetTrans = m_targetTrans[i];
+                        //重置状态
+                        CancelDelayMoveHandle();
+                        CancelRotateInvoke();
+                        m_curTargetTrans.GetComponent<Rigidbody>().isKinematic = false;
+                        break;
+                    }
+                }
+
+
+            }
+        }
+    }
+    void RotateTarget()
+    {
+        if (m_bIsCanMove)
+        {
+            return;
+        }
+        if (m_curTargetTrans)
+        {
+            m_curTargetTrans.transform.Rotate(transform.up, 90.0f);
+        }
+    }
+
+
+
+    public void TurnDir(float angle)
+    {
+        transform.localEulerAngles += new Vector3(0, angle, 0);
+        //m_rigidBody.velocity
+        //Vector3 newVec = Quaternion.AngleAxis(angle, axis) * oriVec;
+        //m_rigidBody.velocity = Quaternion.Euler(0, angle, 0) * m_rigidBody.velocity;
+    }
+
+
+
+    private void OnDestroy()
+    {
+        m_targetTrans = null;
+        m_curTargetTrans = null;
+        CancelDelayMoveHandle();
+        CancelRotateInvoke();
+        BattleCtrl.instance.turnDir -= TurnDir;
+    }
+}

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

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

StockRunning/Assets/My/Gold.meta

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

StockRunning/Assets/My/Gold/Gold.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Gold : MonoBehaviour
+{
+    //private void OnTriggerEnter(Collider other)
+    //{
+    //    if (other.tag=="Player")
+    //    {
+    //        BattleCtrl.instance.Score++;
+    //        BattleCtrl.instance.updateScore?.Invoke();
+    //        Destroy(gameObject);
+    //    }
+        
+    //}
+}

StockRunning/Assets/My/Gold/Gold.cs.meta

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

StockRunning/Assets/My/MyETCTest.unity

-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!29 &1
-OcclusionCullingSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_OcclusionBakeSettings:
-    smallestOccluder: 5
-    smallestHole: 0.25
-    backfaceThreshold: 100
-  m_SceneGUID: 00000000000000000000000000000000
-  m_OcclusionCullingData: {fileID: 0}
---- !u!104 &2
-RenderSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 9
-  m_Fog: 0
-  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-  m_FogMode: 3
-  m_FogDensity: 0.01
-  m_LinearFogStart: 0
-  m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
-  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
-  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
-  m_AmbientIntensity: 1
-  m_AmbientMode: 0
-  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
-  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
-  m_HaloStrength: 0.5
-  m_FlareStrength: 1
-  m_FlareFadeSpeed: 3
-  m_HaloTexture: {fileID: 0}
-  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
-  m_DefaultReflectionMode: 0
-  m_DefaultReflectionResolution: 128
-  m_ReflectionBounces: 1
-  m_ReflectionIntensity: 1
-  m_CustomReflection: {fileID: 0}
-  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
-  m_UseRadianceAmbientProbe: 0
---- !u!157 &3
-LightmapSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 11
-  m_GIWorkflowMode: 1
-  m_GISettings:
-    serializedVersion: 2
-    m_BounceScale: 1
-    m_IndirectOutputScale: 1
-    m_AlbedoBoost: 1
-    m_EnvironmentLightingMode: 0
-    m_EnableBakedLightmaps: 1
-    m_EnableRealtimeLightmaps: 0
-  m_LightmapEditorSettings:
-    serializedVersion: 12
-    m_Resolution: 2
-    m_BakeResolution: 40
-    m_AtlasSize: 1024
-    m_AO: 0
-    m_AOMaxDistance: 1
-    m_CompAOExponent: 1
-    m_CompAOExponentDirect: 0
-    m_ExtractAmbientOcclusion: 0
-    m_Padding: 2
-    m_LightmapParameters: {fileID: 0}
-    m_LightmapsBakeMode: 1
-    m_TextureCompression: 1
-    m_FinalGather: 0
-    m_FinalGatherFiltering: 1
-    m_FinalGatherRayCount: 256
-    m_ReflectionCompression: 2
-    m_MixedBakeMode: 2
-    m_BakeBackend: 1
-    m_PVRSampling: 1
-    m_PVRDirectSampleCount: 32
-    m_PVRSampleCount: 512
-    m_PVRBounces: 2
-    m_PVREnvironmentSampleCount: 256
-    m_PVREnvironmentReferencePointCount: 2048
-    m_PVRFilteringMode: 1
-    m_PVRDenoiserTypeDirect: 1
-    m_PVRDenoiserTypeIndirect: 1
-    m_PVRDenoiserTypeAO: 1
-    m_PVRFilterTypeDirect: 0
-    m_PVRFilterTypeIndirect: 0
-    m_PVRFilterTypeAO: 0
-    m_PVREnvironmentMIS: 1
-    m_PVRCulling: 1
-    m_PVRFilteringGaussRadiusDirect: 1
-    m_PVRFilteringGaussRadiusIndirect: 5
-    m_PVRFilteringGaussRadiusAO: 2
-    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
-    m_PVRFilteringAtrousPositionSigmaIndirect: 2
-    m_PVRFilteringAtrousPositionSigmaAO: 1
-    m_ExportTrainingData: 0
-    m_TrainingDataDestination: TrainingData
-    m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 0}
-  m_UseShadowmask: 1
---- !u!196 &4
-NavMeshSettings:
-  serializedVersion: 2
-  m_ObjectHideFlags: 0
-  m_BuildSettings:
-    serializedVersion: 2
-    agentTypeID: 0
-    agentRadius: 0.5
-    agentHeight: 2
-    agentSlope: 45
-    agentClimb: 0.4
-    ledgeDropHeight: 0
-    maxJumpAcrossDistance: 0
-    minRegionArea: 2
-    manualCellSize: 0
-    cellSize: 0.16666667
-    manualTileSize: 0
-    tileSize: 256
-    accuratePlacement: 0
-    debug:
-      m_Flags: 0
-  m_NavMeshData: {fileID: 0}
---- !u!1 &363458761
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 363458762}
-  - component: {fileID: 363458764}
-  - component: {fileID: 363458763}
-  m_Layer: 0
-  m_Name: Thumb
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &363458762
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 363458761}
-  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: 490229792}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 80, y: 80}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &363458763
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 363458761}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300002, guid: becfdeef1534456438d787466a94d207, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 1
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &363458764
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 363458761}
-  m_CullTransparentMesh: 0
---- !u!1 &374974398
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 374974400}
-  - component: {fileID: 374974399}
-  m_Layer: 0
-  m_Name: Directional Light
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!108 &374974399
-Light:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 374974398}
-  m_Enabled: 1
-  serializedVersion: 10
-  m_Type: 1
-  m_Shape: 0
-  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
-  m_Intensity: 1
-  m_Range: 10
-  m_SpotAngle: 30
-  m_InnerSpotAngle: 21.80208
-  m_CookieSize: 10
-  m_Shadows:
-    m_Type: 2
-    m_Resolution: -1
-    m_CustomResolution: -1
-    m_Strength: 1
-    m_Bias: 0.05
-    m_NormalBias: 0.4
-    m_NearPlane: 0.2
-    m_CullingMatrixOverride:
-      e00: 1
-      e01: 0
-      e02: 0
-      e03: 0
-      e10: 0
-      e11: 1
-      e12: 0
-      e13: 0
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-    m_UseCullingMatrixOverride: 0
-  m_Cookie: {fileID: 0}
-  m_DrawHalo: 0
-  m_Flare: {fileID: 0}
-  m_RenderMode: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingLayerMask: 1
-  m_Lightmapping: 4
-  m_LightShadowCasterMode: 0
-  m_AreaSize: {x: 1, y: 1}
-  m_BounceIntensity: 1
-  m_ColorTemperature: 6570
-  m_UseColorTemperature: 0
-  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_UseBoundingSphereOverride: 0
-  m_ShadowRadius: 0
-  m_ShadowAngle: 0
---- !u!4 &374974400
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 374974398}
-  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
-  m_LocalPosition: {x: 0, y: 3, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
---- !u!1 &412330235
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 412330237}
-  - component: {fileID: 412330236}
-  m_Layer: 0
-  m_Name: InputManager
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &412330236
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 412330235}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc670a4ad12868e41967682a2dc32d6e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!4 &412330237
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 412330235}
-  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: 0}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &490229791
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 490229792}
-  - component: {fileID: 490229796}
-  - component: {fileID: 490229795}
-  - component: {fileID: 490229794}
-  - component: {fileID: 490229793}
-  m_Layer: 0
-  m_Name: New Joystick
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &490229792
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 490229791}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.35, y: 1.35, z: 1.35}
-  m_Children:
-  - {fileID: 363458762}
-  m_Father: {fileID: 1770282487}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 130, y: 130}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &490229793
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 490229791}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: becfdeef1534456438d787466a94d207, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 1
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &490229794
-CanvasRenderer:
-  m_ObjectHideFlags: 2
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 490229791}
-  m_CullTransparentMesh: 0
---- !u!225 &490229795
-CanvasGroup:
-  m_ObjectHideFlags: 2
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 490229791}
-  m_Enabled: 1
-  m_Alpha: 1
-  m_Interactable: 1
-  m_BlocksRaycasts: 1
-  m_IgnoreParentGroups: 0
---- !u!114 &490229796
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 490229791}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c26c7a0dcd8138d4194e0a4435a4740c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  isUnregisterAtDisable: 0
-  _anchor: 0
-  _anchorOffet: {x: 0, y: 0}
-  _visible: 1
-  _activated: 1
-  enableCamera: 0
-  cameraMode: 0
-  camTargetTag: Player
-  autoLinkTagCam: 1
-  autoCamTag: MainCamera
-  cameraTransform: {fileID: 0}
-  cameraTargetMode: 0
-  enableWallDetection: 0
-  wallLayer:
-    serializedVersion: 2
-    m_Bits: 0
-  cameraLookAt: {fileID: 0}
-  followOffset: {x: 0, y: 6, z: -6}
-  followDistance: 10
-  followHeight: 5
-  followRotationDamping: 5
-  followHeightDamping: 5
-  pointId: -1
-  enableKeySimulation: 1
-  allowSimulationStandalone: 0
-  visibleOnStandalone: 1
-  dPadAxisCount: 0
-  useFixedUpdate: 0
-  isOnDrag: 0
-  isSwipeIn: 0
-  isSwipeOut: 0
-  showPSInspector: 0
-  showSpriteInspector: 0
-  showEventInspector: 0
-  showBehaviourInspector: 0
-  showAxesInspector: 0
-  showTouchEventInspector: 0
-  showDownEventInspector: 0
-  showPressEventInspector: 0
-  showCameraInspector: 0
-  onMoveStart:
-    m_PersistentCalls:
-      m_Calls: []
-  onMove:
-    m_PersistentCalls:
-      m_Calls: []
-  onMoveSpeed:
-    m_PersistentCalls:
-      m_Calls: []
-  onMoveEnd:
-    m_PersistentCalls:
-      m_Calls: []
-  onTouchStart:
-    m_PersistentCalls:
-      m_Calls: []
-  onTouchUp:
-    m_PersistentCalls:
-      m_Calls: []
-  OnDownUp:
-    m_PersistentCalls:
-      m_Calls: []
-  OnDownDown:
-    m_PersistentCalls:
-      m_Calls: []
-  OnDownLeft:
-    m_PersistentCalls:
-      m_Calls: []
-  OnDownRight:
-    m_PersistentCalls:
-      m_Calls: []
-  OnPressUp:
-    m_PersistentCalls:
-      m_Calls: []
-  OnPressDown:
-    m_PersistentCalls:
-      m_Calls: []
-  OnPressLeft:
-    m_PersistentCalls:
-      m_Calls: []
-  OnPressRight:
-    m_PersistentCalls:
-      m_Calls: []
-  joystickType: 1
-  allowJoystickOverTouchPad: 0
-  radiusBase: 0
-  radiusBaseValue: 0
-  axisX:
-    name: Horizontal
-    autoLinkTagPlayer: 0
-    autoTag: Player
-    player: {fileID: 0}
-    enable: 1
-    invertedAxis: 0
-    speed: 15
-    deadValue: 0.1
-    valueMethod: 0
-    curveValue:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 0
-      m_PostInfinity: 0
-      m_RotationOrder: 4
-    isEnertia: 0
-    inertia: 0
-    inertiaThreshold: 0.08
-    isAutoStab: 0
-    autoStabThreshold: 0.01
-    autoStabSpeed: 10
-    isClampRotation: 0
-    maxAngle: 90
-    minAngle: 90
-    isValueOverTime: 0
-    overTimeStep: 1
-    maxOverTimeValue: 1
-    axisValue: 0
-    axisSpeedValue: 0
-    axisThreshold: 0.5
-    isLockinJump: 0
-    axisState: 0
-    _directTransform: {fileID: 0}
-    directAction: 0
-    axisInfluenced: 0
-    actionOn: 1
-    directCharacterController: {fileID: 0}
-    directRigidBody: {fileID: 0}
-    gravity: 0
-    currentGravity: 0
-    isJump: 0
-    unityAxis: Horizontal
-    showGeneralInspector: 0
-    showDirectInspector: 0
-    showInertiaInspector: 0
-    showSimulatinInspector: 0
-  axisY:
-    name: Vertical
-    autoLinkTagPlayer: 0
-    autoTag: Player
-    player: {fileID: 0}
-    enable: 1
-    invertedAxis: 0
-    speed: 15
-    deadValue: 0.1
-    valueMethod: 0
-    curveValue:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 0
-      m_PostInfinity: 0
-      m_RotationOrder: 4
-    isEnertia: 0
-    inertia: 0
-    inertiaThreshold: 0.08
-    isAutoStab: 0
-    autoStabThreshold: 0.01
-    autoStabSpeed: 10
-    isClampRotation: 0
-    maxAngle: 90
-    minAngle: 90
-    isValueOverTime: 0
-    overTimeStep: 1
-    maxOverTimeValue: 1
-    axisValue: 0
-    axisSpeedValue: 0
-    axisThreshold: 0.5
-    isLockinJump: 0
-    axisState: 0
-    _directTransform: {fileID: 0}
-    directAction: 0
-    axisInfluenced: 0
-    actionOn: 1
-    directCharacterController: {fileID: 0}
-    directRigidBody: {fileID: 0}
-    gravity: 0
-    currentGravity: 0
-    isJump: 0
-    unityAxis: Vertical
-    showGeneralInspector: 0
-    showDirectInspector: 0
-    showInertiaInspector: 0
-    showSimulatinInspector: 0
-  thumb: {fileID: 363458762}
-  joystickArea: 1
-  userArea: {fileID: 0}
-  isTurnAndMove: 0
-  tmSpeed: 10
-  tmAdditionnalRotation: 0
-  tmMoveCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0
-      outWeight: 0
-    - serializedVersion: 3
-      time: 1
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0
-      outWeight: 0
-    m_PreInfinity: 0
-    m_PostInfinity: 0
-    m_RotationOrder: 4
-  tmLockInJump: 0
-  isNoReturnThumb: 0
-  isNoOffsetThumb: 0
---- !u!1 &838055512
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 838055515}
-  - component: {fileID: 838055514}
-  - component: {fileID: 838055513}
-  m_Layer: 0
-  m_Name: EventSystem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &838055513
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 838055512}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalAxis: Horizontal
-  m_VerticalAxis: Vertical
-  m_SubmitButton: Submit
-  m_CancelButton: Cancel
-  m_InputActionsPerSecond: 10
-  m_RepeatDelay: 0.5
-  m_ForceModuleActive: 0
---- !u!114 &838055514
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 838055512}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_FirstSelected: {fileID: 0}
-  m_sendNavigationEvents: 1
-  m_DragThreshold: 10
---- !u!4 &838055515
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 838055512}
-  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: 0}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1199887126
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1199887130}
-  - component: {fileID: 1199887129}
-  - component: {fileID: 1199887128}
-  - component: {fileID: 1199887127}
-  - component: {fileID: 1199887131}
-  m_Layer: 0
-  m_Name: Cube
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!65 &1199887127
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1199887126}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
---- !u!23 &1199887128
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1199887126}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10303, 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_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
---- !u!33 &1199887129
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1199887126}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!4 &1199887130
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1199887126}
-  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: 0}
-  m_RootOrder: 5
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1199887131
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1199887126}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 302f094fe9e75cb4cbc0ebddc6c24c98, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!1 &1485848306
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1485848307}
-  - component: {fileID: 1485848309}
-  - component: {fileID: 1485848308}
-  m_Layer: 5
-  m_Name: Image
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1485848307
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1485848306}
-  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: 1770282487}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 39.27112, y: 687.7593}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1485848308
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1485848306}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &1485848309
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1485848306}
-  m_CullTransparentMesh: 0
---- !u!1 &1617137948
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1617137951}
-  - component: {fileID: 1617137950}
-  - component: {fileID: 1617137949}
-  m_Layer: 0
-  m_Name: Main Camera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!81 &1617137949
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1617137948}
-  m_Enabled: 1
---- !u!20 &1617137950
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1617137948}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: -1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!4 &1617137951
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1617137948}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1770282483
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1770282487}
-  - component: {fileID: 1770282486}
-  - component: {fileID: 1770282485}
-  - component: {fileID: 1770282484}
-  m_Layer: 5
-  m_Name: Canvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &1770282484
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1770282483}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!114 &1770282485
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1770282483}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
---- !u!223 &1770282486
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1770282483}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 0
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!224 &1770282487
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1770282483}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
-  m_Children:
-  - {fileID: 1485848307}
-  - {fileID: 1977805104}
-  - {fileID: 490229792}
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
---- !u!1 &1977805103
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1977805104}
-  - component: {fileID: 1977805107}
-  - component: {fileID: 1977805106}
-  - component: {fileID: 1977805105}
-  m_Layer: 0
-  m_Name: New TouchPad
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1977805104
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1977805103}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.35, y: 1.35, z: 1.35}
-  m_Children: []
-  m_Father: {fileID: 1770282487}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1977805105
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1977805103}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300004, guid: becfdeef1534456438d787466a94d207, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &1977805106
-CanvasRenderer:
-  m_ObjectHideFlags: 2
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1977805103}
-  m_CullTransparentMesh: 0
---- !u!114 &1977805107
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1977805103}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 32a30ee4cdcaaca44a064b72231de6ed, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  isUnregisterAtDisable: 0
-  _anchor: 0
-  _anchorOffet: {x: 0, y: 0}
-  _visible: 1
-  _activated: 1
-  enableCamera: 0
-  cameraMode: 0
-  camTargetTag: Player
-  autoLinkTagCam: 1
-  autoCamTag: MainCamera
-  cameraTransform: {fileID: 0}
-  cameraTargetMode: 0
-  enableWallDetection: 0
-  wallLayer:
-    serializedVersion: 2
-    m_Bits: 0
-  cameraLookAt: {fileID: 0}
-  followOffset: {x: 0, y: 6, z: -6}
-  followDistance: 10
-  followHeight: 5
-  followRotationDamping: 5
-  followHeightDamping: 5
-  pointId: -1
-  enableKeySimulation: 1
-  allowSimulationStandalone: 0
-  visibleOnStandalone: 1
-  dPadAxisCount: 0
-  useFixedUpdate: 0
-  isOnDrag: 0
-  isSwipeIn: 0
-  isSwipeOut: 0
-  showPSInspector: 1
-  showSpriteInspector: 0
-  showEventInspector: 1
-  showBehaviourInspector: 1
-  showAxesInspector: 0
-  showTouchEventInspector: 1
-  showDownEventInspector: 1
-  showPressEventInspector: 1
-  showCameraInspector: 0
-  onMoveStart:
-    m_PersistentCalls:
-      m_Calls: []
-  onMove:
-    m_PersistentCalls:
-      m_Calls: []
-  onMoveSpeed:
-    m_PersistentCalls:
-      m_Calls: []
-  onMoveEnd:
-    m_PersistentCalls:
-      m_Calls: []
-  onTouchStart:
-    m_PersistentCalls:
-      m_Calls: []
-  onTouchUp:
-    m_PersistentCalls:
-      m_Calls: []
-  OnDownUp:
-    m_PersistentCalls:
-      m_Calls: []
-  OnDownDown:
-    m_PersistentCalls:
-      m_Calls: []
-  OnDownLeft:
-    m_PersistentCalls:
-      m_Calls: []
-  OnDownRight:
-    m_PersistentCalls:
-      m_Calls: []
-  OnPressUp:
-    m_PersistentCalls:
-      m_Calls: []
-  OnPressDown:
-    m_PersistentCalls:
-      m_Calls: []
-  OnPressLeft:
-    m_PersistentCalls:
-      m_Calls: []
-  OnPressRight:
-    m_PersistentCalls:
-      m_Calls: []
-  axisX:
-    name: TouchPadHorizontal
-    autoLinkTagPlayer: 0
-    autoTag: Player
-    player: {fileID: 0}
-    enable: 1
-    invertedAxis: 0
-    speed: 1
-    deadValue: 0.1
-    valueMethod: 0
-    curveValue:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    isEnertia: 0
-    inertia: 0
-    inertiaThreshold: 0.08
-    isAutoStab: 0
-    autoStabThreshold: 0.01
-    autoStabSpeed: 10
-    isClampRotation: 0
-    maxAngle: 90
-    minAngle: 90
-    isValueOverTime: 0
-    overTimeStep: 1
-    maxOverTimeValue: 1
-    axisValue: 0
-    axisSpeedValue: 0
-    axisThreshold: 0.5
-    isLockinJump: 0
-    axisState: 0
-    _directTransform: {fileID: 1199887130}
-    directAction: 0
-    axisInfluenced: 0
-    actionOn: 1
-    directCharacterController: {fileID: 0}
-    directRigidBody: {fileID: 0}
-    gravity: 0
-    currentGravity: 0
-    isJump: 0
-    unityAxis: Horizontal
-    showGeneralInspector: 1
-    showDirectInspector: 1
-    showInertiaInspector: 0
-    showSimulatinInspector: 0
-  axisY:
-    name: Vertical
-    autoLinkTagPlayer: 0
-    autoTag: Player
-    player: {fileID: 0}
-    enable: 1
-    invertedAxis: 0
-    speed: 1
-    deadValue: 0.1
-    valueMethod: 0
-    curveValue:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    isEnertia: 0
-    inertia: 0
-    inertiaThreshold: 0.08
-    isAutoStab: 0
-    autoStabThreshold: 0.01
-    autoStabSpeed: 10
-    isClampRotation: 0
-    maxAngle: 90
-    minAngle: 90
-    isValueOverTime: 0
-    overTimeStep: 1
-    maxOverTimeValue: 1
-    axisValue: 0
-    axisSpeedValue: 0
-    axisThreshold: 0.5
-    isLockinJump: 0
-    axisState: 0
-    _directTransform: {fileID: 0}
-    directAction: 0
-    axisInfluenced: 0
-    actionOn: 1
-    directCharacterController: {fileID: 0}
-    directRigidBody: {fileID: 0}
-    gravity: 0
-    currentGravity: 0
-    isJump: 0
-    unityAxis: Vertical
-    showGeneralInspector: 0
-    showDirectInspector: 0
-    showInertiaInspector: 0
-    showSimulatinInspector: 0
-  isDPI: 0

StockRunning/Assets/My/Player.meta

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

StockRunning/Assets/#A2_Scripts/Battle/View/CarView2.cs → StockRunning/Assets/My/Player/PlayerMove.cs

@@ -3,20 +3,33 @@ using System.Collections.Generic;
 using UnityEngine;
 using DG.Tweening;
 using DG.Tweening.Core;
-public class CarView2 : MonoBehaviour
+public enum MoveType
 {
-    [Tooltip("控制向前的速度，点击开始按钮时影响一次。")]
-    public float VSpeed = 10.0f;
+    MoveType1=1,
+    MoveType2=2,
+    MoveType3=3
+}
+public class PlayerMove : MonoBehaviour
+{
+    [Header("控制移动")]
+    [Tooltip("控制向前的速度。")]
+    public float VSpeed = 40.0f;
     [Tooltip("控制左右移动的速度。")]
     public float HSpeed = 10.0f;
-
+    [Tooltip("主角移动方式")]
+    public MoveType moveType= MoveType.MoveType3;
+    [Header("地面检测")]
     public Transform ray1Pos;
     public Transform ray2Pos;
+    private RaycastHit RHit;
+    private CharacterController characterController;
+    private int SpeedLevel=1;
+
 
     private bool m_bIsCanMove = true;//是否能开车
     private MeshCollider[] m_targetTrans;//所有目标
     private MeshCollider m_curTargetTrans;//当前抓的目标
-    private Rigidbody m_rigidBody;//自身刚体
+ //   private Rigidbody m_rigidBody;//自身刚体
     private Dictionary<MeshCollider, bool> m_dicBox = new Dictionary<MeshCollider, bool>();
 
     private bool m_bControlStartMove = false;
@@ -25,12 +38,16 @@ public class CarView2 : MonoBehaviour
     private bool isGround1 = true;
     private bool isGround2 = true;
     private bool isAddSpeed = true;
+    private float timer = 0.0f;
+
+
+
     // Start is called before the first frame update
     void Start()
     {
+        characterController = GetComponent<CharacterController>();
         BattleCtrl.instance.turnDir += TurnDir;
-
-        m_rigidBody = GetComponent<Rigidbody>();
+        //m_rigidBody = GetComponent<Rigidbody>();
         
 
 
@@ -40,38 +57,20 @@ public class CarView2 : MonoBehaviour
 
         
     }
-    private void OnCollisionEnter(Collision other)
+
+    private void OnTriggerEnter(Collider other)
     {
-        
-        print("发生碰撞");
-        if (other.collider.gameObject.CompareTag("Egg"))
+        if (other.tag == "Gold")
         {
+            SpeedLevel += 1;
             BattleCtrl.instance.Score++;
             BattleCtrl.instance.updateScore?.Invoke();
             Destroy(other.gameObject);
-            //Rigidbody varBody = other.collider.transform.parent.GetComponent<Rigidbody>();
-            //if (varBody && m_dicRigidDic.ContainsKey(varBody) && m_dicRigidDic[varBody])
-            //{
-            //    m_dicRigidDic[varBody] = false;
-            //    Transform varTrans = other.collider.transform.parent;
-
-            //    BattleCtrl.instance.Score++;
-            //    BattleCtrl.instance.updateScore?.Invoke();
-            //}
-        }
-    }
-    private void OnCollisionExit(Collision other)
-    {
-        if (other.collider.gameObject.CompareTag("Target"))
-        {
-            MeshCollider varBox = other.collider.gameObject.GetComponent<MeshCollider>();
-            //if (m_dicBox.ContainsKey(varBox))
-            //{
-            //    m_dicBox[varBox] = false;
-            //}
         }
+
     }
-    //invoke旋转
+
+
     void RotateInvoke()
     {
         CancelRotateInvoke();
@@ -121,6 +120,7 @@ public class CarView2 : MonoBehaviour
         varThumb.y = 4000;
         m_thumbRT.sizeDelta = varThumb;
     }
+    
     void CancelDelayMoveHandle()
     {
         if (IsInvoking("DelayMoveHandle"))
@@ -128,38 +128,13 @@ public class CarView2 : MonoBehaviour
             CancelInvoke("DelayMoveHandle");
         }
     }
-    //延时判断是否可以移动处理
-    private void DelayMoveHandle()
-    {
-        int varIndex = 0;
-        if (!m_bIsCanMove)
-        {
-            for (int i = 0; i < m_targetTrans.Length; i++)
-            {
-                Rigidbody varBody = m_targetTrans[i].GetComponent<Rigidbody>();
-                if (varBody)
-                {
-                    varBody.isKinematic = true;
-                }
-            }
-            if (m_targetTrans != null)
-            {
-                for (int i = 0; i < m_targetTrans.Length; i++)
-                {
-                    if (m_targetTrans[i].transform.position.y >= 2.2f)
-                    {
-                        varIndex++;
-                    }
-                }
-            }
-            
-        }
-    }
+
 
     private void FixedUpdate()
     {
-        print("游戏是否开始："+ BattleCtrl.instance.isStartBattle);
-        print("游戏是否结束："+ BattleCtrl.instance.isEndBattle);
+        //print("游戏是否开始："+ BattleCtrl.instance.isStartBattle);
+        //print("游戏是否结束："+ BattleCtrl.instance.isEndBattle);
+        
         if (!BattleCtrl.instance.isStartBattle)
         {
             isAddSpeed = true;
@@ -170,28 +145,43 @@ public class CarView2 : MonoBehaviour
             isAddSpeed = true;
             return;
         }
-        if (BattleCtrl.instance.isStartBattle && isAddSpeed)
-        {
-            //初始化一次速度。
-            m_rigidBody.velocity = transform.forward * VSpeed;
-            isAddSpeed = false;
-        }
+
 
         //射线检测。
         //Debug.DrawRay(transform.position, Vector3.down * 10f, Color.red);
         RaycastHit hit;
         //isGround = Physics.Raycast(transform.position, -Vector3.up, out hit,3.0f);// 可控制投射距离bool grounded = Physics.Raycast(transform.position, -Vector3.up, out hit,100.0);
         isGround1 = Physics.Raycast(ray1Pos.position, -Vector3.up, out hit, 3.0f);
+        if (hit.collider!=null)
+        {
+            RHit = hit;
+        }
         isGround2 = Physics.Raycast(ray2Pos.position, -Vector3.up, out hit, 3.0f);
+        if (hit.collider != null&& RHit.collider!=null)
+        {
+            RHit = hit;
+        }
+        if (RHit.collider != null)
+        {
+            //print("正向：" + RHit.collider.gameObject.transform.forward.ToString());
+        }
+
         if (isGround1||isGround2)
         {
             //在跑道上。
+            timer = 0.0f;
+
         }
         else 
         {
             print("跑出跑道。");
-            m_rigidBody.constraints = RigidbodyConstraints.FreezeRotationX | RigidbodyConstraints.FreezeRotationY | RigidbodyConstraints.FreezeRotationZ;
-            BattleCtrl.instance.OnBattleFail();//游戏失败
+            //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)
+            {
+                //不在跑道上，并且y<-1.0f。游戏失败
+                BattleCtrl.instance.OnBattleFail();
+            }
         }
 
         if (m_bIsCanMove  && !BattleCtrl.instance.isEndBattle)
@@ -205,10 +195,27 @@ public class CarView2 : MonoBehaviour
     void UpdateJoystick()
     {
         print("摇杆控制左右");
+        switch (moveType)
+        {
+            case MoveType.MoveType1:
+                MoveType1(); //阻尼的形式
+                break;
+            case MoveType.MoveType2:
+                MoveType2(); //乱飘的形式
+                break;
+            case MoveType.MoveType3:
+                MoveType3();   //比较生硬的形式
+                break;
+            default:
+                MoveType3();   //比较生硬的形式
+                break;
+
+        }
         //MoveType1(); //阻尼的形式
         //MoveType2(); //乱飘的形式
-        MoveType3();   //比较生硬的形式
+        //MoveType3();   //比较生硬的形式
     }
+
     public void MoveType1()
     {
         //1、rigibody的形式左右移动。
@@ -216,27 +223,55 @@ public class CarView2 : MonoBehaviour
         if (angle != 0)
         {
             //拖动摇杆改变速度方向
-            m_rigidBody.velocity = Quaternion.Euler(0, angle, 0) * m_rigidBody.velocity;
+            //m_rigidBody.velocity = Quaternion.Euler(0, angle, 0) * m_rigidBody.velocity;
         }
         else
         {
             //松开摇杆恢复速度方向。
-            m_rigidBody.velocity=Vector3.Lerp(m_rigidBody.velocity, transform.forward * VSpeed, 5*Time.deltaTime);
-            //m_rigidBody.velocity = transform.forward * VSpeed;
+            if (isGround1 || isGround2)
+            {
+                //在地面上保持一定的速度。
+                //m_rigidBody.velocity = Vector3.Lerp(m_rigidBody.velocity, transform.forward * VSpeed, 5 * Time.deltaTime);
+                //m_rigidBody.velocity = transform.forward * VSpeed;
+            }
+
         }
     }
 
     public void MoveType2()
     {
+        if(isGround1|| isGround2)
+        {
+            //在地面上保持一定的速度。
+            //m_rigidBody.velocity = transform.forward * VSpeed;
+        }
         //2、改变 速度和transform的方向
         TurnDir(90 * 0.01f * GameServices.inputService.joyStick.axisX.axisValue);
     }
     public void MoveType3()
     {
-        //3在FixedUpdate()中更新解决物体抖动问题。
-        transform.position += transform.right * GameServices.inputService.joyStick.axisX.axisValue * HSpeed * Time.deltaTime;
+        characterController.SimpleMove(transform.forward * VSpeed* SpeedLevel);
+        if (isGround1 || isGround2)
+        {
+            //在地面上才能控制移动
+            transform.position += transform.right * GameServices.inputService.joyStick.axisX.axisValue * HSpeed * Time.deltaTime;
+        }
+
+       
+        
     }
 
+    /// <summary>
+    /// 调整速度方向为路面的正向。
+    /// </summary>
+    public void AutoSpeedDir()
+    {
+        //调整速度方向为路面的正向。
+        if (RHit.collider != null && RHit.collider.gameObject.transform.forward != transform.forward)
+        {
+            TurnDir(Vector3.Angle(transform.forward, RHit.collider.gameObject.transform.forward));
+        }
+    }
 
 
     //返回剩余物体个数
@@ -305,10 +340,11 @@ public class CarView2 : MonoBehaviour
         transform.localEulerAngles += new Vector3(0, angle, 0);
         //m_rigidBody.velocity
         //Vector3 newVec = Quaternion.AngleAxis(angle, axis) * oriVec;
-        m_rigidBody.velocity = Quaternion.Euler(0, angle, 0) * m_rigidBody.velocity;
+        //m_rigidBody.velocity = Quaternion.Euler(0, angle, 0) * m_rigidBody.velocity;
     }
 
 
+
     private void OnDestroy()
     {
         m_targetTrans = null;

StockRunning/Assets/My/Test.meta

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

StockRunning/Assets/#A1_Scenes/Test.unity → StockRunning/Assets/My/Test/Test.unity

@@ -187,270 +187,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &167026679
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 167026680}
-  - component: {fileID: 167026683}
-  - component: {fileID: 167026682}
-  - component: {fileID: 167026681}
-  m_Layer: 0
-  m_Name: TouchPad1
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &167026680
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 167026679}
-  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: 650073308}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &167026681
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 167026679}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300004, guid: becfdeef1534456438d787466a94d207, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &167026682
-CanvasRenderer:
-  m_ObjectHideFlags: 2
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 167026679}
-  m_CullTransparentMesh: 0
---- !u!114 &167026683
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 167026679}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 32a30ee4cdcaaca44a064b72231de6ed, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  isUnregisterAtDisable: 0
-  _anchor: 0
-  _anchorOffet: {x: 0, y: 0}
-  _visible: 0
-  _activated: 1
-  enableCamera: 0
-  cameraMode: 0
-  camTargetTag: Player
-  autoLinkTagCam: 1
-  autoCamTag: MainCamera
-  cameraTransform: {fileID: 0}
-  cameraTargetMode: 0
-  enableWallDetection: 0
-  wallLayer:
-    serializedVersion: 2
-    m_Bits: 0
-  cameraLookAt: {fileID: 0}
-  followOffset: {x: 0, y: 6, z: -6}
-  followDistance: 10
-  followHeight: 5
-  followRotationDamping: 5
-  followHeightDamping: 5
-  pointId: -1
-  enableKeySimulation: 1
-  allowSimulationStandalone: 0
-  visibleOnStandalone: 1
-  dPadAxisCount: 0
-  useFixedUpdate: 0
-  isOnDrag: 0
-  isSwipeIn: 0
-  isSwipeOut: 0
-  showPSInspector: 1
-  showSpriteInspector: 1
-  showEventInspector: 1
-  showBehaviourInspector: 1
-  showAxesInspector: 0
-  showTouchEventInspector: 0
-  showDownEventInspector: 0
-  showPressEventInspector: 0
-  showCameraInspector: 0
-  onMoveStart:
-    m_PersistentCalls:
-      m_Calls: []
-  onMove:
-    m_PersistentCalls:
-      m_Calls: []
-  onMoveSpeed:
-    m_PersistentCalls:
-      m_Calls: []
-  onMoveEnd:
-    m_PersistentCalls:
-      m_Calls: []
-  onTouchStart:
-    m_PersistentCalls:
-      m_Calls: []
-  onTouchUp:
-    m_PersistentCalls:
-      m_Calls: []
-  OnDownUp:
-    m_PersistentCalls:
-      m_Calls: []
-  OnDownDown:
-    m_PersistentCalls:
-      m_Calls: []
-  OnDownLeft:
-    m_PersistentCalls:
-      m_Calls: []
-  OnDownRight:
-    m_PersistentCalls:
-      m_Calls: []
-  OnPressUp:
-    m_PersistentCalls:
-      m_Calls: []
-  OnPressDown:
-    m_PersistentCalls:
-      m_Calls: []
-  OnPressLeft:
-    m_PersistentCalls:
-      m_Calls: []
-  OnPressRight:
-    m_PersistentCalls:
-      m_Calls: []
-  axisX:
-    name: Horizontal
-    autoLinkTagPlayer: 0
-    autoTag: Player
-    player: {fileID: 0}
-    enable: 1
-    invertedAxis: 0
-    speed: 1
-    deadValue: 0.1
-    valueMethod: 0
-    curveValue:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    isEnertia: 0
-    inertia: 0
-    inertiaThreshold: 0.08
-    isAutoStab: 0
-    autoStabThreshold: 0.01
-    autoStabSpeed: 10
-    isClampRotation: 0
-    maxAngle: 90
-    minAngle: 90
-    isValueOverTime: 0
-    overTimeStep: 1
-    maxOverTimeValue: 1
-    axisValue: 0
-    axisSpeedValue: 0
-    axisThreshold: 0.5
-    isLockinJump: 0
-    axisState: 0
-    _directTransform: {fileID: 568485060}
-    directAction: 2
-    axisInfluenced: 0
-    actionOn: 1
-    directCharacterController: {fileID: 0}
-    directRigidBody: {fileID: 0}
-    gravity: 0
-    currentGravity: 0
-    isJump: 0
-    unityAxis: Horizontal
-    showGeneralInspector: 1
-    showDirectInspector: 1
-    showInertiaInspector: 0
-    showSimulatinInspector: 0
-  axisY:
-    name: Vertical
-    autoLinkTagPlayer: 0
-    autoTag: Player
-    player: {fileID: 0}
-    enable: 1
-    invertedAxis: 0
-    speed: 1
-    deadValue: 0.1
-    valueMethod: 0
-    curveValue:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    isEnertia: 0
-    inertia: 0
-    inertiaThreshold: 0.08
-    isAutoStab: 0
-    autoStabThreshold: 0.01
-    autoStabSpeed: 10
-    isClampRotation: 0
-    maxAngle: 90
-    minAngle: 90
-    isValueOverTime: 0
-    overTimeStep: 1
-    maxOverTimeValue: 1
-    axisValue: 0
-    axisSpeedValue: 0
-    axisThreshold: 0.5
-    isLockinJump: 0
-    axisState: 0
-    _directTransform: {fileID: 0}
-    directAction: 0
-    axisInfluenced: 0
-    actionOn: 1
-    directCharacterController: {fileID: 0}
-    directRigidBody: {fileID: 0}
-    gravity: 0
-    currentGravity: 0
-    isJump: 0
-    unityAxis: Vertical
-    showGeneralInspector: 0
-    showDirectInspector: 0
-    showInertiaInspector: 0
-    showSimulatinInspector: 0
-  isDPI: 0
 --- !u!1 &291339882
 GameObject:
   m_ObjectHideFlags: 0
@@ -481,7 +217,7 @@ Transform:
   m_Children:
   - {fileID: 977927036}
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &291339884
 MonoBehaviour:
@@ -968,7 +704,7 @@ Transform:
   m_Father: {fileID: 977927036}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &650073304
+--- !u!1 &729256232
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -976,118 +712,19 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 650073308}
-  - component: {fileID: 650073307}
-  - component: {fileID: 650073306}
-  - component: {fileID: 650073305}
+  - component: {fileID: 729256233}
+  - component: {fileID: 729256236}
+  - component: {fileID: 729256235}
+  - component: {fileID: 729256234}
   m_Layer: 0
-  m_Name: EasyTouchControlsCanvas
+  m_Name: bord
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!114 &650073305
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 650073304}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!114 &650073306
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 650073304}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 1
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 1080, y: 1920}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
---- !u!223 &650073307
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 650073304}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 0
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!224 &650073308
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 650073304}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
-  m_Children:
-  - {fileID: 167026680}
-  m_Father: {fileID: 0}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
---- !u!1 &729256232
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 729256233}
-  - component: {fileID: 729256236}
-  - component: {fileID: 729256235}
-  - component: {fileID: 729256234}
-  m_Layer: 0
-  m_Name: bord
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &729256233
-Transform:
+--- !u!4 &729256233
+Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1160,6 +797,105 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 729256232}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &801551183
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 801551187}
+  - component: {fileID: 801551186}
+  - component: {fileID: 801551185}
+  - component: {fileID: 801551184}
+  m_Layer: 0
+  m_Name: EasyTouchControlsCanvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &801551184
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 801551183}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &801551185
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 801551183}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 1080, y: 1920}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+--- !u!223 &801551186
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 801551183}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &801551187
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 801551183}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 1508803903}
+  m_Father: {fileID: 0}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
 --- !u!1 &977927035
 GameObject:
   m_ObjectHideFlags: 0
@@ -1280,6 +1016,270 @@ CharacterController:
   m_SkinWidth: 0.08
   m_MinMoveDistance: 0.001
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &1508803902
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1508803903}
+  - component: {fileID: 1508803906}
+  - component: {fileID: 1508803905}
+  - component: {fileID: 1508803904}
+  m_Layer: 0
+  m_Name: TouchPad1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1508803903
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1508803902}
+  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: 801551187}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1508803904
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1508803902}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300004, guid: becfdeef1534456438d787466a94d207, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1508803905
+CanvasRenderer:
+  m_ObjectHideFlags: 2
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1508803902}
+  m_CullTransparentMesh: 0
+--- !u!114 &1508803906
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1508803902}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 32a30ee4cdcaaca44a064b72231de6ed, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isUnregisterAtDisable: 0
+  _anchor: 0
+  _anchorOffet: {x: 0, y: 0}
+  _visible: 1
+  _activated: 1
+  enableCamera: 0
+  cameraMode: 0
+  camTargetTag: Player
+  autoLinkTagCam: 1
+  autoCamTag: MainCamera
+  cameraTransform: {fileID: 0}
+  cameraTargetMode: 0
+  enableWallDetection: 0
+  wallLayer:
+    serializedVersion: 2
+    m_Bits: 0
+  cameraLookAt: {fileID: 0}
+  followOffset: {x: 0, y: 6, z: -6}
+  followDistance: 10
+  followHeight: 5
+  followRotationDamping: 5
+  followHeightDamping: 5
+  pointId: -1
+  enableKeySimulation: 1
+  allowSimulationStandalone: 0
+  visibleOnStandalone: 1
+  dPadAxisCount: 0
+  useFixedUpdate: 0
+  isOnDrag: 0
+  isSwipeIn: 0
+  isSwipeOut: 0
+  showPSInspector: 1
+  showSpriteInspector: 1
+  showEventInspector: 0
+  showBehaviourInspector: 0
+  showAxesInspector: 0
+  showTouchEventInspector: 0
+  showDownEventInspector: 0
+  showPressEventInspector: 0
+  showCameraInspector: 0
+  onMoveStart:
+    m_PersistentCalls:
+      m_Calls: []
+  onMove:
+    m_PersistentCalls:
+      m_Calls: []
+  onMoveSpeed:
+    m_PersistentCalls:
+      m_Calls: []
+  onMoveEnd:
+    m_PersistentCalls:
+      m_Calls: []
+  onTouchStart:
+    m_PersistentCalls:
+      m_Calls: []
+  onTouchUp:
+    m_PersistentCalls:
+      m_Calls: []
+  OnDownUp:
+    m_PersistentCalls:
+      m_Calls: []
+  OnDownDown:
+    m_PersistentCalls:
+      m_Calls: []
+  OnDownLeft:
+    m_PersistentCalls:
+      m_Calls: []
+  OnDownRight:
+    m_PersistentCalls:
+      m_Calls: []
+  OnPressUp:
+    m_PersistentCalls:
+      m_Calls: []
+  OnPressDown:
+    m_PersistentCalls:
+      m_Calls: []
+  OnPressLeft:
+    m_PersistentCalls:
+      m_Calls: []
+  OnPressRight:
+    m_PersistentCalls:
+      m_Calls: []
+  axisX:
+    name: Horizontal
+    autoLinkTagPlayer: 0
+    autoTag: Player
+    player: {fileID: 0}
+    enable: 1
+    invertedAxis: 0
+    speed: 1
+    deadValue: 0.1
+    valueMethod: 0
+    curveValue:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    isEnertia: 0
+    inertia: 0
+    inertiaThreshold: 0.08
+    isAutoStab: 0
+    autoStabThreshold: 0.01
+    autoStabSpeed: 10
+    isClampRotation: 0
+    maxAngle: 90
+    minAngle: 90
+    isValueOverTime: 0
+    overTimeStep: 1
+    maxOverTimeValue: 1
+    axisValue: 0
+    axisSpeedValue: 0
+    axisThreshold: 0.5
+    isLockinJump: 0
+    axisState: 0
+    _directTransform: {fileID: 0}
+    directAction: 0
+    axisInfluenced: 0
+    actionOn: 1
+    directCharacterController: {fileID: 0}
+    directRigidBody: {fileID: 0}
+    gravity: 0
+    currentGravity: 0
+    isJump: 0
+    unityAxis: Horizontal
+    showGeneralInspector: 0
+    showDirectInspector: 0
+    showInertiaInspector: 0
+    showSimulatinInspector: 0
+  axisY:
+    name: Vertical
+    autoLinkTagPlayer: 0
+    autoTag: Player
+    player: {fileID: 0}
+    enable: 1
+    invertedAxis: 0
+    speed: 1
+    deadValue: 0.1
+    valueMethod: 0
+    curveValue:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    isEnertia: 0
+    inertia: 0
+    inertiaThreshold: 0.08
+    isAutoStab: 0
+    autoStabThreshold: 0.01
+    autoStabSpeed: 10
+    isClampRotation: 0
+    maxAngle: 90
+    minAngle: 90
+    isValueOverTime: 0
+    overTimeStep: 1
+    maxOverTimeValue: 1
+    axisValue: 0
+    axisSpeedValue: 0
+    axisThreshold: 0.5
+    isLockinJump: 0
+    axisState: 0
+    _directTransform: {fileID: 0}
+    directAction: 0
+    axisInfluenced: 0
+    actionOn: 1
+    directCharacterController: {fileID: 0}
+    directRigidBody: {fileID: 0}
+    gravity: 0
+    currentGravity: 0
+    isJump: 0
+    unityAxis: Vertical
+    showGeneralInspector: 0
+    showDirectInspector: 0
+    showInertiaInspector: 0
+    showSimulatinInspector: 0
+  isDPI: 0
 --- !u!1 &1526102705
 GameObject:
   m_ObjectHideFlags: 0

StockRunning/Assets/My/TestEtc.cs → StockRunning/Assets/My/Test/TestEtc.cs

@@ -8,8 +8,9 @@ public class TestEtc : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        //ETCInput.GetControlTouchPad("TouchPad1").onMove.AddListener(onMove);
-        ETCInput.GetControlTouchPad("TouchPad1").onMoveSpeed.AddListener(onMoveSpeed);
+       
+        ETCInput.GetControlTouchPad("TouchPad1").onMove.AddListener(onMove);
+        //ETCInput.GetControlTouchPad("TouchPad1").onMoveSpeed.AddListener(onMoveSpeed);
         
     }
 
@@ -18,19 +19,23 @@ public class TestEtc : MonoBehaviour
     {
         //print(ETCInput.GetAxis("TouchPadHorizontal"));
         //target.Translate(new Vector3(0, 0, 2*Time.deltaTime));
-        target.GetComponent<CharacterController>().Move(new Vector3(0, 0, 2 * Time.deltaTime));
+        //CollisionFlags cf= target.GetComponent<CharacterController>().Move(new Vector3(0, 0, 2 * Time.deltaTime));
+        //print(cf.ToString());
+        bool isGround=target.GetComponent<CharacterController>().SimpleMove(new Vector3(0, 0, 2));
+        
+        print("是否在地面："+ isGround);
 
     }
-    //public void onMove(Vector2 aa)
-    //{
-    //    //print("OnMove:"+aa.ToString());
-    //    //target.Translate(new Vector3(aa.x,aa.y,0));
-    //}
+    public void onMove(Vector2 aa)
+    {
+        target.GetComponent<CharacterController>().SimpleMove(new Vector3(aa.x, 0, 0));
+    }
     public void onMoveSpeed(Vector2 aa) 
     {
         //print("onMoveSpeed:" + aa.ToString());
         //target.Translate( new Vector3(aa.x,0, 0));
-        target.GetComponent<CharacterController>().Move(new Vector3(aa.x, 0,0));
+        //target.GetComponent<CharacterController>().Move(new Vector3(aa.x, 0,0));
+        target.GetComponent<CharacterController>().SimpleMove(new Vector3(aa.x*10.0f, 0, 0));
     }
     public void Show(string aa)
     {

StockRunning/Assets/My/TriggerTurnDir.cs

@@ -19,7 +19,7 @@ public class TriggerTurnDir : MonoBehaviour
     }
     private void OnTriggerEnter(Collider other)
     {
-        if (other.tag == "Player" && other.name== "TurnDirCollider")
+        if (other.tag == "Player" )
         {
             print("变化"+turnAngle+"度");
             BattleCtrl.instance.turnDir?.Invoke(turnAngle);

StockRunning/Assets/Resources/Egg.prefab → StockRunning/Assets/Resources/Gold1.prefab

@@ -9,10 +9,11 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 804694910378826939}
-  - component: {fileID: 3214120346423666526}
+  - component: {fileID: 2201797878330323258}
+  - component: {fileID: 609213534401771201}
   m_Layer: 0
-  m_Name: Egg
-  m_TagString: Egg
+  m_Name: Gold1
+  m_TagString: Gold
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -33,22 +34,31 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0.75900006, y: 0, z: 0}
---- !u!54 &3214120346423666526
-Rigidbody:
+--- !u!114 &2201797878330323258
+MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 804694910378826938}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0b6122de87679854eb2212330a8efaaf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!135 &609213534401771201
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 804694910378826938}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
   serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 0
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 0
-  m_CollisionDetection: 0
+  m_Radius: 0.42
+  m_Center: {x: 0, y: 0.24, z: 0}
 --- !u!64 &2227981512111987852
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -58,7 +68,7 @@ MeshCollider:
   m_GameObject: {fileID: 8650065609645589432}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 4
   m_Convex: 1
   m_CookingOptions: 30
@@ -72,7 +82,7 @@ MeshCollider:
   m_GameObject: {fileID: 8650065610918094599}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 4
   m_Convex: 1
   m_CookingOptions: 30
@@ -152,7 +162,7 @@ PrefabInstance:
     - target: {fileID: -927199367670048503, guid: 57d35467d1e4fe342bf6d78f402ace73,
         type: 3}
       propertyPath: m_TagString
-      value: Egg
+      value: Untagged
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 57d35467d1e4fe342bf6d78f402ace73, type: 3}
@@ -243,7 +253,7 @@ PrefabInstance:
     - target: {fileID: -927199367670048503, guid: 2f966a98e51e2824b9e5ee4af73def99,
         type: 3}
       propertyPath: m_TagString
-      value: Egg
+      value: Untagged
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 2f966a98e51e2824b9e5ee4af73def99, type: 3}

StockRunning/ProjectSettings/TagManager.asset

@@ -8,6 +8,9 @@ TagManager:
   - Target
   - soldier
   - Egg
+  - AI
+  - Competitor
+  - Gold
   layers:
   - Default
   - TransparentFX