Merge remote-tracking branch 'remotes/origin/pure-infrared-ios' into pure_infrared

Assets/BowArrow/Scenes/Login.unity

@@ -857,8 +857,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: 23.9, y: 0}
-  m_SizeDelta: {x: -27.8, y: 0}
+  m_AnchoredPosition: {x: 42.5, y: 0}
+  m_SizeDelta: {x: -65, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &41911013
 MonoBehaviour:
@@ -898,7 +898,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 22
+    m_FontSize: 40
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -952,10 +952,10 @@ RectTransform:
   m_Father: {fileID: 2032870919}
   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: 0, y: 0}
-  m_SizeDelta: {x: 160, y: 30}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 100, y: -30}
+  m_SizeDelta: {x: 200, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &42842150
 MonoBehaviour:
@@ -1542,7 +1542,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: -10}
+  m_AnchoredPosition: {x: -0.000030517578, y: -25.904522}
   m_SizeDelta: {x: 0, y: 2}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &59411099
@@ -2323,8 +2323,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: 262.21954, y: -64.15}
-  m_SizeDelta: {x: 0, y: 71.363106}
+  m_AnchoredPosition: {x: 264.1073, y: -64.15}
+  m_SizeDelta: {x: 0, y: 75.2814}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &117160419
 MonoBehaviour:
@@ -2485,7 +2485,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: -5.100006}
-  m_SizeDelta: {x: 102.874084, y: 30}
+  m_SizeDelta: {x: 103.909546, y: 30}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &118209003
 MonoBehaviour:
@@ -2672,10 +2672,10 @@ RectTransform:
   m_Father: {fileID: 2032870919}
   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: 145.9, y: 0}
-  m_SizeDelta: {x: 160, y: 30}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 320, y: -30}
+  m_SizeDelta: {x: 200, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &123117861
 MonoBehaviour:
@@ -3745,7 +3745,7 @@ RectTransform:
   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: 30, y: 30}
+  m_SizeDelta: {x: 70, y: 70}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &203846193
 MonoBehaviour:
@@ -4415,8 +4415,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: 691.47284, y: -64.15}
-  m_SizeDelta: {x: 111.21523, y: 32.437775}
+  m_AnchoredPosition: {x: 690.057, y: -64.15}
+  m_SizeDelta: {x: 110.271355, y: 31.809044}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &236450063
 MonoBehaviour:
@@ -5022,7 +5022,7 @@ RectTransform:
   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: 30, y: 30}
+  m_SizeDelta: {x: 70, y: 70}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &243232140
 MonoBehaviour:
@@ -6023,7 +6023,7 @@ MonoBehaviour:
     m_Left: 10
     m_Right: 0
     m_Top: 0
-    m_Bottom: 0
+    m_Bottom: 200
   m_ChildAlignment: 3
   m_Spacing: -5
   m_ChildForceExpandWidth: 0
@@ -6091,7 +6091,6 @@ RectTransform:
   - {fileID: 250359778}
   - {fileID: 2101505225}
   - {fileID: 440793048}
-  - {fileID: 1356701317}
   m_Father: {fileID: 1974991359}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6138,8 +6137,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: 429.2533, y: -35.681553}
-  m_SizeDelta: {x: 111.21523, y: 32.437775}
+  m_AnchoredPosition: {x: 432, y: -37.5}
+  m_SizeDelta: {x: 112, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &288339401
 MonoBehaviour:
@@ -6278,7 +6277,7 @@ RectTransform:
   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: 30, y: 30}
+  m_SizeDelta: {x: 70, y: 70}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &291366569
 MonoBehaviour:
@@ -7214,8 +7213,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: 23.9, y: 0}
-  m_SizeDelta: {x: -27.8, y: 0}
+  m_AnchoredPosition: {x: 42.5, y: 0}
+  m_SizeDelta: {x: -65, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &335252825
 MonoBehaviour:
@@ -7239,7 +7238,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 22
+    m_FontSize: 40
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -7407,7 +7406,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: -10}
+  m_AnchoredPosition: {x: 0, y: -25.904522}
   m_SizeDelta: {x: 0, y: 2}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &338215277
@@ -7763,6 +7762,7 @@ GameObject:
   m_Component:
   - component: {fileID: 351538165}
   - component: {fileID: 351538166}
+  - component: {fileID: 351538167}
   m_Layer: 5
   m_Name: ToggleGroup
   m_TagString: Untagged
@@ -7779,8 +7779,8 @@ RectTransform:
   m_GameObject: {fileID: 351538164}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.6276, y: 1.6276, z: 1.6276}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 520053283}
   - {fileID: 1041550254}
