1.修改WildAttack读取SCV路径bug

2.调整首页inputX

Assets/BowArrow/Scenes/Login.unity

@@ -160,7 +160,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 760, y: 99}
+  m_SizeDelta: {x: 760, y: 119.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &25527129
 MonoBehaviour:
@@ -469,7 +469,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: 0, y: -104.55}
+  m_AnchoredPosition: {x: 0, y: -146.45}
   m_SizeDelta: {x: 574.9, y: 109.1}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &51373216
@@ -2040,7 +2040,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 760, y: 97}
+  m_SizeDelta: {x: 760, y: 113.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &207802365
 MonoBehaviour:
@@ -2059,7 +2059,7 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 4
+  m_ChildAlignment: 7
   m_Spacing: 0
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
@@ -2842,6 +2842,7 @@ RectTransform:
   m_Children:
   - {fileID: 732884359}
   - {fileID: 1316887421}
+  - {fileID: 1436097010}
   - {fileID: 1545576239}
   m_Father: {fileID: 261231101}
   m_RootOrder: 1
@@ -3767,7 +3768,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: 0, y: -104.55}
+  m_AnchoredPosition: {x: 0, y: -146.45}
   m_SizeDelta: {x: 574.9, y: 109.1}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &338287894
@@ -4113,10 +4114,10 @@ RectTransform:
   m_Father: {fileID: 1614998518}
   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: 381.05005, y: 0}
-  m_SizeDelta: {x: 762.1, y: 25.42}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 0.050048828, y: 0}
+  m_SizeDelta: {x: 0.099975586, y: 25.42}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &370704864
 MonoBehaviour:
@@ -5522,7 +5523,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: 595.55, y: -110.55}
+  m_AnchoredPosition: {x: 595.55, y: -168.95}
   m_SizeDelta: {x: 1191.1, y: 109.1}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &681531954
@@ -5568,7 +5569,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 760, y: 17}
+  m_SizeDelta: {x: 760, y: 103}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &681531957
 MonoBehaviour:
@@ -6151,7 +6152,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: 300, y: -20}
+  m_AnchoredPosition: {x: 300, y: -61.899994}
   m_SizeDelta: {x: 300, y: 40}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &715618109
@@ -6461,9 +6462,9 @@ RectTransform:
   m_Father: {fileID: 681531955}
   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: 267, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 267, y: -51.5}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &750604318
@@ -9119,7 +9120,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 760, y: 145}
+  m_SizeDelta: {x: 760, y: 188}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1077993568
 MonoBehaviour:
@@ -9370,13 +9371,13 @@ RectTransform:
   m_Children:
   - {fileID: 715618108}
   - {fileID: 338287893}
-  m_Father: {fileID: 1316887421}
-  m_RootOrder: 2
+  m_Father: {fileID: 1436097010}
+  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: 287.45, y: -280.5}
-  m_SizeDelta: {x: 574.9, y: 159}
+  m_AnchoredPosition: {x: 287.45, y: -100.5}
+  m_SizeDelta: {x: 574.9, y: 201}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1105214627
 MonoBehaviour:
@@ -9448,7 +9449,7 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 3
+  m_ChildAlignment: 6
   m_Spacing: 10
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
@@ -9647,7 +9648,7 @@ MonoBehaviour:
   m_LineType: 0
   m_HideMobileInput: 0
   m_CharacterValidation: 0
-  m_CharacterLimit: 18
+  m_CharacterLimit: 40
   m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
@@ -11094,15 +11095,13 @@ RectTransform:
   m_Children:
   - {fileID: 257790178}
   - {fileID: 2049143081}
-  - {fileID: 1105214626}
-  - {fileID: 1802940218}
   m_Father: {fileID: 260775651}
   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: 607.5, y: -405.95}
-  m_SizeDelta: {x: 1195, y: 418.5}
+  m_AnchoredPosition: {x: 607.5, y: -276.2}
+  m_SizeDelta: {x: 1195, y: 159}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1316887422
 MonoBehaviour:
@@ -11362,7 +11361,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 760, y: 145}
+  m_SizeDelta: {x: 760, y: 188}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1366365311
 MonoBehaviour:
@@ -11432,9 +11431,9 @@ MonoBehaviour:
   m_Padding:
     m_Left: 0
     m_Right: 0
-    m_Top: 0
+    m_Top: 43
     m_Bottom: 0
-  m_ChildAlignment: 3
+  m_ChildAlignment: 6
   m_Spacing: 8
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
@@ -11641,6 +11640,109 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &1436097009
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1436097010}
+  - component: {fileID: 1436097013}
+  - component: {fileID: 1436097012}
+  - component: {fileID: 1436097011}
+  m_Layer: 5
+  m_Name: grid2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1436097010
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1436097009}
+  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: 1105214626}
+  - {fileID: 1802940218}
+  m_Father: {fileID: 260775651}
+  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: 607.5, y: -456.2}
+  m_SizeDelta: {x: 1195, y: 201}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1436097011
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1436097009}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_StartCorner: 0
+  m_StartAxis: 0
+  m_CellSize: {x: 574.9, y: 201}
+  m_Spacing: {x: 45, y: 42}
+  m_Constraint: 0
+  m_ConstraintCount: 2
+--- !u!114 &1436097012
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1436097009}
+  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: 0.392}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1436097013
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1436097009}
+  m_CullTransparentMesh: 1
 --- !u!1 &1453333789
 GameObject:
   m_ObjectHideFlags: 0
@@ -12304,8 +12406,8 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 4
-  m_Spacing: 43
+  m_ChildAlignment: 1
+  m_Spacing: 0
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -12348,12 +12450,12 @@ RectTransform:
   - {fileID: 1687503763}
   - {fileID: 679882285}
   m_Father: {fileID: 260775651}
-  m_RootOrder: 2
+  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: 605.5, y: -697.7}
-  m_SizeDelta: {x: 1191, y: 165}
+  m_AnchoredPosition: {x: 605.5, y: -668.45}
+  m_SizeDelta: {x: 1191, y: 223.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1545576240
 MonoBehaviour:
@@ -12423,9 +12525,9 @@ MonoBehaviour:
   m_Padding:
     m_Left: 0
     m_Right: 0
-    m_Top: 5
+    m_Top: 63
     m_Bottom: 0
-  m_ChildAlignment: 3
+  m_ChildAlignment: 6
   m_Spacing: 16
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
@@ -12547,9 +12649,9 @@ RectTransform:
   m_Father: {fileID: 681531955}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 431, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 431, y: -51.5}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1549087752
@@ -13040,7 +13142,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 762.1, y: 0}
+  m_SizeDelta: {x: 762.1, y: 42}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1621113219
 GameObject:
@@ -13322,9 +13424,9 @@ RectTransform:
   m_Father: {fileID: 681531955}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 591, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 591, y: -51.5}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1628073323
@@ -14541,7 +14643,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: 160, y: -22.5}
+  m_AnchoredPosition: {x: 160, y: -80.7}
   m_SizeDelta: {x: 160, y: 35}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &1687503764
@@ -15297,13 +15399,13 @@ RectTransform:
   - {fileID: 1991630324}
   - {fileID: 51373215}
   - {fileID: 2110482411}
-  m_Father: {fileID: 1316887421}
-  m_RootOrder: 3
+  m_Father: {fileID: 1436097010}
+  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: 907.35004, y: -280.5}
-  m_SizeDelta: {x: 574.9, y: 159}
+  m_AnchoredPosition: {x: 907.35004, y: -100.5}
+  m_SizeDelta: {x: 574.9, y: 201}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1802940219
 MonoBehaviour:
@@ -15375,7 +15477,7 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 3
+  m_ChildAlignment: 6
   m_Spacing: 10
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
@@ -15419,7 +15521,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: -1}
+  m_AnchoredPosition: {x: 0, y: -17.5}
   m_SizeDelta: {x: 0, y: 2}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &1803470178
@@ -16490,7 +16592,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 232, y: -20}
+  m_AnchoredPosition: {x: 232, y: -44.5}
   m_SizeDelta: {x: 198.8, y: 65.4}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1867995539
