Explorar el Código

3个引导页面:连接->地磁计->陀螺仪

lvjincheng hace 2 años
padre
commit
5997b6d973

+ 84 - 7
Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/ConnectGuidanceView.prefab

@@ -448,7 +448,7 @@ RectTransform:
   - {fileID: 1254516242089234503}
   - {fileID: 1254516242182012394}
   m_Father: {fileID: 6942982441339297973}
-  m_RootOrder: 4
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1119,7 +1119,7 @@ RectTransform:
   - {fileID: 1254516241781985496}
   - {fileID: 1254516243464601900}
   m_Father: {fileID: 6942982441339297973}
-  m_RootOrder: 5
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1240,7 +1240,7 @@ RectTransform:
   - {fileID: 1254516242951852259}
   - {fileID: 1254516243193209574}
   m_Father: {fileID: 6942982441339297973}
-  m_RootOrder: 1
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1497,7 +1497,7 @@ RectTransform:
   - {fileID: 1254516242318970245}
   - {fileID: 1254516242596103350}
   m_Father: {fileID: 6942982441339297973}
-  m_RootOrder: 3
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -2162,7 +2162,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6942982441339297973}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -2291,6 +2291,82 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 3.
+--- !u!1 &5655091748381281952
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3337301201855293941}
+  - component: {fileID: 8947987939501671924}
+  - component: {fileID: 8199359268789397533}
+  m_Layer: 5
+  m_Name: BtnNext
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3337301201855293941
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5655091748381281952}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6942982441339297973}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8947987939501671924
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5655091748381281952}
+  m_CullTransparentMesh: 1
+--- !u!114 &8199359268789397533
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5655091748381281952}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  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: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &6942982441339297969
 GameObject:
   m_ObjectHideFlags: 0
@@ -2324,11 +2400,12 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6942982441650629192}
-  - {fileID: 1254516242565904546}
   - {fileID: 1254516243596033487}
-  - {fileID: 1254516242749286052}
   - {fileID: 1254516242006829828}
   - {fileID: 1254516242548659640}
+  - {fileID: 3337301201855293941}
+  - {fileID: 1254516242565904546}
+  - {fileID: 1254516242749286052}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 82 - 33
Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/GyrGuidanceView.prefab

@@ -1,5 +1,81 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2823352511136847493
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6748997971718369909}
+  - component: {fileID: 1578200717470906871}
+  - component: {fileID: 5381640857889253282}
+  m_Layer: 5
+  m_Name: BtnNext
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6748997971718369909
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2823352511136847493}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5651314242315564806}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1578200717470906871
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2823352511136847493}
+  m_CullTransparentMesh: 1
+--- !u!114 &5381640857889253282
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2823352511136847493}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  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: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5651314242315564802
 GameObject:
   m_ObjectHideFlags: 0
@@ -34,9 +110,10 @@ RectTransform:
   m_Children:
   - {fileID: 5651314242354419839}
   - {fileID: 5651314242930350345}
-  - {fileID: 5651314242594850861}
   - {fileID: 5651314243503148123}
+  - {fileID: 6748997971718369909}
   - {fileID: 5651314244108234268}
+  - {fileID: 5651314242594850861}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -118,6 +195,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ca8f8b63852e0ac48b5a321a22f8d880, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  btnGyrCalibrate: {fileID: 5651314244108234241}
 --- !u!1 &5651314242330084023
 GameObject:
   m_ObjectHideFlags: 0
@@ -467,7 +545,7 @@ RectTransform:
   - {fileID: 5651314242670474731}
   - {fileID: 5651314242578082637}
   m_Father: {fileID: 5651314242315564806}
-  m_RootOrder: 2
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -955,7 +1033,7 @@ RectTransform:
   - {fileID: 5651314243550147649}
   - {fileID: 5651314244172765875}
   m_Father: {fileID: 5651314242315564806}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1286,7 +1364,6 @@ GameObject:
   - component: {fileID: 5651314243985302722}
   - component: {fileID: 5651314243985302727}
   - component: {fileID: 5651314243985302720}
-  - component: {fileID: 5651314243985302721}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -1356,22 +1433,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Gyr Initialization
---- !u!114 &5651314243985302721
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5651314243985302723}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b7cbfcb0916cf694fb3d059ea4b4c1da, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  textID: 14
-  layoutRebuildObject: {fileID: 0}
-  textFormatArgs: []
-  languageFontSizes: []
 --- !u!1 &5651314244108234269
 GameObject:
   m_ObjectHideFlags: 0
