1.适配英文版

2.修改login 场景调整 AgreenmentOption toggle 功能

Assets/BowArrow/Scenes/Login.unity

@@ -1246,6 +1246,7 @@ GameObject:
   - component: {fileID: 118209004}
   - component: {fileID: 118209003}
   - component: {fileID: 118209005}
+  - component: {fileID: 118209006}
   m_Layer: 5
   m_Name: BtnForgetPWD
   m_TagString: Untagged
@@ -1269,11 +1270,11 @@ RectTransform:
   m_Father: {fileID: 1983304604}
   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: 1.9000015, y: -5.1}
-  m_SizeDelta: {x: 150, y: 30}
-  m_Pivot: {x: 0, y: 1}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -5.100006}
+  m_SizeDelta: {x: 0, y: 30}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &118209003
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1307,7 +1308,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u5FD8\u8BB0\u5BC6\u7801\uFF1F"
+  m_Text: "\u5FD8\u8BB0\u5BC6\u7801?"
 --- !u!222 &118209004
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1331,6 +1332,20 @@ MonoBehaviour:
   textKey: login_forgot_password
   layoutRebuildObject: {fileID: 0}
   languageFontSizes: []
+--- !u!114 &118209006
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 118209001}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &122606335
 GameObject:
   m_ObjectHideFlags: 0
@@ -1366,8 +1381,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: 11.5, y: 0}
-  m_SizeDelta: {x: -23, y: 0}
+  m_AnchoredPosition: {x: -103.49997, y: 0}
+  m_SizeDelta: {x: -253.00006, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &122606338
 MonoBehaviour:
@@ -1402,7 +1417,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u9A8C\u8BC1\u7801"
+  m_Text: "\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801"
 --- !u!222 &122606339
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -3200,7 +3215,6 @@ GameObject:
   - component: {fileID: 288339400}
   - component: {fileID: 288339405}
   - component: {fileID: 288339404}
-  - component: {fileID: 288339403}
   - component: {fileID: 288339402}
   - component: {fileID: 288339401}
   m_Layer: 5
@@ -3228,7 +3242,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: 535.8, y: -8.5}
+  m_AnchoredPosition: {x: 432, y: -36}
   m_SizeDelta: {x: 112, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &288339401
@@ -3290,20 +3304,6 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!114 &288339403
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 288339399}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 2
 --- !u!114 &288339404
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5106,7 +5106,6 @@ GameObject:
   - component: {fileID: 615420134}
   - component: {fileID: 615420138}
   - component: {fileID: 615420137}
-  - component: {fileID: 615420136}
   - component: {fileID: 615420135}
   m_Layer: 5
   m_Name: Text1
@@ -5132,7 +5131,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: 162.6, y: -8.5}
+  m_AnchoredPosition: {x: 108, y: -36}
   m_SizeDelta: {x: 196, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &615420135
@@ -5150,20 +5149,6 @@ MonoBehaviour:
   textKey: agreement_read_and_agree
   layoutRebuildObject: {fileID: 0}
   languageFontSizes: []
---- !u!114 &615420136
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 615420133}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 2
 --- !u!114 &615420137
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5583,7 +5568,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 600, y: 17}
+  m_SizeDelta: {x: 760, y: 17}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &681531957
 MonoBehaviour:
@@ -5604,11 +5589,11 @@ MonoBehaviour:
     m_Bottom: 0
   m_ChildAlignment: 4
   m_Spacing: 10
-  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
   m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
+  m_ChildScaleWidth: 1
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
 --- !u!114 &681531958
@@ -5624,7 +5609,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -6478,7 +6463,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: 162.6, y: 0}
+  m_AnchoredPosition: {x: 267, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &750604318
@@ -6551,7 +6536,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textKey: agreement_read_and_agree
   layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
+  languageFontSizes:
+  - language: 0
+    fontSize: 28
+  - language: 1
+    fontSize: 22
 --- !u!1 &751308049
 GameObject:
   m_ObjectHideFlags: 0
@@ -7294,7 +7283,7 @@ RectTransform:
   m_GameObject: {fileID: 848642643}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.548, y: 1.548, z: 1.548}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1075730481}
