Merge branch 'master' of http://81.70.224.233:10080/yichael/SmartBow

Assets/BowArrow/Modules/NewUserGuider/NewUserGuider.prefab

@@ -38,6 +38,101 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &2101127842758809372
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8607556292885240014}
+  - component: {fileID: 3264933040126695247}
+  - component: {fileID: 7990656812139408690}
+  - component: {fileID: 3294247421292484447}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8607556292885240014
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2101127842758809372}
+  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_Children: []
+  m_Father: {fileID: 6836443563845834744}
+  m_RootOrder: 0
+  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: 3.449997}
+  m_SizeDelta: {x: 0, y: -0.9000001}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3264933040126695247
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2101127842758809372}
+  m_CullTransparentMesh: 1
+--- !u!114 &7990656812139408690
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2101127842758809372}
+  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.7137255, g: 0.3529412, b: 0, 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: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
+    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: "\u786E\u5B9A"
+--- !u!114 &3294247421292484447
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2101127842758809372}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: new-user-guider_btn_ok
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &2383056636774157077
 GameObject:
   m_ObjectHideFlags: 0
@@ -208,6 +303,127 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2923544159759576968
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6836443563845834744}
+  - component: {fileID: 8806843181813046934}
+  - component: {fileID: 3863612671880620189}
+  - component: {fileID: 193196351415848163}
+  m_Layer: 5
+  m_Name: BtnOK
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6836443563845834744
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2923544159759576968}
+  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_Children:
+  - {fileID: 8607556292885240014}
+  m_Father: {fileID: 3835120308163295950}
+  m_RootOrder: 10
+  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: 165, y: 60}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8806843181813046934
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2923544159759576968}
+  m_CullTransparentMesh: 1
+--- !u!114 &3863612671880620189
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2923544159759576968}
+  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: 8ccd496b30ced39438603d237003eafe, type: 3}
+  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!114 &193196351415848163
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2923544159759576968}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 3863612671880620189}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3835120306900162603
 GameObject:
   m_ObjectHideFlags: 0
@@ -784,6 +1000,7 @@ RectTransform:
   - {fileID: 3835120307076861217}
   - {fileID: 1605085932212410050}
   - {fileID: 1244776228589720226}
+  - {fileID: 6836443563845834744}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/BowArrow/Modules/NewUserGuider/NewUserGuiderManager.cs

@@ -64,7 +64,7 @@ public class NewUserGuiderManager : MonoBehaviour
             PersistenHandler.ins.menuBackCtr.OnOnceBack();
         }
         foreach (var item in FindObjectsOfType<NewUserGuider>()) Destroy(item);
-        curConfigKey = "模块开机";
+        curConfigKey = "投屏建议";
         ExecuteCurConfig();
         LoginMgr.myUserInfo.SaveGuideFinish(0);
     }
@@ -75,6 +75,28 @@ public class NewUserGuiderManager : MonoBehaviour
         configsInited = true;
 
         NewUserGuiderConfig config = new NewUserGuiderConfig();
+        config.key = "投屏建议";
+        config.hitActive = false;
+        config.pointerActive = false;
+        config.frameTipPivot = "ct";
+        config.frameTipPosType = 1;
+        config.frameTipPos = Vector2.zero;
+        config.onStart = (g) => {
+            g.GetMaskClickedEvent().RemoveAllListeners();
+            g.ActiveBtnSkip(false);
+            RectTransform btnOK = g.transform.Find("BtnOK") as RectTransform;
+            btnOK.anchoredPosition = new Vector2(0, -250);
+            if (TextAutoLanguage2.GetLanguage() == LanguageEnum.English) {
+                btnOK.anchoredPosition = new Vector2(0, -300);
+                g.FixFrameTipWidth(1200);
+                g.frameTip.anchoredPosition += Vector2.up * 20;
+            }
+            btnOK.GetComponent<Button>().onClick.AddListener(() => g.OnClick_ToNext());
+            btnOK.gameObject.SetActive(true);
+        };
+        configs.Add(config.key, config);
+
+        config = new NewUserGuiderConfig();
         config.key = "模块开机";
         config.hitPosType = 1;
         config.hitPos = new Vector2(-138.9f, -56.1f); 
@@ -755,8 +777,9 @@ public class NewUserGuiderManager : MonoBehaviour
 
     private Dictionary<string, NewUserGuiderConfig> configs = new Dictionary<string, NewUserGuiderConfig>();
     private bool configsInited = false;
-    [SerializeField] public string curConfigKey = "模块开机";
+    [SerializeField] public string curConfigKey = "投屏建议";
     private List<string> configKeyList = new List<string>(new string[]{
+        "投屏建议",
         "模块开机",
         "连接设备",
         "弓箭详情",

Assets/BowArrow/Prefabs/Views/Home/TopBarView.prefab

@@ -835,7 +835,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -286, y: 0}
+  m_AnchoredPosition: {x: -376, y: 0}
   m_SizeDelta: {x: 165, y: 36}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &2128067459324531179
@@ -1181,6 +1181,7 @@ RectTransform:
   - {fileID: 2128067459538172585}
   - {fileID: 2128067458930073742}
   - {fileID: 2128067460172203419}
+  - {fileID: 4259038983160908176}
   - {fileID: 6668840932815502840}
   m_Father: {fileID: 2128067458449166888}
   m_RootOrder: 0
@@ -1479,6 +1480,138 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!1 &3080831763992379622
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4259038983160908176}
+  - component: {fileID: 7762113118501321696}
+  - component: {fileID: 2051874976904017725}
+  - component: {fileID: 5148013552892545021}
+  m_Layer: 5
+  m_Name: IconGuider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4259038983160908176
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3080831763992379622}
+  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_Children: []
+  m_Father: {fileID: 2128067459747996997}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -174, y: 4}
+  m_SizeDelta: {x: 45, y: 45}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &7762113118501321696
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3080831763992379622}
+  m_CullTransparentMesh: 1
+--- !u!114 &2051874976904017725
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3080831763992379622}
+  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: 26c45bba5de3c06449d9d17c952709f6, 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!114 &5148013552892545021
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3080831763992379622}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 2051874976904017725}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 2128067458449166889}
+        m_TargetAssemblyTypeName: TopBarView, Assembly-CSharp
+        m_MethodName: GoToGuider
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &5158656862151622292
 GameObject:
   m_ObjectHideFlags: 0
@@ -1510,11 +1643,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2128067459747996997}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -174, y: 4}
+  m_AnchoredPosition: {x: -264, y: 4}
   m_SizeDelta: {x: 45, y: 42}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &3331743979985365298

Assets/BowArrow/Resources/Prefabs/Views/Home/CourseView.prefab

@@ -313,7 +313,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 18.5, y: 5}
+  m_AnchoredPosition: {x: 18.5, y: 0}
   m_SizeDelta: {x: 100, y: 50}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &4919944601704202164
@@ -508,7 +508,7 @@ RectTransform:
   m_GameObject: {fileID: 5822578836178350386}
   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_LocalScale: {x: 1.125, y: 1.125, z: 1.125}
   m_Children: []
   m_Father: {fileID: 5822578837464263678}
   m_RootOrder: 0

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

@@ -56,6 +56,7 @@
     "course_title_9": "瞄准",
     "course_title_10": "撒放",
     "course_title_11": "结束动作",
+    "course_title_12": "如何安装智能弓箭",
     "course_btn_see": "查看",
     
     "device-calibrate_gyr-tip": "将瞄准模块从智能弓箭上拆下，将其静置在一个平面上，再点击陀螺仪初始化。",
@@ -65,6 +66,7 @@
     "device-calibrate_n-connect": "请先连接模块",
 
     "new-user-guider_btn_skip": "跳过教程",
+    "new-user-guider_tip_投屏建议": "为保证良好的用户体验，建议在本产品开始初始化设置前投屏到电视/投影仪等大屏上。\n注意将电视/投影仪和智能手机/平板处在同一个WIFI网络下。\n投屏方法：\n1、 使用手机/平板自带的无线投屏功能\n2、 通过第三方投屏软件来实现投屏\n3、 通过第三方投屏硬件来实现投屏",
     "new-user-guider_tip_模块开机": "长按模块上的<color=#FFA500>“开机”</color>键，当绿灯闪\n烁时，即模块处于等待连接的状态。",
     "new-user-guider_tip_连接设备": "点击<color=#FFA500>“连接”</color>等待设备提示连接成功，\n此时模块是绿灯常亮的状态。",
     "new-user-guider_tip_弓箭详情": "点击<color=#FFA500>弓箭</color>，进入设备界面进行模块初始化。",
@@ -82,6 +84,7 @@
     "new-user-guider_tip_视角归位-触发": "短按模块上的<color=#FFA500>“视角归位”</color>键，<color=#FFA500>参考图中\n姿势将弓箭瞄准靶心</color>，3秒后完成视角归位。",
     "new-user-guider_tip_视角归位-瞄准": "请参考图中姿势，立即瞄准靶心，\n<size=40><color=#FFA500>{0}</color></size>秒后完成视角归位。",
     "new-user-guider_tip_教程结束": "恭喜您完成了本次新手教程，下次如果还\n要<color=#FFA500>了解本教程</color>，请在<color=#FFA500>设置中查看新手指导</color>。",
+    "new-user-guider_btn_ok": "确定",
 
     "guider-module-plane": "平面",
     
@@ -176,7 +179,7 @@
 
     "Model_Location-Prominent": "{0}收集位置数据，即使应用程序关闭或未使用，也能连接弓箭模块和参与地区排行。",
 
-    "lebo_viewname": "乐播投屏",
+    "lebo_viewname": "投屏",
     "lebo_browseTip": "正在不断搜索可用设备...",
     "lebo_stop": "停止投屏",
     "lebo_pwd-tip": "请输入投屏密码",

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

@@ -56,6 +56,7 @@
     "course_title_9": "Aim",
     "course_title_10": "Release",
     "course_title_11": "Finish up job",
+    "course_title_12": "How to install smart bow",
     "course_btn_see": "see",
 
     "device-calibrate_gyr-tip": "Remove the aiming module from the smart bow and place it on a plane, and then click Gyr Init.",
@@ -65,6 +66,7 @@
     "device-calibrate_n-connect": "Please connect the module first",
     
     "new-user-guider_btn_skip": "Skip Tutorial",
+    "new-user-guider_tip_投屏建议": "To ensure a good user experience, it is recommended to project the screen onto a large screen such as a TV/projector before initializing the product.\nBe careful to place the TV/projector and smartphone/tablet on the same WIFI network.\nScreen projection method:\n1. Using the built-in wireless screen projection function of the phone/tablet\n2. Implementing screen casting through third-party screen casting software\n3. Implementing screen projection through third-party screen projection hardware",
     "new-user-guider_tip_模块开机": "Press and hold the <color=#FFA500>\"Power on\"</color> \nkey on the module, and when \nthe green light flashes, the \nmodule is in the state of \nwaiting for connection.",
     "new-user-guider_tip_连接设备": "Click <color=#FFA500>\"Connect\"</color> and wait for the device \nto prompt that the connection is \nsuccessful. At this time, the module \nis in the green state.",
     "new-user-guider_tip_弓箭详情": "Click the <color=#FFA500>arrow</color> to enter the device \ninterface for module initialization.",
@@ -82,6 +84,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_btn_ok": "OK",
 
     "guider-module-plane": "Plane",
 

Assets/BowArrow/Scripts/Editor/MenuChangeAppLanguage.cs

@@ -1,4 +1,5 @@
 using UnityEditor;
+using UnityEngine;
 
 //在编辑菜单中增加功能-APP语言版本切换
 public class MenuChangeAppLanguage
@@ -15,6 +16,7 @@ public class MenuChangeAppLanguage
         PlayerSettings.productName = CommonConfig.AppNames[0];
         #if UNITY_IOS
         PlayerSettings.SetApplicationIdentifier(BuildTargetGroup.iOS, "com.xmjssvr.BowArrow");
+        SetIosAppIcon(false);
         #endif
         #if UNITY_ANDROID
         PlayerSettings.SetApplicationIdentifier(BuildTargetGroup.Android, "com.xmjssvr.BowArrow.mi");
@@ -34,6 +36,7 @@ public class MenuChangeAppLanguage
         PlayerSettings.productName = CommonConfig.AppNames[1];
         #if UNITY_IOS
         PlayerSettings.SetApplicationIdentifier(BuildTargetGroup.iOS, "com.xmjssvr.BowArrowEn");
+        SetIosAppIcon(true);
         #endif
         #if UNITY_ANDROID
         PlayerSettings.SetApplicationIdentifier(BuildTargetGroup.Android, "com.xmjssvr.BowArrowEn");
@@ -46,4 +49,18 @@ public class MenuChangeAppLanguage
         RefreshMenuChecked();
         return true;
     }
+
+    static void SetIosAppIcon(bool en)
+    {
+        Texture2D texture = null;
+        if (en) {
+            texture = AssetDatabase.LoadAssetAtPath(
+                "Assets/BowArrow/Textures/Common/AppIconEN.png", typeof(Texture2D)) as Texture2D;
+        }
+        int[] iconSize = PlayerSettings.GetIconSizesForTargetGroup(BuildTargetGroup.iOS);
+        Texture2D[] textureArray = new Texture2D[iconSize.Length];
+        for (int i = 0; i < textureArray.Length; i++) textureArray[i] = texture;
+        PlayerSettings.SetIconsForTargetGroup(BuildTargetGroup.iOS, textureArray);
+        AssetDatabase.SaveAssets();
+    }
 }

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

@@ -8,27 +8,33 @@ public class CourseView : JCUnityLib.ViewBase, MenuBackInterface
     [SerializeField] GameObject scrollViewContent;
     [SerializeField] GameObject scrollViewContentItem;
 
-    string[] videoUrls = {
-        "新手教程-无连接"
-    };
+    int[] titleIds = {0, 12};
+    Dictionary<int, string> videoUrlDict = new Dictionary<int, string>();
 
     public void Awake() {
+        videoUrlDict[12] = "https://smartbow-1310052819.cos.ap-shanghai.myqcloud.com/Video/%E4%B8%AD%E6%96%87%E5%8E%8B%E7%BC%A9.mp4";        
         scrollViewContentItem.transform.Find("Icon").gameObject.SetActive(false);
         scrollViewContentItem.transform.Find("Icon-1").gameObject.SetActive(false);
         scrollViewContentItem.SetActive(false);
-        for (int i = 1; i <= videoUrls.Length; i++)
+        int titleSeq = 1;
+        foreach (var titleId in titleIds)
         {
-            int id = i;
-            string title = TextAutoLanguage2.GetTextByKey("course_title_" + (id - 1));
+            string title = TextAutoLanguage2.GetTextByKey("course_title_" + titleId);
             GameObject item = Instantiate<GameObject>(scrollViewContentItem, scrollViewContent.transform);
-            item.GetComponent<Text>().text = id + "、" + title;
-            Transform icon = item.transform.Find(id == 1 ? "Icon-1" : "Icon");
+            item.GetComponent<Text>().text = titleSeq + "、" + title;
+            titleSeq++;
+            bool useIcon1 = titleId == 0 || titleId == 12;
+            Transform icon = item.transform.Find(useIcon1 ? "Icon-1" : "Icon");
             icon.GetComponent<Button>().onClick.AddListener(delegate() {
                 AudioMgr.ins.PlayBtn();
-                if (id == 1) {
+                if (titleId == 0) {
                     NewUserGuiderManager.ins.ReviewNewUserGuide();
                     return;
                 }
+                if (titleId == 12) {
+                    Application.OpenURL(videoUrlDict[titleId]);
+                    return;
+                }
             });
             icon.gameObject.SetActive(true);
             item.SetActive(true);

Assets/BowArrow/Scripts/View/TopBarView.cs

@@ -33,7 +33,7 @@ public class TopBarView : JCUnityLib.ViewBase
                 }
             }
         }
-        if (CommonConfig.ReleaseVersion2) {
+        if (Application.platform == RuntimePlatform.IPhonePlayer) {
             Transform diamond = transform.Find("TopBar/Item");
             diamond.localPosition += Vector3.right * 87;
             transform.Find("TopBar/IconLebo").gameObject.SetActive(false);
@@ -94,6 +94,12 @@ public class TopBarView : JCUnityLib.ViewBase
         ViewMgr.Instance.ShowView<ShopView>();
     }
 
+    public void GoToGuider()
+    {
+        AudioMgr.ins.PlayBtn();
+        NewUserGuiderManager.ins.ReviewNewUserGuide();
+    }
+
     public void GoToLebo()
     {
         AudioMgr.ins.PlayBtn();

Assets/BowArrow/Textures/Common/AppIconEN.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 5a86b450fbbf31f4d9269beac3ccd441
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/DuckHunter/Scenes/DuckHunter.unity

@@ -306,7 +306,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -2594,7 +2594,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 60, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -3290,7 +3290,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -50, y: -60}
+  m_AnchoredPosition: {x: -94, y: -78}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 1, y: 1}
 --- !u!114 &1180745910
@@ -4935,7 +4935,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1944838814
 RectTransform:
   m_ObjectHideFlags: 0
@@ -5254,7 +5254,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -50, y: 40}
+  m_AnchoredPosition: {x: -83, y: 40}
   m_SizeDelta: {x: 120, y: 145}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &1995187171
@@ -5773,7 +5773,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: 50, y: 40}
+  m_AnchoredPosition: {x: 80, y: 40}
   m_SizeDelta: {x: 110, y: 103}
   m_Pivot: {x: 0, y: 0}
 --- !u!114 &2117762104