CoderLearningCode
diff --git a/‎CrazyCar/Assembly-CSharp-Editor.csproj
Lines changed: 250 additions & 256 deletions b/‎CrazyCar/Assembly-CSharp-Editor.csproj
Lines changed: 250 additions & 256 deletions
diff --git a/‎CrazyCar/Assembly-CSharp-firstpass.csproj
Lines changed: 235 additions & 241 deletions b/‎CrazyCar/Assembly-CSharp-firstpass.csproj
Lines changed: 235 additions & 241 deletions
diff --git a/‎CrazyCar/Assembly-CSharp.csproj
Lines changed: 235 additions & 241 deletions b/‎CrazyCar/Assembly-CSharp.csproj
Lines changed: 235 additions & 241 deletions
diff --git a/‎CrazyCar/Assets/Scripts/Common/MPlayer.cs
Lines changed: 14 additions & 8 deletions b/‎CrazyCar/Assets/Scripts/Common/MPlayer.cs
Lines changed: 14 additions & 8 deletions
diff --git a/‎CrazyCar/Assets/StreamingAssets/avatar.manifest
Lines changed: 2 additions & 2 deletions b/‎CrazyCar/Assets/StreamingAssets/avatar.manifest
Lines changed: 2 additions & 2 deletions
diff --git a/‎CrazyCar/Assets/StreamingAssets/config.json
Lines changed: 1 addition & 1 deletion b/‎CrazyCar/Assets/StreamingAssets/config.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎CrazyCar/Assets/StreamingAssets/equip.manifest
Lines changed: 2 additions & 2 deletions b/‎CrazyCar/Assets/StreamingAssets/equip.manifest
Lines changed: 2 additions & 2 deletions
diff --git a/‎CrazyCar/Assets/StreamingAssets/equip_android
-23.8 KB b/‎CrazyCar/Assets/StreamingAssets/equip_android
-23.8 KB
diff --git a/‎CrazyCar/ProjectSettings/GraphicsSettings.asset
Lines changed: 1 addition & 0 deletions b/‎CrazyCar/ProjectSettings/GraphicsSettings.asset
Lines changed: 1 addition & 0 deletions
diff --git a/‎CrazyCar/UnityWebSocket.Editor.csproj
Lines changed: 234 additions & 240 deletions b/‎CrazyCar/UnityWebSocket.Editor.csproj
Lines changed: 234 additions & 240 deletions
diff --git a/‎CrazyCar/UnityWebSocket.Runtime.csproj
Lines changed: 228 additions & 234 deletions b/‎CrazyCar/UnityWebSocket.Runtime.csproj
Lines changed: 228 additions & 234 deletions
diff --git a/‎CrazyCar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
-977 Bytes b/‎CrazyCar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
-977 Bytes
@@ -68,19 +68,20 @@ void Update() {
             hInput = Input.GetAxisRaw("Horizontal");
         }
 
-        if ((Input.GetKey(KeyCode.Space) || sInput > 0) && currentForce > 0) {
-            if (isGround && !isDrifting &&
-                rig.velocity.sqrMagnitude > 10) {
+        if (((Input.GetKey(KeyCode.Space) && isUseKeyboard) || (sInput > 0 && !isUseKeyboard)) && currentForce > 0) {
+            if (isGround && !isDrifting && rig.velocity.sqrMagnitude > 10) {
                 StartDrift();
             }
         }
 
-        if (Input.GetKeyUp(KeyCode.Space) || sInput == 0) {
+        if ((Input.GetKeyUp(KeyCode.Space) && isUseKeyboard) || (sInput == 0 && !isUseKeyboard)) {
             if (isDrifting) {
                 Boost(boostForce);
                 StopDrift();
             }
         }
+        // 不能放在FixedUpdate 加速时间太短
+        ShowScreenEffect();
     }
 
     public void ConfirmStatus(PlayerStateMsg playerStateMsg) {
@@ -111,6 +112,14 @@ private void FixedUpdate() {
         }
     }
 
+    private void ShowScreenEffect() {
+        if (leftTrail.enabled == true) {
+            EnableScreenEffect();
+        } else {
+            DisableScreenEffect();
+        }
+    }
+
     public void AdjustPlayerPosition(Vector3 pos) {
         peerTargetPos = pos;
     }
@@ -176,10 +185,9 @@ private void ReduceForce() {
         }
 
         if (currentForce <= normalForce) {
-            DisableScreenEffect();
             DisableTrail();
+        } 
 
-        }
         currentForce = Mathf.MoveTowards(currentForce, targetForce, 60 * Time.fixedDeltaTime);//每秒60递减，可调
     }
 
@@ -233,7 +241,6 @@ private void StartDrift() {
             driftDirection = DriftDirection.Right;
             m_DriftOffset = Quaternion.Euler(0f, -30, 0f);
         }
-
         PlayDriftParticle();
     }
 
