1.调整首页布局

2.调整pk匹配页面按钮居中
3.调整登录页面，个人页面弹出输入按钮贴合
4.设置页面调整list布局
5.调整搜索设备添加限制

Assets/BowArrow/Resources/Prefabs/Views/PKGameView.prefab

@@ -29,6 +29,7 @@ RectTransform:
   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: 2120877169563598815}
   m_RootOrder: 2
@@ -122,6 +123,7 @@ RectTransform:
   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: 2120877171554691214}
   - {fileID: 2120877171312960329}
@@ -202,6 +204,7 @@ RectTransform:
   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: 2120877171598678229}
   m_RootOrder: 0
@@ -311,6 +314,7 @@ RectTransform:
   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: 2120877169851161208}
   - {fileID: 2120877170220808392}
@@ -394,6 +398,7 @@ RectTransform:
   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: 2120877169636818124}
   m_RootOrder: 0
@@ -490,6 +495,7 @@ RectTransform:
   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: 2120877171598678229}
   m_RootOrder: 3
@@ -583,6 +589,7 @@ RectTransform:
   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: 2120877171598678229}
   m_RootOrder: 2
@@ -659,6 +666,7 @@ RectTransform:
   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: 2120877170876783139}
   m_Father: {fileID: 2120877169636818124}
@@ -748,6 +756,7 @@ RectTransform:
   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: 2120877169636818124}
   m_RootOrder: 5
@@ -828,15 +837,16 @@ RectTransform:
   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: 2120877169636818124}
   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: -95.2, y: -16}
+  m_AnchoredPosition: {x: -138.40001, y: -16}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2120877170444756638
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -872,7 +882,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 0
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -922,6 +932,7 @@ RectTransform:
   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: 2120877169636818124}
   m_RootOrder: 4
@@ -1015,6 +1026,7 @@ RectTransform:
   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: 2120877171598678229}
   m_RootOrder: 1
@@ -1090,6 +1102,7 @@ RectTransform:
   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: 2120877170220808392}
   m_RootOrder: 0
@@ -1166,6 +1179,7 @@ RectTransform:
   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: 2120877171598678229}
   m_RootOrder: 4
@@ -1260,6 +1274,7 @@ RectTransform:
   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: 2120877171075001422}
   m_Father: {fileID: 2120877169636818124}
@@ -1349,6 +1364,7 @@ RectTransform:
   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: 2120877171050826761}
   m_RootOrder: 0
@@ -1425,6 +1441,7 @@ RectTransform:
   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: 2120877169563598815}
   m_RootOrder: 1
@@ -1520,6 +1537,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2120877169636818124}
   - {fileID: 2120877171598678229}
@@ -1638,6 +1656,7 @@ RectTransform:
   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: 2120877169563598815}
   m_RootOrder: 0
@@ -1717,6 +1736,7 @@ RectTransform:
   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: 2120877169594462444}
   - {fileID: 2120877170793001438}
@@ -1798,6 +1818,7 @@ RectTransform:
   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: 2120877171394070473}
   m_RootOrder: 2

Assets/BowArrow/Resources/Textures/GameIcon/Prefabs/Views/Home/PKMatchView.prefab

@@ -1350,8 +1350,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -5}
-  m_SizeDelta: {x: 0, y: 2}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4672314268688794859
 CanvasRenderer:

Assets/BowArrow/Resources/Textures/GameIcon/Prefabs/Views/Home/RoleSelectView.prefab

@@ -660,8 +660,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -7}
-  m_SizeDelta: {x: 0, y: -1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4507770290175012985
 CanvasRenderer:

Assets/BowArrow/Scenes/Login.unity

@@ -2727,8 +2727,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: 287.45, y: -79}
-  m_SizeDelta: {x: 574.9, y: 158}
+  m_AnchoredPosition: {x: 287.45, y: -79.5}
+  m_SizeDelta: {x: 574.9, y: 159}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &257790179
 MonoBehaviour:
@@ -3242,8 +3242,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: 412.01797, y: -35.11394}
-  m_SizeDelta: {x: 106.290855, y: 30.368814}
+  m_AnchoredPosition: {x: 432, y: -36}
+  m_SizeDelta: {x: 112, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &288339401
 MonoBehaviour:
@@ -4388,8 +4388,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: 595.5, y: -79}
-  m_SizeDelta: {x: 1191, y: 158}
+  m_AnchoredPosition: {x: 595.5, y: -79.5}
+  m_SizeDelta: {x: 1191, y: 159}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &466652731
 MonoBehaviour:
@@ -5131,8 +5131,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: 103.00449, y: -35.11394}
-  m_SizeDelta: {x: 186.00899, y: 30.368814}
+  m_AnchoredPosition: {x: 108, y: -36}
+  m_SizeDelta: {x: 196, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &615420135
 MonoBehaviour:
@@ -5364,8 +5364,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: 595.5, y: -643}
-  m_SizeDelta: {x: 1191, y: 158}
+  m_AnchoredPosition: {x: 595.5, y: -646.5}
+  m_SizeDelta: {x: 1191, y: 159}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &665936835
 MonoBehaviour:
@@ -6461,9 +6461,9 @@ RectTransform:
   m_Father: {fileID: 681531955}
   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: 273.4228, y: -8.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &750604318
@@ -7979,7 +7979,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 1892, y: -852}
-  m_SizeDelta: {x: 465.16342, y: 70.22788}
+  m_SizeDelta: {x: 488, y: 72}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &919185866
 MonoBehaviour:
@@ -8962,8 +8962,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: 595.5, y: -267}
-  m_SizeDelta: {x: 1191, y: 158}
+  m_AnchoredPosition: {x: 595.5, y: -268.5}
+  m_SizeDelta: {x: 1191, y: 159}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1060399965
 MonoBehaviour:
@@ -9213,8 +9213,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: 595.5, y: -455}
-  m_SizeDelta: {x: 1191, y: 158}
+  m_AnchoredPosition: {x: 595.5, y: -457.5}
+  m_SizeDelta: {x: 1191, y: 159}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1098956580
 MonoBehaviour:
@@ -9375,8 +9375,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: 287.45, y: -281}
-  m_SizeDelta: {x: 574.9, y: 158}
+  m_AnchoredPosition: {x: 287.45, y: -280.5}
+  m_SizeDelta: {x: 574.9, y: 159}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1105214627
 MonoBehaviour:
@@ -9931,8 +9931,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: 335.58618, y: -35.11394}
-  m_SizeDelta: {x: 26.572714, y: 30.368814}
+  m_AnchoredPosition: {x: 352, y: -36}
+  m_SizeDelta: {x: 28, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1170570970
 MonoBehaviour:
@@ -10349,8 +10349,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: 259.15442, y: -35.11394}
-  m_SizeDelta: {x: 106.290855, y: 30.368814}
+  m_AnchoredPosition: {x: 272, y: -36}
+  m_SizeDelta: {x: 112, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1212388777
 MonoBehaviour:
@@ -11124,8 +11124,8 @@ MonoBehaviour:
   m_ChildAlignment: 0
   m_StartCorner: 0
   m_StartAxis: 0
-  m_CellSize: {x: 574.9, y: 158}
-  m_Spacing: {x: 45, y: 44}
+  m_CellSize: {x: 574.9, y: 159}
+  m_Spacing: {x: 45, y: 42}
   m_Constraint: 0
   m_ConstraintCount: 2
 --- !u!114 &1316887423
@@ -12352,8 +12352,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: 605.5, y: -694.60004}
-  m_SizeDelta: {x: 1191, y: 158.8}
+  m_AnchoredPosition: {x: 605.5, y: -697.7}
+  m_SizeDelta: {x: 1191, y: 165}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1545576240
 MonoBehaviour:
@@ -12469,7 +12469,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -0.0000038146973, y: -0.99999905}
+  m_AnchoredPosition: {x: -0.0000038146973, y: -1}
   m_SizeDelta: {x: 0, y: 2}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &1547999409
@@ -12547,9 +12547,9 @@ RectTransform:
   m_Father: {fileID: 681531955}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 429.57272, y: -8.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1549087752
@@ -13322,9 +13322,9 @@ RectTransform:
   m_Father: {fileID: 681531955}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 582.43634, y: -8.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1628073323
@@ -15221,7 +15221,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -0.000030517578, y: -0.99999905}
+  m_AnchoredPosition: {x: -0.000030517578, y: -1}
   m_SizeDelta: {x: 0, y: 2}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &1778367895
@@ -15302,8 +15302,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: 907.35004, y: -281}
-  m_SizeDelta: {x: 574.9, y: 158}
+  m_AnchoredPosition: {x: 907.35004, y: -280.5}
+  m_SizeDelta: {x: 574.9, y: 159}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1802940219
 MonoBehaviour:
@@ -15419,7 +15419,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: -0.99999905}
+  m_AnchoredPosition: {x: 0, y: -1}
   m_SizeDelta: {x: 0, y: 2}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &1803470178
@@ -16770,9 +16770,9 @@ RectTransform:
   m_Father: {fileID: 681531955}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 506.00452, y: -8.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1900702359
@@ -17417,7 +17417,7 @@ MonoBehaviour:
   m_ChildAlignment: 0
   m_StartCorner: 0
   m_StartAxis: 0
-  m_CellSize: {x: 1191, y: 158}
+  m_CellSize: {x: 1191, y: 159}
   m_Spacing: {x: 0, y: 30}
   m_Constraint: 0
   m_ConstraintCount: 2
@@ -17571,8 +17571,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: 0, y: -35.11394}
-  m_SizeDelta: {x: 0, y: 70.22788}
+  m_AnchoredPosition: {x: 0, y: -36}
+  m_SizeDelta: {x: 0, y: 72}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1969566645
 MonoBehaviour:
@@ -18670,8 +18670,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: 907.35004, y: -79}
-  m_SizeDelta: {x: 574.9, y: 158}
+  m_AnchoredPosition: {x: 907.35004, y: -79.5}
+  m_SizeDelta: {x: 574.9, y: 159}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2049143084
 MonoBehaviour:
@@ -19459,7 +19459,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -0.000030517578, y: -0.99999905}
+  m_AnchoredPosition: {x: -0.000030517578, y: -1}
   m_SizeDelta: {x: 0, y: 2}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &2142587149

Assets/BowArrow/Scripts/Bluetooth/AimHandler.cs

@@ -4,16 +4,17 @@ using System.Collections;
 using System.Collections.Generic;
 
 public enum AimDeviceType { 
-    HOUYI,
-    HOUYI2,
-    ARTEMIS,
+    NONE = -1,
+    HOUYI = 0,
+    HOUYI2 = 1,
+    ARTEMIS = 2,
 }
 
 [Serializable]//需要在转换为json格式的类的上方添加序列化
 public class AimDeviceInfo
 {
     public int id;
-    public int type;//类型 AimDeviceType
+    public int type = -1;//类型 AimDeviceType
     public int pos; //位置
 
     public AimDeviceInfo(int _id) {
@@ -71,6 +72,10 @@ public class AimDeviceInfos
 
         //  StartCoroutine(TestRecord());
     }
+    //public void onClearAimDeviceInfos() {
+    //    PlayerPrefs.DeleteKey("aim-device-info-" + LoginMgr.myUserInfo.id);
+    //    aimDeviceInfos.arry.Clear();
+    //}
     public void OnGetAimDeviceInfos() {
         string deviceInfo = PlayerPrefs.GetString("aim-device-info-" + LoginMgr.myUserInfo.id, "");
         if (deviceInfo != "")

Assets/BowArrow/Scripts/View/Home/DeviceView.cs

@@ -32,7 +32,7 @@ public class DeviceView : JCUnityLib.ViewBase, MenuBackInterface
                 OnChangeSmartArcheryButton(temp);
             });
         }
- 
+
 
         //bowOptions = this.transform.Find("ItemInfo/BowOptions").gameObject;
 
@@ -56,7 +56,7 @@ public class DeviceView : JCUnityLib.ViewBase, MenuBackInterface
         //        }
         //    });
         //}
-
+        //AimHandler.ins.onClearAimDeviceInfos();
         //进入连接界面，初始化一下AimDeviceInfo
         AimHandler.ins.OnGetAimDeviceInfos();
         //for (int j = 0; j < deviceViewItems.Count; j++)
@@ -94,7 +94,7 @@ public class DeviceView : JCUnityLib.ViewBase, MenuBackInterface
         {
             Button _button = smartArcheryButtons[i];
             Color32 _white;
-            Color32 _buttonBg;
+            //Color32 _buttonBg;
             if (index == i)
             {
                  _white = new Color32(255, 255, 255, 255);
@@ -138,7 +138,7 @@ public class DeviceView : JCUnityLib.ViewBase, MenuBackInterface
         {
             Button _button = smartArcheryButtons[i];
             Color32 _white;
-            Color32 _buttonBg;
+            //Color32 _buttonBg;
             if (index == i)
             {
                 _white = new Color32(255, 255, 255, 255);

Assets/BowArrow/Scripts/View/Home/DeviceView_ItemShow.cs

@@ -36,7 +36,7 @@ public class DeviceView_ItemShow : MonoBehaviour
     //这个是处理设备下标
     [SerializeField] int deviceIndex = 0;
     // Start is called before the first frame update
-    bool bProcess = false;
+    // bool bProcess = false;
     private void Awake()
     {
         AimHandler.ins.aimDeviceInfoChangeEvent += onShowDeviceInfo;
@@ -134,7 +134,8 @@ public class DeviceView_ItemShow : MonoBehaviour
                 {
                     onSetInitStatusInfo(false);
                 }
-                else {
+                else
+                {
                     if (!process.activeSelf) onShowDeviceInfo();
                 }
                 if (bettery.activeSelf) bettery.SetActive(false);
@@ -150,7 +151,7 @@ public class DeviceView_ItemShow : MonoBehaviour
                 }
                 else
                 {
-                    if (!process.activeSelf)onShowDeviceInfo();
+                    if (!process.activeSelf) onShowDeviceInfo();
                 }
                 if (ConnectButtonImage.gameObject.activeSelf) ConnectButtonImage.sprite = ConnectButtonImages[1];
             }
@@ -204,15 +205,13 @@ public class DeviceView_ItemShow : MonoBehaviour
 
     public void onShowDeviceInfo()
     {
-        if (AimHandler.ins.aimDeviceInfos.arry.Count <= deviceIndex) {
-            if (!btnConnectBow.gameObject.activeSelf)btnConnectBow.gameObject.SetActive(true);
+        if (AimHandler.ins.aimDeviceInfos.arry.Count <= deviceIndex)
+        {
+            if (!btnConnectBow.gameObject.activeSelf) btnConnectBow.gameObject.SetActive(true);
             return;
-        } 
-
-        if (btnConnectBow.gameObject.activeSelf) btnConnectBow.gameObject.SetActive(false);
-        if (!connected.activeSelf) connected.SetActive(true);
-
+        }
         AimDeviceInfo aimDeviceInfo = AimHandler.ins.aimDeviceInfos.arry[deviceIndex];
+        bool bShow = true;
         switch ((AimDeviceType)aimDeviceInfo.type)
         {
             case AimDeviceType.HOUYI:
@@ -227,14 +226,46 @@ public class DeviceView_ItemShow : MonoBehaviour
                 titleText.text = "ARTEMIS";
                 bowBg.sprite = bowBgs[1];
                 break;
+            default:
+                bShow = false;
+                //Debug.LogWarning("AimDeviceType：" + ((AimDeviceType)aimDeviceInfo.type).ToString());
+                break;
+        }
+        if (bShow)
+        {
+            if (btnConnectBow.gameObject.activeSelf) btnConnectBow.gameObject.SetActive(false);
+            if (!connected.activeSelf) connected.SetActive(true);
         }
+        else
+        {
+            if (!btnConnectBow.gameObject.activeSelf) btnConnectBow.gameObject.SetActive(true);
+            if (connected.activeSelf) connected.SetActive(false);
+        }
+
+
+        //switch ((AimDeviceType)aimDeviceInfo.type)
+        //{
+        //    case AimDeviceType.HOUYI:
+        //        titleText.text = "HOUYI";
+        //        bowBg.sprite = bowBgs[0];
+        //        break;
+        //    case AimDeviceType.HOUYI2:
+        //        titleText.text = "HOUYI 2";
+        //        bowBg.sprite = bowBgs[0];
+        //        break;
+        //    case AimDeviceType.ARTEMIS:
+        //        titleText.text = "ARTEMIS";
+        //        bowBg.sprite = bowBgs[1];
+        //        break;
+        //}
         onUpdateStatusInfo();
     }
-
+    //刷新状态
     public void onUpdateStatusInfo()
     {
 
         string name = BluetoothStatus.GetStatusTextKey(BluetoothAim.ins.status);
-        _TextAutoLanguage2.SetTextKey(name);
+        if (name != _TextAutoLanguage2.GetTextKey())
+            _TextAutoLanguage2.SetTextKey(name);
     }
 }

Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/PersonalView.prefab

@@ -34,8 +34,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -34.999992}
-  m_SizeDelta: {x: -184, y: -150.00002}
+  m_AnchoredPosition: {x: 0, y: -35}
+  m_SizeDelta: {x: -115.67999, y: -150.00002}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &93843140345698664
 GameObject:
@@ -582,6 +582,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 7327544349405985028}
+        m_TargetAssemblyTypeName: BoxUserSettings, Assembly-CSharp
+        m_MethodName: setDeleteBtnBg
+        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 &1472640005652350763
 GameObject:
   m_ObjectHideFlags: 0
@@ -959,7 +971,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: 521.95, y: -1234.2549}
+  m_AnchoredPosition: {x: 855.95, y: -1318.2549}
   m_SizeDelta: {x: 1043.9, y: 115.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7555906436447852659
@@ -1395,8 +1407,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: 500, y: -0}
-  m_SizeDelta: {x: 999.03, y: 238.79}
+  m_AnchoredPosition: {x: 534.45996, y: -0}
+  m_SizeDelta: {x: 1097.6, y: 238.79}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5712395964656695378
 CanvasRenderer:
@@ -2882,10 +2894,10 @@ RectTransform:
   m_Father: {fileID: 82297731775721367}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1000, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2888973560298852020
 CanvasRenderer:
@@ -7846,7 +7858,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 250, y: -57.85}
-  m_SizeDelta: {x: 500, y: 89}
+  m_SizeDelta: {x: 500, y: 115.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544348383879155
 CanvasRenderer:
@@ -8297,8 +8309,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 334.05005, y: 0}
-  m_SizeDelta: {x: -651.1, y: 222.10498}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 16.900024, y: 306.10486}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &7327544348609726811
 MonoBehaviour:
@@ -8317,8 +8329,8 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 79
     m_Bottom: 100
-  m_ChildAlignment: 0
-  m_Spacing: 20
+  m_ChildAlignment: 4
+  m_Spacing: 34
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -8338,7 +8350,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
+  m_HorizontalFit: 0
   m_VerticalFit: 2
 --- !u!1 &7327544348654066635
 GameObject:
@@ -8698,7 +8710,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: 521.95, y: -691.45496}
+  m_AnchoredPosition: {x: 855.95, y: -719.45496}
   m_SizeDelta: {x: 1043.9, y: 115.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544348720492376
@@ -9174,7 +9186,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: 521.95, y: -1098.5549}
+  m_AnchoredPosition: {x: 855.95, y: -1168.5549}
   m_SizeDelta: {x: 1043.9, y: 115.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544348907805820
@@ -9413,7 +9425,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 795.26, y: -57.85}
-  m_SizeDelta: {x: 500, y: 89}
+  m_SizeDelta: {x: 500, y: 115.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544349054001379
 CanvasRenderer:
@@ -10250,6 +10262,7 @@ MonoBehaviour:
   - {fileID: 7327544350179495039}
   - {fileID: 7327544350241898385}
   - {fileID: 7327544349271826858}
+  - {fileID: 654430252714443831}
   datePickerPrefab: {fileID: 8259705882647745319, guid: 6dd9c8703bf161b4a915b6bd1b76622d, type: 3}
   avatarSelectView: {fileID: 3568271985103462570}
 --- !u!1 &7327544349476603443
@@ -11081,7 +11094,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: 521.95, y: -827.15497}
+  m_AnchoredPosition: {x: 855.95, y: -869.15497}
   m_SizeDelta: {x: 1043.9, y: 115.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544349694194269
@@ -11328,7 +11341,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: 521.95, y: -555.755}
+  m_AnchoredPosition: {x: 855.95, y: -569.755}
   m_SizeDelta: {x: 1043.9, y: 115.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544349774047091
@@ -11551,7 +11564,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: 521.95, y: -962.855}
+  m_AnchoredPosition: {x: 855.95, y: -1018.855}
   m_SizeDelta: {x: 1043.9, y: 115.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7327544349788496971
@@ -11830,7 +11843,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 6
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -12117,7 +12130,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: 521.95, y: -278.4525}
+  m_AnchoredPosition: {x: 855.95, y: -278.4525}
   m_SizeDelta: {x: 1043.9, y: 398.905}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7327544349953523155
@@ -12349,7 +12362,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 6
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -14171,7 +14184,7 @@ MonoBehaviour:
   m_ChildAlignment: 1
   m_StartCorner: 0
   m_StartAxis: 0
-  m_CellSize: {x: 999.03, y: 238.79}
+  m_CellSize: {x: 1097.6, y: 238.79}
   m_Spacing: {x: 0, y: 0}
   m_Constraint: 0
   m_ConstraintCount: 2

Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/SettingsView.prefab

@@ -272,9 +272,9 @@ RectTransform:
   m_Father: {fileID: 3494904712085876893}
   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}
-  m_AnchoredPosition: {x: 22.9, y: -406}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 22.9, y: 179}
   m_SizeDelta: {x: 532.5, y: 3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6114277709100586611
@@ -10689,9 +10689,9 @@ RectTransform:
   m_Father: {fileID: 3494904712085876893}
   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: 135.9, y: 41.2}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -274.1, y: 41.2}
   m_SizeDelta: {x: 385, y: 80}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &3494904713265228565
@@ -11690,10 +11690,10 @@ RectTransform:
   m_Father: {fileID: 3494904712039391356}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 820, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &3494904713372387230
 MonoBehaviour:

Assets/SmartBow/Scripts/Views/PersonalViewParts/BoxUserSettings.cs

@@ -46,7 +46,7 @@ public class BoxUserSettings : MonoBehaviour
         {
             isFocused = inputFieldNickname.isFocused;
             if (isFocused) setStateBg(1);
-            else bgArray[1].sprite = bgOff;
+            //else bgArray[1].sprite = bgOff;
         }
     }
 
@@ -258,4 +258,12 @@ public class BoxUserSettings : MonoBehaviour
         }
     }
     #endregion
+
+
+    #region 删除按钮背景
+    public void setDeleteBtnBg()
+    {
+        setStateBg(6);
+    }
+    #endregion
 }