浏览代码

适配ios版本,调整新的部分按钮顺序和文案需求

slambb 2 周之前
父节点
当前提交
46ee20189a

二进制
Assets/AddressableAssetsData/iOS/addressables_content_state.bin


+ 26 - 0
Assets/AddressableAssetsData/link.xml

@@ -0,0 +1,26 @@
+<linker>
+  <assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
+    <type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
+  </assembly>
+  <assembly fullname="Unity.Localization, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="UnityEngine.Localization.Locale" preserve="all" />
+    <type fullname="UnityEngine.Localization.Tables.SharedTableData" preserve="all" />
+    <type fullname="UnityEngine.Localization.Tables.StringTable" preserve="all" />
+    <type fullname="UnityEngine.Localization.LocaleIdentifier" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.Localization.Metadata.MetadataCollection" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.Localization.Tables.DistributedUIDGenerator" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.Localization.Tables.SharedTableData/SharedTableEntry" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.Localization.Metadata.SmartFormatTag" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.Localization.Tables.TableEntryData" preserve="nothing" serialized="true" />
+  </assembly>
+  <assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.LegacyResourcesProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="UnityEngine.Object" preserve="all" />
+  </assembly>
+</linker>

+ 7 - 0
Assets/AddressableAssetsData/link.xml.meta

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

+ 1 - 1
Assets/BowArrow/DoubleScene/Scripts/PKGameSettleViewNew.cs

@@ -26,7 +26,7 @@ public class PKGameSettleViewNew : MonoBehaviour
         {
             int index = i - 1;
             transform.Find("Win" + i).gameObject.SetActive(pkResults[index] == 1);
-            transform.Find("Fail" + i).gameObject.SetActive(pkResults[index] == -1);
+            //transform.Find("Fail" + i).gameObject.SetActive(pkResults[index] == -1);
             transform.Find("Draw" + i).gameObject.SetActive(pkResults[index] == 0);
             string _format = "F" + CommonConfig.ringsPrecision; //显示保留一位小数
             transform.Find("Score" + i + "/Text").GetComponent<Text>().text = gc.scores[index].ToString(_format);

+ 26 - 350
Assets/BowArrow/Resources/Prefabs/Views/Home/DeviceViewInfrared.prefab

@@ -77,7 +77,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3319966071402702626}
-  - {fileID: 9195925919553701895}
+  - {fileID: 5368886303976252795}
   m_Father: {fileID: 2624584339530074265}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -376,9 +376,9 @@ RectTransform:
   m_Father: {fileID: 3831481266065365646}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 310, y: -653.5}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -244.5}
   m_SizeDelta: {x: 570, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &475354049885480237
@@ -537,9 +537,8 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 4083f8e1ca929ce4bb6ec7d9c29c9365, type: 3}
   - {fileID: 21300000, guid: 4efce04128ca7f942b8fae9ddab14030, type: 3}
   - {fileID: 21300000, guid: a018c9375be0b7a4bb8b464069fcfaae, type: 3}
-  _TextAutoLanguage2: {fileID: 4288816417670544630}
   deviceIndex: 0
-  omitText: {fileID: 5895775015745707182}
+  curConnectStatus: {fileID: 4257527137690726779}
 --- !u!114 &4470117404291567566
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -945,7 +944,7 @@ RectTransform:
   - {fileID: 4032015130671786350}
   - {fileID: 3315857762555884578}
   m_Father: {fileID: 1355390331581377791}
-  m_RootOrder: 0
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -1358,9 +1357,8 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 4083f8e1ca929ce4bb6ec7d9c29c9365, type: 3}
   - {fileID: 21300000, guid: 4efce04128ca7f942b8fae9ddab14030, type: 3}
   - {fileID: 21300000, guid: a018c9375be0b7a4bb8b464069fcfaae, type: 3}
-  _TextAutoLanguage2: {fileID: 2040204180109477403}
   deviceIndex: 1
-  omitText: {fileID: 8172346654568656097}
+  curConnectStatus: {fileID: 6365139638093466434}
 --- !u!114 &1077310257611460567
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1647,9 +1645,9 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8263437580043844647}
   - {fileID: 7592521884376863672}
   - {fileID: 5007556406709545517}
+  - {fileID: 8263437580043844647}
   - {fileID: 2344157582300514336}
   - {fileID: 223303591192069062}
   m_Father: {fileID: 8146888902267481947}
@@ -3000,71 +2998,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &3663055746462982435
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 9195925919553701895}
-  - component: {fileID: 5424964691604017367}
-  m_Layer: 5
-  m_Name: statusParent
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &9195925919553701895
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3663055746462982435}
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5368886303976252795}
-  - {fileID: 6540119674589221142}
-  m_Father: {fileID: 8809921120636371870}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 340, y: -131.5}
-  m_SizeDelta: {x: 600, y: 45}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &5424964691604017367
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3663055746462982435}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 4
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 0
-  m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
 --- !u!1 &3975078034313454886
 GameObject:
   m_ObjectHideFlags: 0