@@ -7789,8 +7789,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: 384, y: -77}
-  m_SizeDelta: {x: 100, y: 40}
+  m_AnchoredPosition: {x: 430, y: -79.5}
+  m_SizeDelta: {x: 420, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &351538166
 MonoBehaviour:
@@ -7805,6 +7805,32 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_AllowSwitchOff: 0
+--- !u!114 &351538167
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 351538164}
+  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: 0
+  m_Spacing: 20
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &355330514
 GameObject:
   m_ObjectHideFlags: 0
@@ -7843,8 +7869,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: 532.4538, y: -64.15}
-  m_SizeDelta: {x: 111.21523, y: 32.437775}
+  m_AnchoredPosition: {x: 532.21783, y: -64.15}
+  m_SizeDelta: {x: 110.271355, y: 31.809044}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &355330516
 MonoBehaviour:
@@ -8781,7 +8807,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: 512.695, y: -422.3866}
+  m_AnchoredPosition: {x: 512.695, y: -330.14142}
   m_SizeDelta: {x: 1005.39, y: 220}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &430763807
@@ -8902,8 +8928,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: 589.8229, y: -51.5}
-  m_SizeDelta: {x: 111.21523, y: 0}
+  m_AnchoredPosition: {x: 588.40704, y: -51.5}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &431282297
 MonoBehaviour:
@@ -9145,7 +9171,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: 514.65, y: -1451.5366}
+  m_AnchoredPosition: {x: 514.65, y: -1359.2914}
   m_SizeDelta: {x: 1009.3, y: 128.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &443609487
@@ -10916,10 +10942,10 @@ RectTransform:
   m_Father: {fileID: 351538165}
   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: 0, y: 0}
-  m_SizeDelta: {x: 160, y: 30}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 100, y: -30}
+  m_SizeDelta: {x: 200, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &520053284
 MonoBehaviour:
@@ -11773,8 +11799,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: 369.53287, y: -64.15}
-  m_SizeDelta: {x: 194.62665, y: 32.437775}
+  m_AnchoredPosition: {x: 370.59473, y: -64.15}
+  m_SizeDelta: {x: 192.97487, y: 31.809044}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &604241381
 MonoBehaviour:
@@ -11869,8 +11895,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: 107.313324, y: -35.681553}
-  m_SizeDelta: {x: 194.62665, y: 32.437775}
+  m_AnchoredPosition: {x: 108, y: -37.5}
+  m_SizeDelta: {x: 196, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &615420135
 MonoBehaviour:
@@ -14136,8 +14162,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: 267.88287, y: -51.5}
-  m_SizeDelta: {x: 194.62665, y: 32.437775}
+  m_AnchoredPosition: {x: 268.94473, y: -51.5}
+  m_SizeDelta: {x: 192.97487, y: 31.809044}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &750604318
 MonoBehaviour:
@@ -15636,8 +15662,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: 15, y: -15}
-  m_SizeDelta: {x: 30, y: 30}
+  m_AnchoredPosition: {x: 30, y: -30}
+  m_SizeDelta: {x: 60, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &820009124
 MonoBehaviour:
@@ -15794,7 +15820,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: 504.5, y: -949.0366}
+  m_AnchoredPosition: {x: 504.5, y: -884.29144}
   m_SizeDelta: {x: 1009, y: 1009}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &840635666
@@ -15894,7 +15920,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: 137.56955, y: -51.5}
+  m_AnchoredPosition: {x: 139.4573, y: -51.5}
   m_SizeDelta: {x: 46, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &848642645
@@ -16408,7 +16434,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: 60, y: -277.3866}
+  m_AnchoredPosition: {x: 60, y: -185.14142}
   m_SizeDelta: {x: 100, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &891240115
@@ -16685,7 +16711,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: 512.695, y: -637.3866}
+  m_AnchoredPosition: {x: 512.695, y: -545.1414}
   m_SizeDelta: {x: 1005.39, y: 220}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &896021739
@@ -16997,7 +17023,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 1892, y: -852}
-  m_SizeDelta: {x: 484.86093, y: 71.363106}
+  m_SizeDelta: {x: 488, y: 75}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &919185866
 MonoBehaviour:
@@ -18657,8 +18683,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: 15, y: -15}
-  m_SizeDelta: {x: 30, y: 30}
+  m_AnchoredPosition: {x: 30, y: -30}
+  m_SizeDelta: {x: 60, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1013973322
 MonoBehaviour:
@@ -18828,10 +18854,10 @@ RectTransform:
   m_Father: {fileID: 351538165}
   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: 145.9, y: 0}
