Просмотр исходного кода

精度显示,整数后要加.0

lvjincheng 4 лет назад
Родитель
Сommit
722a5ad7ca

+ 22 - 16
Assets/BowArrow/Resources/Prefabs/Views/TimeLimitGameSettleView.prefab

@@ -249,6 +249,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   textID: 89
   textID: 89
   layoutRebuildObject: {fileID: 0}
   layoutRebuildObject: {fileID: 0}
+  textFormatArgs: []
 --- !u!1 &1784699036641984829
 --- !u!1 &1784699036641984829
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -671,7 +672,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 36, y: 0}
+  m_AnchoredPosition: {x: 35.36842, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1584491533125695203
 --- !u!222 &1584491533125695203
@@ -759,6 +760,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   textID: 102
   textID: 102
   layoutRebuildObject: {fileID: 2586604684189674106}
   layoutRebuildObject: {fileID: 2586604684189674106}
+  textFormatArgs: []
 --- !u!1 &3889985700240681247
 --- !u!1 &3889985700240681247
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -853,6 +855,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   textID: 91
   textID: 91
   layoutRebuildObject: {fileID: 0}
   layoutRebuildObject: {fileID: 0}
+  textFormatArgs: []
 --- !u!1 &4024304731853210908
 --- !u!1 &4024304731853210908
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1098,7 +1101,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 116, y: 0}
+  m_AnchoredPosition: {x: 114.52631, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5393253313812614068
 --- !u!222 &5393253313812614068
@@ -1186,6 +1189,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   textID: 104
   textID: 104
   layoutRebuildObject: {fileID: 2586604684189674106}
   layoutRebuildObject: {fileID: 2586604684189674106}
+  textFormatArgs: []
 --- !u!1 &5529496334979727273
 --- !u!1 &5529496334979727273
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1756,8 +1760,8 @@ GameObject:
   - component: {fileID: 8517205286642849935}
   - component: {fileID: 8517205286642849935}
   - component: {fileID: 2732726379489701053}
   - component: {fileID: 2732726379489701053}
   - component: {fileID: 3604732979743705636}
   - component: {fileID: 3604732979743705636}
-  - component: {fileID: 8859793963725612286}
   - component: {fileID: 4649589450464175911}
   - component: {fileID: 4649589450464175911}
+  - component: {fileID: 7757748107560078556}
   m_Layer: 5
   m_Layer: 5
   m_Name: Text
   m_Name: Text
   m_TagString: Untagged
   m_TagString: Untagged
@@ -1781,7 +1785,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 35, y: 0}
+  m_AnchoredPosition: {x: 33.68421, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2732726379489701053
 --- !u!222 &2732726379489701053
@@ -1826,7 +1830,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
     m_LineSpacing: 1
   m_Text: "\u5F97\u5206:"
   m_Text: "\u5F97\u5206:"
---- !u!114 &8859793963725612286
+--- !u!114 &4649589450464175911
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1835,12 +1839,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 7145085236050661087}
   m_GameObject: {fileID: 7145085236050661087}
   m_Enabled: 1
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Script: {fileID: 11500000, guid: b7cbfcb0916cf694fb3d059ea4b4c1da, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 2
---- !u!114 &4649589450464175911
+  textID: 95
+  layoutRebuildObject: {fileID: 918020592718334842}
+  textFormatArgs: []
+--- !u!114 &7757748107560078556
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1849,11 +1854,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 7145085236050661087}
   m_GameObject: {fileID: 7145085236050661087}
   m_Enabled: 1
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b7cbfcb0916cf694fb3d059ea4b4c1da, type: 3}
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
-  textID: 95
-  layoutRebuildObject: {fileID: 0}
+  m_HorizontalFit: 2
+  m_VerticalFit: 2
 --- !u!1 &8613703100091546103
 --- !u!1 &8613703100091546103
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1865,7 +1870,7 @@ GameObject:
   - component: {fileID: 4120701936355868788}
   - component: {fileID: 4120701936355868788}
   - component: {fileID: 199998092357563418}
   - component: {fileID: 199998092357563418}
   - component: {fileID: 6247937261042587991}
   - component: {fileID: 6247937261042587991}
