lvjincheng 3 years ago
parent
commit
c85ca3eec0

+ 81 - 0
Assets/BowArrow/Scenes/Entry.unity

@@ -617,6 +617,85 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
+--- !u!1 &1288895432
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1288895433}
+  - component: {fileID: 1288895435}
+  - component: {fileID: 1288895434}
+  m_Layer: 0
+  m_Name: VersionText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1288895433
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1288895432}
+  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: 1652728298}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -55, y: 30}
+  m_SizeDelta: {x: 100, y: 30}
+  m_Pivot: {x: 1, y: 0}
+--- !u!114 &1288895434
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1288895432}
+  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: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 8
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Version
+--- !u!222 &1288895435
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1288895432}
+  m_CullTransparentMesh: 1
 --- !u!1 &1422346461
 GameObject:
   m_ObjectHideFlags: 0
@@ -660,6 +739,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7a0990c810638084a8d84a65ab73c17b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  versionText: {fileID: 1288895434}
   tipText: {fileID: 730210590}
 --- !u!1 &1652728294
 GameObject:
@@ -754,6 +834,7 @@ RectTransform:
   m_Children:
   - {fileID: 2060474346}
   - {fileID: 730210589}
+  - {fileID: 1288895433}
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 1 - 1
Assets/BowArrow/Scripts/Bluetooth/AimHandler.cs

@@ -217,7 +217,7 @@ public class AimHandler : MonoBehaviour
                     }
                     varianceV /= listArray.Length;
                     isCalibrateMagPerfect = varianceV < 0.001;
-                    PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByKey("tip_mag-calibrate-variance-equal") + varianceV);
+                    // PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByKey("tip_mag-calibrate-variance-equal") + varianceV);
                 }
                 #endregion
             }

+ 1 - 1
Assets/BowArrow/Scripts/Bluetooth/BluetoothHolder.cs

@@ -35,7 +35,7 @@ public class BluetoothHolder : MonoBehaviour
             this.transform.Find("CanvasForOpenDebug").gameObject.SetActive(false);
         }
         CloseDebug();
-        transform.Find("Objects").gameObject.SetActive(true);
+        // transform.Find("Objects").gameObject.SetActive(true);
     } 
 
     public void ShowMagEllipse(Object viewer)

+ 2 - 0
Assets/BowArrow/Scripts/Entry.cs

@@ -21,11 +21,13 @@ public class Entry : MonoBehaviour
         // Application.targetFrameRate = 60;
         QualitySettings.vSyncCount = 1;
         SetTip("Loading", Color.white, 56);
+        versionText.text = "Version_" + appVersion + "_R0";
         //SetTip("正在检测对比软件版本", Color.white);
         StartCoroutine(CheckAppVersion());
         StartCoroutine(AsyncLoadScene());
     }
 
+    [SerializeField] Text versionText;
     const string appVersion = "0.0.1";
     bool appVersionCheckOK = false;