@@ -7304,7 +7293,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 30, y: 30}
+  m_SizeDelta: {x: 46, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &848642645
 MonoBehaviour:
@@ -7958,7 +7947,8 @@ GameObject:
   - component: {fileID: 919185868}
   - component: {fileID: 919185867}
   - component: {fileID: 919185866}
-  - component: {fileID: 919185865}
+  - component: {fileID: 919185869}
+  - component: {fileID: 919185870}
   m_Layer: 5
   m_Name: AgreenmentOption
   m_TagString: Untagged
@@ -7978,7 +7968,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1722823757}
+  - {fileID: 1969566644}
   - {fileID: 615420134}
   - {fileID: 1212388776}
   - {fileID: 1170570969}
@@ -7988,21 +7978,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1807, y: -852}
-  m_SizeDelta: {x: 600, y: 17}
+  m_AnchoredPosition: {x: 1892, y: -852}
+  m_SizeDelta: {x: 488, y: 72}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &919185865
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 919185863}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fd60a0b8a3de3814c9bce50c2515f709, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &919185866
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -8022,10 +8000,10 @@ MonoBehaviour:
     m_Bottom: 0
   m_ChildAlignment: 4
   m_Spacing: 10
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 1
+  m_ChildControlHeight: 1
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
@@ -8042,7 +8020,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.990566, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -8067,6 +8045,33 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 919185863}
   m_CullTransparentMesh: 1
+--- !u!114 &919185869
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 919185863}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 2
+--- !u!114 &919185870
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 919185863}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ecb12f46def47ae46a04e303d632100e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  toggle: {fileID: 1722823758}
 --- !u!1 &933139729
 GameObject:
   m_ObjectHideFlags: 0
@@ -9901,7 +9906,6 @@ GameObject:
   - component: {fileID: 1170570969}
   - component: {fileID: 1170570973}
   - component: {fileID: 1170570972}
-  - component: {fileID: 1170570971}
   - component: {fileID: 1170570970}
   m_Layer: 5
   m_Name: Text2
@@ -9927,7 +9931,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: 439.4, y: -8.5}
+  m_AnchoredPosition: {x: 352, y: -36}
   m_SizeDelta: {x: 28, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1170570970
@@ -9945,20 +9949,6 @@ MonoBehaviour:
   textKey: agreement_and
   layoutRebuildObject: {fileID: 0}
   languageFontSizes: []
---- !u!114 &1170570971
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1170570968}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 2
 --- !u!114 &1170570972
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -10332,7 +10322,6 @@ GameObject:
   - component: {fileID: 1212388776}
   - component: {fileID: 1212388781}
   - component: {fileID: 1212388780}
-  - component: {fileID: 1212388779}
   - component: {fileID: 1212388778}
   - component: {fileID: 1212388777}
   m_Layer: 5