-  - component: {fileID: 5289302532114143027}
+  - component: {fileID: 3437501419224577951}
   m_Layer: 5
   m_Layer: 5
   m_Name: Score
   m_Name: Score
   m_TagString: Untagged
   m_TagString: Untagged
@@ -1889,8 +1894,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 86.666664, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 22.047848, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &199998092357563418
 --- !u!222 &199998092357563418
 CanvasRenderer:
 CanvasRenderer:
@@ -1934,7 +1939,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
     m_LineSpacing: 1
   m_Text: 0
   m_Text: 0
---- !u!114 &5289302532114143027
+--- !u!114 &3437501419224577951
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2042,3 +2047,4 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   textID: 90
   textID: 90
   layoutRebuildObject: {fileID: 0}
   layoutRebuildObject: {fileID: 0}
+  textFormatArgs: []

+ 12 - 0
Assets/BowArrow/Scripts/CommonConfig.cs

@@ -0,0 +1,12 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/**通用配置(2021/12/18新增) */
+public class CommonConfig
+{
+    /**环数精度小数位 */
+    public static int ringsPrecision = 1;
+    /**箭的速度精度小数位 */
+    public static int arrowSpeedPrecision = 1;
+}

+ 11 - 0
Assets/BowArrow/Scripts/CommonConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 92ba5d90296562644ab122e1e985cca2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/BowArrow/Scripts/Effect/HitTargetNumber.cs

@@ -36,6 +36,6 @@ public class HitTargetNumber : MonoBehaviour
             GameObject.Find("Canvas").transform
             GameObject.Find("Canvas").transform
         );
         );
         o.transform.localPosition = new Vector3(340, 180, 0);
         o.transform.localPosition = new Vector3(340, 180, 0);
-        o.GetComponentInChildren<Text>().text = number.ToString();
+        o.GetComponentInChildren<Text>().text = number.ToString($"f{CommonConfig.ringsPrecision}");
     }
     }
 }
 }

+ 1 - 2
Assets/BowArrow/Scripts/Game/Billboard.cs

@@ -17,9 +17,8 @@ public class Billboard : MonoBehaviour
     public static void ShowSpeed(float speed) {
     public static void ShowSpeed(float speed) {
         //转km/h
         //转km/h
         speed = speed * 3600f / 1000f;
         speed = speed * 3600f / 1000f;
-        speed = (float)System.Math.Round((double)speed, 1);
         if (ins && ins.speedText) {
         if (ins && ins.speedText) {
-            ins.speedText.text = speed.ToString();
+            ins.speedText.text = speed.ToString($"f{CommonConfig.arrowSpeedPrecision}");
         }
         }
     }
     }
 }
 }

+ 3 - 3
Assets/BowArrow/Scripts/Game/TargetBody.cs