@@ -3438,7 +3371,7 @@ RectTransform:
   - {fileID: 4496825468146933954}
   - {fileID: 2211300846828181545}
   m_Father: {fileID: 1355390331581377791}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -5015,7 +4948,7 @@ RectTransform:
   - {fileID: 741292733069802814}
   - {fileID: 6468202537809545462}
   m_Father: {fileID: 1355390331581377791}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -5453,7 +5386,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: 310, y: -54}
+  m_AnchoredPosition: {x: 340, y: -54}
   m_SizeDelta: {x: 570, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1043175752115609201
@@ -5646,7 +5579,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5756235976269569222}
-  - {fileID: 2942170420610414968}
+  - {fileID: 5224722728605276788}
   m_Father: {fileID: 8359389633136827950}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5835,86 +5768,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &7830343383463296454
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5016398519639811147}
-  - component: {fileID: 2108338989013650304}
-  - component: {fileID: 8172346654568656097}
-  m_Layer: 5
-  m_Name: omit
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5016398519639811147
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7830343383463296454}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2942170420610414968}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 472.5, y: -22.5}
-  m_SizeDelta: {x: 200, y: 45}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2108338989013650304
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7830343383463296454}
-  m_CullTransparentMesh: 1
---- !u!114 &8172346654568656097
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7830343383463296454}
-  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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 45
-    m_FontStyle: 1
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 45
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 1
-    m_VerticalOverflow: 1
-    m_LineSpacing: 1
-  m_Text: 
 --- !u!1 &7867030853648936596
 GameObject:
   m_ObjectHideFlags: 0
@@ -6207,7 +6060,6 @@ GameObject:
   - component: {fileID: 5368886303976252795}
   - component: {fileID: 2148228175767830763}
   - component: {fileID: 4257527137690726779}
-  - component: {fileID: 4288816417670544630}
   m_Layer: 5
   m_Name: status
   m_TagString: Untagged
@@ -6227,13 +6079,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 9195925919553701895}
-  m_RootOrder: 0
+  m_Father: {fileID: 8809921120636371870}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 200, y: -22.5}
-  m_SizeDelta: {x: 345, y: 45}
+  m_AnchoredPosition: {x: 340, y: -131.5}
+  m_SizeDelta: {x: 600, y: 45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2148228175767830763
 CanvasRenderer:
@@ -6270,28 +6122,13 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 50
-    m_Alignment: 5
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: Connect
---- !u!114 &4288816417670544630
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8035895859342677344}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  textKey: Connect_BLE_Connect
-  layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
 --- !u!1 &8241605669420897683
 GameObject:
   m_ObjectHideFlags: 0
@@ -7704,7 +7541,6 @@ GameObject:
   - component: {fileID: 5224722728605276788}
   - component: {fileID: 49497840751108719}
   - component: {fileID: 6365139638093466434}
-  - component: {fileID: 2040204180109477403}
   m_Layer: 5
   m_Name: status
   m_TagString: Untagged
@@ -7724,13 +7560,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 2942170420610414968}
-  m_RootOrder: 0
+  m_Father: {fileID: 3115437585392817648}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 200, y: -22.5}
-  m_SizeDelta: {x: 345, y: 45}
+  m_AnchoredPosition: {x: 340, y: -131.5}
+  m_SizeDelta: {x: 600, y: 45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &49497840751108719
 CanvasRenderer:
@@ -7767,28 +7603,13 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 45
-    m_Alignment: 5
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: Connect
---- !u!114 &2040204180109477403
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8760962491654948458}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  textKey: Connect_BLE_Connect
-  layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
 --- !u!1 &8768998982485598618
 GameObject:
   m_ObjectHideFlags: 0
@@ -8118,10 +7939,10 @@ RectTransform:
   m_Father: {fileID: 1922190892495397972}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 310, y: -653.5}
-  m_SizeDelta: {x: 570, y: 80}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -244.5}
+  m_SizeDelta: {x: 640, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5218443512998239074
 CanvasRenderer:
@@ -8180,151 +8001,6 @@ MonoBehaviour:
   textKey: Connect_BLE_NotConnected
   layoutRebuildObject: {fileID: 0}
   languageFontSizes: []
---- !u!1 &9031970122640690138
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2942170420610414968}
-  - component: {fileID: 8667097138556066916}
-  m_Layer: 5
-  m_Name: statusParent
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2942170420610414968
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9031970122640690138}
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5224722728605276788}
-  - {fileID: 5016398519639811147}
-  m_Father: {fileID: 3115437585392817648}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 310, y: -131.5}
-  m_SizeDelta: {x: 600, y: 45}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &8667097138556066916
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9031970122640690138}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 4
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 0
-  m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
---- !u!1 &9143769868297749396
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6540119674589221142}
-  - component: {fileID: 4561199668158207216}
-  - component: {fileID: 5895775015745707182}
-  m_Layer: 5
-  m_Name: omit
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &6540119674589221142
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9143769868297749396}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 9195925919553701895}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 472.5, y: -22.5}
-  m_SizeDelta: {x: 200, y: 45}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4561199668158207216
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9143769868297749396}
-  m_CullTransparentMesh: 1
---- !u!114 &5895775015745707182
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9143769868297749396}
-  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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 45
-    m_FontStyle: 1
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 50
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 1
-    m_VerticalOverflow: 1
-    m_LineSpacing: 1
-  m_Text: 
 --- !u!1 &9222168600980044169
 GameObject:
   m_ObjectHideFlags: 0