@@ -10360,7 +10349,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: 343, y: -8.5}
+  m_AnchoredPosition: {x: 272, y: -36}
   m_SizeDelta: {x: 112, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1212388777
@@ -10422,20 +10411,6 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!114 &1212388779
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1212388775}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 2
 --- !u!114 &1212388780
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -10912,7 +10887,7 @@ MonoBehaviour:
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u65B0\u7528\u6237\u6CE8\u518C"
@@ -12329,7 +12304,7 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 1
+  m_ChildAlignment: 4
   m_Spacing: 43
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
@@ -12574,7 +12549,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: 343, y: 0}
+  m_AnchoredPosition: {x: 431, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1549087752
@@ -12691,7 +12666,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textKey: agreement_user
   layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
+  languageFontSizes:
+  - language: 0
+    fontSize: 28
+  - language: 1
+    fontSize: 22
 --- !u!1 &1557644639
 GameObject:
   m_ObjectHideFlags: 0
@@ -13345,7 +13324,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: 535.8, y: 0}
+  m_AnchoredPosition: {x: 591, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1628073323
@@ -13462,7 +13441,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textKey: agreement_privacy
   layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
+  languageFontSizes:
+  - language: 0
+    fontSize: 28
+  - language: 1
+    fontSize: 22
 --- !u!1 &1634501522
 GameObject:
   m_ObjectHideFlags: 0
@@ -14685,7 +14668,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 4
     m_MaxSize: 50
-    m_Alignment: 4
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -14739,20 +14722,20 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1722823756}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.548, y: 1.548, z: 1.548}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 839545096}
-  m_Father: {fileID: 919185864}
+  m_Father: {fileID: 1969566644}
   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: 23.2, y: -8.5}
-  m_SizeDelta: {x: 30, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -23, y: -10}
+  m_SizeDelta: {x: 46, y: 46}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &1722823758
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -14983,8 +14966,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: 11.5, y: 0}
-  m_SizeDelta: {x: -23, y: 0}
+  m_AnchoredPosition: {x: -108.50001, y: 0}
+  m_SizeDelta: {x: -263, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1740757989
 MonoBehaviour:
@@ -15436,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.0000038146973, y: -1}
+  m_AnchoredPosition: {x: 0, y: -1}
   m_SizeDelta: {x: 0, y: 2}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &1803470178
@@ -16654,7 +16637,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 180, y: 0}
+  m_SizeDelta: {x: 760, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1892141017
 GameObject:
@@ -16789,7 +16772,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: 439.4, y: 0}
+  m_AnchoredPosition: {x: 511, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1900702359
@@ -16862,7 +16845,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textKey: agreement_and
   layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
+  languageFontSizes:
+  - language: 0
+    fontSize: 28
+  - language: 1
+    fontSize: 22
 --- !u!1 &1906664772
 GameObject:
   m_ObjectHideFlags: 0
@@ -17507,8 +17494,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -5, y: 1.7}
-  m_SizeDelta: {x: -30, y: 2}
+  m_AnchoredPosition: {x: 0, y: -3.05}
+  m_SizeDelta: {x: 10, y: 2}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &1960152677
 MonoBehaviour:
@@ -17548,6 +17535,87 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1960152675}
   m_CullTransparentMesh: 1
+--- !u!1 &1969566643
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1969566644}
+  - component: {fileID: 1969566646}
+  - component: {fileID: 1969566645}
+  m_Layer: 5
+  m_Name: Left
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1969566644
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1969566643}
+  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: 1722823757}
+  m_Father: {fileID: 919185864}
+  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: 0, y: -36}
+  m_SizeDelta: {x: 0, y: 72}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1969566645
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1969566643}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 64
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 6
+    m_MaxSize: 64
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!222 &1969566646
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1969566643}
+  m_CullTransparentMesh: 1
 --- !u!1 &1979674714
 GameObject:
   m_ObjectHideFlags: 0
@@ -17776,10 +17844,10 @@ RectTransform:
   m_Father: {fileID: 1872430155}
   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: 7.6, y: 0}
-  m_SizeDelta: {x: 150, y: 40}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 300, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1983304605
 MonoBehaviour:
@@ -17844,13 +17912,13 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1983304603}
-  m_Enabled: 1
+  m_Enabled: 0
   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_Color: {r: 0.990566, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -18735,7 +18803,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  textKey: login_placeholder_user
+  textKey: login_placeholder_account
   layoutRebuildObject: {fileID: 0}
   languageFontSizes: []
 --- !u!114 &2080858407

Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/cn.json

@@ -14,6 +14,7 @@
   "common_confirm": "确定",
   "common_return": "返回",
   "common_send": "发送",
+  "common_code": "验证码",
 
   "modal-confirm-default": "知道了",
 
@@ -25,6 +26,7 @@
   /**
   登录注册 页面
   **/
+  "login_placeholder_account": "请输入您的账号",
   "login_placeholder_user": "请输入您的账号",
   "login_placeholder_password": "请输入您的密码",
   "login_placeholder_graphicCode": "请输入图形验证码",
@@ -235,6 +237,7 @@
   "RelateValidateView-email0": "邮箱验证",
   "RelateValidateView-email1": "请输入邮箱账号",
   "RelateValidateView-email2": "请输入验证码",
+  "RelateValidateView-email22": "请输入验证码",
   "RelateValidateView-email3": "发送验证码",
   "RelateValidateView-email4": "提交",
 
@@ -242,6 +245,7 @@
   "RelateValidateView-phone0": "手机验证",
   "RelateValidateView-phone1": "请输入手机号",
   "RelateValidateView-phone2": "请输入验证码",
+  "RelateValidateView-phone22": "请输入验证码",
   "RelateValidateView-phone3": "发送验证码",
   "RelateValidateView-phone4": "提交",
 

Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/en.json

@@ -14,6 +14,7 @@
   "common_confirm": "Confirm",
   "common_return": "Return",
   "common_send": "Send",
+  "common_code": "Verification code",
 
   "modal-confirm-default": "OK",
 
@@ -25,6 +26,7 @@
   /**
   登录注册 页面
   **/
+  "login_placeholder_account": "Please Input Your Account",
   "login_placeholder_user": "Please Input Your Username",
   "login_placeholder_password": "Please Input Your Password",
   "login_placeholder_graphicCode": "Please Input GraphicCode",
@@ -101,7 +103,7 @@
   "new-user-guider_tip_视角归位-触发": "Short press the <color=#FFA500>\"Aim Reset\"</color> \nkey on the module, <color=#FFA500>aim the bow \nand arrow at the bull's eye with \nreference to the posture in the \npicture</color>, and then complete the \nvisual angle return in 3 seconds.",
   "new-user-guider_tip_视角归位-瞄准": "Please refer to the pose in the figure, aim \nat the bull's-eye immediately, the visual \nangle return will be completed in <size=40><color=#FFA500>{0}</color></size> seconds.",
   "new-user-guider_tip_教程结束": "Congratulations on completing this novice tutorial. If you want \nto <color=#FFA500>know this tutorial</color> next time, please <color=#FFA500>see the novice guidance \nin the setup.</color>",
-  "new-user-guider_tip_准心高亮": "Please follow the prompts to shoot an arrow towards the target,\n complete the manual setup, and return to the connection page.",
+  "new-user-guider_tip_准心高亮": "Please follow the prompts to \nshoot an arrow towards the \ntarget, complete the manual \nsetup, and return to the \nconnection page.",
   "new-user-guider_btn_ok": "OK",
 
   "guider-module-plane": "Plane",
@@ -128,10 +130,10 @@
   "rank_gametype_4": "Wolf\nChallenge PK",
   "friend_title": "Friend",
   "friend_title_2": "Social",
-  "friend_tab_my-friend": "My\nFriend",
-  "friend_tab_request": "Friend\nRequest",
-  "friend_tab_recommend": "Friend\nRecommend",
-  "friend_tab_player-search": "Player\nSearch",
+  "friend_tab_my-friend": "My Friend",
+  "friend_tab_request": "Friend Request",
+  "friend_tab_recommend": "Friend Recommend",
+  "friend_tab_player-search": "Player Search",
   "friend_placeholder_player-search": "Please enter user's id",
   "friend_btn_search": "Search",
   "friend_offline-time_0": "Online",
@@ -236,6 +238,7 @@
   "RelateValidateView-email0": "Email verification",
   "RelateValidateView-email1": "Please enter your email account",
   "RelateValidateView-email2": "Please enter the verification code",
+  "RelateValidateView-email22": "Please enter the \n verification code",
   "RelateValidateView-email3": "Send verification code",
   "RelateValidateView-email4": "Submit",
 
@@ -243,6 +246,7 @@
   "RelateValidateView-phone0": "Phone verification",
   "RelateValidateView-phone1": "Please enter your mobile number",
   "RelateValidateView-phone2": "Please enter the verification code",
+  "RelateValidateView-phone22": "Please enter the \n verification code",
   "RelateValidateView-phone3": "Send verification code",
   "RelateValidateView-phone4": "Submit",
 
@@ -455,7 +459,7 @@
   "Personal_DeleteAccount": "Delete Account",
   "Personal_Content": "Are you sure you want to delete {0} ?",
   "Personal_Warning": "Warning",
-  "Personal_WarningContent": "Deleting this account will erase all your personal information, settings, and data. This action cannot be undone!",
+  "Personal_WarningContent": "Deleting this account will erase all your personal information,\nsettings, and data. This action cannot be undone!",
   "Personal_RecordTime": "played more than ",
   "Personal_RecordTime2": "{0}h{1}m{2}s",
 

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

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -7,8 +8,11 @@ public class AgreenmentOption : MonoBehaviour
 {
     public static AgreenmentOption ins;
 
+    Toggle toggle;
+
     void Awake() {
         ins = this;
+        toggle = transform.Find("Toggle").GetComponent<Toggle>();
         InitAgreementOnClickListeners();
     }
 
@@ -26,12 +30,13 @@ public class AgreenmentOption : MonoBehaviour
             o.GetComponent<AgreementView>().EnterPrivacyAgreement();
         });
     }