@@ -16637,7 +16739,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 760, y: 0}
+  m_SizeDelta: {x: 760, y: 50.4}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1892141017
 GameObject:
@@ -16770,9 +16872,9 @@ RectTransform:
   m_Father: {fileID: 681531955}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 511, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 511, y: -51.5}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1900702359
@@ -17844,10 +17946,10 @@ RectTransform:
   m_Father: {fileID: 1872430155}
   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.5}
+  m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 300, y: 40}
+  m_SizeDelta: {x: -460, y: 43}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1983304605
 MonoBehaviour:
@@ -17979,7 +18081,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: 300, y: -20}
+  m_AnchoredPosition: {x: 300, y: -61.899994}
   m_SizeDelta: {x: 300, y: 40}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &1991630325
@@ -18980,7 +19082,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -25.5}
   m_SizeDelta: {x: 760, y: 145}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2086638596
@@ -19459,7 +19561,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: -17.5}
   m_SizeDelta: {x: 0, y: 2}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &2142587149

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

@@ -226,7 +226,7 @@
  重置 页面
   **/
   "RetrievePassword_PhoneTitle": "Phone Number",
-  "RetrievePassword_EmailTitle": "EMILL",
+  "RetrievePassword_EmailTitle": "EMAIL",
   "RetrievePassword_EmailTip": "Please enter your email number",
   "RetrievePassword_PhoneTip": "Please enter an 11 digit phone number",
   "RetrievePassword_CodeTitle": "Code",

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

@@ -208,6 +208,8 @@ public class DeviceView_ItemShow : MonoBehaviour
         if (AimHandler.ins.aimDeviceInfos.arry.Count <= deviceIndex)
         {
             if (!btnConnectBow.gameObject.activeSelf) btnConnectBow.gameObject.SetActive(true);
+            if (process.activeSelf) process.SetActive(false);
+            if (connected.activeSelf) connected.SetActive(false);
             return;
         }
         AimDeviceInfo aimDeviceInfo = AimHandler.ins.aimDeviceInfos.arry[deviceIndex];
@@ -231,16 +233,21 @@ public class DeviceView_ItemShow : MonoBehaviour
                 //Debug.LogWarning("AimDeviceType：" + ((AimDeviceType)aimDeviceInfo.type).ToString());
                 break;
         }
-        if (bShow)
+        //如果不是process状态下，可刷新对应按钮显示。process 说明在搜索
+        if (!process.activeSelf)
         {
-            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);
+            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)

Assets/BowArrow/Views/LoginScene/RetrievePasswordView/RetrievePasswordView.prefab

@@ -369,7 +369,7 @@ MonoBehaviour:
     m_Top: 10
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 29.5
+  m_Spacing: 0
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
@@ -941,7 +941,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 484.42, y: 93.39}
+  m_SizeDelta: {x: 484.42, y: 122.89}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &399394408
 CanvasRenderer:
@@ -1013,7 +1013,7 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 3
+  m_ChildAlignment: 6
   m_Spacing: 10
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
@@ -1626,7 +1626,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 484.42, y: 93.39}
+  m_SizeDelta: {x: 484.42, y: 122.89}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &880471782
 CanvasRenderer:
@@ -1698,7 +1698,7 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 3
+  m_ChildAlignment: 6
   m_Spacing: 10
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
@@ -2507,7 +2507,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 484.42, y: 93.39}
+  m_SizeDelta: {x: 484.42, y: 122.89}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1819061883
 CanvasRenderer:
@@ -2579,7 +2579,7 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 3
+  m_ChildAlignment: 6
   m_Spacing: 10
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
@@ -2727,7 +2727,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 484.42, y: 93.39}
+  m_SizeDelta: {x: 484.42, y: 122.89}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1870237131
 CanvasRenderer:
@@ -2784,7 +2784,7 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 3
+  m_ChildAlignment: 6
   m_Spacing: 10
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
@@ -3499,7 +3499,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 60.5}
+  m_SizeDelta: {x: 100, y: 90}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2829973556690441110
 GameObject:
@@ -3847,7 +3847,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: 300, y: -9.599998}
+  m_AnchoredPosition: {x: 300, y: -39.699997}
   m_SizeDelta: {x: 300, y: 18}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &3061687750251564958
