Merge remote-tracking branch 'remotes/origin/master' into insertcoin-customport

Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/cn.json

@@ -368,10 +368,6 @@
 
   "======MovingTarget======": "注释",
   "MovingTarget": "移动靶",
-  "TotalScore": "总得分",
-  "ShotCount": "射击次数",
-  "HitCount": "击中数量",
-  "HitRate": "命中率",
 
   /**
   homeView tip 页面

Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/en.json

@@ -415,10 +415,7 @@
 
   "======MovingTarget======": "注释",
   "MovingTarget": "Moving Target",
-  "TotalScore": "TotalScore",
-  "ShotCount": "ShotCount",
-  "HitCount": "HitCount",
-  "HitRate": "HitRate",
+
   /**
   homeView tip 页面
   **/

Assets/Game_Hyperspace/Resources/game over.prefab

@@ -210,8 +210,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 175.7, y: -15}
-  m_SizeDelta: {x: 92.7, y: 30}
+  m_AnchoredPosition: {x: 100.5, y: -15}
+  m_SizeDelta: {x: 92, y: 30}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &8809887650787544279
 CanvasRenderer:
@@ -241,7 +241,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: HitCount
+  m_text: Hits
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 0deb54a3060b89f4fb8b297b552da2ed, type: 2}
   m_sharedMaterial: {fileID: -6865708031882221899, guid: 0deb54a3060b89f4fb8b297b552da2ed, type: 2}
@@ -304,7 +304,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 10.940662, z: 0, w: 10.075355}
+  m_margin: {x: 12.64679, y: 0.12340164, z: 0, w: 0.32292855}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0
@@ -584,15 +584,15 @@ RectTransform:
   m_GameObject: {fileID: 2736556116693654901}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.6, y: 0.6, z: 1}
-  m_ConstrainProportionsScale: 1
+  m_LocalScale: {x: 0.5, y: 0.5, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2736556117064423623}
   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: -144, y: 21}
+  m_AnchoredPosition: {x: -152, y: 15}
   m_SizeDelta: {x: 168, y: 256}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2736556116693654896
@@ -1662,7 +1662,7 @@ RectTransform:
   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: -5, y: 17}
+  m_AnchoredPosition: {x: 7.9, y: 17}
   m_SizeDelta: {x: 200, y: 29.43}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2736556117804988939
@@ -2721,8 +2721,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 253.8, y: -16.335}
-  m_SizeDelta: {x: 134.5, y: 26.19}
+  m_AnchoredPosition: {x: 110.2, y: -16.335}
+  m_SizeDelta: {x: 110.2, y: 26.19}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &4642394356851419281
 CanvasRenderer:
@@ -2752,7 +2752,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: TotalScore
+  m_text: Score
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 0deb54a3060b89f4fb8b297b552da2ed, type: 2}
   m_sharedMaterial: {fileID: -6865708031882221899, guid: 0deb54a3060b89f4fb8b297b552da2ed, type: 2}
@@ -2815,7 +2815,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: -2.8806686, z: 0, w: 0}
+  m_margin: {x: 0.3250122, y: -2.8806686, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0
@@ -2991,7 +2991,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 175.7, y: -15}
+  m_AnchoredPosition: {x: 100.85, y: -15}
   m_SizeDelta: {x: 92.7, y: 30}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &5577106662903413821
@@ -3022,7 +3022,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: HitRate
+  m_text: Accuracy
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 0deb54a3060b89f4fb8b297b552da2ed, type: 2}
   m_sharedMaterial: {fileID: -6865708031882221899, guid: 0deb54a3060b89f4fb8b297b552da2ed, type: 2}
@@ -3085,7 +3085,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 10.940662, z: 0, w: 10.075355}
+  m_margin: {x: 14.188385, y: 0.09078599, z: 0, w: -0.35721302}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0
@@ -3263,7 +3263,7 @@ RectTransform:
   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: 64.2, y: -53.3}
+  m_AnchoredPosition: {x: 79.3, y: -53.3}
   m_SizeDelta: {x: 250, y: 90}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5622467406350384246
@@ -3462,8 +3462,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 100.85, y: -15}
-  m_SizeDelta: {x: 92.7, y: 50}
+  m_AnchoredPosition: {x: 100.5, y: -15}
+  m_SizeDelta: {x: 92, y: 50}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &2535069909443220233
 CanvasRenderer:
@@ -3493,7 +3493,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: ShotCount
+  m_text: Shots
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 0deb54a3060b89f4fb8b297b552da2ed, type: 2}
   m_sharedMaterial: {fileID: -6865708031882221899, guid: 0deb54a3060b89f4fb8b297b552da2ed, type: 2}
@@ -3556,7 +3556,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 10.940662, z: 0, w: 10.075355}
+  m_margin: {x: 12.401733, y: 10.940662, z: 0, w: 10.075355}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0

Assets/Game_Hyperspace/Script/GeneratingTarget.cs

@@ -353,7 +353,7 @@ public class GeneratingTarget : MonoBehaviour
         shootingEvent.OnShooting();
     }
 
-   // int tempScore = 0;
+    //int tempScore = 0;
     private void Update()
     {
         //if (reloadTime > 0)
@@ -585,8 +585,8 @@ public class GeneratingTarget : MonoBehaviour
         grade.sprite = TextAutoLanguage2.GetLanguage() == LanguageEnum.Chinese ? ScoreLevel[index]: EnScoreLevel[index];
         grade.SetNativeSize();
         RectTransform rectTransform = grade.GetComponent<RectTransform>();
-        rectTransform.anchoredPosition = TextAutoLanguage2.GetLanguage() == LanguageEnum.Chinese ? new Vector3(-144, 30, 1) : new Vector3(-144, 21, 1);
-        rectTransform.localScale = TextAutoLanguage2.GetLanguage() == LanguageEnum.Chinese ? new Vector3(0.6f, 0.6f, 1) : new Vector3(0.25f, 0.25f, 1);
+        rectTransform.anchoredPosition = TextAutoLanguage2.GetLanguage() == LanguageEnum.Chinese ? new Vector3(-152, 15, 1) : new Vector3(-144, 15, 1);
+        rectTransform.localScale = TextAutoLanguage2.GetLanguage() == LanguageEnum.Chinese ? new Vector3(0.55f, 0.55f, 1) : new Vector3(0.25f, 0.25f, 1);
         //
     }