+ 10 - 10
Assets/BowArrow/Resources/Prefabs/Views/PKGameSettleView.prefab

@@ -195,7 +195,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1182041858766446311
 RectTransform:
   m_ObjectHideFlags: 0
@@ -775,7 +775,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6205683938100527565
 RectTransform:
   m_ObjectHideFlags: 0
@@ -888,7 +888,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6205683938153467024
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1491,8 +1491,8 @@ 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: -135, y: -3.2000008}
-  m_SizeDelta: {x: 187, y: 116}
+  m_AnchoredPosition: {x: -135, y: 0}
+  m_SizeDelta: {x: 187, y: 157}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6205683939022552658
 CanvasRenderer:
@@ -1522,7 +1522,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 50f2a01e9bf6519478bfd1b8a53a1c89, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 2ac15a1654d86ab489235e1415c1b408, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1645,8 +1645,8 @@ 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: 135, y: -3.2000008}
-  m_SizeDelta: {x: 187, y: 116}
+  m_AnchoredPosition: {x: 135, y: 0}
+  m_SizeDelta: {x: 187, y: 157}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6205683939230700093
 CanvasRenderer:
@@ -1676,7 +1676,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 50f2a01e9bf6519478bfd1b8a53a1c89, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 2ac15a1654d86ab489235e1415c1b408, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2183,7 +2183,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6010139181422031421
 RectTransform:
   m_ObjectHideFlags: 0

二进制
Assets/BowArrow/Resources/Textures/Common/winner01.png


+ 135 - 0
Assets/BowArrow/Resources/Textures/Common/winner01.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 2ac15a1654d86ab489235e1415c1b408
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 8
Assets/BowArrow/Scenes/Game.unity

@@ -6283,8 +6283,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: 29.871845, y: -16.5}
-  m_SizeDelta: {x: 39.74369, y: 33}
+  m_AnchoredPosition: {x: 29.275995, y: -16.5}
+  m_SizeDelta: {x: 38.55199, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &589339043
 MonoBehaviour:
@@ -7833,8 +7833,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: 29.871845, y: -16.5}
-  m_SizeDelta: {x: 39.74369, y: 33}
+  m_AnchoredPosition: {x: 29.275995, y: -16.5}
+  m_SizeDelta: {x: 38.55199, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &694545845
 MonoBehaviour:
@@ -13353,8 +13353,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: 29.871845, y: -16.5}
-  m_SizeDelta: {x: 39.74369, y: 33}
+  m_AnchoredPosition: {x: 29.275995, y: -16.5}
+  m_SizeDelta: {x: 38.55199, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1218454288
 MonoBehaviour:
@@ -21276,8 +21276,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: 79.74369, y: -20}
-  m_SizeDelta: {x: 79.48738, y: 40}
+  m_AnchoredPosition: {x: 78.55199, y: -20}
+  m_SizeDelta: {x: 77.10398, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1845023679
 MonoBehaviour:

+ 27 - 27
Assets/BowArrow/Scenes/GameDouble.unity

@@ -230,7 +230,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &6883532
 RectTransform:
   m_ObjectHideFlags: 0
@@ -249,8 +249,8 @@ 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: 135, y: -3.2000008}
-  m_SizeDelta: {x: 187, y: 116}
+  m_AnchoredPosition: {x: 135, y: 0}
+  m_SizeDelta: {x: 187, y: 157}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6883533
 MonoBehaviour:
@@ -272,7 +272,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 50f2a01e9bf6519478bfd1b8a53a1c89, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 2ac15a1654d86ab489235e1415c1b408, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4908,8 +4908,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: 30, y: -16.5}
-  m_SizeDelta: {x: 40, y: 33}
+  m_AnchoredPosition: {x: 29.692308, y: -16.5}
+  m_SizeDelta: {x: 39.384617, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &286416209
 MonoBehaviour:
@@ -5398,7 +5398,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &301685955
 RectTransform:
   m_ObjectHideFlags: 0
@@ -5417,8 +5417,8 @@ 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: -135, y: -3.2000008}
-  m_SizeDelta: {x: 187, y: 116}
+  m_AnchoredPosition: {x: -135, y: 0}
+  m_SizeDelta: {x: 187, y: 157}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &301685956
 MonoBehaviour:
@@ -5440,7 +5440,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 50f2a01e9bf6519478bfd1b8a53a1c89, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 2ac15a1654d86ab489235e1415c1b408, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -10805,7 +10805,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &656989269
 RectTransform:
   m_ObjectHideFlags: 0
@@ -12345,8 +12345,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: 30, y: -16.5}
-  m_SizeDelta: {x: 40, y: 33}
+  m_AnchoredPosition: {x: 29.692308, y: -16.5}
+  m_SizeDelta: {x: 39.384617, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &745608731
 MonoBehaviour:
@@ -13111,8 +13111,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: 30, y: -16.5}
-  m_SizeDelta: {x: 40, y: 33}
+  m_AnchoredPosition: {x: 29.692308, y: -16.5}
+  m_SizeDelta: {x: 39.384617, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &781839819
 MonoBehaviour:
@@ -16189,7 +16189,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 7.7}
-  m_SizeDelta: {x: 157.27454, y: 57.71543}
+  m_SizeDelta: {x: 158.76923, y: 57.846153}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &991273717
 MonoBehaviour:
@@ -16851,7 +16851,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: 35.3507, y: -34.26854}
+  m_AnchoredPosition: {x: 35.692307, y: -34.153847}
   m_SizeDelta: {x: 71.38461, y: 47.384617}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1017634273
@@ -17644,7 +17644,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1086500643
 RectTransform:
   m_ObjectHideFlags: 0
@@ -20113,8 +20113,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: 50, y: -16.5}
-  m_SizeDelta: {x: 80, y: 33}
+  m_AnchoredPosition: {x: 49.384617, y: -16.5}
+  m_SizeDelta: {x: 78.76923, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1278939257
 MonoBehaviour:
@@ -25382,8 +25382,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: 30, y: -16.5}
-  m_SizeDelta: {x: 40, y: 33}
+  m_AnchoredPosition: {x: 29.692308, y: -16.5}
+  m_SizeDelta: {x: 39.384617, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1609303132
 MonoBehaviour:
@@ -26281,7 +26281,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1644623713
 RectTransform:
   m_ObjectHideFlags: 0
@@ -27491,7 +27491,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1699029732
 RectTransform:
   m_ObjectHideFlags: 0
@@ -29502,8 +29502,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: 50, y: -16.5}
-  m_SizeDelta: {x: 80, y: 33}
+  m_AnchoredPosition: {x: 49.384617, y: -16.5}
+  m_SizeDelta: {x: 78.76923, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1807247319
 MonoBehaviour:
@@ -31358,7 +31358,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: 113.987976, y: -28.857716}
+  m_AnchoredPosition: {x: 115.07692, y: -28.923077}
   m_SizeDelta: {x: 87.38461, y: 57.846153}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1896393110

+ 3 - 0
Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/cn.json

@@ -157,6 +157,8 @@
   "new-user-guider_tip_视角归位-瞄准-infraredD": "请参考图中姿势,以箭筒头部为参考点,\n立即瞄准靶心,<size=40><color=#FFA500>{0}</color></size>秒后完成准心校准。",
   //"new-user-guider_tip_视角归位-瞄准-infrared-gun": "请快速装回弹夹后,用三点一线的射击姿势\n瞄准靶心,<size=40><color=#FFA500>{0}</color></size>秒后完成准心校准。",
   "new-user-guider_tip_视角归位-瞄准-infrared-gun": "装回弹夹后,用真实射击姿势瞄准靶心,确保眼睛、准星和靶心对齐。\n<size=40><color=#FFA500>{0}</color></size>秒后准星会自动移动到靶心,完成校准。",
+  "infrared-gun-m416": "用真实射击姿势瞄准靶心,确保眼睛、准星和靶心对齐。\n<size=40><color=#FFA500>{0}</color></size>秒后准星会自动移动到靶心,完成校准。",
+
   "new-user-guider_tip_教程结束": "恭喜您完成了本次新手教程,下次如果还\n要<color=#FFA500>了解本教程</color>,请在<color=#FFA500>设置中查看新手指导</color>。",
   "new-user-guider_tip_准心高亮": "请按提示向箭靶上射中一箭后,\n完成本次手动设置,并回到连接页面。",
   "new-user-guider_btn_ok": "确定",
@@ -611,6 +613,7 @@
   "ReManualSetup": "重新手动设置",
   "ReManualSetup1": "重新进行手动定位",
   "AutoPositioningTip": "系统正在自动定位中,请稍等片刻...",
+  "CalibrationFailed": "AI 校准失败\n请尝试手动校准",
 
   "EnterMarker": "进入屏幕标记",
   "Marker": "屏幕标记",

+ 14 - 13
Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/en.json

@@ -156,6 +156,7 @@
   "new-user-guider_tip_视角归位-瞄准-infraredD": "Refer to the diagram: Immediately aim \nat the bullseye using the arrow nock \nhead as reference point. Calibration \ncompletes in <size=40><color=#FFA500>{0}</color></size> seconds.",
   //"new-user-guider_tip_视角归位-瞄准-infrared-gun": "Quickly reload the magazine and adopt the three-point shooting stance\n to aim at the target center. The reticle calibration will \ncomplete after <size=40><color=#FFA500>{0}</color></size> seconds.",
   "new-user-guider_tip_视角归位-瞄准-infrared-gun": "Reinsert magazine to aim at bullseye.\nHold firing stance for <size=40><color=#FFA500>{0}</color></size>s and crosshair auto-aligns.",
