Browse Source

修改(投屏ui,鸭子ui,教程ui)、增加视频教程

lvjincheng 2 years ago
parent
commit
a099dffcd6

+ 136 - 3
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

+ 2 - 2
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

+ 2 - 1
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": "将瞄准模块从智能弓箭上拆下,将其静置在一个平面上,再点击陀螺仪初始化。",
@@ -176,7 +177,7 @@
 
     "Model_Location-Prominent": "{0}收集位置数据,即使应用程序关闭或未使用,也能连接弓箭模块和参与地区排行。",
 
-    "lebo_viewname": "乐播投屏",
+    "lebo_viewname": "投屏",
     "lebo_browseTip": "正在不断搜索可用设备...",
     "lebo_stop": "停止投屏",
     "lebo_pwd-tip": "请输入投屏密码",

+ 1 - 0
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.",

+ 15 - 9
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);

+ 7 - 1
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();

+ 6 - 6
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

BIN
Assets/Plugins/Android/smartbowlib-debug.aar