@@ -3946,8 +3946,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: 255.21, y: -274.585}
-  m_SizeDelta: {x: 484.42, y: 93.39}
+  m_AnchoredPosition: {x: 327.873, y: -168.52849}
+  m_SizeDelta: {x: 484.42, y: 122.89}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8159435952674783874
 CanvasRenderer:
@@ -4019,7 +4019,7 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 3
+  m_ChildAlignment: 6
   m_Spacing: 10
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
@@ -4222,7 +4222,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: 0, y: -60.695}
+  m_AnchoredPosition: {x: 0, y: -90.795}
   m_SizeDelta: {x: 484.42, y: 64.19}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3015255263941786039

Assets/WildAttack/Scripts/GameEnter.cs

@@ -13,16 +13,17 @@ namespace WildAttack
         /// 协程数
         /// </summary>
         private int coroutineNum = 7;
+        private bool bCanUpdate = false;
         void Awake()
         {
             SingletonManager.Clear();
+            userGameAnalyse1 = UserGameAnalyse1.CreateWhenGameStartAndReturn(14);
             // 数据类init
             ModuleInit();
         }
 
         void Start()
         {
-            userGameAnalyse1 = UserGameAnalyse1.CreateWhenGameStartAndReturn(14);
         }
 
         void OnDestroy()
@@ -58,7 +59,7 @@ namespace WildAttack
         /// </summary>
         void Update()
         {
-            if (coroutineNum == 0)
+            if (coroutineNum == 0 && bCanUpdate)
             {
                 GameMananger.GetInstance().Update();
 
@@ -83,6 +84,8 @@ namespace WildAttack
                     ProcessManager.GetInstance().Init();
                 });
                 GameMananger.GetInstance().Init(userGameAnalyse1);
+
+                bCanUpdate = true;
             }
         }
     }

Assets/WildAttack/Scripts/Module/GameModule.cs

@@ -34,7 +34,7 @@ namespace WildAttack
             //刻意延迟，避免过快加载完成，因为遇到过加载完了，但其它GameObject脚本的Start()还没执行
             yield return new WaitForSeconds(0.2f); 
 
-            string sPath = Application.streamingAssetsPath + "/" + fileName;
+            string sPath = CSVUtils.GetStreamingAssetPath() + "/" + fileName;
             UnityWebRequest www = UnityWebRequest.Get(sPath);
             yield return www.SendWebRequest();
             File.WriteAllText(Application.persistentDataPath + "/" + fileName, www.downloadHandler.text, Encoding.GetEncoding("utf-8"));

Assets/WildAttack/Scripts/Module/MonsterModule.cs