+  "infrared-gun-m416": "Aim at bullseye.\nHold firing stance for <size=40><color=#FFA500>{0}</color></size>s and crosshair auto-aligns.",
 
   "new-user-guider_tip_教程结束": "Congratulations on completing this novice tutorial. If you want \nto <color=#FFA500>know this tutorial</color> next time, please <color=#FFA500>see the novice guidance \nin the setup.</color>",
   "new-user-guider_tip_准心高亮": "Follow the instructions to \nhoot one arrow at the \ntarget, complete the manual \nadjustment, and return to \nthe connection page.",
@@ -661,7 +662,7 @@
   "ReManualSetup": "Re-Manual Setup",
   "ReManualSetup1": "Redo Manual\nCalibration",
   "AutoPositioningTip": "Calibrating...Please Wait.",
-
+  "CalibrationFailed": "AI Calibration failed\nPlease try Manual Calibration",
 
   "EnterMarker": "Start Screen Marking",
   "Marker": "Screen Marking",
@@ -703,22 +704,22 @@
   /**
    红外连接后游戏射击页面
   **/
-  //"TopTip_CrossHair": "Press the button on the device <sprite=0> to toggle the reticle adjustment interface (on/off). Please double-click with a one-second interval.",
-  "TopTip_CrossHair": "Press button <sprite=0>  once to disable crosshair.",
-  "TopTip_CrossHair2": "Press again <sprite=0> to enable crosshair.",
-  //"TopTip_CrossHairPro": "Press the button on the device to toggle the reticle adjustment interface (on/off). Please double-click with a one-second interval.",
-  "TopTip_CrossHairPro": "Press button once to disable crosshair.",
-  //"TopTip_CrossHairGunPro": "Remove the magazine and press the button on it to toggle the reticle adjustment interface (on/off). Please double-click with a one-second interval.",
-  "TopTip_CrossHairGunPro": "Remove magazine and press once to disable crosshair.",
+  //"TopTip_CrossHair": "Click the button on the device <sprite=0> to toggle the reticle adjustment interface (on/off). Please double-click with a one-second interval.",
+  "TopTip_CrossHair": "Click button <sprite=0>  once to disable crosshair.",
+  "TopTip_CrossHair2": "Click again <sprite=0> to enable crosshair.",
+  //"TopTip_CrossHairPro": "Click the button on the device to toggle the reticle adjustment interface (on/off). Please double-click with a one-second interval.",
+  "TopTip_CrossHairPro": "Click button once to disable crosshair.",
+  //"TopTip_CrossHairGunPro": "Remove the magazine and click the button on it to toggle the reticle adjustment interface (on/off). Please double-click with a one-second interval.",
+  "TopTip_CrossHairGunPro": "Remove magazine and click once to disable crosshair.",
   //Artemis Pro 和 Gun 共用
-  "TopTip_CrossHairGunPro2": "Press again to enable crosshair.",
+  "TopTip_CrossHairGunPro2": "Click again to enable crosshair.",
 
   //"TopTip_ARTEMISPro": "Double-click the button on the device, then adopt a standard archery stance, aiming the arrowhead at the bullseye. After {0} seconds, the reticle will automatically move to the bullseye, completing the calibration.",
-  "TopTip_ARTEMISPro": "Double-press to calibrate.",
+  "TopTip_ARTEMISPro": "Double-click to calibrate.",
   //"TopTip_GunPro": "Remove the magazine module and double-click the button on it to begin reticle calibration. After quickly reattaching the magazine, adopt a three-point shooting stance and aim at the bullseye. After {0} seconds, the reticle will automatically align with the bullseye, completing the calibration.",
-  "TopTip_GunPro": "Double-press to calibrate.",
-  //"TopTip": "Press and hold the button on the device <sprite=0>, maintain a standard archery stance, and aim the arrowhead at the bullseye. After {0} seconds, the reticle will automatically align with the bullseye, completing the calibration.",
-  "TopTip": "Long-press <sprite=0> to calibrate.",
+  "TopTip_GunPro": "Double-click to calibrate.",
+  //"TopTip": "Click and hold the button on the device <sprite=0>, maintain a standard archery stance, and aim the arrowhead at the bullseye. After {0} seconds, the reticle will automatically align with the bullseye, completing the calibration.",
+  "TopTip": "Long-click <sprite=0> to calibrate.",
 
   //"TopTip2": "The reticle has been calibrated. After hitting the bullseye, the system will automatically exit the calibration interface.",
   "TopTip2": "Tutorial completes after hitting target!",

+ 5 - 0
Assets/BowArrow/Scripts/Expand/AutoResetView.cs

@@ -216,6 +216,11 @@ public class AutoResetView : MonoBehaviour
                 Transform textInfrared = transform.Find("FrameTip/Text-Infrared-Gun");
                 textInfrared.gameObject.SetActive(true);
                 _guideTip = textInfrared.GetComponentInChildren<TextAutoLanguage2>();