@@ -1495,19 +1556,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 5651314244108234240}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: HomeView, Assembly-CSharp
-        m_MethodName: OnClick_ConnectBLE
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
 --- !u!114 &5651314244108234242
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 289 - 44
Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/MagGuidanceView.prefab

@@ -1,5 +1,81 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1237197124446190207
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3709285175023385618}
+  - component: {fileID: 127499285437122985}
+  - component: {fileID: 5924603076615260642}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3709285175023385618
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1237197124446190207}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3421592739151455481}
+  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: 228.99998, y: 67.00003}
+  m_SizeDelta: {x: 212, y: 108}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &127499285437122985
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1237197124446190207}
+  m_CullTransparentMesh: 1
+--- !u!114 &5924603076615260642
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1237197124446190207}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 35eb2930dc375c942964005b33a0d4b7, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &1517141302923954734
 GameObject:
   m_ObjectHideFlags: 0
@@ -110,9 +186,9 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1517141303485755894}
   - {fileID: 1517141303477645293}
   - {fileID: 1517141303345374334}
+  - {fileID: 3421592739151455481}
   m_Father: {fileID: 1517141303310141644}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -471,7 +547,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1517141303080194407}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -556,8 +632,8 @@ 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: 8, y: 109}
-  m_SizeDelta: {x: 215, y: 196}
+  m_AnchoredPosition: {x: 0, y: -24}
+  m_SizeDelta: {x: 390, y: 323}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1517141303467430855
 CanvasRenderer:
@@ -587,7 +663,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 40ab944e5c084a945a652482318fe752, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 66a6d351ab0a173459033015ea7f2d6b, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -628,7 +704,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1517141303080194407}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -702,18 +778,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1517141303485755889}
-  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, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1517141303080194407}
+  m_Father: {fileID: 3421592739151455481}
   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: 67}
-  m_SizeDelta: {x: 539, y: 369}
+  m_AnchoredPosition: {x: -251, y: 67}
+  m_SizeDelta: {x: 167, y: 156}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1517141303485755892
 CanvasRenderer:
@@ -743,7 +819,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: b677b48b1092c9c4a880196398a3aefd, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3b741206ff0906048a1b198101cc1e95, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -871,6 +947,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ab5ef25032319f849a4101cc960da7d2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  btnMagCalibrate: {fileID: 1517141303817155299}
+  prefab_MagInterferenceTipView: {fileID: 6172428592328166794, guid: ec43c0c7af8cd9b42a2a6fa569f73b52, type: 3}
 --- !u!1 &1517141303755171929
 GameObject:
   m_ObjectHideFlags: 0
@@ -1070,19 +1148,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1517141303817155296}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: HomeView, Assembly-CSharp
-        m_MethodName: OnClick_ConnectBLE
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
 --- !u!114 &1517141303817155298
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1467,7 +1533,6 @@ GameObject:
   - component: {fileID: 1517141304427223183}
   - component: {fileID: 1517141304427223170}
   - component: {fileID: 1517141304427223181}
-  - component: {fileID: 1517141304427223180}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -1537,22 +1602,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Mag Initialization
---- !u!114 &1517141304427223180
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1517141304427223182}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b7cbfcb0916cf694fb3d059ea4b4c1da, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  textID: 14
-  layoutRebuildObject: {fileID: 0}
-  textFormatArgs: []
-  languageFontSizes: []
 --- !u!1 &1517141304486116603
 GameObject:
   m_ObjectHideFlags: 0