-
+    
     public bool IsAgreementChecked() {
-        return transform.Find("Toggle").GetComponent<Toggle>().isOn; 
+        //transform.Find("Toggle").GetComponent<Toggle>()
+        return toggle.isOn; 
     }
 
     public void SetAgreementChecked(bool value) {
-        transform.Find("Toggle").GetComponent<Toggle>().isOn = value;
+        toggle.isOn = value;
     }
 }

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

@@ -0,0 +1,44 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+/* 勾选框-用户协议和隐私政策 */
+public class AgreenmentOption_Second : MonoBehaviour
+{
+    [SerializeField] Toggle toggle;
+    void Awake() {
+        toggle.onValueChanged.AddListener(SetAgreementChecked);
+        InitAgreementOnClickListeners();
+    }
+    void OnEnable()
+    {
+        //进来一定是同意条件后才进此页面
+        toggle.isOn = true;
+
+    }
+    void OnDestroy() {
+    }
+
+    void InitAgreementOnClickListeners() {
+        transform.Find("TextA").GetComponent<Button>().onClick.AddListener(delegate() {
+            GameObject o = GameObject.Instantiate(Resources.Load<GameObject>("Prefabs/Views/AgreementView"));
+            o.GetComponent<AgreementView>().EnterUserAgreement();
+        });
+        transform.Find("TextB").GetComponent<Button>().onClick.AddListener(delegate() {
+            GameObject o = GameObject.Instantiate(Resources.Load<GameObject>("Prefabs/Views/AgreementView"));
+            o.GetComponent<AgreementView>().EnterPrivacyAgreement();
+        });
+    }
+
+    //public void onAgreeStatusChange(bool isOn) {
+    //    if (toggle.isOn != isOn)
+    //        toggle.isOn = isOn;
+    //}
+
+
+
+    public void SetAgreementChecked(bool value) {
+        //修改主页按钮状态
+        AgreenmentOption.ins.SetAgreementChecked(value);
+    }
+}