+                //如果连接M416则替换文字
+                if (BluetoothAim.ins.isMainConnectToGunType().gunType == AimDeviceType.RifleM416)
+                {
+                   _guideTip.SetTextKey("infrared-gun-m416");
+                }
             }
                 else {
                 Transform textInfrared = transform.Find("FrameTip/Text-Infrared");

+ 6 - 0
Assets/BowArrow/Scripts/View/Home/DeviceViewInfrared.cs

@@ -131,6 +131,12 @@ public class DeviceViewInfrared : JCUnityLib.ViewBase, MenuBackInterface
                     if (!Connect1Parent.activeSelf) Connect1Parent.SetActive(true);
                     if (Connect2Parent.activeSelf) Connect2Parent.SetActive(false);
                 }
+
+                //如果不是红外设备,隐藏屏幕按钮
+                bool isInfraredDevices = selectDeviceViewItem.bInfraredDevices();
+                if (smartConnect2Buttons[0].gameObject.activeSelf != isInfraredDevices)
+                    smartConnect2Buttons[0].gameObject.SetActive(isInfraredDevices);
+
             }
             else {
                 if (!Connect1Parent.activeSelf) Connect1Parent.SetActive(true);

+ 10 - 17
Assets/BowArrow/Scripts/View/Home/DeviceView_ItemShow.cs

@@ -38,8 +38,6 @@ public class DeviceView_ItemShow : MonoBehaviour
     float countingTime1 = 5;
     BluetoothStatusEnum bowStatus;
 
-    [SerializeField] TextAutoLanguage2 _TextAutoLanguage2;
-
     //这个是处理设备下标
     [SerializeField] int deviceIndex = 0;
 
@@ -49,11 +47,13 @@ public class DeviceView_ItemShow : MonoBehaviour
     // bool bProcess = false;
 
 
-    [SerializeField] Text omitText;
+    private string omitText;
     private int dotCount = 0;
     private float interval = 0.5f; // 标点更新间隔
     private float timer = 0f;
 
+    [SerializeField] Text curConnectStatus;
+
     private void Awake()
     {
         AimHandler.ins.aimDeviceInfoChangeEvent += onShowDeviceInfo;
@@ -267,7 +267,7 @@ public class DeviceView_ItemShow : MonoBehaviour
         if (timer >= interval)
         {
             dotCount = (dotCount + 1) % 4; // 标点数量从 0 到 3 循环
-            omitText.text = new string('.', dotCount); // 添加相应数量的点
+            omitText = new string('.', dotCount); // 添加相应数量的点
             timer = 0f; // 重置计时器
         }
     }
@@ -276,7 +276,7 @@ public class DeviceView_ItemShow : MonoBehaviour
     public void StopLoading()
     {
         dotCount = 0;
-        omitText.text = ""; // 停止时恢复为基础文本
+        omitText = ""; // 停止时恢复为基础文本
     }
 
     void RequestBatteryForBow()
@@ -369,39 +369,32 @@ public class DeviceView_ItemShow : MonoBehaviour
     {
         if (bluetoothPlayer == BluetoothPlayer.FIRST_PLAYER)
         {
-
-            string name = BluetoothStatus.GetStatusTextKey(BluetoothAim.ins.status);
-            if (name != _TextAutoLanguage2.GetTextKey())
-                _TextAutoLanguage2.SetTextKey(name);
-
             if (BluetoothAim.ins.status == BluetoothStatusEnum.Connecting)
             {
-                omitText.gameObject.SetActive(true);
                 UpdateLoadingText();
             }
             else
             {
                 StopLoading();
             }
+            string name = BluetoothStatus.GetStatusTextKey(BluetoothAim.ins.status);
+            curConnectStatus.text = TextAutoLanguage2.GetTextByKey(name) + omitText;
+
         }
         else if (bluetoothPlayer == BluetoothPlayer.SECONDE_PLAYER)
         {
             SmartBowSDK.SmartBowHelper smartBowHelper = BluetoothAim.ins.getSmartBowHelper2P();
             if (smartBowHelper == null) return;
-            string name = BluetoothStatus.GetBLE2StatusTextKey(smartBowHelper.GetBluetoothStatus());
-            if (name != _TextAutoLanguage2.GetTextKey())
-                _TextAutoLanguage2.SetTextKey(name);
-
             if (smartBowHelper.GetBluetoothStatus() == SmartBowSDK.BluetoothStatusEnum.Connecting)
             {
-                omitText.gameObject.SetActive(true);
                 UpdateLoadingText();
             }
             else
             {
                 StopLoading();
             }
-
+            string name = BluetoothStatus.GetBLE2StatusTextKey(smartBowHelper.GetBluetoothStatus());
+            curConnectStatus.text = TextAutoLanguage2.GetTextByKey(name) + omitText;
         }
 
     }

+ 1 - 1
Assets/BowArrow/Scripts/View/PKGameSettleView.cs

@@ -30,7 +30,7 @@ public class PKGameSettleView : MonoBehaviour
                 TextEllipsis.SetTextWithEllipsis(transform.Find("Name" + i).GetComponent<Text>(), nickName);
             }
             this.transform.Find("Win" + i).gameObject.SetActive(results[i - 1] == "胜利");