@@ -1589,8 +1638,8 @@ 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: -31}
-  m_SizeDelta: {x: 493, y: 89}
+  m_AnchoredPosition: {x: 0, y: 72}
+  m_SizeDelta: {x: 224, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1517141304486116606
 CanvasRenderer:
@@ -1620,7 +1669,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 29ea56c2d665b54438b83b2813a6b0b6, type: 3}
+  m_Sprite: {fileID: 21300000, guid: df32255bd87736744bad07f64a45e4a3, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1709,3 +1758,199 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2485638985727102301
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3421592739151455481}
+  m_Layer: 5
+  m_Name: Box
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3421592739151455481
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2485638985727102301}
+  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: 1517141303485755894}
+  - {fileID: 3709285175023385618}
+  - {fileID: 8985114651392762497}
+  - {fileID: 3609045725168158299}
+  m_Father: {fileID: 1517141303080194407}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &5039245252701780433
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3609045725168158299}
+  - component: {fileID: 1756542392210722131}
+  - component: {fileID: 6131054885113007496}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3609045725168158299
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5039245252701780433}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3421592739151455481}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -28, y: 95}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1756542392210722131
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5039245252701780433}
+  m_CullTransparentMesh: 1
+--- !u!114 &6131054885113007496
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5039245252701780433}
+  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.0627451, g: 0.7607843, b: 0.7764706, 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: 24
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: '>0.5M'
+--- !u!1 &6577652661733261400
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8985114651392762497}
+  - component: {fileID: 691985369116290349}
+  - component: {fileID: 1432570926514082621}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8985114651392762497
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6577652661733261400}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3421592739151455481}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -24, y: 68}
+  m_SizeDelta: {x: 171, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &691985369116290349
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6577652661733261400}
+  m_CullTransparentMesh: 1
+--- !u!114 &1432570926514082621
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6577652661733261400}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: e9af67494783ed74da84cb89a87b4d77, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1

+ 18 - 12
Assets/SmartBow/Scripts/Views/ConnectGuidanceView.cs

@@ -7,7 +7,8 @@ public class ConnectGuidanceView : MonoBehaviour
 {
     void Start()
     {
-        SetConfirmToggle(IsConfirmFromStorage());
+        InitConfirmStorage();
+        transform.Find("BtnNext").GetComponent<Button>().onClick.AddListener(OnClick_Next);
     }
 
     void Update()
@@ -15,19 +16,28 @@ public class ConnectGuidanceView : MonoBehaviour
         UpdateBtnForConnect();
     }
 
-    bool IsConfirmToggleOn()
+    void OnClick_Next()
     {
-        return transform.Find("ConfirmStep/Toggle").GetComponent<Toggle>().isOn;
+        if (bowStatus == BluetoothStatusEnum.ConnectSuccess)
+        {
+            ViewManager2.HideView(ViewManager2.Path_ConnectGuidanceView);
+            ViewManager2.ShowView(ViewManager2.Path_GyrGuidanceView);
+        }
     }
-    void SetConfirmToggle(bool on)
+
+    void InitConfirmStorage()
     {
-        transform.Find("ConfirmStep/Toggle").GetComponent<Toggle>().isOn = on;
+        transform.Find("ConfirmStep/Toggle").GetComponent<Toggle>().SetIsOnWithoutNotify(IsConfirmInStorage());
+        transform.Find("ConfirmStep/Toggle").GetComponent<Toggle>().onValueChanged.AddListener(v =>
+        {
+            SetConfirmToStorage(v);
+        });
     }
-    bool IsConfirmFromStorage()
+    bool IsConfirmInStorage()
     {
         return PlayerPrefs.GetInt("connect-confirm-" + LoginMgr.myUserInfo.id, 0) == 1;
     }
-    void SetConfirmFromStorage(bool value)
+    void SetConfirmToStorage(bool value)
     {
         PlayerPrefs.SetInt("connect-confirm-" + LoginMgr.myUserInfo.id, value ? 1 : 0);
     }
@@ -48,15 +58,11 @@ public class ConnectGuidanceView : MonoBehaviour
 
     public void OnClick_ConnectBLE()
     {
-        if (!IsConfirmToggleOn())
+        if (!IsConfirmInStorage())
         {
             PopupMgr.ins.ShowTip("Please Confirmed the completion of the above steps");
             return;
         }
-        else
-        {
-            SetConfirmFromStorage(true);
-        }
         if (HomeView.ShowProminentBeforeConnectBLE()) return;
         BluetoothAim.ins.DoConnect();
     }

+ 81 - 4
Assets/SmartBow/Scripts/Views/GyrGuidanceView.cs