-  m_SizeDelta: {x: 160, y: 30}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 320, y: -30}
+  m_SizeDelta: {x: 200, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1041550255
 MonoBehaviour:
@@ -19145,6 +19171,7 @@ GameObject:
   - component: {fileID: 1060399964}
   - component: {fileID: 1060399966}
   - component: {fileID: 1060399965}
+  - component: {fileID: 1060399967}
   m_Layer: 5
   m_Name: InGender
   m_TagString: Untagged
@@ -19212,6 +19239,32 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1060399963}
   m_CullTransparentMesh: 0
+--- !u!114 &1060399967
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1060399963}
+  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: 3
+  m_Spacing: 120
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &1072556385
 GameObject:
   m_ObjectHideFlags: 0
@@ -19330,7 +19383,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: 512.695, y: -1067.3866}
+  m_AnchoredPosition: {x: 512.695, y: -975.1414}
   m_SizeDelta: {x: 1005.39, y: 220}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1075730480
@@ -19658,8 +19711,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: 510.31335, y: -51.5}
-  m_SizeDelta: {x: 27.803808, y: 0}
+  m_AnchoredPosition: {x: 509.48746, y: -51.5}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1089492277
 MonoBehaviour:
@@ -20386,8 +20439,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: 430.8038, y: -51.5}
-  m_SizeDelta: {x: 111.21523, y: 0}
+  m_AnchoredPosition: {x: 430.56787, y: -51.5}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1134649143
 MonoBehaviour:
@@ -21088,8 +21141,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: 349.7438, y: -35.681553}
-  m_SizeDelta: {x: 27.803808, y: 32.437775}
+  m_AnchoredPosition: {x: 352, y: -37.5}
+  m_SizeDelta: {x: 28, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1170570970
 MonoBehaviour:
@@ -21184,8 +21237,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: 300, y: -74}
-  m_SizeDelta: {x: 300, y: 40}
+  m_AnchoredPosition: {x: 100, y: -105}
+  m_SizeDelta: {x: 100, y: 60}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &1176732680
 MonoBehaviour:
@@ -21549,8 +21602,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: 611.9633, y: -64.15}
-  m_SizeDelta: {x: 27.803808, y: 32.437775}
+  m_AnchoredPosition: {x: 611.13745, y: -64.15}
+  m_SizeDelta: {x: 27.567839, y: 31.809044}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1185233885
 MonoBehaviour:
@@ -21645,8 +21698,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: 15, y: -15}
-  m_SizeDelta: {x: 30, y: 30}
+  m_AnchoredPosition: {x: 30, y: -30}
+  m_SizeDelta: {x: 60, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1198825418
 MonoBehaviour:
@@ -21847,7 +21900,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: 512.695, y: -852.3866}
+  m_AnchoredPosition: {x: 512.695, y: -760.1414}
   m_SizeDelta: {x: 1005.39, y: 220}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1208463443
@@ -21967,8 +22020,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: 270.23425, y: -35.681553}
-  m_SizeDelta: {x: 111.21523, y: 32.437775}
+  m_AnchoredPosition: {x: 272, y: -37.5}
+  m_SizeDelta: {x: 112, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1212388777
 MonoBehaviour:
@@ -24111,12 +24164,12 @@ RectTransform:
   - {fileID: 514143547}
   - {fileID: 351473203}
   - {fileID: 1958189478}
-  m_Father: {fileID: 282093230}
-  m_RootOrder: 8
+  m_Father: {fileID: 1974991359}
+  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: 527.6, y: -1585.6866}
+  m_AnchoredPosition: {x: 1935.2401, y: -1585.6866}
   m_SizeDelta: {x: 1035.2, y: 150}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1356701318
@@ -24578,9 +24631,9 @@ RectTransform:
   m_Father: {fileID: 2109231682}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 160, y: -17.825}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 160, y: 27}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &1417191191
@@ -25199,7 +25252,7 @@ RectTransform:
   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: 30, y: 30}
+  m_SizeDelta: {x: 70, y: 70}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1471927010
 MonoBehaviour:
@@ -26915,8 +26968,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: 430.8038, y: -51.5}
-  m_SizeDelta: {x: 111.21523, y: 32.437775}
+  m_AnchoredPosition: {x: 430.56787, y: -51.5}
+  m_SizeDelta: {x: 110.271355, y: 31.809044}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1549087752
 MonoBehaviour:
@@ -27365,6 +27418,7 @@ GameObject:
   - component: {fileID: 1577823811}
   - component: {fileID: 1577823813}
   - component: {fileID: 1577823812}