-            this.transform.Find("Fail" + i).gameObject.SetActive(results[i - 1] == "失败");
+            //this.transform.Find("Fail" + i).gameObject.SetActive(results[i - 1] == "失败");
             if (GlobalData.pkMatchType == PKMatchType.LocalPK) {
                 this.transform.Find("Score" + i + "/Text").GetComponent<Text>().text = ((PKGameMode)gameMode).totalScores[i - 1].ToString();
             } else if (GlobalData.pkMatchType == PKMatchType.OnlinePK) {

+ 215 - 2
Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/InfraredScreenPositioningView.prefab

@@ -3508,6 +3508,8 @@ MonoBehaviour:
   AutoEndConfirmBtn: {fileID: 7414640327676729118}
   TipAutoEnd: {fileID: 1325068315848368893}
   TipAutoEndHas: {fileID: 2845380691329673789}
+  TipCalibrationFailedIphone: {fileID: 2735675795741493569}
+  TipCalibrationFailedIpad: {fileID: 4232547595077920875}
   LayoutLightCtrl: {fileID: 6619217424693250322}
   sliderContrast: {fileID: 445937460444285362}
   sliderBrightness: {fileID: 236129132674385549}
@@ -3528,6 +3530,7 @@ MonoBehaviour:
   markerPointsLine: {fileID: 2894555110740189758}
   pointMarker: {fileID: 3538024524113724305}
   LayoutManual: {fileID: 197752899219209777}
+  manualLine: {fileID: 0}
   LayoutSuccessful: {fileID: 1975716043050077061}
   ResultLines:
   - {fileID: 21300000, guid: e49f5f7319cc1c14aa7b815786b5f70a, type: 3}
@@ -4471,7 +4474,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 8668745481116252073}
   m_Father: {fileID: 7412197821328202880}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4527,6 +4531,7 @@ MonoBehaviour:
   arrowWidth: 60
   arrowHeadHeight: 70
   arrowDis: 120
+  antiAliasValue: 2
 --- !u!1 &1280175986336066943
 GameObject:
   m_ObjectHideFlags: 0
@@ -7410,6 +7415,7 @@ MonoBehaviour:
   fanColor: {r: 1, g: 1, b: 1, a: 1}
   fanSegments: 20
   fanOuterRadius: 150
+  antiAliasValue: 2
   _points: []
 --- !u!1 &2238504720722144021
 GameObject:
@@ -8132,7 +8138,106 @@ MonoBehaviour:
   fanColor: {r: 1, g: 1, b: 1, a: 1}
   fanSegments: 20
   fanOuterRadius: 40
+  antiAliasValue: 2
   _points: []
+--- !u!1 &2735675795741493569
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7866051644154511076}
+  - component: {fileID: 5749869825478650077}
+  - component: {fileID: 5173619570832504405}
+  - component: {fileID: 2342591689591830775}
+  m_Layer: 11
+  m_Name: FailTip1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7866051644154511076
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2735675795741493569}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2112691052271887221}
+  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: 3.25, y: -51.40683}
+  m_SizeDelta: {x: 1560.7488, y: 950.9005}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5749869825478650077
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2735675795741493569}
+  m_CullTransparentMesh: 1
+--- !u!114 &5173619570832504405
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2735675795741493569}
+  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: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 0
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
+    m_FontSize: 89
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 4
+    m_MaxSize: 97
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 'AI Calibration failed
+
+    Please try Manual Calibration'
+--- !u!114 &2342591689591830775
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2735675795741493569}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: CalibrationFailed
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &2757443893517646438
 GameObject:
   m_ObjectHideFlags: 0
@@ -10371,6 +10476,7 @@ MonoBehaviour:
   fanColor: {r: 1, g: 1, b: 1, a: 1}
   fanSegments: 20
   fanOuterRadius: 150
+  antiAliasValue: 2
   _points: []
 --- !u!1 &3465547412657623470
 GameObject:
@@ -10725,6 +10831,7 @@ MonoBehaviour:
   fanColor: {r: 1, g: 1, b: 1, a: 1}
   fanSegments: 20
   fanOuterRadius: 150
+  antiAliasValue: 2
   _points: []
 --- !u!1 &3614563988931576643
 GameObject:
@@ -10887,6 +10994,7 @@ MonoBehaviour:
   arrowWidth: 50
   arrowHeadHeight: 30
   arrowDis: 100
+  antiAliasValue: 2
 --- !u!1 &3632382463857017291
 GameObject:
   m_ObjectHideFlags: 0