@@ -29,7 +29,7 @@ namespace WildAttack
         #region Override
         public IEnumerator LoadCSV(string fileName, Action callback)
         {
-            string sPath = Application.streamingAssetsPath + "/" + fileName;
+            string sPath = CSVUtils.GetStreamingAssetPath() + "/" + fileName;
             UnityWebRequest www = UnityWebRequest.Get(sPath);
             yield return www.SendWebRequest();
             File.WriteAllText(Application.persistentDataPath + "/" + fileName, www.downloadHandler.text, Encoding.GetEncoding("utf-8"));

Assets/WildAttack/Scripts/Module/ProcessModule.cs

@@ -30,7 +30,7 @@ namespace WildAttack
         #region Override
         public IEnumerator LoadCSV(string fileName, Action callback)
         {
-            string sPath = Application.streamingAssetsPath + "/" + fileName;
+            string sPath = CSVUtils.GetStreamingAssetPath() + "/" + fileName;
             UnityWebRequest www = UnityWebRequest.Get(sPath);
             yield return www.SendWebRequest();
             File.WriteAllText(Application.persistentDataPath + "/" + fileName, www.downloadHandler.text, Encoding.GetEncoding("utf-8"));
@@ -97,7 +97,6 @@ namespace WildAttack
                 {
                     timeList.Add(float.Parse(timeListStr[z]));
                 }
-
                 processDataDic[int.Parse(data[0])] = new ProcessData()
                 {
                     id = int.Parse(data[0]),

Assets/WildAttack/Scripts/Module/StagePropertyModule.cs

@@ -21,7 +21,7 @@ namespace WildAttack
         public Dictionary<int, StagePropertyData> stagePropDataDic;
         public IEnumerator LoadCSV(string fileName, Action callback)
         {
-            string sPath = Application.streamingAssetsPath + "/" + fileName;
+            string sPath = CSVUtils.GetStreamingAssetPath() + "/" + fileName;
             UnityWebRequest www = UnityWebRequest.Get(sPath);
             yield return www.SendWebRequest();
             File.WriteAllText(Application.persistentDataPath + "/" + fileName, www.downloadHandler.text, Encoding.GetEncoding("utf-8"));

Assets/WildAttack/Scripts/Module/StringModule.cs

@@ -22,7 +22,7 @@ namespace WildAttack
         private Dictionary<string, StringData> stringDataDic;
         public IEnumerator LoadCSV(string fileName, Action callback)
         {
-            string sPath = Application.streamingAssetsPath + "/" + fileName;
+            string sPath = CSVUtils.GetStreamingAssetPath() + "/" + fileName;
             UnityWebRequest www = UnityWebRequest.Get(sPath);
             yield return www.SendWebRequest();
             File.WriteAllText(Application.persistentDataPath + "/" + fileName, www.downloadHandler.text, Encoding.GetEncoding("utf-8"));

Assets/WildAttack/Scripts/Module/WayPointModule.cs

@@ -30,7 +30,7 @@ namespace WildAttack
         #region Override
         public IEnumerator LoadCSV(string fileName, Action callback)
         {
-            string sPath = Application.streamingAssetsPath + "/" + fileName;
+            string sPath = CSVUtils.GetStreamingAssetPath() + "/" + fileName;
             UnityWebRequest www = UnityWebRequest.Get(sPath);
             yield return www.SendWebRequest();
             File.WriteAllText(Application.persistentDataPath + "/" + fileName, www.downloadHandler.text, Encoding.GetEncoding("utf-8"));

Assets/WildAttack/Scripts/Module/WeaponModule.cs

@@ -19,7 +19,7 @@ namespace WildAttack
 
         public IEnumerator LoadCSV(string fileName, Action callback)
         {
-            string sPath = Application.streamingAssetsPath + "/" + fileName;
+            string sPath = CSVUtils.GetStreamingAssetPath() + "/" + fileName;
             UnityWebRequest www = UnityWebRequest.Get(sPath);
             yield return www.SendWebRequest();
             File.WriteAllText(Application.persistentDataPath + "/" + fileName, www.downloadHandler.text, Encoding.GetEncoding("utf-8"));

Assets/WildAttack/Scripts/ObjectPool/EnemyPool.cs

@@ -30,7 +30,6 @@ namespace WildAttack
             enemyPfbs.Add(pfb1);
             enemyPfbs.Add(pfb2);
             enemyPfbs.Add(pfb3);
-
             for (int i = 0; i < ProcessModule.GetInstance().processDataDic[ProcessModule.GetInstance().processDataDic.Count].monsterId.Count; i++)
             {
                 GameObject enemy = GameObject.Instantiate<GameObject>(pfb1, poolTrans);

Assets/WildAttack/Scripts/Utils/CSVUtils.cs

@@ -8,6 +8,20 @@ namespace WildAttack
     /// </summary>
     public class CSVUtils : Singleton<CSVUtils>
     {
+        public static string GetStreamingAssetPath() {
+            string path =
+            #if UNITY_ANDROID && !UNITY_EDITOR
+                    Application.streamingAssetsPath;
+            #elif UNITY_IPHONE && !UNITY_EDITOR
+                    "file://" + Application.streamingAssetsPath;
+            #elif UNITY_STANDLONE_WIN || UNITY_EDITOR
+                    "file://" + Application.streamingAssetsPath;
+            #else
+                    string.Empty;
+            #endif
+            return path;
+        }
+
         #region Members
         //利用二维数组存储对应行和列中的字符串
         public string[][] m_ArrayData;