Assets/BowArrow/Scripts/Manager/LoginMgr/AgreenmentOption_Second.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ecb12f46def47ae46a04e303d632100e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -74,7 +74,8 @@ public class LoginView : MonoBehaviour
     }
 
     void InitInputLimit() {
-        GameObject[] inputNodes = {loginInUser, loginInPWD};
+        //loginInUser
+        GameObject[] inputNodes = {loginInPWD};
         foreach (var inputNode in inputNodes) {
             InputField inputField = GetInputField(inputNode);
             inputField.onValueChanged.AddListener(delegate(string text) {

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

@@ -75,14 +75,26 @@ public class RegisterView : MonoBehaviour
     }
 
     void InitInputLimit() {
-        GameObject[] inputNodes = {registerInUser, registerInPWD1, registerInPWD2};
+        GameObject[] inputNodes = {registerInPWD1, registerInPWD2};
         foreach (var inputNode in inputNodes) {
             InputField inputField = GetInputField(inputNode);
             inputField.onValueChanged.AddListener(delegate(string text) {
-                Match match = new Regex("[^A-Za-z0-9]").Match(text);
-                if (match.Success) {
-                    inputField.text = text.Replace(match.Value, "");
+                if (_LoginValidateType == LoginValidateType.Email)
+                {
+                    Match matchEmail = new Regex("^[a-zA-Z0-9_+&*-]+(?:\\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,7}$").Match(text);
+                    if (matchEmail.Success)
+                    {
+                        inputField.text = text.Replace(matchEmail.Value, "");
+                    }
+                }
+                else {
+                    Match match = new Regex("[^A-Za-z0-9]").Match(text);
+                    if (match.Success)
+                    {
+                        inputField.text = text.Replace(match.Value, "");
+                    }
                 }
+               
             });       
         }
     }
@@ -180,6 +192,7 @@ public class RegisterView : MonoBehaviour
     public void SetLoginValidateType(LoginValidateType _loginValidateType)
     {
         _LoginValidateType = _loginValidateType;
+        LanguageEnum languageEnum = TextAutoLanguage2.GetLanguage();
         if (_LoginValidateType == LoginValidateType.Email)
         {
             _inputRelateAccount.contentType = InputField.ContentType.EmailAddress;
@@ -189,9 +202,11 @@ public class RegisterView : MonoBehaviour
             //输入框文案
             registerInPhone.transform.Find("Text").GetComponent<Text>().text = TextAutoLanguage2.GetTextByKey("RelateValidateView-email0");
             //输入框提示
-            _inputValidateCode.transform.Find("Placeholder").GetComponent<Text>().text = TextAutoLanguage2.GetTextByKey("RelateValidateView-email2");
+            Text _tempCodeText = _inputValidateCode.transform.Find("Placeholder").GetComponent<Text>();
+            //_tempCodeText.fontSize = languageEnum == LanguageEnum.Chinese ? 24 : 20;
+            _tempCodeText.text = TextAutoLanguage2.GetTextByKey("RelateValidateView-email2"); //RelateValidateView-email2
             //发送按钮
-            registerInPhone.transform.Find("GameObject/Send/Text").GetComponent<Text>().text = TextAutoLanguage2.GetTextByKey("RelateValidateView-email3");
+            registerInPhone.transform.Find("GameObject/Send/Text").GetComponent<Text>().text = TextAutoLanguage2.GetTextByKey("common_send"); //RelateValidateView-email3
         }
         else if (_LoginValidateType == LoginValidateType.Phone)
         {
@@ -200,8 +215,10 @@ public class RegisterView : MonoBehaviour
             registerInUser.transform.Find("Text").GetComponent<Text>().text = TextAutoLanguage2.GetTextByKey("register_phone2");
             _inputRelateAccount.transform.Find("Placeholder").GetComponent<Text>().text = TextAutoLanguage2.GetTextByKey("RelateValidateView-phone1");
             registerInPhone.transform.Find("Text").GetComponent<Text>().text = TextAutoLanguage2.GetTextByKey("RelateValidateView-phone0");
-            _inputValidateCode.transform.Find("Placeholder").GetComponent<Text>().text = TextAutoLanguage2.GetTextByKey("RelateValidateView-phone2");
-            registerInPhone.transform.Find("GameObject/Send/Text").GetComponent<Text>().text = TextAutoLanguage2.GetTextByKey("RelateValidateView-phone3");
+            Text _tempCodeText = _inputValidateCode.transform.Find("Placeholder").GetComponent<Text>();
+            //_tempCodeText.fontSize = languageEnum == LanguageEnum.Chinese ? 24 : 20;
+            _tempCodeText.text = TextAutoLanguage2.GetTextByKey("RelateValidateView-phone2"); //RelateValidateView-phone2
+            registerInPhone.transform.Find("GameObject/Send/Text").GetComponent<Text>().text = TextAutoLanguage2.GetTextByKey("common_send");//RelateValidateView-phone3
         }
     }
 
@@ -529,6 +546,8 @@ public class RegisterView : MonoBehaviour
             PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("操作过于频繁"));
             return;
         }
+
+        //string clippedString = text_nickname.Substring(0, 12);
         StartCoroutine(LoginController.Instance.CompleteUserInfo(
             usrRecord, pwdRecord, text_nickname, gender, text_birthday,
             countryCode, stateCode, cityCode 
@@ -536,6 +555,10 @@ public class RegisterView : MonoBehaviour
                 PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey(res.msg));
                 if (res.code == 0) {
                     GameObject.FindObjectOfType<LoginMgr>().showLoginView();
+
+                    //再处理一次名称记录
+                    //LoginMgr.myUserInfo.nickname = text_nickname;
+                    //LoginMgr.myUserInfo.Save();
                 }
             }
         ));

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