@@ -12623,6 +12731,104 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!1 &4232547595077920875
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8668745481116252073}
+  - component: {fileID: 6406247964290819347}
+  - component: {fileID: 8851341234563874488}
+  - component: {fileID: 4833250043857119527}
+  m_Layer: 11
+  m_Name: FailTip2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8668745481116252073
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4232547595077920875}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4440664473046411990}
+  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: 13.6201, y: -190.68227}
+  m_SizeDelta: {x: 1622.97, y: 1229.4515}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6406247964290819347
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4232547595077920875}
+  m_CullTransparentMesh: 1
+--- !u!114 &8851341234563874488
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4232547595077920875}
+  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: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 0
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
+    m_FontSize: 89
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 4
+    m_MaxSize: 97
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 'Al Calibration failed
+
+    Please try Manual Calibration'
+--- !u!114 &4833250043857119527
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4232547595077920875}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: CalibrationFailed
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &4255960308957596623
 GameObject:
   m_ObjectHideFlags: 0
@@ -13304,7 +13510,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 7866051644154511076}
   m_Father: {fileID: 7412197821328202880}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -13360,6 +13567,7 @@ MonoBehaviour:
   arrowWidth: 60
   arrowHeadHeight: 70
   arrowDis: 120
+  antiAliasValue: 2
 --- !u!1 &4563568723462213445
 GameObject:
   m_ObjectHideFlags: 0
@@ -14626,6 +14834,7 @@ MonoBehaviour:
   arrowWidth: 50
   arrowHeadHeight: 30
   arrowDis: 100
+  antiAliasValue: 2
 --- !u!1 &5236471070643478924
 GameObject:
   m_ObjectHideFlags: 0
@@ -14962,6 +15171,7 @@ MonoBehaviour:
   arrowWidth: 50
   arrowHeadHeight: 30
   arrowDis: 100
+  antiAliasValue: 2
 --- !u!1 &5505594364145592592
 GameObject:
   m_ObjectHideFlags: 0
@@ -15737,6 +15947,7 @@ MonoBehaviour:
   fanColor: {r: 1, g: 1, b: 1, a: 1}
   fanSegments: 20
   fanOuterRadius: 150
+  antiAliasValue: 2
   _points: []
 --- !u!1 &5650919276052501654
 GameObject:
@@ -22763,6 +22974,7 @@ MonoBehaviour:
   fanColor: {r: 1, g: 1, b: 1, a: 1}
   fanSegments: 20
   fanOuterRadius: 150
+  antiAliasValue: 2
   _points: []
 --- !u!1 &8427933407996438405
 GameObject:
@@ -23428,6 +23640,7 @@ MonoBehaviour:
   arrowWidth: 50
   arrowHeadHeight: 30
   arrowDis: 100
+  antiAliasValue: 2
 --- !u!1 &8846757062284942991
 GameObject:
   m_ObjectHideFlags: 0

+ 15 - 0
Assets/SmartBow/Scripts/Views/InfraredViewParts/InfraredScreenPositioningView.cs

@@ -121,6 +121,12 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
     [Tooltip("存在校准数据时候显示")]
     [SerializeField]
     GameObject TipAutoEndHas;
+    [Tooltip("没有存在校准数据时候显示 iphone 提示失败")]
+    [SerializeField]
+    GameObject TipCalibrationFailedIphone;
+    [Tooltip("没有存在校准数据时候显示 ipad 提示失败")]
+    [SerializeField]
+    GameObject TipCalibrationFailedIpad;
 
     [Header("LightCtrl Layout Group")]
     [SerializeField]
@@ -501,6 +507,10 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
     {
         curStepView = step;
         AllScreenPositioningStepFalse();
+
+        TipCalibrationFailedIphone.SetActive(false);
+        TipCalibrationFailedIpad.SetActive(false);
+
         QuadrilateralInCamera screenAuto = ScreenLocate.Main.ScreenIdentification.QuadAuto;
         switch (step)
         {
@@ -522,6 +532,11 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
                     AutoEndConfirmBtn.interactable = false;
                     //TipAutoEndHas.SetActive(false);
                     //TipAutoEnd.SetActive(true);
+                    if (DeviceTypeHelper.DetectDeviceType() == DeviceTypeHelper.DeviceType.iPhone) {
+                        TipCalibrationFailedIphone.SetActive(true);
+                    } else {
+                        TipCalibrationFailedIpad.SetActive(true);
+                    }
                 }
                 else
                 {

+ 5 - 4
ProjectSettings/ProjectSettings.asset

@@ -9,7 +9,7 @@ PlayerSettings:
   AndroidFilterTouchesWhenObscured: 0
   AndroidEnableSustainedPerformanceMode: 0
   defaultScreenOrientation: 4
-  targetDevice: 1
+  targetDevice: 2
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: JssF
@@ -137,8 +137,9 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 2.1.6
-  preloadedAssets: []
+  bundleVersion: 2.3.1
+  preloadedAssets:
+  - {fileID: 11400000, guid: 8ecb9c5da30ac7d4db9243c684f470ea, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -160,7 +161,7 @@ PlayerSettings:
   applicationIdentifier:
     Android: com.xmjssvr.BowArrow.mi
     Standalone: com.JssF.BowArrow
-    iPhone: com.xmjssvr.PadBowArrowEn
+    iPhone: com.xmjssvr.BowArrow
   buildNumber:
     Bratwurst: 0
     Standalone: 0