主要字体修改

Assets/BowArrow/Resources/Fonts.meta → Assets/BowArrow/Fonts/MySDF.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0ba670b762d5c2c42aeb89f3895c2b2d
+guid: 70d9209a690642a49b0a390c7c75c784
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/BowArrow/Fonts/MySDF/Billboard-use.txt

@@ -0,0 +1 @@
+0123456789. speed SPEED kmh KMH 速度 千米/小时

Assets/BowArrow/Fonts/MySDF/Billboard-use.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 90c73ead3a61a2d4a879edfb2a62d7bf
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BowArrow/Fonts/MySDF/Billboard.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9691dddcdf0268648bb6e2dcf201f7bb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BowArrow/Fonts/MySDF/TTC.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1b4804fab848bcd41b3424e750066bb8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BowArrow/Fonts/MySDF/TTC/msyh.ttc.meta

@@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: 60dc4c0d16e7d9b409b09053503d801a
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - Microsoft YaHei
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BowArrow/Fonts/MySDF/TTC/msyhbd.ttc.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 87db0319e99df824d846d9d64cc6b3dc
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - Microsoft YaHei
+  fallbackFontReferences:
+  - {fileID: 12800000, guid: 60dc4c0d16e7d9b409b09053503d801a, type: 3}
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BowArrow/Fonts/MySDF/TTC/msyhl.ttc.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 1fe2c66e9931e654684916f22c725988
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - Microsoft YaHei
+  fallbackFontReferences:
+  - {fileID: 12800000, guid: 60dc4c0d16e7d9b409b09053503d801a, type: 3}
+  - {fileID: 12800000, guid: 87db0319e99df824d846d9d64cc6b3dc, type: 3}
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BowArrow/Scenes/Game.unity

@@ -4944,8 +4944,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Speed                KM/H
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 9691dddcdf0268648bb6e2dcf201f7bb, type: 2}
+  m_sharedMaterial: {fileID: 4361754590329142513, guid: 9691dddcdf0268648bb6e2dcf201f7bb, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -7236,7 +7236,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 29.53646, y: 0}
+  m_AnchoredPosition: {x: 30, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &589339043
@@ -9345,7 +9345,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 29.53646, y: 0}
+  m_AnchoredPosition: {x: 30, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &694545845
@@ -10464,6 +10464,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   speedText: {fileID: 1869291963}
+  speedLabel: {fileID: 391051845}
 --- !u!1 &785919752
 GameObject:
   m_ObjectHideFlags: 0
@@ -15057,7 +15058,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 29.53646, y: 0}
+  m_AnchoredPosition: {x: 30, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1218454288
@@ -16708,7 +16709,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 49.07292, y: 0}
+  m_AnchoredPosition: {x: 50, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1338115114
@@ -24355,7 +24356,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 79.07292, y: 0}
+  m_AnchoredPosition: {x: 80, y: 0}
   m_SizeDelta: {x: 0, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1845023679
@@ -24803,7 +24804,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: 0.05, y: 2.95}
+  m_AnchoredPosition: {x: 0, y: 2.95}
   m_SizeDelta: {x: 160, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1869291963

Assets/BowArrow/Scripts/Bluetooth/AimHandler.cs

@@ -250,7 +250,8 @@ public class AimHandler : MonoBehaviour
                         AutoResetView.DoIdentity();
                     }
                 } else if (bytes[0] == 0x66 && bytes[1] == 0x32) {
-                    if (SB_EventSystem.ins && !CommonConfig.SpecialVersion1) {
+                    if (SB_EventSystem.ins) {
+                    // if (SB_EventSystem.ins && !CommonConfig.SpecialVersion1) {
                         //唤起/隐藏虚拟鼠标
                         SB_EventSystem.ins.AwakenSimulateMouse(); 
                     }

Assets/BowArrow/Scripts/Game/Billboard.cs

@@ -7,6 +7,7 @@ using TMPro;
 public class Billboard : MonoBehaviour
 {
     public TextMeshProUGUI speedText;
+    public TextMeshProUGUI speedLabel;
     private float arrowSpeed;
     private float arrowSpeedScale = 1;
     
@@ -14,6 +15,15 @@ public class Billboard : MonoBehaviour
 
     void Awake() {
         ins = this;   
+        if (TextAutoLanguage.GetLanguage() == LanguageEnum.Chinese) {
+            speedLabel.text = "速度               千米/时";
+            Vector3 lpos = speedText.transform.localPosition;
+            lpos.x = -0.61f;
+            lpos.y = 2.86f;
+            speedText.transform.localPosition = lpos;
+        } else {
+            speedLabel.text = "Speed                KM/H";
+        }
     }
 
     void OnDestroy() {

Assets/BowArrow/Scripts/Game/BowCamera.cs

@@ -65,6 +65,11 @@ public class BowCamera : MonoBehaviour
     {
         _ins = this;
         localEulerAngles = transform.localEulerAngles;
+        if (CommonConfig.SpecialVersion1) {
+            if (UnityEngine.SceneManagement.SceneManager.GetActiveScene().name.Equals("GameChallenge")) {
+                this.cameraComp.fieldOfView = 25;
+            }
+        }
         RecordDefaultCameraFieldOfView();
         if (UserSettings.ins.bowCameraFixed && !CommonConfig.isReleaseVersion)
         {

Assets/DependAsset/TextMesh Pro/Resources/TMP Settings.asset

@@ -20,7 +20,7 @@ MonoBehaviour:
   m_EnableRaycastTarget: 1
   m_GetFontFeaturesAtRuntime: 1
   m_missingGlyphCharacter: 0
-  m_warningsDisabled: 0
+  m_warningsDisabled: 1
   m_defaultFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_defaultFontAssetPath: Fonts & Materials/
   m_defaultFontSize: 36
@@ -29,18 +29,16 @@ MonoBehaviour:
   m_defaultTextMeshProTextContainerSize: {x: 20, y: 5}
   m_defaultTextMeshProUITextContainerSize: {x: 200, y: 50}
   m_autoSizeTextContainer: 0
+  m_IsTextObjectScaleStatic: 0
   m_fallbackFontAssets: []
   m_matchMaterialPreset: 1
-  m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45,
-    type: 2}
+  m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45, type: 2}
   m_defaultSpriteAssetPath: Sprite Assets/
   m_enableEmojiSupport: 1
   m_MissingCharacterSpriteUnicode: 0
   m_defaultColorGradientPresetsPath: Color Gradient Presets/
-  m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e,
-    type: 2}
+  m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e, type: 2}
   m_StyleSheetsResourcePath: 
   m_leadingCharacters: {fileID: 4900000, guid: d82c1b31c7e74239bff1220585707d2b, type: 3}
-  m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b,
-    type: 3}
+  m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b, type: 3}
   m_UseModernHangulLineBreakingRules: 0