@@ -36,9 +36,9 @@ public class TargetBody : MonoBehaviour
         if (arrow.armBow.validTargets.Contains(this)) {
         if (arrow.armBow.validTargets.Contains(this)) {
             float maxSize = Vector3.Distance(this.transform.Find("CenterPoint").position, this.transform.Find("SidePoint").position);
             float maxSize = Vector3.Distance(this.transform.Find("CenterPoint").position, this.transform.Find("SidePoint").position);
             float radius = this.measureRadius(hitPosition);
             float radius = this.measureRadius(hitPosition);
-            float score = Mathf.Clamp(10f - radius / maxSize * 10f, 0, 9.9f);
-            if (score >= 0) {
-                score = (float)System.Math.Round((double)score + 1, 1);
+            float score = Mathf.Clamp(10f - radius / maxSize * 10f, 0, 9.9f) + 1;
+            if (score >= 1) {
+                score = (float)System.Math.Round((double)score, CommonConfig.ringsPrecision);
                 GameMgr.ins.gameMode.HitTarget(score);
                 GameMgr.ins.gameMode.HitTarget(score);
                 AudioMgr.ins.PlayCheer(true);
                 AudioMgr.ins.PlayCheer(true);
                 hitTarget = true;
                 hitTarget = true;

+ 2 - 2
Assets/BowArrow/Scripts/View/PKGameView.cs

@@ -33,8 +33,8 @@ public class PKGameView : MonoBehaviour
     {
     {
         scoreTexts[0].text = TextAutoLanguage.GetLanguage() == LanguageEnum.Chinese 
         scoreTexts[0].text = TextAutoLanguage.GetLanguage() == LanguageEnum.Chinese 
             ? numCNs[pKGameMode.round] : numENs[pKGameMode.round];
             ? numCNs[pKGameMode.round] : numENs[pKGameMode.round];
-        scoreTexts[1].text = pKGameMode.currentScores[0].ToString();
-        scoreTexts[2].text = pKGameMode.currentScores[1].ToString();
+        scoreTexts[1].text = pKGameMode.currentScores[0].ToString($"f{CommonConfig.ringsPrecision}");
+        scoreTexts[2].text = pKGameMode.currentScores[1].ToString($"f{CommonConfig.ringsPrecision}");
         scoreTexts[3].text = pKGameMode.totalScores[0] + " : " + pKGameMode.totalScores[1];
         scoreTexts[3].text = pKGameMode.totalScores[0] + " : " + pKGameMode.totalScores[1];
             
             
         if (currentPlayerIndex != pKGameMode.currentPlayerIndex)
         if (currentPlayerIndex != pKGameMode.currentPlayerIndex)

+ 3 - 1
Assets/BowArrow/Scripts/View/TimeLimitGameSettleView.cs

@@ -31,8 +31,10 @@ public class TimeLimitGameSettleView : MonoBehaviour
                 tsf.DOPunchScale(new Vector3(0.3f, 0.3f, 0.3f), 0.3f);
                 tsf.DOPunchScale(new Vector3(0.3f, 0.3f, 0.3f), 0.3f);
             });
             });
         }
         }
+        Text scoreText = this.transform.Find("ScoreBG/Layout/Score").GetComponent<Text>();
         DOTween.To(() => 0, value => {
         DOTween.To(() => 0, value => {
-            this.transform.Find("ScoreBG/Layout/Score").GetComponent<Text>().text = System.Math.Round((double)value, 1).ToString();
+            scoreText.text = value.ToString($"f{CommonConfig.ringsPrecision}");
+            LayoutRebuilder.ForceRebuildLayoutImmediate(scoreText.transform.parent.GetComponent<RectTransform>());
         }, score, 1);
         }, score, 1);
 
 
         AudioMgr.ins.PlayWin();
         AudioMgr.ins.PlayWin();

+ 2 - 2
Assets/BowArrow/Scripts/View/TimeLimitGameView.cs

@@ -25,7 +25,7 @@ public class TimeLimitGameView : MonoBehaviour
     void Update()
     void Update()
     {
     {
         timeTxt.text = gameMode.GetTimeStr();
         timeTxt.text = gameMode.GetTimeStr();
-        currentScoreTxt.text = gameMode.score.ToString();
+        currentScoreTxt.text = gameMode.score.ToString($"f{CommonConfig.ringsPrecision}");
     }
     }
 
 
     public void RenderHighestScoreByDistance(int distance)
     public void RenderHighestScoreByDistance(int distance)
@@ -34,6 +34,6 @@ public class TimeLimitGameView : MonoBehaviour
         string distanceStr = distance.ToString();
         string distanceStr = distance.ToString();
         System.Object highestScoreObj = LoginMgr.myUserInfo.timeLimitGameHighestScores[distanceStr];
         System.Object highestScoreObj = LoginMgr.myUserInfo.timeLimitGameHighestScores[distanceStr];
         if (highestScoreObj != null) highestScore = float.Parse(highestScoreObj.ToString()); 
         if (highestScoreObj != null) highestScore = float.Parse(highestScoreObj.ToString()); 
-        highestScoreTxt.text = highestScore.ToString();
+        highestScoreTxt.text = highestScore.ToString($"f{CommonConfig.ringsPrecision}");
     }
     }
 }
 }