ソースを参照

2022-11-13修改

lvjincheng 3 年 前
コミット
be45bde79d

+ 1 - 1
Assets/BowArrow/Resources/Prefabs/Views/ChallengeOptionView.prefab

@@ -914,7 +914,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5173\u5361\u9009\u62E9"
+  m_Text: "\u6E38\u620F\u6A21\u5F0F"
 --- !u!114 &4507770290359092602
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 15 - 15
Assets/BowArrow/Resources/Prefabs/Views/DeviceView 1.prefab

@@ -912,7 +912,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 200, y: 435}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &5503306405124738963
 MonoBehaviour:
@@ -988,9 +988,9 @@ RectTransform:
   m_Father: {fileID: 2387945470651067040}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 100, y: -372.5}
   m_SizeDelta: {x: 200, y: 125}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6147133747908002619
@@ -1504,7 +1504,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8433476829696237043
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1863,9 +1863,9 @@ RectTransform:
   m_Father: {fileID: 2387945470651067040}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 100, y: -217.5}
   m_SizeDelta: {x: 200, y: 125}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4845271796129735070
@@ -1968,7 +1968,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8677266361091138002
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2501,7 +2501,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: 105.6, y: 0}
+  m_AnchoredPosition: {x: 113.49118, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &8677266362387219396
@@ -2722,9 +2722,9 @@ RectTransform:
   m_Father: {fileID: 2387945470651067040}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 100, y: -62.5}
   m_SizeDelta: {x: 200, y: 125}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4334228089628417680
@@ -3186,7 +3186,7 @@ RectTransform:
   m_GameObject: {fileID: 8677266362914771145}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.279375, y: 1.279375, z: 1.279375}
+  m_LocalScale: {x: 1.0532326, y: 1.0532326, z: 1.0532326}
   m_Children: []
   m_Father: {fileID: 8677266362471276963}
   m_RootOrder: 0
@@ -3264,7 +3264,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8677266362960937004
 RectTransform:
   m_ObjectHideFlags: 0

+ 359 - 98
Assets/BowArrow/Resources/Prefabs/Views/TimeLimitGameDistanceSelectView.prefab

@@ -1,5 +1,118 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2069632762097573699
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4156393725614079617}
+  m_Layer: 0
+  m_Name: Back
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4156393725614079617
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2069632762097573699}
+  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:
+  - {fileID: 7568640701499087496}
+  - {fileID: 2537209794954315393}
+  - {fileID: 8287844008489535366}
+  m_Father: {fileID: 4426387084030329090}
+  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: 30, y: -30}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0, y: 1}
+--- !u!1 &3711277416404858385
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7568640701499087496}
+  - component: {fileID: 2740988150838642141}
+  - component: {fileID: 5248861304619327172}
+  m_Layer: 0
+  m_Name: InfoBG
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7568640701499087496
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3711277416404858385}
+  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: 4156393725614079617}
+  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: 179.99997, y: 0}
+  m_SizeDelta: {x: 367, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2740988150838642141
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3711277416404858385}
+  m_CullTransparentMesh: 0
+--- !u!114 &5248861304619327172
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3711277416404858385}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: bcb0fbe2a329f444ebca11b69f3f91d6, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &4426387082750964904
 GameObject:
   m_ObjectHideFlags: 0
@@ -121,102 +234,6 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!1 &4426387083081045269
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4426387083081045270}
-  - component: {fileID: 4426387083081045272}
-  - component: {fileID: 4426387083081045271}
-  - component: {fileID: 6390827713609550317}
-  m_Layer: 5
-  m_Name: Title
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4426387083081045270
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4426387083081045269}
-  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: 4426387084030329090}
-  m_RootOrder: 1
-  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, y: 180}
-  m_SizeDelta: {x: 600, y: 80}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4426387083081045272
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4426387083081045269}
-  m_CullTransparentMesh: 1
---- !u!114 &4426387083081045271
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4426387083081045269}
-  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: 40
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u8DDD\u79BB\u9009\u62E9"
---- !u!114 &6390827713609550317
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4426387083081045269}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b7cbfcb0916cf694fb3d059ea4b4c1da, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  textID: 94
-  layoutRebuildObject: {fileID: 0}
-  textFormatArgs: []
-  languageFontSizes: []
 --- !u!1 &4426387083872469790
 GameObject:
   m_ObjectHideFlags: 0
@@ -252,7 +269,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, y: -40}
+  m_AnchoredPosition: {x: 0, y: -30}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4426387083872469761
@@ -422,7 +439,7 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 4426387084049413463}
-  - {fileID: 4426387083081045270}
+  - {fileID: 4156393725614079617}
   - {fileID: 4426387083872469791}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -580,3 +597,247 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7260632375364358149
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8287844008489535366}
+  - component: {fileID: 899195221187979256}
+  - component: {fileID: 5748625008090463221}
+  - component: {fileID: 1882705026472316452}
+  m_Layer: 0
+  m_Name: Btn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8287844008489535366
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7260632375364358149}
+  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: 4156393725614079617}
+  m_RootOrder: 2
+  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, y: 0}
+  m_SizeDelta: {x: 98, y: 98}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &899195221187979256
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7260632375364358149}
+  m_CullTransparentMesh: 0
+--- !u!114 &5748625008090463221
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7260632375364358149}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: bcd1b5d74da7b224e94a39017ebd24fe, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1882705026472316452
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7260632375364358149}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 5748625008090463221}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 4426387084030329091}
+        m_TargetAssemblyTypeName: TimeLimitGameDistanceSelectView, Assembly-CSharp
+        m_MethodName: OnClick_Back
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!1 &7552867224609581139
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2537209794954315393}
+  - component: {fileID: 5021938272100004693}
+  - component: {fileID: 4943346643354803528}
+  - component: {fileID: 1126573168378024425}
+  - component: {fileID: 9005125317984948489}
+  m_Layer: 0
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2537209794954315393
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7552867224609581139}
+  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: 4156393725614079617}
+  m_RootOrder: 1
+  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: 60, y: -1.699997}
+  m_SizeDelta: {x: 300, y: 40}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &5021938272100004693
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7552867224609581139}
+  m_CullTransparentMesh: 0
+--- !u!114 &4943346643354803528
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7552867224609581139}
+  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: 28
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9009\u62E9\u8DDD\u79BB"
+--- !u!114 &1126573168378024425
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7552867224609581139}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.3339622, g: 0.5847058, b: 1, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!114 &9005125317984948489
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7552867224609581139}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7cbfcb0916cf694fb3d059ea4b4c1da, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textID: 94
+  layoutRebuildObject: {fileID: 0}
+  textFormatArgs: []
+  languageFontSizes: []

+ 366 - 8
Assets/BowArrow/Scenes/GameChallengeScene/GameChallenge.unity

@@ -12441,6 +12441,81 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 586061235}
   m_CullTransparentMesh: 0
+--- !u!1 &588728368
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 588728369}
+  - component: {fileID: 588728371}
+  - component: {fileID: 588728370}
+  m_Layer: 0
+  m_Name: InfoBG
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &588728369
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 588728368}
+  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: 1956523008}
+  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: 179.99997, y: 0}
+  m_SizeDelta: {x: 367, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &588728370
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 588728368}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: bcb0fbe2a329f444ebca11b69f3f91d6, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &588728371
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 588728368}
+  m_CullTransparentMesh: 0
 --- !u!1 &589011793
 GameObject:
   m_ObjectHideFlags: 0
@@ -12958,6 +13033,138 @@ MeshCollider:
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: 4300000, guid: 4637b89c6b089924c8505ce875d04ba5, type: 3}
+--- !u!1 &607591399
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 607591400}
+  - component: {fileID: 607591403}
+  - component: {fileID: 607591402}
+  - component: {fileID: 607591401}
+  m_Layer: 0
+  m_Name: Btn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &607591400
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 607591399}
+  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: 1956523008}
+  m_RootOrder: 2
+  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, y: 0}
+  m_SizeDelta: {x: 98, y: 98}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &607591401
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 607591399}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 607591402}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1746986226}
+        m_TargetAssemblyTypeName: HuntGameSelectLevelView, Assembly-CSharp
+        m_MethodName: OnClick_Back
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!114 &607591402
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 607591399}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: bcd1b5d74da7b224e94a39017ebd24fe, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &607591403
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 607591399}
+  m_CullTransparentMesh: 0
 --- !u!1001 &609238264
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -13056,7 +13263,7 @@ RectTransform:
   - {fileID: 1596179122}
   - {fileID: 589011794}
   m_Father: {fileID: 1746986225}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -13243,7 +13450,7 @@ RectTransform:
   - {fileID: 431906705}
   - {fileID: 502703924}
   m_Father: {fileID: 1746986225}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -18248,7 +18455,7 @@ RectTransform:
   - {fileID: 1899385001}
   - {fileID: 821824368}
   m_Father: {fileID: 1746986225}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -23302,7 +23509,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: 30, y: 0}
+  m_AnchoredPosition: {x: 28.947369, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1047161075
@@ -26796,7 +27003,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: 30, y: 0}
+  m_AnchoredPosition: {x: 28.947369, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1203594963
@@ -29267,7 +29474,7 @@ RectTransform:
   - {fileID: 1979882722}
   - {fileID: 1624522139}
   m_Father: {fileID: 1746986225}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -38733,6 +38940,7 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 940116533}
+  - {fileID: 1956523008}
   - {fileID: 616316266}
   - {fileID: 1916180771}
   - {fileID: 1310389974}
@@ -42647,7 +42855,7 @@ RectTransform:
   - {fileID: 929600158}
   - {fileID: 684274214}
   m_Father: {fileID: 1746986225}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -43721,6 +43929,44 @@ MeshCollider:
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: 4300000, guid: c1b942116a63fd744ac45f76e99363e4, type: 3}
+--- !u!1 &1956523007
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1956523008}
+  m_Layer: 0
+  m_Name: Back
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1956523008
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1956523007}
+  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:
+  - {fileID: 588728369}
+  - {fileID: 2061808085}
+  - {fileID: 607591400}
+  m_Father: {fileID: 1746986225}
+  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: 30, y: -30}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0, y: 1}
 --- !u!1001 &1959858821
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -45679,6 +45925,118 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2057778720}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &2061808084
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2061808085}
+  - component: {fileID: 2061808089}
+  - component: {fileID: 2061808088}
+  - component: {fileID: 2061808087}
+  - component: {fileID: 2061808086}
+  m_Layer: 0
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2061808085
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2061808084}
+  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: 1956523008}
+  m_RootOrder: 1
+  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: 60, y: -1.699997}
+  m_SizeDelta: {x: 300, y: 40}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!114 &2061808086
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2061808084}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7cbfcb0916cf694fb3d059ea4b4c1da, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textID: 401
+  layoutRebuildObject: {fileID: 0}
+  textFormatArgs: []
+  languageFontSizes: []
+--- !u!114 &2061808087
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2061808084}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.3339622, g: 0.5847058, b: 1, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!114 &2061808088
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2061808084}
+  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: 28
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9009\u62E9\u5173\u5361"
+--- !u!222 &2061808089
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2061808084}
+  m_CullTransparentMesh: 0
 --- !u!1 &2068500569
 GameObject:
   m_ObjectHideFlags: 0
@@ -47583,7 +47941,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: 50, y: 0}
+  m_AnchoredPosition: {x: 47.894737, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2142579590

+ 9 - 9
Assets/BowArrow/Scenes/Login.unity

@@ -3249,7 +3249,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 346.59082, y: -168.50002}
-  m_SizeDelta: {x: 150, y: 30}
+  m_SizeDelta: {x: 150, y: 40}
   m_Pivot: {x: 1, y: 1}
 --- !u!114 &306981415
 MonoBehaviour:
@@ -3353,7 +3353,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
-    m_FontSize: 20
+    m_FontSize: 26
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -3840,7 +3840,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: 35.90244, y: 0}
+  m_AnchoredPosition: {x: 35.93583, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &355551584
@@ -6207,7 +6207,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: 116.95122, y: 0}
+  m_AnchoredPosition: {x: 115.85562, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &750604318
@@ -11209,7 +11209,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: 250.7317, y: 0}
+  m_AnchoredPosition: {x: 247.91446, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1549087752
@@ -11747,7 +11747,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: 377.80487, y: 0}
+  m_AnchoredPosition: {x: 373.4225, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1628073323
@@ -13650,7 +13650,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1831635681
 RectTransform:
   m_ObjectHideFlags: 0
@@ -13881,7 +13881,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: 115.51219, y: 0}
+  m_AnchoredPosition: {x: 115.508026, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1847328316
@@ -14367,7 +14367,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: 314.26828, y: 0}
+  m_AnchoredPosition: {x: 310.6685, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1900702359

+ 23 - 21
Assets/BowArrow/Scripts/Components/TextAutoLanguage.cs

@@ -133,11 +133,11 @@ class LanguageDefault {
     public string text21 = "教程";
     public string text22 = "商城";
     public string text23 = "设备";
-    public string text24 = "用 户 名 :";
+    public string text24 = "账 号 :";
     public string text25 = "密 码 :";
     public string text26 = "忘记密码";
     public string text27 = "新用户注册";
-    public string text28 = "用 户 名 :";
+    public string text28 = "账 号 :";
     public string text29 = "密 码 :";
     public string text30 = "确认密码 :";
     public string text31 = "昵 称 :";
@@ -148,14 +148,14 @@ class LanguageDefault {
     public string text36 = "新 密 码 :";
     public string text37 = "确认密码 :";
     public string text38 = "获取";
-    public string text39 = "用户名";
+    public string text39 = "账号";
     public string text40 = "手机号";
-    public string text41 = "请输入用户名";
+    public string text41 = "请输入账号";
     public string text42 = "请输入密码";
     public string text43 = "登录成功";
     public string text44 = "密码错误";
     public string text45 = "该用户尚未注册";
-    public string text46 = "用户名长度至少6位";
+    public string text46 = "账号长度至少6位";
     public string text47 = "密码长度至少6位";
     public string text48 = "两次输入的密码不一致";
     public string text49 = "请输入游戏昵称";
@@ -182,7 +182,7 @@ class LanguageDefault {
     public string text91 = "再来";
     public string text92 = "友谊赛";
     public string text93 = "当前玩家";
-    public string text94 = "距离选择";
+    public string text94 = "选择距离";
     public string text95 = "得分:";
     public string text96 = "新手教程";
     public string text97 = "返回主页";
@@ -208,8 +208,8 @@ class LanguageDefault {
     public string text118 = "靶子已超出当前射程,请加大拉距或去商城装备射速卡!";
     public string text119 = "长度{0}~{1}位,可使用中文";
     //设备页面
-    public string text500 = "陀螺仪校准";
-    public string text501 = "地磁计校准";
+    public string text500 = "陀螺仪初始化";
+    public string text501 = "地磁计初始化";
     public string text502 = "视角回正";
     public string text503 = "16G加速计";
     public string text504 = "64G加速计";
@@ -229,8 +229,9 @@ class LanguageDefault {
     public string text132 = "PK模式";
     public string text130 = "静止靶PK";
     public string text131 = "闯关PK";
+    public string text401 = "选择关卡";
     //关卡选择
-    public string text134 = "关卡选择";
+    public string text134 = "游戏模式";
     public string text135 = "野兔关卡";
     public string text136 = "野鸡关卡";
     public string text137 = "野狼关卡";
@@ -263,14 +264,14 @@ class LanguageDefault {
     public string text79 = "完成";
     public string text80 = "视角回正";
     public string text81 = "实体弓指向正前方,然后点击视角回正。";
-    public string text82 = "开始校准";
-    public string text83 = "停止校准";
+    public string text82 = "开始初始化";
+    public string text83 = "停止初始化";
     public string text84 = "尽量尝试多角度旋转模块,直到XYZ三个象限中多点形成圆形为止。";
-    public string text85 = "开始校准";
+    public string text85 = "开始初始化";
     public string text86 = "校准时需要将瞄准模块静止放在桌面上。";
-    public string text116 = "重新校准";
+    public string text116 = "重新初始化";
     public string text120 = "校准效果不理想,请重新校准!";
-    public string text121 = "取消校准";
+    public string text121 = "取消初始化";
     //游戏场景通用UI信息
     public string text200 = "引导";
     public string text201 = "开镜";
@@ -336,11 +337,11 @@ class LanguageEnglish : LanguageDefault {
     public new string text21 = "Course";
     public new string text22 = "Shop";
     public new string text23 = "Device";
-    public new string text24 = "Username:";
+    public new string text24 = "Account:";
     public new string text25 = "Password:";
     public new string text26 = "Forget Password";
     public new string text27 = "New User Register";
-    public new string text28 = "Username :";
+    public new string text28 = "Account :";
     public new string text29 = "Password :";
     public new string text30 = "Confirm    Password :";
     public new string text31 = "Nickname :";
@@ -351,14 +352,14 @@ class LanguageEnglish : LanguageDefault {
     public new string text36 = "Password :";
     public new string text37 = "Confirm  Password :";
     public new string text38 = "Get";
-    public new string text39 = "User Name";
+    public new string text39 = "Account";
     public new string text40 = "Phone Number";
-    public new string text41 = "Please Enter Username";
+    public new string text41 = "Please Enter Account";
     public new string text42 = "Please Enter Password";
     public new string text43 = "Login Successful";
     public new string text44 = "Wrong Password";
     public new string text45 = "User Not Register";
-    public new string text46 = "Username At Least 6 Digits";
+    public new string text46 = "Account At Least 6 Digits";
     public new string text47 = "Password At Least 6 Digits";
     public new string text48 = "Two Passwords Are Inconsistent";
     public new string text49 = "Please Enter Nickname";
@@ -411,8 +412,8 @@ class LanguageEnglish : LanguageDefault {
     public new string text118 = "The target has exceeded the current range, please increase the pull distance or go to the shop to equip the shoot card!";
     public new string text119 = "Limit {0}~{1} Bit, Can Use Chinese";
     //设备页面
-    public new string text500 = "GyrCalibrate";
-    public new string text501 = "MagCalibrate";
+    public new string text500 = "Gyr Init";
+    public new string text501 = "Mag Init";
     public new string text502 = "ResetView";
     public new string text503 = "16G Acc";
     public new string text504 = "64G Acc";
@@ -432,6 +433,7 @@ class LanguageEnglish : LanguageDefault {
     public new string text132 = "Dart Game";
     public new string text130 = "TARGET";
     public new string text131 = "HUNTING";
+    public new string text401 = "Select Level";
     //关卡选择
     public new string text134 = "Hunting";
     public new string text135 = "Hare";

+ 11 - 10
Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/cn.json

@@ -5,7 +5,7 @@
     "common_reject": "拒绝",
     "common_add": "添加",
     "common_del": "删除",
-    "login_placeholder_user": "请输入您的用户名",
+    "login_placeholder_user": "请输入您的账号",
     "login_placeholder_password": "请输入您的密码",
     "login_placeholder_graphicCode": "请输入图形验证码",
     "login_placeholder_phone": "请输入您的手机号",
@@ -28,16 +28,17 @@
     "course_title_11": "结束动作",
     "course_btn_see": "查看",
     
-    "device-calibrate_gyr-tip": "将安装了模块的智能弓箭静置在一个平面上,\n再点击陀螺仪校准。",
-    "device-calibrate_mag-tip": "将安装了模块的智能弓箭沿着不同方向持续翻转,\n直到提示校准完成为止。",
-    "device-calibrate_mag-ok": "地磁计校准已完成",
+    "device-calibrate_gyr-tip": "将安装了模块的智能弓箭静置在一个平面上,\n再点击陀螺仪初始化。",
+    "device-calibrate_mag-tip": "将安装了模块的智能弓箭沿着不同方向持续翻转,\n直到提示初始化完成为止。",
+    "device-calibrate_mag-ok": "地磁计初始化已完成",
+    "device-calibrate_n-connect": "请先连接模块",
 
     "new-user-guider_btn_skip": "跳过教程",
     "new-user-guider_tip_模块开机": "长按模块上的<color=#FFA500>“开机”</color>键,当绿灯闪\n烁时,即模块处于等待连接的状态。",
     "new-user-guider_tip_连接设备": "点击<color=#FFA500>“连接”</color>等待设备提示连接成功,\n此时模块是绿灯常亮的状态。",
-    "new-user-guider_tip_弓箭详情": "点击<color=#FFA500>弓箭</color>,进入设备界面进行模块校准。",
-    "new-user-guider_tip_设备-陀螺仪校准": "将安装了模块的智能弓箭<color=#FFA500>静置在一个平面上</color>,\n再点击陀螺仪校准。",
-    "new-user-guider_tip_设备-地磁计校准": "将安装了模块的智能弓箭<color=#FFA500>沿着不同方向持续翻转</color>,\n直到提示校准完成为止。",
+    "new-user-guider_tip_弓箭详情": "点击<color=#FFA500>弓箭</color>,进入设备界面进行模块初始化。",
+    "new-user-guider_tip_设备-陀螺仪校准": "将安装了模块的智能弓箭<color=#FFA500>静置在一个平面上</color>,\n再点击陀螺仪初始化。",
+    "new-user-guider_tip_设备-地磁计校准": "将安装了模块的智能弓箭<color=#FFA500>沿着不同方向持续翻转</color>,\n直到提示初始化完成为止。",
     "new-user-guider_tip_查看设置": "点击<color=#FFA500>设置</color>了解更多",
     "new-user-guider_tip_查看商城": "点击查看<color=#FFA500>商城</color>",
     "new-user-guider_tip_切换好友/排行榜": "点击切换<color=#FFA500>好友/排行榜</color>",
@@ -119,12 +120,12 @@
     "tip_pk_friend-invite-join": "好友邀请你参加",
     "tip_pk_invite-try-again": "对方邀请你再来一次",
     "tip_mag-calibrate-variance-equal": "地磁校准方差 = ",
-    "tip_mag-calibrate_success": "地磁计校准成功",
-    "tip_mag-calibrate_please-leave-interfere": "存在磁场干扰,请远离电子设备后再进行校准!",
+    "tip_mag-calibrate_success": "地磁计初始化成功",
+    "tip_mag-calibrate_please-leave-interfere": "存在磁场干扰,请远离电子设备后再进行初始化!",
     "tip_phone-menu-back_quit-app": "再按一次退出APP",
     "about-us_content": "<color=#FFFFFF00>缩进</color>青凤鸾是一个技能运动智能硬件品牌。产品包含智能弓箭、智能射击、智能滑雪、智能高尔夫等。青凤鸾希望通过创新的智能硬件,让技能运动变得触手可及。并在疫情的大环境下,让人们的室内运动生活更加丰富有趣。",
     "ble-please-open-ble": "请求蓝牙失败,可能原因:\n1.未打开手机蓝牙\n2.未授予蓝牙定位权限",
 
-    "MagInterferenceTip_content": "由于地磁计校准易受到周围环境的影响,因此在校准过程中请按照以下步骤来做:\n1、请在校正过程中,保持周围环境的稳定,远离金属物体和磁场干扰。\n2、请保持智能弓箭模块和手机、电视等电子设备0.5米以上的距离。\n3、请将安装了模块的智能弓箭沿着XYZ三轴进行充分地旋转,直到提示校准完成为止。\n4、如多次无法完成校正,也可继续使用,只是瞄准的精度会受到影响,游戏中需多做一次视角归位的操作。",
+    "MagInterferenceTip_content": "由于地磁计初始化易受到周围环境的影响,因此在初始化过程中请按照以下步骤来做:\n1、请在初始化过程中,保持周围环境的稳定,远离金属物体和磁场干扰。\n2、请保持智能弓箭模块和手机、电视等电子设备0.5米以上的距离。\n3、请将安装了模块的智能弓箭或单独模块沿着XYZ三轴进行充分地旋转,直到提示完成为止。\n4、如多次无法完成初始化,也可继续使用,只是瞄准的精度会受到影响,游戏中需多做一次视角归位的操作。",
     "MagInterferenceTip_ok": "确定"
 }

+ 12 - 11
Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/en.json

@@ -28,16 +28,17 @@
     "course_title_11": "Finish up job",
     "course_btn_see": "see",
 
-    "device-calibrate_gyr-tip": "Place the smart bow with the module installed \non a plane, and then click Gyr Calibration.",
-    "device-calibrate_mag-tip": "Turn the smart bow and arrow with the module \ninstalled in different directions until it prompts \nthat the calibration is completed.",
-    "device-calibrate_mag-ok": "Mag calibration completed",
+    "device-calibrate_gyr-tip": "Place the smart bow with the module installed \non a plane, and then click Gyr Init.",
+    "device-calibrate_mag-tip": "Turn the smart bow and arrow with the module \ninstalled in different directions until it prompts \nthat the initialization is completed.",
+    "device-calibrate_mag-ok": "Mag init completed",
+    "device-calibrate_n-connect": "Please connect the module first",
     
     "new-user-guider_btn_skip": "Skip Tutorial",
     "new-user-guider_tip_模块开机": "Press and hold the <color=#FFA500>\"Power on\"</color> \nkey on the module, and when \nthe green light flashes, the \nmodule is in the state of \nwaiting for connection.",
     "new-user-guider_tip_连接设备": "Click <color=#FFA500>\"Connect\"</color> and wait for the device \nto prompt that the connection is \nsuccessful. At this time, the module \nis in the green state.",
-    "new-user-guider_tip_弓箭详情": "Click the <color=#FFA500>arrow</color> to enter the device \ninterface for module calibration.",
-    "new-user-guider_tip_设备-陀螺仪校准": "Place the smart bow with the module <color=#FFA500>installed \non a plane</color>, and then click GyrCalibrate.",
-    "new-user-guider_tip_设备-地磁计校准": "Turn the smart bow and arrow with the module \n<color=#FFA500>installed in different directions</color> until it prompts \nthat the calibration is completed.",
+    "new-user-guider_tip_弓箭详情": "Click the <color=#FFA500>arrow</color> to enter the device \ninterface for module initialization.",
+    "new-user-guider_tip_设备-陀螺仪校准": "Place the smart bow with the module <color=#FFA500>installed \non a plane</color>, and then click Gyr Init.",
+    "new-user-guider_tip_设备-地磁计校准": "Turn the smart bow and arrow with the module \n<color=#FFA500>installed in different directions</color> until it prompts \nthat the initialization is completed.",
     "new-user-guider_tip_查看设置": "Click <color=#FFA500>SetUp</color> to learn more",
     "new-user-guider_tip_查看商城": "Click to view the <color=#FFA500>Shop</color>",
     "new-user-guider_tip_切换好友/排行榜": "Click to switch <color=#FFA500>friend/rand</color>",
@@ -119,27 +120,27 @@
     "tip_pk_friend-invite-join": "Friend Invite ",
     "tip_pk_invite-try-again": "Invite Again ",
     "tip_mag-calibrate-variance-equal": "Mag Calibrate Variance = ",
-    "tip_mag-calibrate_success": "Mag Calibrate Success",
-    "tip_mag-calibrate_please-leave-interfere": "Magnetic field interference exists, please keep away from electronic equipment before calibration!",
+    "tip_mag-calibrate_success": "Mag Init Success",
+    "tip_mag-calibrate_please-leave-interfere": "Magnetic field interference exists, please keep away from electronic equipment before initialization!",
     "tip_phone-menu-back_quit-app": "Press again to exit the app",
     "about-us_content": "Qingfengluan is a skill sports intelligent hardware brand. Products include intelligent bow and arrow, intelligent shooting, intelligent skiing, intelligent golf, etc. Qingfengluan hopes to make skill sports accessible through innovative intelligent hardware. And in the context of the epidemic, make people's indoor sports life more rich and interesting.",
     "ble-please-open-ble": "Failed to request Bluetooth. Possible causes:\n1.Bluetooth is not turned on\n2.Bluetooth location permission not granted",
 
-    "MagInterferenceTip_content": "Since the calibration of the magnetometer is vulnerable to the influence of the surrounding environment, please follow the following steps in the calibration process: \n1. Please keep the surrounding environment stable and away from metal objects and magnetic field interference during the calibration process. \n2. Please keep a distance of more than 0.5m between the smart bow module and electronic devices such as mobile phones and televisions. \n3. Please fully rotate the smart bow with the module installed along the XYZ axis until you are prompted that the calibration is complete. \n4. If the calibration cannot be completed for many times, it can still be used. However, the accuracy of aiming will be affected, and the game needs to do one more angle of view homing operation.",
+    "MagInterferenceTip_content": "Since the initialization of the magnetometer is vulnerable to the influence of the surrounding environment, please follow the following steps in the initialization process: \n1. Please keep the surrounding environment stable and away from metal objects and magnetic field interference during the initialization process. \n2. Please keep a distance of more than 0.5m between the smart bow module and electronic devices such as mobile phones and televisions. \n3. Please fully rotate the smart bow or individual module with the module installed along the XYZ axis until the prompt is completed. \n4. If the initialization cannot be completed for many times, it can still be used. However, the accuracy of aiming will be affected, and the game needs to do one more angle of view homing operation.",
     "MagInterferenceTip_ok": "OK",
 
     "当前正处于匹配状态,无法接受好友PK邀请!": "In matching, can't accept PK!",
     "目前状态下,无法接受该邀请!": "In current state, can't accept invite!",
     "某方退出或掉线,联机游戏终止!": "One quit or outline, game stop!",
     "操作过于频繁": "Operation is too frequent",
-    "请输入用户名": "Please enter username",
+    "请输入账号": "Please enter username",
     "请输入密码": "Please enter password",
     "验证码错误": "Verification code error",
     "请阅读并同意App协议": "Please read and agree to the app agreement",
     "账号未注册": "Account not registered",
     "登录成功": "Login successful",
     "密码错误": "Password error",
-    "用户名长度至少6位": "The user name must be at least 6 characters long",
+    "账号长度至少6位": "The user name must be at least 6 characters long",
     "密码长度至少6位": "The password must be at least 6 digits long",
     "两次输入的密码不一致": "The passwords entered twice are inconsistent",
     "该账号已被注册": "This account has been registered",

+ 1 - 6
Assets/BowArrow/Scripts/Game/GameAssistUI.cs

@@ -21,12 +21,7 @@ public class GameAssistUI : MonoBehaviour
         ins = this;
     }
 
-    public void copyButtonBack(Transform parent) {
-        GameObject o = GameObject.Instantiate(this.transform.Find("Button0").gameObject, parent);
-        o.GetComponent<Button>().onClick.AddListener(onBtnBack);
-    }   
-
-    void onBtnBack() {
+    public void onBtnBack() {
         AudioMgr.ins.PlayBtn();
         SceneManager.LoadScene("Home", LoadSceneMode.Single);
     }

+ 5 - 2
Assets/BowArrow/Scripts/GameChallenge/Views/HuntGameSelectLevelView.cs

@@ -36,8 +36,6 @@ public class HuntGameSelectLevelView : MonoBehaviour
             levelTF.Find("Icon2").gameObject.SetActive(levelRecord == myPassLevel + 1);
             levelTF.Find("Icon2").GetComponent<Image>().sprite = avatarSprite;
         }
-
-        GameAssistUI.ins.copyButtonBack(this.transform);
     }
 
     void OnDestroy()
@@ -45,4 +43,9 @@ public class HuntGameSelectLevelView : MonoBehaviour
         if (GameMgr.ins) GameMgr.ins.removeLockerForGamePause(this);
         SimulateMouseController.ins?.RemoveOpenLocker(this);
     }
+
+    public void OnClick_Back()
+    {
+        GameAssistUI.ins.onBtnBack();
+    }
 }

+ 1 - 1
Assets/BowArrow/Scripts/Manager/LoginMgr/LoginView.cs

@@ -153,7 +153,7 @@ public class LoginView : MonoBehaviour
     void LoginNormal() {
         InputField user = GetInputField(loginInUser);
         if (user.text.Trim().Length == 0) {
-            PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("请输入用户名"));
+            PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("请输入账号"));
             return;
         }
         InputField pwd = GetInputField(loginInPWD);

+ 1 - 1
Assets/BowArrow/Scripts/Manager/LoginMgr/RegisterView.cs

@@ -90,7 +90,7 @@ public class RegisterView : MonoBehaviour
     {
         InputField user = GetInputField(registerInUser);
         if (user.text.Length < 6) {
-            PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("用户名长度至少6位"));
+            PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("账号长度至少6位"));
             return;
         }
         InputField pwd1 = GetInputField(registerInPWD1);

+ 8 - 0
Assets/BowArrow/Scripts/View/DeviceCalibrateView.cs

@@ -165,6 +165,10 @@ public class DeviceCalibrateView : MonoBehaviour, MenuBackInterface
         if (action_OnClickMagCalibrateInterceptor != null) {
             if (action_OnClickMagCalibrateInterceptor.Invoke()) return;
         }
+        if (BluetoothAim.ins.status != BluetoothStatusEnum.ConnectSuccess) {
+            PopupMgr.ins.ShowTipTop(TextAutoLanguage2.GetTextByKey("device-calibrate_n-connect"));
+            return;
+        }
         calibrateMagDoing = !calibrateMagDoing;
         if (calibrateMagDoing) {
             calibrateMagStartTime = Time.realtimeSinceStartup;
@@ -232,6 +236,10 @@ public class DeviceCalibrateView : MonoBehaviour, MenuBackInterface
         if (action_OnClickGyrCalibrateInterceptor != null) {
             if (action_OnClickGyrCalibrateInterceptor.Invoke()) return;
         }
+        if (BluetoothAim.ins.status != BluetoothStatusEnum.ConnectSuccess) {
+            PopupMgr.ins.ShowTipTop(TextAutoLanguage2.GetTextByKey("device-calibrate_n-connect"));
+            return;
+        }
         //Logic
         gyrCalibrating = !gyrCalibrating;
         interactableAllSkipBtns(!gyrCalibrating);

+ 5 - 2
Assets/BowArrow/Scripts/View/TimeLimitGameDistanceSelectView.cs

@@ -41,8 +41,6 @@ public class TimeLimitGameDistanceSelectView : MonoBehaviour
                 action_OnClickSelectDistance?.Invoke();
             });
         }
-
-        GameAssistUI.ins.copyButtonBack(this.transform);
     }
 
     void OnDestroy()
@@ -51,4 +49,9 @@ public class TimeLimitGameDistanceSelectView : MonoBehaviour
         if (GameMgr.ins) GameMgr.ins.removeLockerForGamePause(this);
         SimulateMouseController.ins?.RemoveOpenLocker(this);
     }
+
+    public void OnClick_Back()
+    {
+        GameAssistUI.ins.onBtnBack();
+    }
 }