@@ -261,7 +268,6 @@ private void StopDrift() {
     private void Boost(float boostForce) {
         //按照漂移等级加速：1 / 1.1 / 1.2
         currentForce = (1 + (int)driftLevel / 10) * boostForce;
-        EnableScreenEffect();
         EnableTrail();
     }
 
 
@@ -1,9 +1,9 @@
 ManifestFileVersion: 0
-CRC: 2609764841
+CRC: 2776471209
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: d1d41fdc0a1697887adb7e6a2e51faca
+    Hash: b99e280df02593fde9ce4e342f4ea477
   TypeTreeHash:
     serializedVersion: 2
     Hash: c90fc19e2679e5295d10bd00f33cb4c3
 
@@ -1 +1 @@
-{"avatar":"9370cfe1c8e8884648f086b820bca347","equip":"6e255c8279db8f8436b31738cd57e50d"}
+{"avatar":"9370cfe1c8e8884648f086b820bca347","equip":"0dc989fbf1109552e44cb6d6ac3ca5d7"}
@@ -1,9 +1,9 @@
 ManifestFileVersion: 0
-CRC: 675956164
+CRC: 1362249926
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: ce56992c59052a40fd931403a68e4f88
+    Hash: f640d8e3481bd3a16a0c80fb55a5bd0a
   TypeTreeHash:
     serializedVersion: 2
     Hash: 4d5164c33b6ba89d8440f356dc2efae8
 
@@ -38,6 +38,7 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}
Original file line number	Diff line number	Diff line change
`@@ -68,19 +68,20 @@ void Update() {`
`68`	`68`	`hInput = Input.GetAxisRaw("Horizontal");`
`69`	`69`	`}`
`70`	`70`
`71`		`- if ((Input.GetKey(KeyCode.Space) \|\| sInput > 0) && currentForce > 0) {`
`72`		`- if (isGround && !isDrifting &&`
`73`		`- rig.velocity.sqrMagnitude > 10) {`
	`71`	`+ if (((Input.GetKey(KeyCode.Space) && isUseKeyboard) \|\| (sInput > 0 && !isUseKeyboard)) && currentForce > 0) {`
	`72`	`+ if (isGround && !isDrifting && rig.velocity.sqrMagnitude > 10) {`
`74`	`73`	`StartDrift();`
`75`	`74`	`}`
`76`	`75`	`}`
`77`	`76`
`78`		`- if (Input.GetKeyUp(KeyCode.Space) \|\| sInput == 0) {`
	`77`	`+ if ((Input.GetKeyUp(KeyCode.Space) && isUseKeyboard) \|\| (sInput == 0 && !isUseKeyboard)) {`
`79`	`78`	`if (isDrifting) {`
`80`	`79`	`Boost(boostForce);`
`81`	`80`	`StopDrift();`
`82`	`81`	`}`
`83`	`82`	`}`
	`83`	`+ // 不能放在FixedUpdate 加速时间太短`
	`84`	`+ ShowScreenEffect();`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`public void ConfirmStatus(PlayerStateMsg playerStateMsg) {`
`@@ -111,6 +112,14 @@ private void FixedUpdate() {`
`111`	`112`	`}`
`112`	`113`	`}`
`113`	`114`
	`115`	`+ private void ShowScreenEffect() {`
	`116`	`+ if (leftTrail.enabled == true) {`
	`117`	`+ EnableScreenEffect();`
	`118`	`+ } else {`
	`119`	`+ DisableScreenEffect();`
	`120`	`+ }`
	`121`	`+ }`
	`122`	`+`
`114`	`123`	`public void AdjustPlayerPosition(Vector3 pos) {`
`115`	`124`	`peerTargetPos = pos;`
`116`	`125`	`}`
`@@ -176,10 +185,9 @@ private void ReduceForce() {`
`176`	`185`	`}`
`177`	`186`
`178`	`187`	`if (currentForce <= normalForce) {`
`179`		`- DisableScreenEffect();`
`180`	`188`	`DisableTrail();`
	`189`	`+ }`
`181`	`190`
`182`		`- }`
`183`	`191`	`currentForce = Mathf.MoveTowards(currentForce, targetForce, 60 * Time.fixedDeltaTime);//每秒60递减，可调`
`184`	`192`	`}`
`185`	`193`
`@@ -233,7 +241,6 @@ private void StartDrift() {`
`233`	`241`	`driftDirection = DriftDirection.Right;`
`234`	`242`	`m_DriftOffset = Quaternion.Euler(0f, -30, 0f);`
`235`	`243`	`}`
`236`		`-`
`237`	`244`	`PlayDriftParticle();`
`238`	`245`	`}`
`239`	`246`
`@@ -261,7 +268,6 @@ private void StopDrift() {`
`261`	`268`	`private void Boost(float boostForce) {`
`262`	`269`	`//按照漂移等级加速：1 / 1.1 / 1.2`
`263`	`270`	`currentForce = (1 + (int)driftLevel / 10) * boostForce;`
`264`		`- EnableScreenEffect();`
`265`	`271`	`EnableTrail();`
`266`	`272`	`}`
`267`	`273`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{"avatar":"9370cfe1c8e8884648f086b820bca347","equip":"6e255c8279db8f8436b31738cd57e50d"}`
	`1`	`+{"avatar":"9370cfe1c8e8884648f086b820bca347","equip":"0dc989fbf1109552e44cb6d6ac3ca5d7"}`