+  - component: {fileID: 1577823814}
   m_Layer: 5
   m_Name: InGender
   m_TagString: Untagged
@@ -27432,6 +27486,32 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1577823810}
   m_CullTransparentMesh: 0
+--- !u!114 &1577823814
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1577823810}
+  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: 3
+  m_Spacing: 120
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &1591195433
 GameObject:
   m_ObjectHideFlags: 0
@@ -28108,8 +28188,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: 589.8229, y: -51.5}
-  m_SizeDelta: {x: 111.21523, y: 32.437775}
+  m_AnchoredPosition: {x: 588.40704, y: -51.5}
+  m_SizeDelta: {x: 110.271355, y: 31.809044}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1628073323
 MonoBehaviour:
@@ -28521,7 +28601,7 @@ RectTransform:
   - {fileID: 1901235582}
   - {fileID: 1281461237}
   m_Father: {fileID: 1974991359}
-  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}
@@ -28858,8 +28938,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: 300, y: -74}
-  m_SizeDelta: {x: 300, y: 40}
+  m_AnchoredPosition: {x: 100, y: -79.5}
+  m_SizeDelta: {x: 100, y: 60}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &1649386619
 MonoBehaviour:
@@ -33784,8 +33864,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: 510.31335, y: -51.5}
-  m_SizeDelta: {x: 27.803808, y: 32.437775}
+  m_AnchoredPosition: {x: 509.48746, y: -51.5}
+  m_SizeDelta: {x: 27.567839, y: 31.809044}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1900702359
 MonoBehaviour:
@@ -34209,8 +34289,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: 15, y: -15}
-  m_SizeDelta: {x: 30, y: 30}
+  m_AnchoredPosition: {x: 30, y: -30}
+  m_SizeDelta: {x: 60, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1906664774
 MonoBehaviour:
@@ -35108,8 +35188,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.681553}
-  m_SizeDelta: {x: 0, y: 71.363106}
+  m_AnchoredPosition: {x: 0, y: -37.5}
+  m_SizeDelta: {x: 0, y: 75}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1969566645
 MonoBehaviour:
@@ -35185,6 +35265,7 @@ RectTransform:
   - {fileID: 1314974005}
   - {fileID: 282093230}
   - {fileID: 545607614}
+  - {fileID: 1356701317}
   - {fileID: 1635998746}
   - {fileID: 2055872240}
   m_Father: {fileID: 239919974}
@@ -36253,6 +36334,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2032870919}
   - component: {fileID: 2032870920}
+  - component: {fileID: 2032870921}
   m_Layer: 5
   m_Name: ToggleGroup
   m_TagString: Untagged
@@ -36269,8 +36351,8 @@ RectTransform:
   m_GameObject: {fileID: 2032870918}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.6276, y: 1.6276, z: 1.6276}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 42842149}
   - {fileID: 123117860}
@@ -36279,8 +36361,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: 384, y: -77}
-  m_SizeDelta: {x: 100, y: 40}
+  m_AnchoredPosition: {x: 430, y: -105}
+  m_SizeDelta: {x: 420, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2032870920
 MonoBehaviour:
@@ -36295,6 +36377,32 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_AllowSwitchOff: 0
+--- !u!114 &2032870921
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2032870918}
+  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: 0
+  m_Spacing: 20
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &2034254768
 GameObject:
   m_ObjectHideFlags: 0
@@ -36331,8 +36439,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: 23.9, y: 0}
-  m_SizeDelta: {x: -27.8, y: 0}
+  m_AnchoredPosition: {x: 42.5, y: 0}
+  m_SizeDelta: {x: -65, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2034254770
 MonoBehaviour:
@@ -36372,7 +36480,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 22
+    m_FontSize: 40
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -36857,7 +36965,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: -1}
+  m_AnchoredPosition: {x: -0.0000038146973, y: -32.809044}
   m_SizeDelta: {x: 0, y: 2}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &2050012215
@@ -36915,7 +37023,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8373776209521498629, guid: 1c0daaacf8083d540857cd8257a709f2, type: 3}
       propertyPath: m_RootOrder
-      value: 4
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 8373776209521498629, guid: 1c0daaacf8083d540857cd8257a709f2, type: 3}
       propertyPath: m_AnchorMax.x
@@ -37044,7 +37152,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: -1}
+  m_AnchoredPosition: {x: -0.000030517578, y: -32.809044}
   m_SizeDelta: {x: 0, y: 2}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &2058528771