@@ -1,19 +1,31 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
+using System;
 
 public class GyrGuidanceView : MonoBehaviour
 {
-    // Start is called before the first frame update
+    [SerializeField] Button btnGyrCalibrate;
+
     void Start()
     {
-        
+        btnGyrCalibrate.GetComponent<Button>().onClick.AddListener(ClickGyrCalibrate);
+        transform.Find("BtnNext").GetComponent<Button>().onClick.AddListener(OnClick_Next);
     }
 
-    // Update is called once per frame
     void Update()
     {
-        
+        UpdateForGyr();    
+    }
+
+    void OnClick_Next()
+    {
+        if (AimHandler.ins.IsGyrCompleted())
+        {
+            ViewManager2.HideView(ViewManager2.Path_GyrGuidanceView);
+            ViewManager2.ShowView(ViewManager2.Path_MagGuidanceView);
+        }
     }
 
     public void OnClick_Back()
@@ -21,4 +33,69 @@ public class GyrGuidanceView : MonoBehaviour
         AudioMgr.ins.PlayBtn();
         ViewManager2.HideView(ViewManager2.Path_GyrGuidanceView);
     }
+
+    #region 陀螺仪校准逻辑
+    [NonSerialized] public int flag_GyrCalibarateOperateAndFinish = -1;
+    public Action action_GyrCalibarateOperateAndFinish;
+    public Func<bool> action_OnClickGyrCalibrateInterceptor;
+    [NonSerialized] public bool gyrCalibrating = false;
+    void ClickGyrCalibrate()
+    {
+        if (action_OnClickGyrCalibrateInterceptor != null)
+        {
+            if (action_OnClickGyrCalibrateInterceptor.Invoke()) return;
+        }
+        if (!gyrCalibrating && BluetoothAim.ins.status != BluetoothStatusEnum.ConnectSuccess)
+        {
+            PopupMgr.ins.ShowTipTop(TextAutoLanguage2.GetTextByKey("device-calibrate_n-connect"));
+            return;
+        }
+        gyrCalibrating = !gyrCalibrating;
+        if (gyrCalibrating)
+        {
+            AimHandler.ins.gyrCalibrateCompleteCount = 0;
+            canUpdateGyrCalibrateProgress = true;
+            flag_GyrCalibarateOperateAndFinish = 0;
+        }
+        else
+        {
+            canUpdateGyrCalibrateProgress = false;
+        }
+        AimHandler.ins.ResetGyr();
+        AimHandler.ins.CalibrateGyr(gyrCalibrating);
+    }
+
+    void FinishGyrCalibrate()
+    {
+        gyrCalibrating = false;
+        canUpdateGyrCalibrateProgress = false;
+        AimHandler.ins.CalibrateGyr(false);
+        StartCoroutine(AimHandler.ins.SaveGyr());
+    }
+
+    bool canUpdateGyrCalibrateProgress = false;
+    void UpdateForGyr()
+    {
+        Text btnText = btnGyrCalibrate.GetComponentInChildren<Text>();
+        if (canUpdateGyrCalibrateProgress)
+        {
+            int progress = AimHandler.ins.gyrCalibrateCompleteCount * 100 / AimHandler.ins.gyrCalibrateTotalCount;
+            btnText.text = string.Format("lnitializing {0}%", progress);
+            if (progress >= 100)
+            {
+                FinishGyrCalibrate();
+                if (flag_GyrCalibarateOperateAndFinish == 0)
+                {
+                    flag_GyrCalibarateOperateAndFinish = 1;
+                    action_GyrCalibarateOperateAndFinish?.Invoke();
+                }
+            }
+        }
+        else
+        {
+            if (AimHandler.ins.IsGyrCompleted()) btnText.text = "Succeed";
+            else btnText.text = "Gyr Initialization";
+        }
+    }
+    #endregion
 }

+ 101 - 4
Assets/SmartBow/Scripts/Views/MagGuidanceView.cs