@@ -8193,7 +8193,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 37, y: -68}
-  m_SizeDelta: {x: 160, y: 30}
+  m_SizeDelta: {x: 720, y: 30}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &7327544348564479422
 CanvasRenderer:
@@ -8236,8 +8236,10 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1.2
-  m_Text: "Deleting this account will erase all your personal information, \nsettings,
-    and data. This action cannot be undone!"
+  m_Text: 'Deleting this account will erase all your personal information,
+
+    settings,
+    and data. This action cannot be undone!'
 --- !u!114 &5665773561006157702
 MonoBehaviour:
   m_ObjectHideFlags: 0

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

@@ -3163,7 +3163,7 @@ MonoBehaviour:
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
-    m_VerticalOverflow: 1
+    m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Add Friend
 --- !u!114 &8598988670000195849
@@ -5652,7 +5652,7 @@ MonoBehaviour:
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
-    m_VerticalOverflow: 1
+    m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Friend List
 --- !u!114 &8139272505153978647
@@ -6417,7 +6417,7 @@ MonoBehaviour:
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
-    m_VerticalOverflow: 1
+    m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Friend Request
 --- !u!114 &4888477043834679136
@@ -6965,7 +6965,7 @@ MonoBehaviour:
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
-    m_VerticalOverflow: 1
+    m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Friend You May Interest
 --- !u!114 &1710675117183040300

ProjectSettings/ProjectSettings.asset

@@ -166,7 +166,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.xmjssvr.BowArrow.mi
+    Android: com.xmjssvr.BowArrowEn
     Standalone: com.JssF.BowArrow
     iPhone: com.xmjssvr.BowArrow
   buildNumber:
@@ -286,7 +286,7 @@ PlayerSettings:
   - m_BuildTarget: 
     m_Icons:
     - serializedVersion: 2
-      m_Icon: {fileID: 2800000, guid: e1485575cd9962247a6d7cc46fd6d6a9, type: 3}
+      m_Icon: {fileID: 2800000, guid: 5a86b450fbbf31f4d9269beac3ccd441, type: 3}
       m_Width: 128
       m_Height: 128
       m_Kind: 0