@@ -37201,9 +37309,9 @@ RectTransform:
   m_Father: {fileID: 2109231682}
   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: 0, y: -90.325}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 760, y: 100.7}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &2080044274
@@ -37753,8 +37861,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: 267.88287, y: -51.5}
-  m_SizeDelta: {x: 194.62665, y: 0}
+  m_AnchoredPosition: {x: 268.94473, y: -51.5}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2095661144
 MonoBehaviour:
@@ -38086,7 +38194,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: 512.695, y: -1282.3866}
+  m_AnchoredPosition: {x: 512.695, y: -1190.1414}
   m_SizeDelta: {x: 1005.39, y: 220}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2109231680
@@ -38622,8 +38730,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: 23.9, y: 0}
-  m_SizeDelta: {x: -27.8, y: 0}
+  m_AnchoredPosition: {x: 42.5, y: 0}
+  m_SizeDelta: {x: -65, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2145334113
 MonoBehaviour:
@@ -38647,7 +38755,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 22
+    m_FontSize: 40
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2

Assets/BowArrow/Scripts/Game/ArmBow.cs

@@ -8,7 +8,7 @@ public class ArmBow : MonoBehaviour
     [SerializeField] AnimationPlayer AP_arm;
     [SerializeField] AnimationPlayer AP_bow;
     [SerializeField] public GameObject arrow;
-    [SerializeField] GameObject bullet;
+    [SerializeField] public GameObject bullet;
 
 
     [SerializeField] GameObject armObj;

Assets/BowArrow/Scripts/GameMode/OnlineObject/ArrowSync.cs

@@ -54,11 +54,13 @@ public class ArrowSync : MonoBehaviour
                 ps1.maxParticleSize = value;
             }, 0.8f, 0.6f);
         }
-        void activeEffectBomb(bool value) 
-        {
-            this.transform.Find("Head/EF_baodian").gameObject.SetActive(value);
-        }
-        void activeEffectTrail(bool value)
+    void activeEffectBomb(bool value)
+    {
+        this.transform.Find("Head/EF_baodian").gameObject.SetActive(value);
+    }
+    void activeEffectTrail(bool value)
+    {
+        if (GlobalData.MyDeviceMode == DeviceMode.Archery)
         {
             //this.transform.Find("EF_tuowei").gameObject.SetActive(value);
             //this.transform.Find("EF_tuowei/Trail").GetComponent<TrailRenderer>().time = 1.6f / mySpeed;
@@ -74,6 +76,21 @@ public class ArrowSync : MonoBehaviour
             }
 
         }
+        else
+        {
+            StartCoroutine(showTrail(value));
+
+        }
+
+
+    }
+    IEnumerator showTrail(bool value)
+    {
+
+        this.transform.Find("EF_tuowei_bullet").gameObject.SetActive(value);
+        yield return new WaitForEndOfFrame();
+        this.transform.Find("EF_tuowei_bullet/GB_flame_FX_1").gameObject.SetActive(true);
+    }
     #endregion
 
     Quaternion rotation;

Assets/BowArrow/Scripts/GameMode/PKGameMode_OnlinePK.cs

@@ -76,11 +76,13 @@ public class PKGameMode_OnlinePK : GameMode {
                 item.Value.hasSetSyncData = false;
             }
             GameObject arrowPrefab = ArmBow.ins.arrow;
+            GameObject bulletPrefab = ArmBow.ins.bullet;
             foreach (var item in arrowSyncDataList) {
                 ArrowSync arrowSync;
                 arrowSyncMap.TryGetValue(item.id, out arrowSync);
                 if (arrowSync == null) {
-                    GameObject arrowObj = GameObject.Instantiate(arrowPrefab);
+                    GameObject arrowObj = GameObject.Instantiate(GlobalData.MyDeviceMode == DeviceMode.Archery ? arrowPrefab: bulletPrefab);
+                    arrowObj.SetActive(true);
                     arrowSync = arrowObj.AddComponent<ArrowSync>();
                     arrowSync.SetSyncData(item, true);
                     arrowSyncMap[item.id] = arrowSync;

Assets/BowArrow/Scripts/Manager/LoginMgr/RegisterView.cs

@@ -424,7 +424,7 @@ public class RegisterView : MonoBehaviour
         passwordTip.SetActive(pwd1.text != pwd2.text);
     }
     void TestNav() {
-        InputField user = GetInputField(registerInUser);
+        InputField user = GetGameObjectInputField(registerInUser);
         InputField pwd1 = GetInputField(registerInPWD1);
         usrRecord = user.text;
         pwdRecord = pwd1.text;