@@ -1,24 +1,121 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
+using System;
 
 public class MagGuidanceView : MonoBehaviour
 {
-    // Start is called before the first frame update
+    [SerializeField] Button btnMagCalibrate;
+    [SerializeField] GameObject prefab_MagInterferenceTipView;
+
     void Start()
     {
-        
+        btnMagCalibrate.GetComponent<Button>().onClick.AddListener(ClickResetMag);
     }
 
-    // Update is called once per frame
     void Update()
     {
-        
+        UpdateForMag();
+    }
+
+    void SetMagBtnText(string text)
+    {
+        btnMagCalibrate.GetComponentInChildren<Text>().text = text;
     }
+
     public void OnClick_Back()
     {
         AudioMgr.ins.PlayBtn();
         ViewManager2.HideView(ViewManager2.Path_MagGuidanceView);
     }
 
+    #region 地磁计校准逻辑
+    /* ------ 新地磁计校准(2022-10-3) ------ */
+    [NonSerialized] public bool calibrateMagDoing = false;
+    float calibrateMagStartTime = 0; //地磁校准开始时刻
+    //在当前页面中,用户是否点击了开始校准并校准成功;有则flag=1
+    [NonSerialized] public int flag_MagCalibarateOperateAndFinish = -1;
+    public Action action_MagCalibarateOperateAndFinish;
+    public Func<bool> action_OnClickMagCalibrateInterceptor;
+    void ClickResetMag()
+    {
+        if (action_OnClickMagCalibrateInterceptor != null)
+        {
+            if (action_OnClickMagCalibrateInterceptor.Invoke()) return;
+        }
+        if (!calibrateMagDoing && BluetoothAim.ins.status != BluetoothStatusEnum.ConnectSuccess)
+        {
+            PopupMgr.ins.ShowTipTop(TextAutoLanguage2.GetTextByKey("device-calibrate_n-connect"));
+            return;
+        }
+        calibrateMagDoing = !calibrateMagDoing;
+        if (calibrateMagDoing)
+        {
+            calibrateMagStartTime = Time.realtimeSinceStartup;
+            AimHandler.ins.ResetMag();
+            flag_MagCalibarateOperateAndFinish = 0;
+        }
+        else
+        {
+            Axis9CalibrateRecord.ResumeCalibrateRecord(LoginMgr.myUserInfo.mac);
+            Axis9CalibrateRecord.SetCalibrateOkRecord(LoginMgr.myUserInfo.mac, false);
+        }
+    }
+    //取消地磁计校准(仅用在UpdateForMag中)
+    void CancelResetMag()
+    {
+        calibrateMagDoing = false;
+    }
+    void UpdateForMag()
+    {
+        if (!AimHandler.ins.IsMagCompleted())
+        {
+            //地磁校准超时提示
+            if (calibrateMagDoing)
+            {
+                float doingTime = Time.realtimeSinceStartup - calibrateMagStartTime;
+                float progress = Mathf.FloorToInt(doingTime / 20 * 100);
+                if (progress >= 100)
+                {
+                    CancelResetMag();
+                    //地磁干扰提示页面-start
+                    GameObject o = Instantiate(prefab_MagInterferenceTipView);
+                    var nug = FindObjectOfType<NewUserGuider>(); //判断是否处于引导界面
+                    if (nug && nug.gameObject && nug.gameObject.activeSelf)
+                    {
+                        JCUnityLib.CanvasUtils.PlusSortOrder(nug.gameObject, o, 1);
+                    }
+                    else
+                    {
+                        JCUnityLib.CanvasUtils.PlusSortOrder(gameObject, o, 1);
+                    }
+                    //地磁干扰提示页面-end
+                    PopupMgr.ins.ShowTipTop(TextAutoLanguage2.GetTextByKey("tip_mag-calibrate_please-leave-interfere"));
+                }
+                else
+                {
+                    SetMagBtnText("Initializing");
+                }
+            }
+            else
+            {
+                SetMagBtnText("Mag Initialization");
+            }
+        }
+        else
+        {
+            SetMagBtnText("Succeed");
+            if (calibrateMagDoing)
+            {
+                CancelResetMag();
+            }
+            if (flag_MagCalibarateOperateAndFinish == 0)
+            {
+                flag_MagCalibarateOperateAndFinish = 1;
+                action_MagCalibarateOperateAndFinish?.Invoke();
+            }
+        }
+    }
+    #endregion
 }

+ 8 - 8
Assets/SmartBow/Textures/Guidance/Mag/DoublePointer.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 12
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -36,13 +36,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -51,9 +51,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -131,7 +131,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

+ 8 - 8
Assets/SmartBow/Textures/Guidance/Mag/Mobile.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 12
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -36,13 +36,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -51,9 +51,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -131,7 +131,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

+ 8 - 8
Assets/SmartBow/Textures/Guidance/Mag/Module1.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 12
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -36,13 +36,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -51,9 +51,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -131,7 +131,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: