slambb 2 лет назад
Родитель
Сommit
4f0846dd26
78 измененных файлов с 3657 добавлено и 1231 удалено
  1. 5 1
      Assets/BowArrow/FancyScrollView/FocusOn/Cell.cs
  2. 18 0
      Assets/BowArrow/FancyScrollView/FocusOn/Cell.prefab
  3. 2 2
      Assets/BowArrow/FancyScrollView/FocusOn/ScrollView.cs
  4. 19 3
      Assets/BowArrow/Modules/NewUserGuider/NewUserGuider.prefab
  5. 32 7
      Assets/BowArrow/Modules/NewUserGuider/NewUserGuiderManager.cs
  6. 10 1
      Assets/BowArrow/Resources/Prefabs/Views/GameRuleView.prefab
  7. 1 1
      Assets/BowArrow/Resources/Prefabs/Views/Home/AboutUsView.prefab
  8. 241 521
      Assets/BowArrow/Resources/Prefabs/Views/Home/DeviceView.prefab
  9. 2 1
      Assets/BowArrow/Resources/Prefabs/Views/Home/DeviceViewCopy.prefab
  10. 191 23
      Assets/BowArrow/Resources/Prefabs/Views/Home/ModeSelectView.prefab
  11. 58 2
      Assets/BowArrow/Resources/Prefabs/Views/Home/SettingsGameView.prefab
  12. 172 28
      Assets/BowArrow/Resources/Prefabs/Views/Home/SmartArcheryView.prefab
  13. 10 2
      Assets/BowArrow/Resources/Prefabs/Views/PKGameReadyView_Challenge.prefab
  14. 46 22
      Assets/BowArrow/Resources/Prefabs/Views/PKMatchingView.prefab
  15. 1 1
      Assets/BowArrow/Resources/Prefabs/Views/TimeLimitGameSettleView.prefab
  16. BIN
      Assets/BowArrow/Resources/Textures/Common/TitleE2.png
  17. 147 0
      Assets/BowArrow/Resources/Textures/Common/TitleE2.png.meta
  18. 253 21
      Assets/BowArrow/Resources/Textures/GameIcon/Prefabs/Views/Home/HomeView.prefab
  19. 17 1
      Assets/BowArrow/Resources/Textures/GameIcon/Prefabs/Views/Home/HomeViewCopy.prefab
  20. 92 20
      Assets/BowArrow/Resources/Textures/GameIcon/Prefabs/Views/Home/PKMatchView.prefab
  21. 48 24
      Assets/BowArrow/Resources/Textures/GameIcon/Prefabs/Views/Home/RoleSelectView.prefab
  22. 5 5
      Assets/BowArrow/Scenes/Game.unity
  23. 4 3
      Assets/BowArrow/Scenes/GameChallengeScene/GameChallenge.unity
  24. 126 3
      Assets/BowArrow/Scenes/GameChallengeScene/场景备份/GameChallenge 1.unity
  25. 144 52
      Assets/BowArrow/Scenes/Login.unity
  26. 23 6
      Assets/BowArrow/Scripts/Bluetooth/AimHandler.cs
  27. 2 2
      Assets/BowArrow/Scripts/Bluetooth/BluetoothAim.cs
  28. 25 0
      Assets/BowArrow/Scripts/Bluetooth/BluetoothStatus.cs
  29. 16 1
      Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/cn.json
  30. 15 0
      Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/en.json
  31. 1 0
      Assets/BowArrow/Scripts/Entry.cs
  32. 3 0
      Assets/BowArrow/Scripts/Expand/SB_EventSystem.cs
  33. 35 0
      Assets/BowArrow/Scripts/Expand/SB_EventSystem/MouseConfirm/MouseButton.cs
  34. 22 4
      Assets/BowArrow/Scripts/Expand/SB_EventSystem/MouseConfirm/MouseConfirm.cs
  35. 17 2
      Assets/BowArrow/Scripts/Expand/UserGameAnalyse.cs
  36. 1 1
      Assets/BowArrow/Scripts/Game/ArmBow.cs
  37. 5 1
      Assets/BowArrow/Scripts/GameChallenge/Views/HunterGameSettleView.cs
  38. 1 1
      Assets/BowArrow/Scripts/GameMode/ChallengeGameMode.cs
  39. 9 2
      Assets/BowArrow/Scripts/GameMode/TimeLimitGameMode.cs
  40. 26 10
      Assets/BowArrow/Scripts/Manager/GameMgr.cs
  41. 87 0
      Assets/BowArrow/Scripts/Manager/LoginMgr/Gradient1.cs
  42. 11 0
      Assets/BowArrow/Scripts/Manager/LoginMgr/Gradient1.cs.meta
  43. 7 5
      Assets/BowArrow/Scripts/Manager/LoginMgr/LoginView.cs
  44. 5 3
      Assets/BowArrow/Scripts/Manager/LoginMgr/RegisterView.cs
  45. 236 2
      Assets/BowArrow/Scripts/Network/HttpController/CaptchaController.cs
  46. 33 10
      Assets/BowArrow/Scripts/Network/UserPlayer.cs
  47. 48 22
      Assets/BowArrow/Scripts/View/Home/DeviceView.cs
  48. 89 62
      Assets/BowArrow/Scripts/View/Home/DeviceView_ItemShow.cs
  49. 39 1
      Assets/BowArrow/Scripts/View/Home/HomeView.cs
  50. 1 2
      Assets/BowArrow/Scripts/View/Home/HomeView_BottomBarView.cs
  51. 19 20
      Assets/BowArrow/Scripts/View/Home/HomeView_ChallengeOption.cs
  52. 19 2
      Assets/BowArrow/Scripts/View/Home/ModeSelectView.cs
  53. 38 0
      Assets/BowArrow/Scripts/View/Home/SmartArcheryView.cs
  54. 4 1
      Assets/BowArrow/Scripts/View/PKGameSettleView.cs
  55. 5 1
      Assets/BowArrow/Scripts/View/TimeLimitGameSettleView.cs
  56. 2 2
      Assets/BowArrow/Textures/ChallengeGame/Option/RoundConorGrey.mat
  57. BIN
      Assets/BowArrow/Textures/Device/bow_smart.png
  58. BIN
      Assets/BowArrow/Textures/Device/bow_smart_1.png
  59. 147 0
      Assets/BowArrow/Textures/Device/bow_smart_1.png.meta
  60. 5 5
      Assets/BowArrow/Views/LoginScene/RetrievePasswordView/RetrievePasswordView.prefab
  61. 71 47
      Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/ConnectGuidanceView.prefab
  62. 58 34
      Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/GyrGuidanceView.prefab
  63. 2 2
      Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/HomeView_Tip.prefab
  64. 75 51
      Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/MagGuidanceView.prefab
  65. 244 95
      Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/PersonalView.prefab
  66. 74 2
      Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/RankingView.prefab
  67. 224 8
      Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/SettingsView.prefab
  68. 161 9
      Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/SocialView.prefab
  69. 11 0
      Assets/SmartBow/Scripts/Views/ConnectGuidanceView.cs
  70. 5 1
      Assets/SmartBow/Scripts/Views/GameResultView.cs
  71. 28 31
      Assets/SmartBow/Scripts/Views/GyrGuidanceView.cs
  72. 46 35
      Assets/SmartBow/Scripts/Views/MagGuidanceView.cs
  73. 2 0
      Assets/SmartBow/Scripts/Views/SettingsView.cs
  74. 9 2
      Assets/ThirdAssets/JCUnityLib/Untiy/SimulateMouse/SimulateMouse.cs
  75. 1 1
      Assets/WildAttack/Scenes/WildAttack.unity
  76. 1 0
      Assets/WildAttack/Scripts/Manager/GameMananger.cs
  77. 2 0
      Assets/WildAttack/Scripts/Module/GameModule.cs
  78. 3 1
      Assets/WildAttack/Scripts/SmartBowController.cs

+ 5 - 1
Assets/BowArrow/FancyScrollView/FocusOn/Cell.cs

@@ -30,7 +30,11 @@ namespace FancyScrollView.FocusOn
 
         public override void Initialize()
         {
-            button.onClick.AddListener(() => Context.OnCellClicked?.Invoke(Index,false));
+            button.onClick.AddListener(() => Context.OnCellClicked?.Invoke(Index,true));
+        }
+
+        public void onCellClickedEvent() {
+            Context.OnCellClicked?.Invoke(Index, false);
         }
 
         public override void UpdateContent(ItemData itemData)

+ 18 - 0
Assets/BowArrow/FancyScrollView/FocusOn/Cell.prefab

@@ -92,6 +92,7 @@ GameObject:
   - component: {fileID: 222091998879527630}
   - component: {fileID: 114838212754810210}
   - component: {fileID: 114221931273792762}
+  - component: {fileID: 6869108631108311798}
   m_Layer: 5
   m_Name: Image
   m_TagString: Untagged
@@ -205,6 +206,23 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &6869108631108311798
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1289454684641978}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 1901728338085442}
 --- !u!1 &1901728338085442
 GameObject:
   m_ObjectHideFlags: 0

+ 2 - 2
Assets/BowArrow/FancyScrollView/FocusOn/ScrollView.cs

@@ -91,11 +91,11 @@ namespace FancyScrollView.FocusOn
                 scroller.ScrollTo(index, 0.35f, Ease.OutCubic);
         }
 
-        public void onClick(int index, bool bScrollTo = true) {
+        public void onClick(int index, bool bSelectedAndNav = true) {
             Context.SelectedIndex = index;
             Refresh();
             //点击按钮算触发
-            onSelectionChanged?.Invoke(index, true);
+            onSelectionChanged?.Invoke(index, bSelectedAndNav);
         }
     }
 }

+ 19 - 3
Assets/BowArrow/Modules/NewUserGuider/NewUserGuider.prefab

@@ -464,8 +464,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: 60, y: -54.483852}
-  m_SizeDelta: {x: 0, y: 28.967705}
+  m_AnchoredPosition: {x: 60, y: -59.692307}
+  m_SizeDelta: {x: 0, y: 39.384613}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3835120306900162600
 CanvasRenderer:
@@ -548,7 +548,7 @@ RectTransform:
   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: 120, y: 108.967705}
+  m_SizeDelta: {x: 120, y: 119.38461}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3835120307076861222
 CanvasRenderer:
@@ -910,6 +910,14 @@ MonoBehaviour:
   targetRTF: {fileID: 0}
   targetGraphic: {fileID: 3835120308048927398}
   selectedColor: {r: 0.2853684, g: 0.8487587, b: 0.9056604, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3835120308157238171
 GameObject:
   m_ObjectHideFlags: 0
@@ -1609,6 +1617,14 @@ MonoBehaviour:
   targetRTF: {fileID: 1605085932212410050}
   targetGraphic: {fileID: 3552016407371106846}
   selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &8895338450821241910
 GameObject:
   m_ObjectHideFlags: 0

+ 32 - 7
Assets/BowArrow/Modules/NewUserGuider/NewUserGuiderManager.cs

@@ -29,7 +29,8 @@ public class NewUserGuiderManager : MonoBehaviour
 
     void Start()
     {
-        SceneManager.sceneLoaded += onSceneLoaded; onSceneLoaded_added = true;
+        SceneManager.sceneLoaded += onSceneLoaded;
+        onSceneLoaded_added = true;
         if (CommonConfig.StandaloneMode)
         {
             configKeyList.Remove("切换好友/排行榜");
@@ -48,6 +49,10 @@ public class NewUserGuiderManager : MonoBehaviour
                 case "限时游戏-选择距离":
                     ExecuteCurConfig();
                     break;
+                case "视角归位-触发":
+                    configKeyList.Remove("教程结束");
+                    ExecuteCurConfig();
+                    break;
             }
         }
     }
@@ -704,7 +709,10 @@ public class NewUserGuiderManager : MonoBehaviour
         config.key = "准心高亮";
         config.hitActive = false;
         config.pointerActive = false;
-        config.frameTipText = "";
+        //config.frameTipText = "";
+        config.frameTipPivot = "ct";
+        config.frameTipPosType = 1;
+        config.frameTipPos = new Vector2(-400, 0);
         config.onStart = (g) => {
             g.GetMaskClickedEvent().RemoveAllListeners();
 
@@ -725,6 +733,17 @@ public class NewUserGuiderManager : MonoBehaviour
             RectTransform crossHairLight = g.transform.Find("CrossHair-Light") as RectTransform;
             crossHairLight.gameObject.SetActive(true);
 
+            Action a_hitTarget = () => {
+                g.clickedWillPlayAudioBtn = false;
+                g.OnClick_ToNext();
+            };
+            if (gameMode.GetType().Equals(typeof(TimeLimitGameMode)) && !GameMgr.bShowDistance)
+            {
+                //如果是地磁计进入后的射箭
+                TimeLimitGameMode timeLimitGameMode = (TimeLimitGameMode)gameMode;
+                timeLimitGameMode.onHitTargetEvent += a_hitTarget;
+                g.action_OnDestroy += () => timeLimitGameMode.onHitTargetEvent -= a_hitTarget;
+            }
             float countDown = 5;
             g.action_Update += () => {
                 Vector3 centerPos = RectTransformUtility.WorldToScreenPoint(Camera.main, centerPoint.position);
@@ -733,10 +752,16 @@ public class NewUserGuiderManager : MonoBehaviour
                 iconRect.position = centerPos;
                 iconRect.sizeDelta = JCUnityLib.RectTransformUtils.ScreenV3ToCanvasV3(Vector3.one * sizeLen, iconRect); 
                 g.hollowOutMask.RefreshViewImmediate();
-                countDown -= Time.deltaTime;
-                if (countDown <= 0) {
-                    g.clickedWillPlayAudioBtn = false;
-                    g.OnClick_ToNext();
+
+                if (!(gameMode.GetType().Equals(typeof(TimeLimitGameMode)) && !GameMgr.bShowDistance))
+                {
+                    countDown -= Time.deltaTime;
+                    if (countDown <= 0)
+                    {
+                        g.clickedWillPlayAudioBtn = false;
+                        g.OnClick_ToNext();
+                    }
+
                 }
             };
             Action a_updateCrossHair = () => {
@@ -823,7 +848,7 @@ public class NewUserGuiderManager : MonoBehaviour
         "视角归位-触发",
         // "视角归位-瞄准",
         "准心高亮",
-        "教程结束",
+        "教程结束"
     });
 
     [ContextMenu("执行当前配置")]

+ 10 - 1
Assets/BowArrow/Resources/Prefabs/Views/GameRuleView.prefab

@@ -29,6 +29,7 @@ RectTransform:
   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: 7069939210709011093}
   m_Father: {fileID: 7069939211475722161}
@@ -163,6 +164,7 @@ RectTransform:
   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: 7069939211236851654}
   - {fileID: 7069939212632147373}
@@ -282,13 +284,14 @@ RectTransform:
   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: 7069939211236851654}
   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: 107, y: 0}
+  m_AnchoredPosition: {x: 106.69231, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7069939210734650691
@@ -362,6 +365,7 @@ MonoBehaviour:
   textID: 96
   layoutRebuildObject: {fileID: 7069939210709011093}
   textFormatArgs: []
+  languageFontSizes: []
 --- !u!1 &7069939211236851653
 GameObject:
   m_ObjectHideFlags: 0
@@ -390,6 +394,7 @@ RectTransform:
   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: 7069939212018072968}
   - {fileID: 7069939210734650689}
@@ -471,6 +476,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2015592159593996713}
   m_Father: {fileID: 0}
@@ -584,6 +590,7 @@ RectTransform:
   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: 7069939211236851654}
   m_RootOrder: 0
@@ -661,6 +668,7 @@ RectTransform:
   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: 7069939210709011093}
   m_RootOrder: 1
@@ -741,3 +749,4 @@ MonoBehaviour:
   textID: 0
   layoutRebuildObject: {fileID: 7069939210709011093}
   textFormatArgs: []
+  languageFontSizes: []

+ 1 - 1
Assets/BowArrow/Resources/Prefabs/Views/Home/AboutUsView.prefab

@@ -992,7 +992,7 @@ RectTransform:
   m_GameObject: {fileID: 8963406417100636762}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.0938119, y: 1.0938119, z: 1.0938119}
+  m_LocalScale: {x: 1.2173077, y: 1.2173077, z: 1.2173077}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8963406415416676176}

Разница между файлами не показана из-за своего большого размера
+ 241 - 521
Assets/BowArrow/Resources/Prefabs/Views/Home/DeviceView.prefab


+ 2 - 1
Assets/BowArrow/Resources/Prefabs/Views/Home/DeviceViewCopy.prefab

@@ -3036,8 +3036,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   smartArcheryButtons: []
-  addDeviceButtons: []
   smartArcheryBg: []
+  deviceViewItems: []
+  selectIndex: 0
 --- !u!1 &8677266362722324691
 GameObject:
   m_ObjectHideFlags: 0

+ 191 - 23
Assets/BowArrow/Resources/Prefabs/Views/Home/ModeSelectView.prefab

@@ -127,6 +127,7 @@ GameObject:
   - component: {fileID: 5918711544913229050}
   - component: {fileID: 2722124012293983374}
   - component: {fileID: 4247846390806709161}
+  - component: {fileID: 6368459258669311996}
   m_Layer: 5
   m_Name: SINGLE_PLYAER
   m_TagString: Untagged
@@ -283,6 +284,53 @@ MonoBehaviour:
   bottomImages:
   - {fileID: 21300000, guid: 6d53e6fea157f7d4e9f3d84a50a1adf3, type: 3}
   - {fileID: 21300000, guid: e89b393162aa8a84db0372bda4994ef9, type: 3}
+--- !u!114 &6368459258669311996
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 829613615845051617}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 4657469431725244474}
+        m_TargetAssemblyTypeName: ModeSelectView, Assembly-CSharp
+        m_MethodName: OnChangeButtonState
+        m_Mode: 3
+        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
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 4657469431725244474}
+        m_TargetAssemblyTypeName: ModeSelectView, Assembly-CSharp
+        m_MethodName: OnChangeButtonState
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: -1
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &1011975821911880517
 GameObject:
   m_ObjectHideFlags: 0
@@ -477,6 +525,7 @@ GameObject:
   - component: {fileID: 5335974329003615350}
   - component: {fileID: 5046233009757811391}
   - component: {fileID: 1394799667879230049}
+  - component: {fileID: 5189046108508029414}
   m_Layer: 5
   m_Name: PLAY_LOCALLY
   m_TagString: Untagged
@@ -633,6 +682,53 @@ MonoBehaviour:
   bottomImages:
   - {fileID: 21300000, guid: 9f0ef5bb5aa72fc4798ac7a8d85d1a20, type: 3}
   - {fileID: 21300000, guid: 2927d63cec973d740b8f09341c20768e, type: 3}
+--- !u!114 &5189046108508029414
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1302195588701657637}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 4657469431725244474}
+        m_TargetAssemblyTypeName: ModeSelectView, Assembly-CSharp
+        m_MethodName: OnChangeButtonState
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 1
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 4657469431725244474}
+        m_TargetAssemblyTypeName: ModeSelectView, Assembly-CSharp
+        m_MethodName: OnChangeButtonState
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: -1
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &3234008209330207657
 GameObject:
   m_ObjectHideFlags: 0
@@ -1163,11 +1259,11 @@ RectTransform:
   m_Father: {fileID: 8677266362471276963}
   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: 56, y: -85}
-  m_SizeDelta: {x: 252, y: 73.33}
-  m_Pivot: {x: 0, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -808, y: 460}
+  m_SizeDelta: {x: 600, y: 73.329956}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7360663831917119848
 GameObject:
   m_ObjectHideFlags: 0
@@ -1279,6 +1375,7 @@ GameObject:
   - component: {fileID: 8086339659889037025}
   - component: {fileID: 4378259615297643876}
   - component: {fileID: 7156893346904219609}
+  - component: {fileID: 3923335023067077279}
   m_Layer: 5
   m_Name: PLAY_GLOBALLY
   m_TagString: Untagged
@@ -1435,6 +1532,53 @@ MonoBehaviour:
   bottomImages:
   - {fileID: 21300000, guid: 12bc2213329abb44dabade3e282ec163, type: 3}
   - {fileID: 21300000, guid: 6bccb6e1f2b15a24e9957699509af957, type: 3}
+--- !u!114 &3923335023067077279
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7363074581255620259}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 4657469431725244474}
+        m_TargetAssemblyTypeName: ModeSelectView, Assembly-CSharp
+        m_MethodName: OnChangeButtonState
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 2
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 4657469431725244474}
+        m_TargetAssemblyTypeName: ModeSelectView, Assembly-CSharp
+        m_MethodName: OnChangeButtonState
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: -1
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &7939101963789477431
 GameObject:
   m_ObjectHideFlags: 0
@@ -1538,7 +1682,7 @@ RectTransform:
   m_GameObject: {fileID: 8677266361160975224}
   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.45, y: 1.45, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8677266361696092476}
@@ -1546,7 +1690,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: -48.9, y: 0}
+  m_AnchoredPosition: {x: -82.6, y: 0}
   m_SizeDelta: {x: 25.64, y: 29.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8677266361160975228
@@ -1597,6 +1741,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8677266361696092476}
   - component: {fileID: 5847324503461343397}
+  - component: {fileID: 7587321336244348855}
   m_Layer: 0
   m_Name: Back
   m_TagString: Untagged
@@ -1613,7 +1758,7 @@ RectTransform:
   m_GameObject: {fileID: 8677266361696092475}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.495, y: 1.495, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8677266362401961738}
@@ -1621,11 +1766,11 @@ RectTransform:
   m_Father: {fileID: 8677266362471276963}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -83.3, y: -93.359}
-  m_SizeDelta: {x: 250, y: 39}
-  m_Pivot: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 1009, y: 460}
+  m_SizeDelta: {x: 290, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5847324503461343397
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1645,7 +1790,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -1682,6 +1827,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &7587321336244348855
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8677266361696092475}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 8677266361696092476}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &8677266362401961737
 GameObject:
   m_ObjectHideFlags: 0
@@ -1710,7 +1878,7 @@ RectTransform:
   m_GameObject: {fileID: 8677266362401961737}
   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.32, y: 1.32, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8677266361696092476}
@@ -1718,7 +1886,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: -11, y: 0}
+  m_AnchoredPosition: {x: -27.4, y: 0}
   m_SizeDelta: {x: 160, y: 40}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8677266362401961741
@@ -1751,7 +1919,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 32
+    m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -1762,7 +1930,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: Back
+  m_Text: Return
 --- !u!114 &4303748580277974917
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2098,9 +2266,9 @@ RectTransform:
   m_Father: {fileID: 5558585036946217141}
   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: -23, y: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 305, y: 40}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9170237829049141499
@@ -2133,11 +2301,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 40
+    m_FontSize: 42
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 48
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1

+ 58 - 2
Assets/BowArrow/Resources/Prefabs/Views/Home/SettingsGameView.prefab

@@ -324,6 +324,14 @@ MonoBehaviour:
   targetRTF: {fileID: 0}
   targetGraphic: {fileID: 418570792086247151}
   selectedColor: {r: 0.3339622, g: 0.9736237, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1328618322569880187
 GameObject:
   m_ObjectHideFlags: 0
@@ -1276,6 +1284,14 @@ MonoBehaviour:
   targetRTF: {fileID: 0}
   targetGraphic: {fileID: 1343870003093494025}
   selectedColor: {r: 0.3339622, g: 0.9736237, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5102807909894183498
 GameObject:
   m_ObjectHideFlags: 0
@@ -2101,7 +2117,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: 128.78629, y: 0}
+  m_AnchoredPosition: {x: 129.61539, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2075870506722154811
@@ -2419,6 +2435,14 @@ MonoBehaviour:
   targetRTF: {fileID: 0}
   targetGraphic: {fileID: 648429165420338760}
   selectedColor: {r: 0.3339622, g: 0.9736237, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &7112477757689077179
 GameObject:
   m_ObjectHideFlags: 0
@@ -2699,6 +2723,14 @@ MonoBehaviour:
   targetRTF: {fileID: 0}
   targetGraphic: {fileID: 507940145748458576}
   selectedColor: {r: 0.3339622, g: 0.9736237, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &7501016391423803558
 GameObject:
   m_ObjectHideFlags: 0
@@ -3997,6 +4029,14 @@ MonoBehaviour:
   targetRTF: {fileID: 0}
   targetGraphic: {fileID: 8963406416033706028}
   selectedColor: {r: 0.3339622, g: 0.9736237, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &8963406416110060783
 GameObject:
   m_ObjectHideFlags: 0
@@ -4149,6 +4189,14 @@ MonoBehaviour:
   targetRTF: {fileID: 0}
   targetGraphic: {fileID: 8963406416110060781}
   selectedColor: {r: 0.3339622, g: 0.9736237, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &8963406416255362472
 GameObject:
   m_ObjectHideFlags: 0
@@ -4755,6 +4803,14 @@ MonoBehaviour:
   targetRTF: {fileID: 0}
   targetGraphic: {fileID: 8963406416761350435}
   selectedColor: {r: 0.3339622, g: 0.9736237, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &8963406416781499661
 GameObject:
   m_ObjectHideFlags: 0
@@ -5068,7 +5124,7 @@ RectTransform:
   m_GameObject: {fileID: 8963406417100636762}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.0427152, y: 1.0427152, z: 1.0427152}
+  m_LocalScale: {x: 1.2173077, y: 1.2173077, z: 1.2173077}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8963406415416676176}

+ 172 - 28
Assets/BowArrow/Resources/Prefabs/Views/Home/SmartArcheryView.prefab

@@ -12,6 +12,7 @@ GameObject:
   - component: {fileID: 197694052669976451}
   - component: {fileID: 1240299060731103982}
   - component: {fileID: 5918711544913229050}
+  - component: {fileID: 6876638643627344091}
   m_Layer: 5
   m_Name: smartArcheryButton1
   m_TagString: Untagged
@@ -123,6 +124,53 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &6876638643627344091
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 829613615845051617}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 156485815492543730}
+        m_TargetAssemblyTypeName: SmartArcheryView, Assembly-CSharp
+        m_MethodName: OnChangeSmartArcheryButtonState
+        m_Mode: 3
+        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
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 156485815492543730}
+        m_TargetAssemblyTypeName: SmartArcheryView, Assembly-CSharp
+        m_MethodName: OnChangeSmartArcheryButtonState
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: -1
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &1269557267540402333
 GameObject:
   m_ObjectHideFlags: 0
@@ -456,6 +504,7 @@ GameObject:
   - component: {fileID: 5821385007341413149}
   - component: {fileID: 8093071401497287988}
   - component: {fileID: 1259905374672652858}
+  - component: {fileID: 188575832393551290}
   m_Layer: 5
   m_Name: smartArcheryButton2
   m_TagString: Untagged
@@ -567,6 +616,53 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &188575832393551290
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4320137467291838265}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 156485815492543730}
+        m_TargetAssemblyTypeName: SmartArcheryView, Assembly-CSharp
+        m_MethodName: OnChangeSmartArcheryButtonState
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 1
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 156485815492543730}
+        m_TargetAssemblyTypeName: SmartArcheryView, Assembly-CSharp
+        m_MethodName: OnChangeSmartArcheryButtonState
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: -1
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &4620655508745620914
 GameObject:
   m_ObjectHideFlags: 0
@@ -594,17 +690,17 @@ RectTransform:
   m_GameObject: {fileID: 4620655508745620914}
   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.3090456, y: 1.3090456, z: 0.90279}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5558585036946217141}
   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: -173, y: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 4.2286987, y: 0}
   m_SizeDelta: {x: 60, y: 60}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2751393317025161550
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -915,7 +1011,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: bcd16e2f115288045ad83b77ad82438c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8bae84fa585196c448ee365b8a8e9b52, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1013,6 +1109,7 @@ GameObject:
   - component: {fileID: 3835279618138448171}
   - component: {fileID: 6041730798941079173}
   - component: {fileID: 5411581553878029809}
+  - component: {fileID: 4980365187986417824}
   m_Layer: 5
   m_Name: smartArcheryButton3
   m_TagString: Untagged
@@ -1124,6 +1221,53 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &4980365187986417824
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7221806186678265994}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 156485815492543730}
+        m_TargetAssemblyTypeName: SmartArcheryView, Assembly-CSharp
+        m_MethodName: OnChangeSmartArcheryButtonState
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 2
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 156485815492543730}
+        m_TargetAssemblyTypeName: SmartArcheryView, Assembly-CSharp
+        m_MethodName: OnChangeSmartArcheryButtonState
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: -1
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &7222998956102884019
 GameObject:
   m_ObjectHideFlags: 0
@@ -1157,11 +1301,11 @@ RectTransform:
   m_Father: {fileID: 8677266362471276963}
   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: 183, y: -90.4}
-  m_SizeDelta: {x: 350, y: 73.3}
-  m_Pivot: {x: 0, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -808, y: 460}
+  m_SizeDelta: {x: 600, y: 73.30005}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7360663831917119848
 GameObject:
   m_ObjectHideFlags: 0
@@ -1425,7 +1569,7 @@ RectTransform:
   m_GameObject: {fileID: 8677266361160975224}
   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.45, y: 1.45, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8677266361696092476}
@@ -1433,7 +1577,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: -48.9, y: 0}
+  m_AnchoredPosition: {x: -82.6, y: 0}
   m_SizeDelta: {x: 25.64, y: 29.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8677266361160975228
@@ -1500,7 +1644,7 @@ RectTransform:
   m_GameObject: {fileID: 8677266361696092475}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.49, y: 1.49, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8677266362401961738}
@@ -1508,11 +1652,11 @@ RectTransform:
   m_Father: {fileID: 8677266362471276963}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -83.3, y: -93.359}
-  m_SizeDelta: {x: 250, y: 39}
-  m_Pivot: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 1009, y: 460}
+  m_SizeDelta: {x: 290, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5847324503461343397
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1597,7 +1741,7 @@ RectTransform:
   m_GameObject: {fileID: 8677266362401961737}
   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.32, y: 1.32, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8677266361696092476}
@@ -1605,7 +1749,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: -11, y: 0}
+  m_AnchoredPosition: {x: -27.4, y: 0}
   m_SizeDelta: {x: 160, y: 40}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8677266362401961741
@@ -1638,7 +1782,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 32
+    m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -1912,9 +2056,9 @@ RectTransform:
   m_Father: {fileID: 5558585036946217141}
   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: -121, y: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 113, y: 0}
   m_SizeDelta: {x: 305, y: 40}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9170237829049141499
@@ -1947,11 +2091,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 40
-    m_FontStyle: 0
+    m_FontSize: 42
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 48
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1

+ 10 - 2
Assets/BowArrow/Resources/Prefabs/Views/PKGameReadyView_Challenge.prefab

@@ -28,6 +28,7 @@ RectTransform:
   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: 2915765761901999689}
   m_RootOrder: 0
@@ -104,6 +105,7 @@ RectTransform:
   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: 2915765762100361061}
   m_RootOrder: 2
@@ -111,7 +113,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -125}
-  m_SizeDelta: {x: 120, y: 40}
+  m_SizeDelta: {x: 118.15385, y: 39.384617}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2915765761887718705
 CanvasRenderer:
@@ -198,6 +200,7 @@ RectTransform:
   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: 2915765761837923874}
   m_Father: {fileID: 2915765762100361061}
@@ -287,6 +290,7 @@ RectTransform:
   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: 2915765762803400326}
   - {fileID: 2915765761901999689}
@@ -367,6 +371,7 @@ RectTransform:
   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: 2915765762100361061}
   m_RootOrder: 0
@@ -374,7 +379,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 140}
-  m_SizeDelta: {x: 160, y: 53.333332}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2915765762803400321
 CanvasRenderer:
@@ -478,6 +483,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2915765762100361061}
   - {fileID: 1141306172738083406}
@@ -594,6 +600,7 @@ RectTransform:
   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: 2915765762832846782}
   m_RootOrder: 2
@@ -718,6 +725,7 @@ RectTransform:
   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: 2915765762832846782}
   m_RootOrder: 1

+ 46 - 22
Assets/BowArrow/Resources/Prefabs/Views/PKMatchingView.prefab

@@ -186,9 +186,9 @@ RectTransform:
   m_Father: {fileID: 1807429016285992687}
   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: -140, y: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 2.2}
   m_SizeDelta: {x: 300, y: 50}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5563798961636010524
@@ -221,11 +221,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 50
+    m_FontSize: 42
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
-    m_MaxSize: 50
+    m_MaxSize: 60
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -280,11 +280,11 @@ RectTransform:
   m_Father: {fileID: 8849455052383709944}
   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: 143, y: -98.4}
-  m_SizeDelta: {x: 290, y: 50}
-  m_Pivot: {x: 0, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -808, y: 460}
+  m_SizeDelta: {x: 600, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &8849455050966853540
 GameObject:
   m_ObjectHideFlags: 0
@@ -389,7 +389,7 @@ RectTransform:
   m_GameObject: {fileID: 8849455050970629769}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.71717, y: 0.71717, z: 0.71717}
+  m_LocalScale: {x: 1.45, y: 1.45, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8849455052753462229}
@@ -397,8 +397,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: -84.2, y: 0}
-  m_SizeDelta: {x: 70, y: 70}
+  m_AnchoredPosition: {x: -82.6, y: 0}
+  m_SizeDelta: {x: 25.64, y: 29.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8849455050970629765
 CanvasRenderer:
@@ -1806,7 +1806,7 @@ RectTransform:
   m_GameObject: {fileID: 8849455052588054758}
   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.32, y: 1.32, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8849455052753462229}
@@ -1814,8 +1814,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: -32.3, y: 0}
-  m_SizeDelta: {x: 300, y: 50}
+  m_AnchoredPosition: {x: -27.400196, y: 0}
+  m_SizeDelta: {x: 160, y: 40}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8849455052588054754
 CanvasRenderer:
@@ -1847,7 +1847,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 50
+    m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -2002,6 +2002,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8849455052753462229}
   - component: {fileID: 3450648541768524218}
+  - component: {fileID: 5803268590297658906}
   m_Layer: 0
   m_Name: Back
   m_TagString: Untagged
@@ -2026,11 +2027,11 @@ RectTransform:
   m_Father: {fileID: 8849455052383709944}
   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: 2130.1, y: -98.4}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 1009, y: 460}
   m_SizeDelta: {x: 290, y: 50}
-  m_Pivot: {x: 0, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3450648541768524218
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2050,7 +2051,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -2087,6 +2088,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &5803268590297658906
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8849455052753462230}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 8849455052753462229}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &8849455052806874086
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/BowArrow/Resources/Prefabs/Views/TimeLimitGameSettleView.prefab

@@ -1757,7 +1757,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: 86.5, y: 0}
+  m_AnchoredPosition: {x: 86.666664, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &199998092357563418

BIN
Assets/BowArrow/Resources/Textures/Common/TitleE2.png


+ 147 - 0
Assets/BowArrow/Resources/Textures/Common/TitleE2.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 0e517dd56d28a7549bc0f514b60ec921
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 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
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    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: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 253 - 21
Assets/BowArrow/Resources/Textures/GameIcon/Prefabs/Views/Home/HomeView.prefab

@@ -1005,6 +1005,7 @@ GameObject:
   - component: {fileID: 546433690805733460}
   - component: {fileID: 1466281607461992622}
   - component: {fileID: 6654628109136090230}
+  - component: {fileID: 3731941613226971955}
   m_Layer: 5
   m_Name: IconNewUser
   m_TagString: Untagged
@@ -1029,9 +1030,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 787, y: 83.75}
+  m_AnchoredPosition: {x: 725.5, y: 22.25}
   m_SizeDelta: {x: 123, y: 123}
-  m_Pivot: {x: 1, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &546433690805733460
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1126,6 +1127,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &3731941613226971955
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 834433657201557836}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 2618902087318748187}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 6654628109136090230}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &846791078786444900
 GameObject:
   m_ObjectHideFlags: 0
@@ -1472,7 +1496,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -33}
-  m_SizeDelta: {x: 1560, y: 450}
+  m_SizeDelta: {x: 1570, y: 450}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &755448247887520781
 MonoBehaviour:
@@ -1530,6 +1554,7 @@ GameObject:
   - component: {fileID: 4481873280247895535}
   - component: {fileID: 3204597003832696434}
   - component: {fileID: 2711445245870200483}
+  - component: {fileID: 5065060313801333306}
   m_Layer: 5
   m_Name: IconFriend
   m_TagString: Untagged
@@ -1557,7 +1582,7 @@ RectTransform:
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 123, y: 123}
-  m_Pivot: {x: 1, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4481873280247895535
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1652,6 +1677,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &5065060313801333306
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1172147704102950535}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 2266937954405821160}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 2711445245870200483}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1249308475108434720
 GameObject:
   m_ObjectHideFlags: 0
@@ -3205,6 +3253,7 @@ GameObject:
   - component: {fileID: 3960036645239489784}
   - component: {fileID: 8059188466421876755}
   - component: {fileID: 7415045407106592994}
+  - component: {fileID: 2414055070846222202}
   m_Layer: 5
   m_Name: IconGuider
   m_TagString: Untagged
@@ -3231,7 +3280,7 @@ RectTransform:
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 123, y: 123}
-  m_Pivot: {x: 1, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3960036645239489784
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -3326,6 +3375,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &2414055070846222202
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3144088645421923913}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 8539695339705384891}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 7415045407106592994}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3436198305830861175
 GameObject:
   m_ObjectHideFlags: 0
@@ -3496,6 +3568,7 @@ GameObject:
   - component: {fileID: 4266474849545211040}
   - component: {fileID: 5309292720451931054}
   - component: {fileID: 7258336056984742091}
+  - component: {fileID: 7316947627297652560}
   m_Layer: 5
   m_Name: IconRank
   m_TagString: Untagged
@@ -3522,7 +3595,7 @@ RectTransform:
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 123, y: 123}
-  m_Pivot: {x: 1, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4266474849545211040
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -3617,6 +3690,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &7316947627297652560
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3459135218513936475}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 5438958743276974379}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 7258336056984742091}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3572727387850533746
 GameObject:
   m_ObjectHideFlags: 0
@@ -3705,6 +3801,7 @@ GameObject:
   - component: {fileID: 4180021472213774380}
   - component: {fileID: 2716842105259953701}
   - component: {fileID: 4298745752983613173}
+  - component: {fileID: 5507130897552305089}
   m_Layer: 5
   m_Name: NextCellButton
   m_TagString: Untagged
@@ -3754,15 +3851,15 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 0, b: 0, a: 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_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -3815,6 +3912,29 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &5507130897552305089
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3723336913283526395}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 580438460404084987}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 4298745752983613173}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3731421700458114478
 GameObject:
   m_ObjectHideFlags: 0
@@ -3827,6 +3947,7 @@ GameObject:
   - component: {fileID: 4924220783119551887}
   - component: {fileID: 5219026040935746495}
   - component: {fileID: 8885810451793478306}
+  - component: {fileID: 5597946846041994481}
   m_Layer: 5
   m_Name: PrevCellButton
   m_TagString: Untagged
@@ -3920,15 +4041,15 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 0, b: 0, a: 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_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -3937,6 +4058,29 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &5597946846041994481
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3731421700458114478}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 1839015975199602751}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 5219026040935746495}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3809318274429865535
 GameObject:
   m_ObjectHideFlags: 0
@@ -4378,7 +4522,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: 16.38835, y: 0}
+  m_AnchoredPosition: {x: 16, y: 0}
   m_SizeDelta: {x: 0, y: 38}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5099759915330397004
@@ -5795,6 +5939,14 @@ MonoBehaviour:
   targetRTF: {fileID: 8057171544677848915}
   targetGraphic: {fileID: 4303860577039744277}
   selectedColor: {r: 1, g: 1, b: 1, a: 0.60784316}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &4438778747837112320
 GameObject:
   m_ObjectHideFlags: 0
@@ -6900,6 +7052,7 @@ GameObject:
   - component: {fileID: 4653790661056570821}
   - component: {fileID: 1249668465097655169}
   - component: {fileID: 8750906234052252861}
+  - component: {fileID: 8433588550686650193}
   m_Layer: 5
   m_Name: IconShop
   m_TagString: Untagged
@@ -6924,9 +7077,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 590.5, y: 83.75}
+  m_AnchoredPosition: {x: 528.9999, y: 22.25}
   m_SizeDelta: {x: 123, y: 123}
-  m_Pivot: {x: 1, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4653790661056570821
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -7021,6 +7174,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &8433588550686650193
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5493853885511555100}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 9154887739578981217}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 8750906234052252861}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5760549738543854732
 GameObject:
   m_ObjectHideFlags: 0
@@ -7537,6 +7713,7 @@ GameObject:
   - component: {fileID: 3485226410561197407}
   - component: {fileID: 1226314307028074782}
   - component: {fileID: 3308641476703353515}
+  - component: {fileID: 8533947926387359087}
   m_Layer: 5
   m_Name: IconConnect
   m_TagString: Untagged
@@ -7563,7 +7740,7 @@ RectTransform:
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 123, y: 123}
-  m_Pivot: {x: 1, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3485226410561197407
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -7658,6 +7835,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &8533947926387359087
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6420294424194915235}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 2380280116642831893}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 3308641476703353515}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &6426432536002113428
 GameObject:
   m_ObjectHideFlags: 0
@@ -8840,7 +9040,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -9619,6 +9819,14 @@ MonoBehaviour:
   targetRTF: {fileID: 0}
   targetGraphic: {fileID: 8617244312983880565}
   selectedColor: {r: 0, g: 1, b: 1, a: 0.21568628}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &8581036950486033519
 GameObject:
   m_ObjectHideFlags: 0
@@ -9877,7 +10085,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -10424,6 +10632,7 @@ GameObject:
   - component: {fileID: 2641412742023049246}
   - component: {fileID: 8617668448688187682}
   - component: {fileID: 5844667691193802225}
+  - component: {fileID: 3946227422355673926}
   m_Layer: 5
   m_Name: IconSetUp
   m_TagString: Untagged
@@ -10450,7 +10659,7 @@ RectTransform:
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 123, y: 123}
-  m_Pivot: {x: 1, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2641412742023049246
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -10545,6 +10754,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &3946227422355673926
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9034309437533279921}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 1220705272716270043}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 5844667691193802225}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &9199553326886594872
 GameObject:
   m_ObjectHideFlags: 0
@@ -10578,6 +10810,6 @@ RectTransform:
   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_AnchoredPosition: {x: -5, y: 0}
+  m_SizeDelta: {x: -10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}

+ 17 - 1
Assets/BowArrow/Resources/Textures/GameIcon/Prefabs/Views/Home/HomeViewCopy.prefab

@@ -2444,7 +2444,7 @@ RectTransform:
   m_GameObject: {fileID: 3572727387850533746}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.0512853, y: 1.0512853, z: 1.0512853}
+  m_LocalScale: {x: 1.042875, y: 1.042875, z: 1.042875}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7022781866214807768}
@@ -4283,6 +4283,14 @@ MonoBehaviour:
   targetRTF: {fileID: 8057171544677848915}
   targetGraphic: {fileID: 4303860577039744277}
   selectedColor: {r: 1, g: 1, b: 1, a: 0.60784316}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &4438778747837112320
 GameObject:
   m_ObjectHideFlags: 0
@@ -6336,6 +6344,14 @@ MonoBehaviour:
   targetRTF: {fileID: 0}
   targetGraphic: {fileID: 8617244312983880565}
   selectedColor: {r: 0, g: 1, b: 1, a: 0.21568628}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &8636979900590103740
 GameObject:
   m_ObjectHideFlags: 0

+ 92 - 20
Assets/BowArrow/Resources/Textures/GameIcon/Prefabs/Views/Home/PKMatchView.prefab

@@ -128,11 +128,11 @@ RectTransform:
   m_Father: {fileID: 4672314268748912425}
   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: 149, y: -105}
-  m_SizeDelta: {x: 305, y: 40}
-  m_Pivot: {x: 0, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -808, y: 460}
+  m_SizeDelta: {x: 600, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1368934892712672271
 GameObject:
   m_ObjectHideFlags: 0
@@ -143,6 +143,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4837503175715193756}
   - component: {fileID: 9059739630350976077}
+  - component: {fileID: 5770903893858727593}
   m_Layer: 0
   m_Name: Back (1)
   m_TagString: Untagged
@@ -159,7 +160,7 @@ RectTransform:
   m_GameObject: {fileID: 1368934892712672271}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.3978, y: 1.3978, z: 1.3978}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3877961564084029604}
@@ -167,11 +168,11 @@ RectTransform:
   m_Father: {fileID: 4672314268748912425}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -83, y: -93.359}
-  m_SizeDelta: {x: 250, y: 39}
-  m_Pivot: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 1009, y: 460}
+  m_SizeDelta: {x: 290, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &9059739630350976077
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -191,7 +192,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -228,6 +229,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &5770903893858727593
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1368934892712672271}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 4837503175715193756}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1669443614924306429
 GameObject:
   m_ObjectHideFlags: 0
@@ -317,6 +341,7 @@ GameObject:
   - component: {fileID: 2745165896412341820}
   - component: {fileID: 1250488012836918156}
   - component: {fileID: 698446086847609679}
+  - component: {fileID: 5550992138721252525}
   m_Layer: 5
   m_Name: random
   m_TagString: Untagged
@@ -403,7 +428,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -428,6 +453,29 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &5550992138721252525
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1764228811883129033}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 1250488012836918156}
+  selectedColor: {r: 0.2627451, g: 0.8392157, b: 0.8745098, a: 0.29803923}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &2400767815652049866
 GameObject:
   m_ObjectHideFlags: 0
@@ -455,7 +503,7 @@ RectTransform:
   m_GameObject: {fileID: 2400767815652049866}
   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.45, y: 1.45, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4837503175715193756}
@@ -463,7 +511,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: -48.9, y: 0}
+  m_AnchoredPosition: {x: -82.6, y: 0}
   m_SizeDelta: {x: 25.64, y: 29.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4758455762696706582
@@ -608,7 +656,7 @@ RectTransform:
   m_GameObject: {fileID: 2987617798924703966}
   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.32, y: 1.32, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4837503175715193756}
@@ -616,7 +664,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: -10.89991, y: 0}
+  m_AnchoredPosition: {x: -27.4, y: 0}
   m_SizeDelta: {x: 160, y: 40}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2270610869950346184
@@ -4634,6 +4682,7 @@ GameObject:
   - component: {fileID: 8715737681027156910}
   - component: {fileID: 2503845471981100681}
   - component: {fileID: 425288893608531927}
+  - component: {fileID: 6465419937007708966}
   m_Layer: 5
   m_Name: friend
   m_TagString: Untagged
@@ -4720,7 +4769,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -4745,6 +4794,29 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &6465419937007708966
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8588984165014573294}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 2503845471981100681}
+  selectedColor: {r: 0.2627451, g: 0.8392157, b: 0.8745098, a: 0.29803923}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &9171374289680111452
 GameObject:
   m_ObjectHideFlags: 0
@@ -4814,8 +4886,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 40
-    m_FontStyle: 0
+    m_FontSize: 42
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 0
     m_MaxSize: 64

+ 48 - 24
Assets/BowArrow/Resources/Textures/GameIcon/Prefabs/Views/Home/RoleSelectView.prefab

@@ -101,6 +101,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2271556579277350283}
   - component: {fileID: 4518461987977483938}
+  - component: {fileID: 7381694357288615278}
   m_Layer: 0
   m_Name: Back
   m_TagString: Untagged
@@ -117,7 +118,7 @@ RectTransform:
   m_GameObject: {fileID: 3061568478711900722}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.4944924, y: 1.4944924, z: 1.4944924}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2591984758216192}
@@ -125,11 +126,11 @@ RectTransform:
   m_Father: {fileID: 4507770291199562698}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -83.3, y: -93.359}
-  m_SizeDelta: {x: 250, y: 39}
-  m_Pivot: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 1009, y: 460}
+  m_SizeDelta: {x: 290, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4518461987977483938
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -149,7 +150,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -186,6 +187,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &7381694357288615278
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3061568478711900722}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 2271556579277350283}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &4488298387908185532
 GameObject:
   m_ObjectHideFlags: 0
@@ -2160,7 +2184,7 @@ RectTransform:
   m_GameObject: {fileID: 5957588094198535789}
   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.32, y: 1.32, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2271556579277350283}
@@ -2168,7 +2192,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: -11.299973, y: 0}
+  m_AnchoredPosition: {x: -27.4, y: 0}
   m_SizeDelta: {x: 160, y: 40}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4900840517904011567
@@ -2201,7 +2225,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 32
+    m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -2255,7 +2279,7 @@ RectTransform:
   m_GameObject: {fileID: 7011375103773017709}
   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.45, y: 1.45, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2271556579277350283}
@@ -2263,7 +2287,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: -48.9, y: 0}
+  m_AnchoredPosition: {x: -82.6, y: 0}
   m_SizeDelta: {x: 25.64, y: 29.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6646701029363383642
@@ -2336,11 +2360,11 @@ RectTransform:
   m_Father: {fileID: 4507770291199562698}
   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: 153, y: -90.4}
-  m_SizeDelta: {x: 350, y: 73.33}
-  m_Pivot: {x: 0, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -808, y: 460}
+  m_SizeDelta: {x: 600, y: 73.329956}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &9219350960200539855
 GameObject:
   m_ObjectHideFlags: 0
@@ -2375,9 +2399,9 @@ RectTransform:
   m_Father: {fileID: 8465568281239410559}
   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: -173, y: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 350, y: 40}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2283220205206604593
@@ -2410,18 +2434,18 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 40
-    m_FontStyle: 0
+    m_FontSize: 42
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 0
     m_MaxSize: 55
-    m_Alignment: 4
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u89D2\u8272\u9009\u62E9"
+  m_Text: Role Select
 --- !u!114 &124879053803098386
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 5 - 5
Assets/BowArrow/Scenes/Game.unity

@@ -6018,7 +6018,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: 29.960396, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &589339043
@@ -7492,7 +7492,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: 29.960396, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &694545845
@@ -12633,7 +12633,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: 29.960396, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1218454288
@@ -14108,7 +14108,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: 49.92079, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1338115114
@@ -20249,7 +20249,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: 79.92079, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1845023679

+ 4 - 3
Assets/BowArrow/Scenes/GameChallengeScene/GameChallenge.unity

@@ -6911,6 +6911,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: eb0867e11e93fe844ad24c36e1c82a90, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  userGameAnalyse: {fileID: 0}
 --- !u!4 &279869869
 Transform:
   m_ObjectHideFlags: 0
@@ -23806,7 +23807,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: 30, y: 0}
+  m_AnchoredPosition: {x: 29.692308, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1047161075
@@ -27330,7 +27331,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: 30, y: 0}
+  m_AnchoredPosition: {x: 29.692308, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1203594963
@@ -48571,7 +48572,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: 0}
+  m_AnchoredPosition: {x: 49.384617, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2142579590

Разница между файлами не показана из-за своего большого размера
+ 126 - 3
Assets/BowArrow/Scenes/GameChallengeScene/场景备份/GameChallenge 1.unity


+ 144 - 52
Assets/BowArrow/Scenes/Login.unity

@@ -200,7 +200,6 @@ GameObject:
   - component: {fileID: 25575914}
   - component: {fileID: 25575913}
   - component: {fileID: 25575915}
-  - component: {fileID: 25575916}
   m_Layer: 0
   m_Name: Text
   m_TagString: Untagged
@@ -261,7 +260,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u8FD4\u56DE\u6CE8\u518C"
+  m_Text: "\u8FD4\u56DE"
 --- !u!222 &25575914
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -271,21 +270,6 @@ CanvasRenderer:
   m_GameObject: {fileID: 25575911}
   m_CullTransparentMesh: 0
 --- !u!114 &25575915
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 25575911}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.3339622, g: 0.5847058, b: 1, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
---- !u!114 &25575916
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -294,12 +278,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 25575911}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b7cbfcb0916cf694fb3d059ea4b4c1da, type: 3}
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  textID: 27
+  textKey: common_return
   layoutRebuildObject: {fileID: 0}
-  textFormatArgs: []
   languageFontSizes: []
 --- !u!1 &51276360
 GameObject:
@@ -2850,8 +2833,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 575, y: 0}
-  m_SizeDelta: {x: -1250, y: 0}
+  m_AnchoredPosition: {x: 626, y: 0}
+  m_SizeDelta: {x: -1252, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &260775652
 MonoBehaviour:
@@ -2991,6 +2974,7 @@ MonoBehaviour:
   agreenment: {fileID: 919185863}
   passwordTip: {fileID: 2110482410}
   captcha_Register: -222222222
+  captcha_Register_str: 
   _prefabValidateJigsawView: {fileID: 5179764180113136045, guid: f386c39ba1b239e4f9fc37517987e779, type: 3}
   datePickerPrefab: {fileID: 8259705882647745319, guid: 6dd9c8703bf161b4a915b6bd1b76622d, type: 3}
   locationPickerPrefab: {fileID: 1734157223177440359, guid: 5414f295b60145b4f9b81e615c27be07, type: 3}
@@ -3187,7 +3171,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 167f8008e7f9d714199ca76a9542663d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0e517dd56d28a7549bc0f514b60ec921, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3607,7 +3591,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: -661, y: -42}
+  m_AnchoredPosition: {x: -630, y: -42}
   m_SizeDelta: {x: 1218.7, y: 962.43}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &322752473
@@ -4766,7 +4750,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  textKey: common_next
+  textKey: register_button
   layoutRebuildObject: {fileID: 0}
   languageFontSizes: []
 --- !u!114 &511007677
@@ -4802,7 +4786,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u4E0B\u4E00\u6B65"
+  m_Text: "\u6CE8\u518C"
 --- !u!222 &511007678
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -5009,14 +4993,14 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 679882285}
-  m_RootOrder: 1
+  m_Father: {fileID: 1453333790}
+  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: 1145, y: -16}
-  m_SizeDelta: {x: 214.9, y: 79.4}
-  m_Pivot: {x: 1, y: 1}
+  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: 214.9, y: 79.399994}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &545359043
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5547,7 +5531,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 700181133}
-  - {fileID: 545359042}
+  - {fileID: 1453333790}
   m_Father: {fileID: 1545576239}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6494,7 +6478,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: 163.49191, y: 0}
+  m_AnchoredPosition: {x: 162.6, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &750604318
@@ -6605,7 +6589,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: 1806, y: -1011}
+  m_AnchoredPosition: {x: 1858, y: -1011}
   m_SizeDelta: {x: 1035.2, y: 150}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &751308051
@@ -6883,8 +6867,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
+  m_Sprite: {fileID: 21300000, guid: fe4cd5a2a3d36da42b1754b152c26f48, type: 3}
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -7774,6 +7758,7 @@ MonoBehaviour:
   loginValidTime: {fileID: 1393089227}
   loginInCaptcha2: {fileID: 1666954136}
   captcha_Login: -222222222
+  captcha_Login_str: 
   captcha_LoginPhone: -222222222
 --- !u!1001 &900131443
 PrefabInstance:
@@ -8003,7 +7988,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: 1755, y: -852}
+  m_AnchoredPosition: {x: 1807, y: -852}
   m_SizeDelta: {x: 600, y: 17}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &919185865
@@ -11681,6 +11666,97 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &1453333789
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1453333790}
+  - component: {fileID: 1453333793}
+  - component: {fileID: 1453333792}
+  - component: {fileID: 1453333791}
+  m_Layer: 5
+  m_Name: Mask
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1453333790
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1453333789}
+  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: 545359042}
+  m_Father: {fileID: 679882285}
+  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: 1043, y: -55}
+  m_SizeDelta: {x: 214.9, y: 79.39999}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1453333791
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1453333789}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!114 &1453333792
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1453333789}
+  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: fe4cd5a2a3d36da42b1754b152c26f48, 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!222 &1453333793
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1453333789}
+  m_CullTransparentMesh: 1
 --- !u!1 &1471927008
 GameObject:
   m_ObjectHideFlags: 0
@@ -12498,7 +12574,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: 342.3139, y: 0}
+  m_AnchoredPosition: {x: 343, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1549087752
@@ -13023,9 +13099,9 @@ RectTransform:
   m_Father: {fileID: 2086638595}
   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: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -90.325}
   m_SizeDelta: {x: 760, y: 100.7}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &1621113221
@@ -13269,7 +13345,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: 536.0744, y: 0}
+  m_AnchoredPosition: {x: 535.8, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1628073323
@@ -14523,8 +14599,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 35
-    m_FontStyle: 0
+    m_FontSize: 40
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 50
@@ -15662,9 +15738,9 @@ RectTransform:
   m_Father: {fileID: 2086638595}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 160, y: -17.825}
   m_SizeDelta: {x: 160, y: 27}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &1829322616
@@ -16406,6 +16482,7 @@ GameObject:
   - component: {fileID: 1867995540}
   - component: {fileID: 1867995539}
   - component: {fileID: 1867995541}
+  - component: {fileID: 1867995542}
   m_Layer: 5
   m_Name: CodeImage
   m_TagString: Untagged
@@ -16527,6 +16604,21 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &1867995542
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1867995537}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 27c5b9ab31f6bc649a4e136922b412cc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Color1: {r: 0.5568628, g: 0.9882353, b: 0.99607843, a: 1}
+  Color2: {r: 0.43137255, g: 0.7254902, b: 0.73333335, a: 1}
+  Angle: -90
 --- !u!1 &1872430154
 GameObject:
   m_ObjectHideFlags: 0
@@ -16697,7 +16789,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 439.19415, y: 0}
+  m_AnchoredPosition: {x: 439.4, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1900702359
@@ -17208,8 +17300,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -42, y: 12}
-  m_SizeDelta: {x: -1242, y: -91.7}
+  m_AnchoredPosition: {x: 0, y: 12}
+  m_SizeDelta: {x: -1263, y: -91.7}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &1950621519
 MonoBehaviour:

+ 23 - 6
Assets/BowArrow/Scripts/Bluetooth/AimHandler.cs

@@ -56,7 +56,8 @@ public class AimDeviceInfos
     [NonSerialized] public int gyrCalibrateTotalCount = 2000;
 
     public static AimHandler ins;
-  
+    public bool bInitOne = false;
+
 
     void Start()
     {
@@ -168,6 +169,11 @@ public class AimDeviceInfos
         } else {
             m_magCompleted = false;
         }
+
+        if (Input.GetKeyDown(KeyCode.Space))
+        {
+            AutoResetView.DoIdentity();
+        }
     }
 
     public void OnDataReceived(byte[] bytes)
@@ -177,13 +183,24 @@ public class AimDeviceInfos
         {
             if (bytes.Length == 2) {
                 if (bytes[0] == 0x66 && bytes[1] == 0x31) {
-                    if (SB_EventSystem.ins && SB_EventSystem.ins.simulateMouseIsAwaked) {
-                        //视角回正
-                        DoIdentity();
-                        //鼠标居中自然会居中
-                    } else {
+                    if (bInitOne)
+                    {
+                        bInitOne = false;
                         AutoResetView.DoIdentity();
                     }
+                    else {
+                        if (SB_EventSystem.ins && SB_EventSystem.ins.simulateMouseIsAwaked)
+                        {
+                            //视角回正
+                            DoIdentity();
+                            //鼠标居中自然会居中
+                        }
+                        else
+                        {
+                            AutoResetView.DoIdentity();
+                        }
+
+                    }
                 } else if (bytes[0] == 0x66 && bytes[1] == 0x32) {
                     if (SB_EventSystem.ins) {
                     // if (SB_EventSystem.ins && !CommonConfig.SpecialVersion1) {

+ 2 - 2
Assets/BowArrow/Scripts/Bluetooth/BluetoothAim.cs

@@ -185,7 +185,7 @@ public class BluetoothAim : MonoBehaviour
         doConnect = false;
         scanLock = true;
         canConnect = false;
-        _scanCanRetryCount = 2;
+        _scanCanRetryCount = 4;
         SetStatus(BluetoothStatusEnum.Connecting);
         #if UNITY_STANDALONE_WIN || UNITY_EDITOR
         ConnectBleByUDP();
@@ -194,7 +194,7 @@ public class BluetoothAim : MonoBehaviour
         #endif
     }
 
-    int _scanCanRetryCount = 2;
+    int _scanCanRetryCount = 4;
     void ConnectBleHelper()
     {
         #if UNITY_ANDROID

+ 25 - 0
Assets/BowArrow/Scripts/Bluetooth/BluetoothStatus.cs

@@ -20,6 +20,31 @@ public class BluetoothStatus
         return (14, Color.white);
     }
 
+    public static string GetStatusTextKey(BluetoothStatusEnum status)
+    {
+        string result = "Connect_BLE_None";
+        switch (BluetoothAim.ins.status)
+        {
+            case BluetoothStatusEnum.None:
+                result = "Connect_BLE_None";
+                break;
+            case BluetoothStatusEnum.Connect:
+                result = "Connect_BLE_Connect";
+                break;
+            case BluetoothStatusEnum.Connecting:
+                result = "Connect_BLE_Connecting";
+                break;
+            case BluetoothStatusEnum.ConnectSuccess:
+                result = "Connect_BLE_Connected";
+                break;
+            case BluetoothStatusEnum.ConnectFail:
+                result = "Connect_BLE_Break";
+                break;
+        }
+
+        return result;
+    }
+
     public static bool IsAllConnected()
     {
         if (!BluetoothAim.ins) return false;

+ 16 - 1
Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/cn.json

@@ -4,6 +4,7 @@
   "common_next": "下一步",
   "common_save": "保存",
   "common_agree": "同意",
+  "common_ignore": "忽略",
   "common_reject": "拒绝",
   "common_add": "添加",
   "common_del": "删除",
@@ -42,6 +43,7 @@
   "register_phone2": "手机号",
   "register_phone_placeholder": "点击绑定您的手机号",
   "register_line_tip": "只需要二选一",
+  "register_button": "注册",
 
   "home_loginAuth": "正在认证登录。。。",
   "home_loginAuthRetry": "正在认证登录\n(网络出错,重试{0}次)",
@@ -98,8 +100,10 @@
   "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_tip_准心高亮": "请完成一次射箭动作。",
   "new-user-guider_btn_ok": "确定",
 
+
   "guider-module-plane": "平面",
 
   "setup_fix-game-bg": "固定游戏背景",
@@ -346,6 +350,13 @@
   "Connect_Title": "连接",
   "Connect_AddDeviceTitle": "手动添加 WONDERFITTER 设备",
   "Connect_ButtonText": "点击进行连接",
+  "Connect_Device_Init": "初始化",
+
+  "Connect_BLE_Connect": "连接",
+  "Connect_BLE_Connecting": "正在连接",
+  "Connect_BLE_Connected": "已连接",
+  "Connect_BLE_Break": "断开连接",
+  "Connect_BLE_None": "未知",
 
   /**
   ConnectGuidanceView 页面
@@ -365,6 +376,8 @@
   "Gyro_Initialization": "陀螺仪初始化",
   "Gyro_Initializing": "初始化 {0}%",
   "Gyro_Success": "成功",
+  "Gyro_Fail": "失败,请再试一次",
+  "Gyro_Reinitialize": "重新初始化",
   "Gyro_Artemis_Step1": "将弓放置在平面上,然后启动陀螺仪初始化",
 
   /**
@@ -375,8 +388,10 @@
   "Mag_Step2": "启动地磁计初始化,并向各个方向旋转WD模块,直到初始化成功。",
   "Mag_Initialization": "地磁计初始化",
   "Mag_Initializing": "正在初始化",
-  "Mag_Initializing2": "初始化 {0}%",
+  "Mag_Initializing2": "初始化{0}%",
   "Mag_Success": "成功",
+  "Mag_Fail": "失败,请再试一次",
+  "Mag_Reinitialize": "重新初始化",
 
   "Mag_Artemis_Step1": "在开始地磁计初始化之前,请确保游戏弓距离手机至少0.5米。",
   "Mag_Artemis_Step2": "启动地磁计初始化,并向各个方向旋转游戏弓,直到初始化成功。",

+ 15 - 0
Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/en.json

@@ -4,6 +4,7 @@
   "common_next": "Next",
   "common_save": "Save",
   "common_agree": "Agree",
+  "common_ignore": "Ignore",
   "common_reject": "Reject",
   "common_add": "Add",
   "common_del": "Delete",
@@ -43,6 +44,7 @@
   "register_phone2": "Phone",
   "register_phone_placeholder": "Click to bind your mobile number",
   "register_line_tip": "Choose one\nfrom them",
+  "register_button": "Register",
 
   "home_loginAuth": "Authenticating Login ...",
   "home_loginAuthRetry": "Authenticating Login\n(Network error, retry {0} time)",
@@ -99,6 +101,7 @@
   "new-user-guider_tip_视角归位-触发": "Short press the <color=#FFA500>\"Aim Reset\"</color> \nkey on the module, <color=#FFA500>aim the bow \nand arrow at the bull's eye with \nreference to the posture in the \npicture</color>, and then complete the \nvisual angle return in 3 seconds.",
   "new-user-guider_tip_视角归位-瞄准": "Please refer to the pose in the figure, aim \nat the bull's-eye immediately, the visual \nangle return will be completed in <size=40><color=#FFA500>{0}</color></size> seconds.",
   "new-user-guider_tip_教程结束": "Congratulations on completing this novice tutorial. If you want \nto <color=#FFA500>know this tutorial</color> next time, please <color=#FFA500>see the novice guidance \nin the setup.</color>",
+  "new-user-guider_tip_准心高亮": "Please complete an archery move.",
   "new-user-guider_btn_ok": "OK",
 
   "guider-module-plane": "Plane",
@@ -394,6 +397,13 @@
   "Connect_Title": "Connect",
   "Connect_AddDeviceTitle": "Add WONDERFITTER device manually",
   "Connect_ButtonText": "Tap to connect",
+  "Connect_Device_Init": "Init",
+
+  "Connect_BLE_Connect": "Connect",
+  "Connect_BLE_Connecting": "Connecting",
+  "Connect_BLE_Connected": "Connected",
+  "Connect_BLE_Break": "Break",
+  "Connect_BLE_None": "None",
 
   /**
   ConnectGuidanceView 页面
@@ -414,6 +424,8 @@
   "Gyro_Initialization": "Gyr Initialization",
   "Gyro_Initializing": "lnitializing {0}%",
   "Gyro_Success": "Success",
+  "Gyro_Fail": "Failed,please try again",
+  "Gyro_Reinitialize": "Reinitialize",
   "Gyro_Artemis_Step1": "Place the bow on a plane surface, and then start Gyr Initialization",
 
   /**
@@ -424,7 +436,10 @@
   "Mag_Step2": "Start Mag Initialization, and rotate the WD Module in various directions until the initialization succeeds.",
   "Mag_Initialization": "Mag Initialization",
   "Mag_Initializing": "lnitializing",
+  "Mag_Initializing2": "lnitializing {0}%",
   "Mag_Success": "Success",
+  "Mag_Fail": "Failed,please try again",
+  "Mag_Reinitialize": "Reinitialize",
 
   "Mag_Artemis_Step1": "Before starting the Mag Initialization,make sure the Gaming Bow is at least 0.5 meters away from the mobile phone.",
   "Mag_Artemis_Step2": "Start Mag Initialization, and rotate the Gaming Bow in various directions until the initialization succeeds.",

+ 1 - 0
Assets/BowArrow/Scripts/Entry.cs

@@ -23,6 +23,7 @@ public class Entry : MonoBehaviour
 
     void Start()
     {
+        Screen.fullScreen = true;
         Screen.orientation = ScreenOrientation.AutoRotation;//设置方向为自动(根据需要自动旋转屏幕朝向任何启用的方向。)
         Screen.autorotateToLandscapeRight = true;           //允许自动旋转到右横屏
         Screen.autorotateToLandscapeLeft = true;            //允许自动旋转到左横屏

+ 3 - 0
Assets/BowArrow/Scripts/Expand/SB_EventSystem.cs

@@ -50,6 +50,9 @@ public class SB_EventSystem : MonoBehaviour
                 // colorBlock.highlightedColor = pointerHoverColor;
                 // btn.colors = colorBlock;
             };
+            //mouseConfirm .OnResumeTarget  += (Selectable target) => {
+            //    simulateMouse.onSetNullToSelectable(target);
+            //};
         }
     #endregion
 

+ 35 - 0
Assets/BowArrow/Scripts/Expand/SB_EventSystem/MouseConfirm/MouseButton.cs

@@ -2,6 +2,8 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
+using FancyScrollView.FocusOn;
+using UnityEngine.Events;
 
 public class MouseButton : MonoBehaviour
 {   
@@ -11,6 +13,15 @@ public class MouseButton : MonoBehaviour
     Vector3 _scale;
     Color _color;
 
+    [SerializeField] public Button targetButton;
+
+    [SerializeField] public GameObject cellObj;
+
+    [SerializeField]
+    UnityEvent OnStartEvent;
+    [SerializeField]
+    UnityEvent OnEndEvent;
+
     public void OnSelect() {
         if (targetGraphic) {
             _color = targetGraphic.color;
@@ -20,10 +31,34 @@ public class MouseButton : MonoBehaviour
             _scale = targetRTF.localScale;
             targetRTF.localScale = _scale * 1.15f;
         }
+
+        if (targetButton) {
+            targetButton.image.sprite = targetButton.spriteState.highlightedSprite;
+        }
+
+        if (cellObj) {
+            cellObj.GetComponent<Cell>().onCellClickedEvent();
+        }
     }
 
     public void OnExit() {
         if (targetGraphic) targetGraphic.color = _color;
         if (targetRTF) targetRTF.localScale = _scale;
+        if (targetButton)
+        {
+            targetButton.image.sprite = targetButton.spriteState.disabledSprite;
+        }
+
+        //if (cellObj)
+        //{
+        //    cellObj.SetActive(false);
+        //}
+
+    }
+    public void OnSendStart() {
+        OnStartEvent.Invoke();
+    }
+    public void OnSendEnd() { 
+        OnEndEvent.Invoke();
     }
 }

+ 22 - 4
Assets/BowArrow/Scripts/Expand/SB_EventSystem/MouseConfirm/MouseConfirm.cs

@@ -9,7 +9,7 @@ using JC.Unity;
 public class MouseConfirm : MonoBehaviour
 {
     [NonSerialized] public Selectable _targetSelectable;
-    
+    [NonSerialized] public Action<Selectable> OnResumeTarget;
     void Update()
     {
         if (!SB_EventSystem.ins.simulateMouseIsAwaked)
@@ -66,7 +66,9 @@ public class MouseConfirm : MonoBehaviour
 
         RectTransform rtf = _targetSelectable.transform as RectTransform;
         _btnTransition = btn.transition;
-        if (btn.transition == Selectable.Transition.ColorTint) { //变色和放大
+        _mouseButton = rtf.GetComponent<MouseButton>();
+        if (btn.transition == Selectable.Transition.ColorTint)
+        { //变色和放大
             Vector3 pos = JCUnityLib.RectTransformUtils.GetPositionByPivot(rtf, Vector2.one * 0.5f);
             rtf.pivot = Vector2.one * 0.5f;
             rtf.position = pos;
@@ -76,11 +78,18 @@ public class MouseConfirm : MonoBehaviour
             var newcolor = _targetSelectable.targetGraphic.color;
             newcolor.a = 0.6f;
             _targetSelectable.targetGraphic.color = newcolor;
-        } else if (btn.transition == Selectable.Transition.None) { //则使用自定义变色和放大
-            _mouseButton = rtf.GetComponent<MouseButton>();
+        }
+        else if (btn.transition == Selectable.Transition.None)
+        { //则使用自定义变色和放大
+            //_mouseButton = rtf.GetComponent<MouseButton>();
             if (_mouseButton) _mouseButton.OnSelect();
         }
+        else if (btn.transition == Selectable.Transition.SpriteSwap) {
 
+            //_mouseButton = rtf.GetComponent<MouseButton>();
+            if (_mouseButton) _mouseButton.OnSelect();
+        }
+        if (_mouseButton) _mouseButton.OnSendStart();
         Show();
     }
 
@@ -97,7 +106,16 @@ public class MouseConfirm : MonoBehaviour
             } else if (_btnTransition == Selectable.Transition.None) {
                 if (_mouseButton) _mouseButton.OnExit();
             }
+            else if (_btnTransition == Selectable.Transition.SpriteSwap)
+            {
+                if (_mouseButton) _mouseButton.OnExit();
+            }
+
         }
+
+        if (_mouseButton) _mouseButton.OnSendEnd();
         _mouseButton = null;
+
+        OnResumeTarget?.Invoke(_targetSelectable);
     }
 }

+ 17 - 2
Assets/BowArrow/Scripts/Expand/UserGameAnalyse.cs

@@ -6,6 +6,10 @@ using System;
 /* 用户游戏情况统计分析-主要向服务器是上传用户游戏数据 */
 public class UserGameAnalyse : MonoBehaviour
 {
+    //跳转关卡时候,记录对应的数据信息。叠加时间和射箭次数
+    public static float allTimeSecond = 0;
+    public static int allShootingCount = 0;
+
     int gameType;
     long startTime; //毫秒
     float duration; //秒
@@ -24,6 +28,11 @@ public class UserGameAnalyse : MonoBehaviour
     {
         UserGameAnalyse userGameAnalyse = new GameObject("UserGameAnaly").AddComponent<UserGameAnalyse>();
         userGameAnalyse.gameType = gameType;
+
+        //生成的时候赋值
+        userGameAnalyse.duration = allTimeSecond;
+        userGameAnalyse.shootingCount = allShootingCount;
+
         return userGameAnalyse;
     }
 
@@ -55,6 +64,7 @@ public class UserGameAnalyse : MonoBehaviour
         if (gameIsEnd) return;
         if (isEnd) gameIsEnd = true; 
         try {
+            allTimeSecond += duration;
             UserPlayer.ins.call("UserGameAnalyseComp.uploadUserGameRecord", gameType, startTime, (int) duration);    
         }
         catch (System.Exception) {}
@@ -63,7 +73,7 @@ public class UserGameAnalyse : MonoBehaviour
      * shootCheck 触发
      */
     public void onShootEvent() {
-        changeShootingCount();
+       allShootingCount = changeShootingCount();
     }
 
     int changeShootingCount(int value = 1)
@@ -79,7 +89,12 @@ public class UserGameAnalyse : MonoBehaviour
         GameInfo gameInfo = TextureMgr.ins.GetGameInfos(gameType);
         GameResultView gameResultView = resultObj.GetComponent<GameResultView>();
         gameResultView.OnBackClicked += callback;
-        gameResultView.setGameResultInfo(gameInfo.textId, (int)duration, shootingCount);
+        gameResultView.setGameResultInfo(gameInfo.textId, (int)allTimeSecond, allShootingCount);
+        onResetOverlayData();
 
     }
+    public void onResetOverlayData() {
+        allTimeSecond = 0;
+        allShootingCount = 0;
+    }
 }

+ 1 - 1
Assets/BowArrow/Scripts/Game/ArmBow.cs

@@ -136,7 +136,7 @@ public class ArmBow : MonoBehaviour
     {
         UpdatePhase();
         #if UNITY_EDITOR
-            if (Input.GetKeyDown(KeyCode.Q)) this.ADS_fire();
+            if (Input.GetKeyDown(KeyCode.Q)) this.ADS_fire(true);
         #endif
     }
 

+ 5 - 1
Assets/BowArrow/Scripts/GameChallenge/Views/HunterGameSettleView.cs

@@ -98,7 +98,11 @@ public class HunterGameSettleView : MonoBehaviour
     }
 
     private void GoHomeLogic() {
-        SceneManager.LoadScene("Home", LoadSceneMode.Single);
+        ChallengeGameMode gameMode = (ChallengeGameMode)GameMgr.ins.gameMode;
+        gameMode.gameMgr.userGameAnalyse.showResultView(() => {
+            SceneManager.LoadScene("Home", LoadSceneMode.Single);
+        });
+        //SceneManager.LoadScene("Home", LoadSceneMode.Single);
         // HomeMgr.DestroyCacheViews();
     }
 }

+ 1 - 1
Assets/BowArrow/Scripts/GameMode/ChallengeGameMode.cs

@@ -32,7 +32,6 @@ public abstract class ChallengeGameMode : GameMode
     public static string enterNextLevel;
     public string nextLevel;
 
-
     public ChallengeGameMode(GameMgr gameMgr) : base(gameMgr) {
         //变量初始化
         animalsBaseT = GameObject.Find("Animals").transform;
@@ -122,4 +121,5 @@ public abstract class ChallengeGameMode : GameMode
     #region  //网络联机新增参数
         public bool banOnBowArrowShootOut = false;
     #endregion
+
 }

+ 9 - 2
Assets/BowArrow/Scripts/GameMode/TimeLimitGameMode.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -13,6 +14,8 @@ public class TimeLimitGameMode : GameMode {
     float time = 60;
     TargetBody targetBody;
 
+    public Action onHitTargetEvent;
+
     public TimeLimitGameMode(GameMgr gameMgr) : base(gameMgr) {
         insCount++;
         //记录可射击的靶子
@@ -31,7 +34,9 @@ public class TimeLimitGameMode : GameMode {
         if (insCount == insCountWillTryAgain) {
             ConfirmSelectedTargetDistance();
         } else {
-            GameObject.Instantiate(Resources.Load<GameObject>("Prefabs/Views/TimeLimitGameDistanceSelectView"));
+            if (GameMgr.bShowDistance) {
+                GameObject.Instantiate(Resources.Load<GameObject>("Prefabs/Views/TimeLimitGameDistanceSelectView"));
+            }
         }
     }
 
@@ -52,7 +57,9 @@ public class TimeLimitGameMode : GameMode {
         this.score += score;
         HitTargetNumber.Create(score);
 
-        gameMgr.StartCoroutine(NavDeviceView());
+        onHitTargetEvent?.Invoke();
+        if(score != 0)
+            gameMgr.StartCoroutine(NavDeviceView());
     }
     //跳回homeView 后,跳转到deviceview
     IEnumerator NavDeviceView() {

+ 26 - 10
Assets/BowArrow/Scripts/Manager/GameMgr.cs

@@ -15,6 +15,8 @@ public class GameMgr : MonoBehaviour
     public UserGameAnalyse userGameAnalyse;
 
     public static bool bNavBack = false;
+    public static bool bShowDistance = true;
+
     void Awake() 
     {
         ins = this;
@@ -51,10 +53,17 @@ public class GameMgr : MonoBehaviour
     }
 
     void OnDestroy() {
-        try { 
+        //此脚本删除后重新设置 bShowDistance bNavBack
+        bShowDistance = true;
+        bNavBack = false;
+        try
+        { 
             GlobalEventCenter.ins.onGameSceneDestroy?.Invoke(); 
         } catch (System.Exception e) { Debug.LogError(e.Message); }
-        if (AimHandler.ins) AimHandler.ins.Ban9AxisCalculate(false);
+        if (AimHandler.ins) {
+            AimHandler.ins.Ban9AxisCalculate(false);
+            AimHandler.ins.bInitOne = false;
+        }
         clearLockerForGamePause();
         if (ins == this) ins = null;
     }
@@ -97,16 +106,23 @@ public class GameMgr : MonoBehaviour
 
     bool guideFinish = false;
     public void CheckGuide() {
-        if (gameType > 0) {
-            if (!UserSettings.ins.deviceCalibrateGuideFinish) {
-                DeviceCalibrateView.Create();
-                return;
-            }
-            if (gameType < 3) {
-                if (!UserSettings.ins.gameRuleGuideFinish.Contains(gameType)) {
-                    GameRuleView.Create();
+        //地磁计跳进来不需要初始化任务
+        if (bShowDistance) {
+            if (gameType > 0)
+            {
+                if (!UserSettings.ins.deviceCalibrateGuideFinish)
+                {
+                    DeviceCalibrateView.Create();
                     return;
                 }
+                if (gameType < 3)
+                {
+                    if (!UserSettings.ins.gameRuleGuideFinish.Contains(gameType))
+                    {
+                        GameRuleView.Create();
+                        return;
+                    }
+                }
             }
         }
         guideFinish = true;

+ 87 - 0
Assets/BowArrow/Scripts/Manager/LoginMgr/Gradient1.cs

@@ -0,0 +1,87 @@
+/*
+ *FileName:      Gradient.cs
+ *Author:        M
+ *Date:          2022/02/23 13:51:26
+ *UnityVersion:  2020.3.0f1c1
+ *Description:   ͼƬ½¥±äЧ¹û
+*/
+
+using UnityEngine;
+using UnityEngine.UI;
+
+[AddComponentMenu("UI/Effects/Gradient")]
+public class Gradient1 : BaseMeshEffect
+{
+    public Color Color1 = Color.white;
+    public Color Color2 = Color.white;
+
+    [Range(-180f, 180f)] public float Angle = -90.0f;
+
+    public override void ModifyMesh(VertexHelper vh)
+    {
+        if (enabled)
+        {
+            var rect = graphic.rectTransform.rect;
+            var dir = RotationDir(Angle);
+
+            var localPositionMatrix = LocalPositionMatrix(rect, dir);
+
+            var vertex = default(UIVertex);
+            for (var i = 0; i < vh.currentVertCount; i++)
+            {
+                vh.PopulateUIVertex(ref vertex, i);
+                var localPosition = localPositionMatrix * vertex.position;
+                vertex.color *= Color.Lerp(Color2, Color1, localPosition.y);
+                vh.SetUIVertex(vertex, i);
+            }
+        }
+    }
+
+    public struct Matrix2x3
+    {
+        public float m00, m01, m02, m10, m11, m12;
+
+        public Matrix2x3(float m00, float m01, float m02, float m10, float m11, float m12)
+        {
+            this.m00 = m00;
+            this.m01 = m01;
+            this.m02 = m02;
+            this.m10 = m10;
+            this.m11 = m11;
+            this.m12 = m12;
+        }
+
+        public static Vector2 operator *(Matrix2x3 m, Vector2 v)
+        {
+            float x = (m.m00 * v.x) - (m.m01 * v.y) + m.m02;
+            float y = (m.m10 * v.x) + (m.m11 * v.y) + m.m12;
+            return new Vector2(x, y);
+        }
+    }
+
+    private Matrix2x3 LocalPositionMatrix(Rect rect, Vector2 dir)
+    {
+        float cos = dir.x;
+        float sin = dir.y;
+        Vector2 rectMin = rect.min;
+        Vector2 rectSize = rect.size;
+        float c = 0.5f;
+        float ax = rectMin.x / rectSize.x + c;
+        float ay = rectMin.y / rectSize.y + c;
+        float m00 = cos / rectSize.x;
+        float m01 = sin / rectSize.y;
+        float m02 = -(ax * cos - ay * sin - c);
+        float m10 = sin / rectSize.x;
+        float m11 = cos / rectSize.y;
+        float m12 = -(ax * sin + ay * cos - c);
+        return new Matrix2x3(m00, m01, m02, m10, m11, m12);
+    }
+
+    private Vector2 RotationDir(float angle)
+    {
+        float angleRad = angle * Mathf.Deg2Rad;
+        float cos = Mathf.Cos(angleRad);
+        float sin = Mathf.Sin(angleRad);
+        return new Vector2(cos, sin);
+    }
+}

+ 11 - 0
Assets/BowArrow/Scripts/Manager/LoginMgr/Gradient1.cs.meta

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

+ 7 - 5
Assets/BowArrow/Scripts/Manager/LoginMgr/LoginView.cs

@@ -28,6 +28,7 @@ public class LoginView : MonoBehaviour
 
     //状态记录
     public int captcha_Login = -222222222;
+    public string captcha_Login_str = "";
     public int captcha_LoginPhone = -222222222;
 
     public static LoginView ins;
@@ -60,13 +61,13 @@ public class LoginView : MonoBehaviour
             if (Input.GetKeyDown(KeyCode.F1)) {
                 GetInputField(loginInUser).text = "lvjincheng";
                 GetInputField(loginInPWD).text = "19980301";
-                GetInputField(loginInCaptcha1).text = captcha_Login.ToString();
+                GetInputField(loginInCaptcha1).text = captcha_Login_str;
                 LoginNormal();
             }
             if (Input.GetKeyDown(KeyCode.F2)) {
                 GetInputField(loginInUser).text = "tester";
                 GetInputField(loginInPWD).text = "123456";
-                GetInputField(loginInCaptcha1).text = captcha_Login.ToString();
+                GetInputField(loginInCaptcha1).text = captcha_Login_str;
                 LoginNormal();
             }
         #endif
@@ -102,7 +103,7 @@ public class LoginView : MonoBehaviour
             Vector3 v31 = btnRegister.localPosition; v31.y = -168.5f;
             btnRegister.localPosition = v31;
 
-            if (captcha_Login < 0) {
+            if (captcha_Login_str.Length <= 0) {
                 ChnageCaptcha1();
             }
         }
@@ -137,8 +138,9 @@ public class LoginView : MonoBehaviour
     public void ChnageCaptcha1() {
         StartCoroutine(CaptchaController.Instance.GetCaptcha(
             loginInCaptcha1.transform.parent.Find("CodeImage").GetComponent<Image>(),
-            (code) => { captcha_Login = code; }
+            (code) => { captcha_Login_str = code.ToString(); }
         ));
+        //captcha_Login_str = CaptchaController.Instance.GetCaptchaV2(loginInCaptcha1.transform.parent.Find("CodeImage").GetComponent<Image>());
     }
 
     public void ChnageCaptcha2() {
@@ -169,7 +171,7 @@ public class LoginView : MonoBehaviour
             return;
         }
         InputField captcha = GetInputField(loginInCaptcha1);
-        if (!captcha.text.Equals(captcha_Login.ToString())) {
+        if (!captcha.text.Equals(captcha_Login_str)) {
             PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("验证码错误"));
             return;
         }

+ 5 - 3
Assets/BowArrow/Scripts/Manager/LoginMgr/RegisterView.cs

@@ -39,6 +39,7 @@ public class RegisterView : MonoBehaviour
 
     //状态记录
     public int captcha_Register = -222222222;
+    public string captcha_Register_str = "";
 
     void OnEnable() 
     {
@@ -137,9 +138,10 @@ public class RegisterView : MonoBehaviour
 
     public void ChnageCaptcha() {
         StartCoroutine(CaptchaController.Instance.GetCaptcha(
-            registerInCaptcha.transform.Find("GameObject/CodeImage").GetComponent<Image>(),
-            (code) => { captcha_Register = code; }
+            registerInCaptcha.transform.Find("GameObject/Mask/CodeImage").GetComponent<Image>(),
+            (code) => { captcha_Register_str = code.ToString(); }
         ));
+        //captcha_Register_str = CaptchaController.Instance.GetCaptchaV2(registerInCaptcha.transform.Find("GameObject/Mask/CodeImage").GetComponent<Image>());
     }
 
     string _bindingEmail = "";
@@ -444,7 +446,7 @@ public class RegisterView : MonoBehaviour
         //    return;
         //}
         InputField captcha = GetGameObjectInputField(registerInCaptcha);
-        if (!captcha.text.Equals(captcha_Register.ToString())) {
+        if (!captcha.text.Equals(captcha_Register_str)) {
             PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("验证码错误"));
             return;
         }

+ 236 - 2
Assets/BowArrow/Scripts/Network/HttpController/CaptchaController.cs

@@ -5,6 +5,11 @@ using UnityEngine;
 using UnityEngine.Networking;
 using UnityEngine.UI;
 
+using System.Drawing;
+using System.Security.Cryptography;
+using Random = System.Random;
+using System.IO;
+using Image = UnityEngine.UI.Image;
 /* Http控制器-验证码 */
 public class CaptchaController : JCUnityLib.Singleton<CaptchaController>
 {
@@ -12,13 +17,15 @@ public class CaptchaController : JCUnityLib.Singleton<CaptchaController>
 
     public IEnumerator GetCaptcha(Image targetRenderImage, Action<int> cb)
     {
-        if (targetRenderImage.sprite == null) {
+        if (targetRenderImage.sprite == null)
+        {
             int codeA = builtInCaptchaList[UnityEngine.Random.Range(0, 3)];
             targetRenderImage.sprite = Resources.Load<Sprite>("Captcha/" + codeA);
             if (cb != null) cb(codeA);
         }
         int code = UnityEngine.Random.Range(1000, 10000);
-        using (UnityWebRequest uwr = new UnityWebRequest(CommonConfig.gateServerURL + "/api/createCaptcha?code=" + code, UnityWebRequest.kHttpVerbGET)) {
+        using (UnityWebRequest uwr = new UnityWebRequest(CommonConfig.gateServerURL + "/api/createCaptcha?code=" + code, UnityWebRequest.kHttpVerbGET))
+        {
             uwr.downloadHandler = new DownloadHandlerTexture();
             yield return uwr.SendWebRequest();
             Texture2D texture = DownloadHandlerTexture.GetContent(uwr);
@@ -27,4 +34,231 @@ public class CaptchaController : JCUnityLib.Singleton<CaptchaController>
             if (cb != null) cb(code);
         }
     }
+    //移动端不可用
+    public string GetCaptchaV2(Image targetRenderImage)
+    {
+        return ShowVerificationCode(targetRenderImage, 150, 60, 4);
+    }
+
+    /// <summary>
+    /// 显示图片验证码
+    /// </summary>
+    /// <param name="img">显示验证码的image组件</param>
+    /// <param name="imgWidth">图片宽度,150</param>
+    /// <param name="imgHeight">图片高度, 60</param>
+    /// <param name="length">字符长度,一般为4</param>
+    /// <returns>验证码字符串</returns>
+    private string ShowVerificationCode(Image img, int imgWidth, int imgHeight, int length)
+    {
+        VerificationCode vCode = new VerificationCode(imgWidth, imgHeight, length);
+        Texture2D texture = VerificationCode.Image2Texture(vCode.Image);
+        img.sprite = Sprite.Create(texture, new Rect(0, 0, imgWidth, imgHeight), new Vector2(0.5f, 0.5f), 125);
+        return vCode.Text;
+    }
+
+
+}
+
+
+/// <summary>
+/// 用于创建验证码图片
+/// 暂时仅支持4位数  如有其它需求  需要进一步修改
+/// </summary>
+public class VerificationCode
+{
+
+    private string text = "";
+    private Bitmap image;
+    private int letterWidth = 30;  //单个字体的宽度范围
+    private int letterHeight = 60; //单个字体的高度范围
+    private static byte[] randb = new byte[4];
+    private static RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();
+
+    /// <summary>
+    /// 字体样式 信息
+    /// </summary>
+    private System.Drawing.Font[] fonts = {
+        //new System.Drawing.Font(new FontFamily("Times New Roman"),30 +Next(1),System.Drawing.FontStyle.Regular),
+        //new System.Drawing.Font(new FontFamily("Georgia"), 25 + Next(1),System.Drawing.FontStyle.Regular),
+        //new System.Drawing.Font(new FontFamily("Arial"), 35 + Next(1),System.Drawing.FontStyle.Regular),
+        //new System.Drawing.Font(new FontFamily("Comic Sans MS"), 28 + Next(1),System.Drawing.FontStyle.Regular)
+        new System.Drawing.Font("HarmonyOS Sans SC", 30 +Next(1),System.Drawing.FontStyle.Regular),
+        new System.Drawing.Font("HarmonyOS Sans SC", 25 + Next(1),System.Drawing.FontStyle.Regular),
+        new System.Drawing.Font("HarmonyOS Sans SC", 35 + Next(1),System.Drawing.FontStyle.Regular),
+        new System.Drawing.Font("HarmonyOS Sans SC", 28 + Next(1),System.Drawing.FontStyle.Regular)
+    };
+
+    /// <summary>
+    /// 验证码
+    /// </summary>
+    public string Text
+    {
+        get { return this.text; }
+    }
+
+    /// <summary>
+    /// 验证码图片
+    /// </summary>
+    public System.Drawing.Bitmap Image
+    {
+        get { return this.image; }
+    }
+
+    public VerificationCode(int imgWidth, int imgHeight, int length)
+    {
+        Number(length, false);
+        CreateImage(imgWidth, imgHeight);
+    }
+
+
+    /// <summary>
+    /// 生成随机数字
+    /// </summary>
+    /// <param name="Length">生成长度</param>
+    /// <param name="Sleep">是否要在生成前将当前线程阻止以避免重复</param>
+    private string Number(int Length, bool Sleep)
+    {
+        if (Sleep) System.Threading.Thread.Sleep(3);
+        string result = "";
+        System.Random random = new System.Random();
+        for (int i = 0; i < Length; i++)
+        {
+            result += random.Next(10).ToString();
+
+        }
+
+        this.text = result;
+        //Debug.Log("result: " + result);
+        return result;
+    }
+
+    /// <summary>
+    /// 获得下一个随机数
+    /// </summary>
+    /// <param name="max">最大值</param>
+    private static int Next(int max)
+    {
+        rand.GetBytes(randb);
+        int value = BitConverter.ToInt32(randb, 0);
+        value = value % (max + 1);
+        if (value < 0) value = -value;
+        return value;
+    }
+
+    /// <summary>
+    /// 获得下一个随机数
+    /// </summary>
+    /// <param name="min">最小值</param>
+    /// <param name="max">最大值</param>
+    private static int Next(int min, int max)
+    {
+        int value = Next(max - min) + min;
+        return value;
+    }
+
+
+    /// <summary>
+    /// 绘制验证码
+    /// </summary>
+    private void CreateImage(int imgWidth, int imgHeight)
+    {
+        image = new Bitmap(imgWidth, imgHeight);
+        System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(image);
+        //画白色背景
+        g.Clear(System.Drawing.Color.White);
+
+        //画三条 扰乱视野的线
+        for (int i = 0; i < 2; i++)
+        {
+            int x1 = Next(imgWidth / 2);
+            int x2 = Next(imgWidth / 2, imgWidth - 1);
+            int y1 = Next(imgHeight / 2);
+            int y2 = Next(imgHeight / 2, imgHeight - 1);
+            g.DrawLine(new Pen(GetRandomColor()), x1, y1, x2, y2);
+        }
+
+        int _x = 0, _y = -30;
+        for (int int_index = 0; int_index < this.text.Length; int_index++)
+        {
+            //随机字符的左边位置
+            _x += Next(10, 30); //x坐标 累加
+            _y = Next(5, 10);//y坐标 在一个范围内 随机
+            string str_char = this.text.Substring(int_index, 1);
+            str_char = Next(1) == 1 ? str_char.ToLower() : str_char.ToUpper();
+            Brush newBrush = new SolidBrush(GetRandomColor());
+            Point thePos = new Point(_x, _y);
+            Debug.Log("index: " + int_index + "    x: " + _x + "    y: " + _y);
+            g.DrawString(str_char, fonts[Next(fonts.Length - 1)], newBrush, thePos);
+        }
+        for (int i = 0; i < 10; i++)
+        {
+            int x = Next(image.Width - 1);
+            int y = Next(image.Height - 1);
+            image.SetPixel(x, y, System.Drawing.Color.FromArgb(Next(0, 255), Next(0, 255), Next(0, 255)));
+        }
+        //image = TwistImage(image, true, Next(1, 3), Next(4, 6));
+        //g.DrawRectangle(new Pen(System.Drawing.Color.LightGray, 5), 0, 0, 150 - 1, (letterHeight - 1));
+    }
+
+    /// <summary>
+    /// 字体随机颜色
+    /// </summary>
+    public System.Drawing.Color GetRandomColor()
+    {
+        System.Random RandomNum_First = new System.Random((int)DateTime.Now.Ticks);
+        System.Threading.Thread.Sleep(RandomNum_First.Next(50));
+        System.Random RandomNum_Sencond = new System.Random((int)DateTime.Now.Ticks);
+        int int_Red = RandomNum_First.Next(180);
+        int int_Green = RandomNum_Sencond.Next(180);
+        int int_Blue = (int_Red + int_Green > 300) ? 0 : 400 - int_Red - int_Green;
+        int_Blue = (int_Blue > 255) ? 255 : int_Blue;
+        return System.Drawing.Color.FromArgb(int_Red, int_Green, int_Blue);
+    }
+
+    /// <summary>
+    /// 将Image 转为 Texture
+    /// </summary>
+    /// <param name="im"></param>
+    /// <returns></returns>
+    public static Texture2D Image2Texture(System.Drawing.Image im)
+    {
+        if (im == null)
+        {
+            return new Texture2D(4, 4);
+        }
+
+        //Memory stream to store the bitmap data.
+        MemoryStream ms = new MemoryStream();
+
+        //Save to that memory stream.
+        im.Save(ms, System.Drawing.Imaging.ImageFormat.Png);
+
+        //Go to the beginning of the memory stream.
+        ms.Seek(0, SeekOrigin.Begin);
+        //make a new Texture2D
+        Texture2D tex = new Texture2D(im.Width, im.Height);
+
+        tex.LoadImage(ms.ToArray());
+
+        //Close the stream.
+        ms.Close();
+        im.Dispose();
+        ms = null;
+        //
+        return tex;
+    }
+
+    /*产生验证码*/
+    public string CreateCode(int codeLength)
+    {
+        string so = "1,2,3,4,5,6,7,8,9,0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z";
+        string[] strArr = so.Split(',');
+        string code = "";
+        Random rand = new Random();
+        for (int i = 0; i < codeLength; i++)
+        {
+            code += strArr[rand.Next(0, strArr.Length)];
+        }
+        return code;
+    }
 }

+ 33 - 10
Assets/BowArrow/Scripts/Network/UserPlayer.cs

@@ -128,7 +128,7 @@ public class UserPlayer : JCEntity
     }
     IEnumerator showTip()
     {
-        yield return new WaitForSeconds(0.5f);
+        yield return new WaitForSeconds(1.0f);
         GameObject settingsViewObj = ViewManager2.getGameObjectAndShowView(ViewManager2.Path_HomeViewTip);
         settingsViewObj.GetComponent<HomeView_Tip>().setHomeTip(0);
     }
@@ -145,14 +145,14 @@ public class UserPlayer : JCEntity
             HomeView.ins.RenderDeviceNames();
         }
         if (AuthLoginMask.ins) AuthLoginMask.ins.SetVisiable(false);
-        if (SceneManager.GetActiveScene().name.Equals("Home") && !LoginMgr.myUserInfo.IsGuideFinish(0)) {
-            //NewUserGuiderManager.ins?.ReviewNewUserGuide();
-            //安装后首次进入APP和首次登录账号进入APP后
-            //GameObject settingsViewObj = ViewManager2.getGameObjectAndShowView(ViewManager2.Path_HomeViewTip);
-            //settingsViewObj.GetComponent<HomeView_Tip>().setHomeTip(0);
-            CoroutineStarter.Start(showTip());
-            LoginMgr.myUserInfo.SaveGuideFinish(0);
-        }
+        //if (SceneManager.GetActiveScene().name.Equals("Home") && !LoginMgr.myUserInfo.IsGuideFinish(0)) {
+        //    //NewUserGuiderManager.ins?.ReviewNewUserGuide();
+        //    //安装后首次进入APP和首次登录账号进入APP后
+        //    //GameObject settingsViewObj = ViewManager2.getGameObjectAndShowView(ViewManager2.Path_HomeViewTip);
+        //    //settingsViewObj.GetComponent<HomeView_Tip>().setHomeTip(0);
+        //    CoroutineStarter.Start(showTip());
+        //    LoginMgr.myUserInfo.SaveGuideFinish(0);
+        //}
         if (SceneManager.GetActiveScene().name.Equals("Home")) {
             if (LoginMgr.myUserInfo.nickname == "test10086") InitLogReporter();
         }
@@ -170,8 +170,31 @@ public class UserPlayer : JCEntity
                         LoginMgr.myUserInfo.Save();
                     }
                 });
+
+                if (!LoginMgr.myUserInfo.IsGuideFinish(0))
+                {
+                    CoroutineStarter.Start(showTip());
+                    LoginMgr.myUserInfo.SaveGuideFinish(0);
+                }
             };
-            if (!HomeView.ShowProminentBeforeConnectBLE(eOnAgree)) eOnAgree.Invoke();
+            System.Action eOnReject = () => {
+                if (!LoginMgr.myUserInfo.IsGuideFinish(0))
+                {
+                    CoroutineStarter.Start(showTip());
+                    LoginMgr.myUserInfo.SaveGuideFinish(0);
+                }
+            };
+            if (!HomeView.ShowProminentBeforeConnectBLE_Event(eOnAgree,eOnReject)) {
+                eOnAgree.Invoke();
+            }
+            //else
+            //{
+            //    if (!LoginMgr.myUserInfo.IsGuideFinish(0))
+            //    {
+            //        CoroutineStarter.Start(showTip());
+            //        LoginMgr.myUserInfo.SaveGuideFinish(0);
+            //    }
+            //}
         }
     }
 

+ 48 - 22
Assets/BowArrow/Scripts/View/Home/DeviceView.cs

@@ -7,7 +7,7 @@ using UnityEngine.UI;
 /* 设备界面 */
 public class DeviceView : JCUnityLib.ViewBase, MenuBackInterface
 {
-    GameObject bowOptions;
+    //GameObject bowOptions;
     [SerializeField] List<Button> smartArcheryButtons;
     [SerializeField] List<Sprite> smartArcheryBg;
 
@@ -34,28 +34,28 @@ public class DeviceView : JCUnityLib.ViewBase, MenuBackInterface
         }
  
 
-        bowOptions = this.transform.Find("ItemInfo/BowOptions").gameObject;
+        //bowOptions = this.transform.Find("ItemInfo/BowOptions").gameObject;
 
         //初始化弓的校准按钮
-        Button[] bowOptionBtns = bowOptions.GetComponentsInChildren<Button>();
-        for (int i = 0; i < bowOptionBtns.Length; i++)
-        {
-            int optionID = i;
-            bowOptionBtns[i].onClick.AddListener(delegate() {
-                AudioMgr.ins.PlayBtn();
-                switch (optionID)
-                {
-                    case 0:
-                        DeviceCalibrateView.Create(DeviceCalibrateItem.Gyr);
-                        action_OnClickGyr?.Invoke();
-                        break;
-                    case 1:
-                        DeviceCalibrateView.Create(DeviceCalibrateItem.Mag);
-                        action_OnClickMag?.Invoke();
-                        break;
-                }
-            });
-        }
+        //Button[] bowOptionBtns = bowOptions.GetComponentsInChildren<Button>();
+        //for (int i = 0; i < bowOptionBtns.Length; i++)
+        //{
+        //    int optionID = i;
+        //    bowOptionBtns[i].onClick.AddListener(delegate() {
+        //        AudioMgr.ins.PlayBtn();
+        //        switch (optionID)
+        //        {
+        //            case 0:
+        //                DeviceCalibrateView.Create(DeviceCalibrateItem.Gyr);
+        //                action_OnClickGyr?.Invoke();
+        //                break;
+        //            case 1:
+        //                DeviceCalibrateView.Create(DeviceCalibrateItem.Mag);
+        //                action_OnClickMag?.Invoke();
+        //                break;
+        //        }
+        //    });
+        //}
 
         //进入连接界面,初始化一下AimDeviceInfo
         AimHandler.ins.OnGetAimDeviceInfos();
@@ -131,5 +131,31 @@ public class DeviceView : JCUnityLib.ViewBase, MenuBackInterface
         //smartArcheryButtons[0].GetComponent<DeviceView_ItemShow>().RenderBattery(deviceID,value);
     }
 
- 
+
+    public void OnChangeSmartArcheryButtonState(int index)
+    {
+        for (int i = 0; i < smartArcheryButtons.Count; i++)
+        {
+            Button _button = smartArcheryButtons[i];
+            Color32 _white;
+            Color32 _buttonBg;
+            if (index == i)
+            {
+                _white = new Color32(255, 255, 255, 255);
+                _button.GetComponent<Image>().sprite = smartArcheryBg[1];
+
+            }
+            else
+            {
+                _white = new Color32(59, 59, 59, 255);
+                _button.GetComponent<Image>().sprite = smartArcheryBg[0];
+
+
+            }
+            _button.transform.Find("icon").GetComponent<Image>().color = _white;
+            _button.transform.Find("title").GetComponent<Text>().color = _white;
+            _button.transform.Find("arrow").GetComponent<Image>().color = _white;
+        }
+
+    }
 }

+ 89 - 62
Assets/BowArrow/Scripts/View/Home/DeviceView_ItemShow.cs

@@ -28,9 +28,11 @@ public class DeviceView_ItemShow : MonoBehaviour
 
     [SerializeField] Image bowBg;
     [SerializeField] Sprite[] bowBgs;
-    float countingTime1 = 0;
+    float countingTime1 = 5;
     BluetoothStatusEnum bowStatus;
 
+    [SerializeField] TextAutoLanguage2 _TextAutoLanguage2;
+
     //这个是处理设备下标
     [SerializeField] int deviceIndex = 0;
     // Start is called before the first frame update
@@ -42,28 +44,31 @@ public class DeviceView_ItemShow : MonoBehaviour
     void Start()
     {
         //addBtn 按钮
-        btnConnectBow.onClick.AddListener(delegate () {
+        btnConnectBow.onClick.AddListener(delegate ()
+        {
             AudioMgr.ins.PlayBtn();
             AimHandler.ins.onCreateAimDeviceInfoById(deviceIndex);
             ViewMgr.Instance.ShowView<SmartArcheryView>();
         });
         //init 按钮(有硬件信息才显示initStatus按钮)
-        initStatus.GetComponent<Button>().onClick.AddListener(delegate () {
+        initStatus.GetComponent<Button>().onClick.AddListener(delegate ()
+        {
             //选择此device index 跳转页面
             AudioMgr.ins.PlayBtn();
             AimHandler.ins.onCreateAimDeviceInfoById(deviceIndex);
             ViewManager2.ShowView(ViewManager2.Path_ConnectGuidanceView);
         });
 
-        ConnectButton.onClick.AddListener(delegate () {
+        ConnectButton.onClick.AddListener(delegate ()
+        {
             if (BluetoothAim.ins && BluetoothAim.ins.status == BluetoothStatusEnum.ConnectSuccess)
             {
                 //断开连接
                 BluetoothAim.ins.DoConnect();
                 return;
             }
-            if (bProcess) return;
-            bProcess = true;
+            //if (bProcess) return;
+            //bProcess = true;
             if (HomeView.ShowProminentBeforeConnectBLE()) return;
             if (!process.activeSelf) process.SetActive(true);
             if (btnConnectBow.gameObject.activeSelf) btnConnectBow.gameObject.SetActive(false);
@@ -72,22 +77,23 @@ public class DeviceView_ItemShow : MonoBehaviour
         });
 
         //进入页面更新一次
-        if (BluetoothAim.ins && BluetoothAim.ins.status == BluetoothStatusEnum.ConnectSuccess)
+        if (BluetoothAim.ins)
         {
-            bProcess = false;
-            if (process.activeSelf) process.SetActive(false);
-            //连接后,更新电池状态
-            RenderBattery(DeviceBatteryView.ins.batteryDeviceID, DeviceBatteryView.ins.batteryValue);
-            if (connected.activeSelf) onSetInitStatusInfo(true);
-            ConnectButtonImage.sprite = ConnectButtonImages[0];
-        }
-        else
-        {
-            if (bProcess) return;
-            if (connected.activeSelf) onSetInitStatusInfo(false);
-            ConnectButtonImage.sprite = ConnectButtonImages[1];
+            if (BluetoothAim.ins.status == BluetoothStatusEnum.ConnectSuccess)
+            {
+                if (process.activeSelf) process.SetActive(false);
+                //连接后,更新电池状态
+                RenderBattery(DeviceBatteryView.ins.batteryDeviceID, DeviceBatteryView.ins.batteryValue);
+                if (connected.activeSelf) onSetInitStatusInfo(true);
+                ConnectButtonImage.sprite = ConnectButtonImages[0];
+            }
+            else
+            {
+                if (connected.activeSelf) onSetInitStatusInfo(false);
+                if (ConnectButtonImage.gameObject.activeSelf) ConnectButtonImage.sprite = ConnectButtonImages[1];
+            }
         }
-
+        onUpdateStatusInfo();
     }
 
     private void OnDestroy()
@@ -98,35 +104,64 @@ public class DeviceView_ItemShow : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
-        if (BluetoothAim.ins && BluetoothAim.ins.status == BluetoothStatusEnum.ConnectSuccess)
+        if (BluetoothAim.ins)
         {
-            bProcess = false;
-            if (btnConnectBow.gameObject.activeSelf) btnConnectBow.gameObject.SetActive(false);
-            if (process.activeSelf) process.SetActive(false);
-            if (!connected.activeSelf) connected.SetActive(true);
-            //连接后,更新电池状态
-            if (countingTime1 < 5)
+            if (BluetoothAim.ins.status == BluetoothStatusEnum.ConnectSuccess)
             {
-                countingTime1 += Time.deltaTime;
+                //Add 按钮
+                if (btnConnectBow.gameObject.activeSelf) btnConnectBow.gameObject.SetActive(false);
+                if (process.activeSelf) process.SetActive(false);
+                if (!connected.activeSelf) connected.SetActive(true);
+                //连接后,更新电池状态
+                if (countingTime1 < 5)
+                {
+                    countingTime1 += Time.deltaTime;
+                }
+                else
+                {
+                    countingTime1 = 0;
+                    //RequestBatteryForBow();
+                    RenderBattery(DeviceBatteryView.ins.batteryDeviceID, DeviceBatteryView.ins.batteryValue);
+                    if (connected.activeSelf) onSetInitStatusInfo(true);
+                    ConnectButtonImage.sprite = ConnectButtonImages[0];
+                }
+            }
+            else if (BluetoothAim.ins.status == BluetoothStatusEnum.ConnectFail)
+            {
+                //如果连接失败,重置一下状态
+                if (process.activeSelf) process.SetActive(false);
+                if (connected.activeSelf)
+                {
+                    onSetInitStatusInfo(false);
+                }
+                else {
+                    if (!process.activeSelf) onShowDeviceInfo();
+                }
+                if (bettery.activeSelf) bettery.SetActive(false);
+                if (ConnectButtonImage.gameObject.activeSelf) ConnectButtonImage.sprite = ConnectButtonImages[1];
             }
             else
             {
-                countingTime1 = 0;
-                if (connected.activeSelf) onUpdateStatusInfo();
-                //RequestBatteryForBow();
-                RenderBattery(DeviceBatteryView.ins.batteryDeviceID, DeviceBatteryView.ins.batteryValue);
-                if (connected.activeSelf) onSetInitStatusInfo(true);
-                ConnectButtonImage.sprite = ConnectButtonImages[0];
+                //连接状态或者正在连接等
+                if (bettery.activeSelf) bettery.SetActive(false);
+                if (connected.activeSelf)
+                {
+                    onSetInitStatusInfo(false);
+                }
+                else
+                {
+                    if (!process.activeSelf)onShowDeviceInfo();
+                }
+                if (ConnectButtonImage.gameObject.activeSelf) ConnectButtonImage.sprite = ConnectButtonImages[1];
             }
+
+            if (connected.activeSelf) onUpdateStatusInfo();
+
         }
-        else
-        {
-            if (bProcess) return;
-            if (connected.activeSelf) onSetInitStatusInfo(false);
-            ConnectButtonImage.sprite = ConnectButtonImages[1];
-        }
+
     }
-    void onSetInitStatusInfo(bool bActive) {
+    void onSetInitStatusInfo(bool bActive)
+    {
 
         //&& !initStatus.activeSelf
         if (bActive)
@@ -136,7 +171,8 @@ public class DeviceView_ItemShow : MonoBehaviour
             rectangle.sprite = rectangles[0];
             initStatusText.color = new Color32(255, 255, 255, 255);
         }
-        else {
+        else
+        {
             pointImage.sprite = pointImages[1];
             rectangle.sprite = rectangles[1];
             initStatusText.color = new Color32(50, 50, 50, 255);
@@ -166,8 +202,12 @@ public class DeviceView_ItemShow : MonoBehaviour
         txt.text = value + "%";
     }
 
-    public void onShowDeviceInfo() {
-        if (AimHandler.ins.aimDeviceInfos.arry.Count <= deviceIndex) return;
+    public void onShowDeviceInfo()
+    {
+        if (AimHandler.ins.aimDeviceInfos.arry.Count <= deviceIndex) {
+            if (!btnConnectBow.gameObject.activeSelf)btnConnectBow.gameObject.SetActive(true);
+            return;
+        } 
 
         if (btnConnectBow.gameObject.activeSelf) btnConnectBow.gameObject.SetActive(false);
         if (!connected.activeSelf) connected.SetActive(true);
@@ -191,23 +231,10 @@ public class DeviceView_ItemShow : MonoBehaviour
         onUpdateStatusInfo();
     }
 
-    public void onUpdateStatusInfo() {
-
-        statusText.text = BluetoothAim.ins.status.ToString();
-        //switch (BluetoothAim.ins.status)
-        //{
-        //    case BluetoothStatusEnum.None:
-        //        break;
-        //    case BluetoothStatusEnum.Connect:
-        //        break;
-        //    case BluetoothStatusEnum.Connecting:
-        //        break;
-        //    case BluetoothStatusEnum.ConnectSuccess:
-        //        break;
-        //    case BluetoothStatusEnum.ConnectFail:
-        //        break;
-        //    default:
-        //        break;
-        //}
+    public void onUpdateStatusInfo()
+    {
+
+        string name = BluetoothStatus.GetStatusTextKey(BluetoothAim.ins.status);
+        _TextAutoLanguage2.SetTextKey(name);
     }
 }

+ 39 - 1
Assets/BowArrow/Scripts/View/Home/HomeView.cs

@@ -75,7 +75,6 @@ public class HomeView : JCUnityLib.ViewBase
         }
 
         //StartCoroutine(testTip());
-       
     }
 
     IEnumerator testTip() {
@@ -144,6 +143,45 @@ public class HomeView : JCUnityLib.ViewBase
         return false;
     }
 
+    public static bool ShowProminentBeforeConnectBLE_Event(Action onAgree = null,Action onReject = null)
+    {
+        if (CommonConfig.StandaloneMode) return false;
+        if (SceneManager.GetActiveScene().name.Equals("HeartRateBand")) return false;
+        if (PlayerPrefs.GetInt("Location-Prominent", 0) == 0)
+        {
+            ModalView m = ModalView.Show();
+            string pName = Application.productName;
+            m.textKey = "Model_Location-Prominent";
+            m.onAgreeTextKey = "common_next";
+            m.onRejectTextKey = "common_cancel";
+            m.textFormatArgs = new object[] { pName };
+            m.onAgree = () => {
+                PlayerPrefs.SetInt("Location-Prominent", 1);
+                try
+                {
+                    onAgree?.Invoke();
+                }
+                catch (System.Exception e)
+                {
+                    Debug.LogError(e.Message + "\n" + e.StackTrace);
+                }
+            };
+            m.onReject = () =>
+            {
+                try
+                {
+                    onReject?.Invoke();
+                }
+                catch (System.Exception e)
+                {
+                    Debug.LogError(e.Message + "\n" + e.StackTrace);
+                }
+            };
+            return true;
+        }
+        return false;
+    }
+
     public void OnClick_ConnectBLE() {
         if (ShowProminentBeforeConnectBLE()) return;
         BluetoothAim.ins.DoConnect();

+ 1 - 2
Assets/BowArrow/Scripts/View/Home/HomeView_BottomBarView.cs

@@ -8,8 +8,7 @@ public class HomeView_BottomBarView : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        //GameObject settingsViewObj = ViewManager2.getGameObjectAndShowView(ViewManager2.Path_HomeViewTip);
-        //settingsViewObj.GetComponent<HomeView_Tip>().setHomeTip(0);
+ 
     }
 
     // Update is called once per frame

+ 19 - 20
Assets/BowArrow/Scripts/View/Home/HomeView_ChallengeOption.cs

@@ -33,7 +33,8 @@ public class HomeView_ChallengeOption : MonoBehaviour
     [SerializeField] ScrollPanel productsPanel;
 
     public List<LevelInfo> levelInfos;
-
+    List<LevelInfo> _tempLevelInfos = new List<LevelInfo>();
+    List<String> gameTextIds = new List<string>{ "OlynpicArchery", "WolfHunt", "LevelWildAttack", "FruitExpert", "LevelDuckHunter", "HareHunt", "PheasuntHunt" };
     void Awake()
     {
         //根据条件激活野鸡关卡或野鸭关卡
@@ -63,12 +64,23 @@ public class HomeView_ChallengeOption : MonoBehaviour
         });
         //对选中的当前对象的下标的显示
         scrollView.OnSelectionChanged(OnSelectionChanged);
-        //var items = levelInfos.Select(i => new ItemData(i.Name, i.Icon, i.textId, i.languageType))
-        //        .ToArray();
+
+        //按 gameTextIds 重新排序
+        for (int i = 0; i < gameTextIds.Count; i++)
+        {
+            for (int j = 0; j < levelInfos.Count; j++)
+            {
+                if (gameTextIds[i] == levelInfos[j].textId) 
+                {
+                    _tempLevelInfos.Add(levelInfos[j]);
+                    break;
+                }
+            }
+        }
         var _items = Enumerable.Range(0, 21)
             .Select(i => {
-                int _index = Mathf.FloorToInt(i % levelInfos.Count);
-                LevelInfo levelInfo = levelInfos[_index];
+                int _index = Mathf.FloorToInt(i % _tempLevelInfos.Count);
+                LevelInfo levelInfo = _tempLevelInfos[_index];
                 //Debug.Log("初始化:"+i+",index:"+_index);
                 return new ItemData(levelInfo.Name, levelInfo.Icon, levelInfo.textId, levelInfo.languageType);
             })
@@ -76,18 +88,6 @@ public class HomeView_ChallengeOption : MonoBehaviour
         scrollView.UpdateData(_items);
         scrollView.SelectCell(0);
 
-        //selectIndexInputField.text = index.ToString()
-        //scrollView.OnCellClicked(index => Debug.Log("index:"+index.ToString()));
-
-        //scrollView.PaddingTop = value
-        //scrollView.PaddingBottom = value
-        //scrollView.Spacing = value
-        //SelectCell()
-        //GenerateCells
-
-        //scrollView.JumpTo(0);
-
-        //this.InitProductsPanel();
     }
 
     void OnDestroy()
@@ -145,9 +145,8 @@ public class HomeView_ChallengeOption : MonoBehaviour
     //游戏选择回调 scroll view control
     void OnSelectionChanged(int index, bool selected)
     {
-        //string str = $"Selected item info: index {levelInfos[index].Name}";
-        Debug.Log(index + ":" + levelInfos[Mathf.FloorToInt(index % levelInfos.Count)].Name);
-        LevelInfo _levelInfo = levelInfos[Mathf.FloorToInt(index % levelInfos.Count)];
+        Debug.Log(index + ":" + _tempLevelInfos[Mathf.FloorToInt(index % _tempLevelInfos.Count)].Name);
+        LevelInfo _levelInfo = _tempLevelInfos[Mathf.FloorToInt(index % _tempLevelInfos.Count)];
         if (_levelInfo.startGameType != -1 && selected)
         {
             JudgmentMode(_levelInfo.startGameType);

+ 19 - 2
Assets/BowArrow/Scripts/View/Home/ModeSelectView.cs

@@ -45,6 +45,23 @@ public class ModeSelectView : JCUnityLib.ViewBase
         }
     }
 
+    public void OnChangeButtonState(int index)
+    {
+        for (int i = 0; i < buttons.Count; i++)
+        {
+            Button _button = buttons[i];
+            if (index == i)
+            {
+                _button.GetComponent<ModeSelectView_Button>().OnSetButtonState(true);
+            }
+            else
+            {
+                _button.GetComponent<ModeSelectView_Button>().OnSetButtonState(false);
+            }
+        }
+   
+    }
+
     public void GoToLocalByName(string _gotoName)
     {
         switch (_gotoName)
@@ -72,13 +89,13 @@ public class ModeSelectView : JCUnityLib.ViewBase
                 break;
             case "PLAY_GLOBALLY": //ÁªÍø
                 Debug.Log("´¥·¢ÁªÍø:PLAY_GLOBALLY");
-                //GlobalDataTemp.pkMatchType = PKMatchType.OnlinePK;
+                GlobalDataTemp.pkMatchType = PKMatchType.OnlinePK;
                 //ViewMgr.Instance.ShowView<PKGameOptionView>();
 
                 if (GameMgr.judgmentGameType == 1)
                 {
                     //Éä¼ý
-                    GlobalDataTemp.pkMatchType = PKMatchType.OnlinePK;
+                    //GlobalDataTemp.pkMatchType = PKMatchType.OnlinePK;
                     GlobalDataTemp.matchGameType = 9;
                     ViewMgr.Instance.ShowView<PKMatchView>();
                 }

+ 38 - 0
Assets/BowArrow/Scripts/View/Home/SmartArcheryView.cs

@@ -82,6 +82,44 @@ public class SmartArcheryView  : JCUnityLib.ViewBase
 
     }
 
+    public void OnChangeSmartArcheryButtonState(int index)
+    {
+        for (int i = 0; i < smartArcheryButtons.Count; i++)
+        {
+            Button _button = smartArcheryButtons[i];
+            // Color32 _white;
+            Color32 _buttonTitle;
+            if (index == i)
+            {
+                //Çл»É豸ÀàÐÍ
+                if (index == 0)
+                {
+                    AimHandler.ins.SetAimDeviceType(AimDeviceType.HOUYI);
+                }
+                else if (index == 1)
+                {
+                    AimHandler.ins.SetAimDeviceType(AimDeviceType.HOUYI2);
+                }
+                else if (index == 2)
+                {
+                    AimHandler.ins.SetAimDeviceType(AimDeviceType.ARTEMIS);
+                }
+                //_white = new Color32(255, 255, 255, 255);
+                _buttonTitle = new Color32(16, 194, 198, 255);
+                _button.transform.Find("right/arrow").GetComponent<Image>().sprite = arrowImages[1];
+                _button.GetComponent<Image>().material = materialGreen;
+            }
+            else
+            {
+                //_white = new Color32(59, 59, 59, 255);
+                _buttonTitle = new Color32(0, 0, 0, 255);
+                _button.transform.Find("right/arrow").GetComponent<Image>().sprite = arrowImages[0];
+                _button.GetComponent<Image>().material = materialGrey;
+            }
+            _button.transform.Find("right/title").GetComponent<Text>().color = _buttonTitle;
+        }
+    }
+
     public void OnClick_Back()
     {
         AudioMgr.ins.PlayBtn();

+ 4 - 1
Assets/BowArrow/Scripts/View/PKGameSettleView.cs

@@ -60,7 +60,10 @@ public class PKGameSettleView : MonoBehaviour
     }
 
     private void GoHomeLogic() {
-        SceneManager.LoadScene("Home", LoadSceneMode.Single);
+        //SceneManager.LoadScene("Home", LoadSceneMode.Single);
+        GameMgr.ins.gameMode.gameMgr.userGameAnalyse.showResultView(() => {
+            SceneManager.LoadScene("Home", LoadSceneMode.Single);
+        });
     }
 
     JCUnityLib.Throttler throttlerTryAgainOnline = new JCUnityLib.Throttler(3000);

+ 5 - 1
Assets/BowArrow/Scripts/View/TimeLimitGameSettleView.cs

@@ -44,7 +44,11 @@ public class TimeLimitGameSettleView : MonoBehaviour
 
     public void OnClick_Back() {
         AudioMgr.ins.PlayBtn();
-        SceneManager.LoadScene(SceneManager.GetActiveScene().name, LoadSceneMode.Single);
+        //SceneManager.LoadScene(SceneManager.GetActiveScene().name, LoadSceneMode.Single);
+
+        GameMgr.ins.gameMode.gameMgr.userGameAnalyse.showResultView(() => {
+            SceneManager.LoadScene(SceneManager.GetActiveScene().name, LoadSceneMode.Single);
+        });
     }
 
     public void OnClick_Again() {

+ 2 - 2
Assets/BowArrow/Textures/ChallengeGame/Option/RoundConorGrey.mat

@@ -67,7 +67,7 @@ Material:
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
-    - _Height: 150
+    - _Height: 124
     - _Metallic: 0
     - _Mode: 0
     - _OcclusionStrength: 1
@@ -85,7 +85,7 @@ Material:
     - _Width: 760
     - _ZWrite: 1
     m_Colors:
-    - _BorderColor: {r: 0, g: 0, b: 0, a: 1}
+    - _BorderColor: {r: 0.8039216, g: 0.8039216, b: 0.8039216, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
   m_BuildTextureStacks: []

BIN
Assets/BowArrow/Textures/Device/bow_smart.png


BIN
Assets/BowArrow/Textures/Device/bow_smart_1.png


+ 147 - 0
Assets/BowArrow/Textures/Device/bow_smart_1.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 8bae84fa585196c448ee365b8a8e9b52
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 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
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    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: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 5 - 5
Assets/BowArrow/Views/LoginScene/RetrievePasswordView/RetrievePasswordView.prefab

@@ -3203,8 +3203,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
+  m_Sprite: {fileID: 21300000, guid: fe4cd5a2a3d36da42b1754b152c26f48, type: 3}
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -3580,8 +3580,8 @@ MonoBehaviour:
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
   m_ReferenceResolution: {x: 2532, y: 1170}
-  m_ScreenMatchMode: 1
-  m_MatchWidthOrHeight: 1
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
@@ -3653,7 +3653,7 @@ RectTransform:
   m_GameObject: {fileID: 2829973556691287250}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.1579232, y: 1.1579232, z: 1.1579232}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3080691916631311539}

+ 71 - 47
Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/ConnectGuidanceView.prefab

@@ -687,7 +687,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1254516242006829828
 RectTransform:
   m_ObjectHideFlags: 0
@@ -697,7 +697,7 @@ RectTransform:
   m_GameObject: {fileID: 1254516242006829831}
   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.1, y: 1.1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1254516243527980215}
@@ -709,7 +709,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 60}
-  m_SizeDelta: {x: 1678, y: 504}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1254516242006829824
 CanvasRenderer:
@@ -933,7 +933,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -998,9 +998,9 @@ RectTransform:
   m_Father: {fileID: 1254516242006829828}
   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: 839, y: -252}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 546, y: 504}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1254516242089234501
@@ -1108,7 +1108,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -1157,9 +1157,9 @@ RectTransform:
   m_Father: {fileID: 1254516242006829828}
   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: 1405, y: -252}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 546, y: 504}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1254516242182012392
@@ -1227,7 +1227,7 @@ RectTransform:
   m_GameObject: {fileID: 1254516242318970244}
   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.45, y: 1.45, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1254516242749286052}
@@ -1235,7 +1235,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: -48.9, y: 0}
+  m_AnchoredPosition: {x: -82.6, y: 0}
   m_SizeDelta: {x: 25.64, y: 29.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1254516242318970243
@@ -1344,7 +1344,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -1401,7 +1401,7 @@ RectTransform:
   m_GameObject: {fileID: 1254516242548659643}
   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.1, y: 1.1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1254516241781985496}
@@ -1411,7 +1411,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: -280}
+  m_AnchoredPosition: {x: 0, y: -294}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1254516242548659620
@@ -1532,7 +1532,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: -393}
+  m_AnchoredPosition: {x: 0, y: -416}
   m_SizeDelta: {x: 0, y: 96}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1254516242565904559
@@ -1697,7 +1697,7 @@ RectTransform:
   m_GameObject: {fileID: 1254516242596103305}
   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.32, y: 1.32, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1254516242749286052}
@@ -1705,7 +1705,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: -11, y: 0}
+  m_AnchoredPosition: {x: -27.4, y: 0}
   m_SizeDelta: {x: 160, y: 40}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1254516242596103348
@@ -1737,8 +1737,8 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 36
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
+    m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 3
@@ -1777,6 +1777,7 @@ GameObject:
   - component: {fileID: 1254516242749286049}
   - component: {fileID: 1254516242749286048}
   - component: {fileID: 1254516242749286051}
+  - component: {fileID: 7526930593107175942}
   m_Layer: 5
   m_Name: BtnBack
   m_TagString: Untagged
@@ -1793,7 +1794,7 @@ RectTransform:
   m_GameObject: {fileID: 1254516242749286055}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.49, y: 1.49, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1254516242318970245}
@@ -1801,11 +1802,11 @@ RectTransform:
   m_Father: {fileID: 6942982441339297973}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -83.3, y: -93.359}
-  m_SizeDelta: {x: 250, y: 39}
-  m_Pivot: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 1009, y: 460}
+  m_SizeDelta: {x: 290, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1254516242749286049
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1900,6 +1901,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &7526930593107175942
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1254516242749286055}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 1254516242749286052}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1254516242951852258
 GameObject:
   m_ObjectHideFlags: 0
@@ -2044,7 +2068,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -2141,7 +2165,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 32
     m_FontStyle: 0
     m_BestFit: 0
@@ -2237,7 +2261,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -2318,7 +2342,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 32
     m_FontStyle: 0
     m_BestFit: 0
@@ -2382,9 +2406,9 @@ RectTransform:
   m_Father: {fileID: 1254516242006829828}
   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: 273, y: -252}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 546, y: 504}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1254516243527980213
@@ -2459,11 +2483,11 @@ RectTransform:
   m_Father: {fileID: 6942982441339297973}
   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: 153, y: -90.4}
-  m_SizeDelta: {x: 160, y: 30}
-  m_Pivot: {x: 0, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -808, y: 460}
+  m_SizeDelta: {x: 600, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1254516243596033485
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2493,9 +2517,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 40
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
+    m_FontSize: 42
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 4
     m_MaxSize: 50
@@ -2588,7 +2612,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -2706,7 +2730,7 @@ RectTransform:
   m_GameObject: {fileID: 3902116191185670344}
   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.1, y: 1.1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1714364031926538133}
@@ -3255,9 +3279,9 @@ MonoBehaviour:
   m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 1920, y: 1080}
-  m_ScreenMatchMode: 1
-  m_MatchWidthOrHeight: 1
+  m_ReferenceResolution: {x: 2532, y: 1170}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96

+ 58 - 34
Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/GyrGuidanceView.prefab

@@ -29,7 +29,7 @@ RectTransform:
   m_GameObject: {fileID: 1854596122114527374}
   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.1, y: 1.1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2183168101543559781}
@@ -323,9 +323,9 @@ MonoBehaviour:
   m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 1920, y: 1080}
-  m_ScreenMatchMode: 1
-  m_MatchWidthOrHeight: 1
+  m_ReferenceResolution: {x: 2532, y: 1170}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
@@ -641,7 +641,7 @@ RectTransform:
   m_GameObject: {fileID: 5651314242578082638}
   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.32, y: 1.32, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5651314242594850861}
@@ -649,7 +649,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: -11, y: 0}
+  m_AnchoredPosition: {x: -27.4, y: 0}
   m_SizeDelta: {x: 160, y: 40}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5651314242578082611
@@ -682,7 +682,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 36
+    m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 3
@@ -721,6 +721,7 @@ GameObject:
   - component: {fileID: 5651314242594850832}
   - component: {fileID: 5651314242594850833}
   - component: {fileID: 5651314242594850834}
+  - component: {fileID: 7713953647772329699}
   m_Layer: 5
   m_Name: BtnBack
   m_TagString: Untagged
@@ -737,7 +738,7 @@ RectTransform:
   m_GameObject: {fileID: 5651314242594850862}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.49, y: 1.49, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5651314242670474731}
@@ -745,11 +746,11 @@ RectTransform:
   m_Father: {fileID: 5651314242315564806}
   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: -83.3, y: -93.359}
-  m_SizeDelta: {x: 250, y: 39}
-  m_Pivot: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 1009, y: 460}
+  m_SizeDelta: {x: 290, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5651314242594850832
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -844,6 +845,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &7713953647772329699
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5651314242594850862}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 5651314242594850861}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5651314242606882625
 GameObject:
   m_ObjectHideFlags: 0
@@ -1027,7 +1051,7 @@ RectTransform:
   m_GameObject: {fileID: 5651314242670474724}
   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.45, y: 1.45, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5651314242594850861}
@@ -1035,7 +1059,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: -48.9, y: 0}
+  m_AnchoredPosition: {x: -82.6, y: 0}
   m_SizeDelta: {x: 25.64, y: 29.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5651314242670474729
@@ -1110,11 +1134,11 @@ RectTransform:
   m_Father: {fileID: 5651314242315564806}
   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: 153, y: -90.4}
-  m_SizeDelta: {x: 160, y: 30}
-  m_Pivot: {x: 0, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -808, y: 460}
+  m_SizeDelta: {x: 600, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5651314242930350351
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1145,12 +1169,12 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 40
-    m_FontStyle: 0
+    m_FontSize: 42
+    m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 4
-    m_MaxSize: 50
-    m_Alignment: 0
+    m_MinSize: 0
+    m_MaxSize: 52
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -1191,7 +1215,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5651314243503148123
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1201,7 +1225,7 @@ RectTransform:
   m_GameObject: {fileID: 5651314243503148116}
   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.1, y: 1.1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5651314243550147649}
@@ -1212,7 +1236,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 60}
-  m_SizeDelta: {x: 1684, y: 504}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5651314243503148127
 CanvasRenderer:
@@ -1328,9 +1352,9 @@ RectTransform:
   m_Father: {fileID: 5651314243503148123}
   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: 416, y: -252}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 832, y: 504}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5651314243550147655
@@ -1919,9 +1943,9 @@ RectTransform:
   m_Father: {fileID: 5651314243503148123}
   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: 1268, y: -252}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 832, y: 504}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5651314244172765873

+ 2 - 2
Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/HomeView_Tip.prefab

@@ -894,7 +894,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: -80, y: -80}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 150, y: 150}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3485226410561197407
@@ -971,7 +971,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: -80, y: 127}
+  m_AnchoredPosition: {x: 0, y: 180}
   m_SizeDelta: {x: 437.95996, y: 137.4}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6695139082867943101

+ 75 - 51
Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/MagGuidanceView.prefab

@@ -67,7 +67,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -147,7 +147,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -264,7 +264,7 @@ RectTransform:
   m_GameObject: {fileID: 1517141302923954734}
   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.32, y: 1.32, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1517141304116027699}
@@ -272,7 +272,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: -11, y: 0}
+  m_AnchoredPosition: {x: -27.4, y: 0}
   m_SizeDelta: {x: 160, y: 40}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1517141302923954733
@@ -304,8 +304,8 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 36
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
+    m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 3
@@ -313,8 +313,8 @@ MonoBehaviour:
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: Return
 --- !u!114 &4211071635906419165
@@ -368,9 +368,9 @@ RectTransform:
   m_Father: {fileID: 1517141303310141644}
   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: 416, y: -252}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 832, y: 504}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1517141303080194405
@@ -479,7 +479,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -575,7 +575,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -607,7 +607,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1517141303310141644
 RectTransform:
   m_ObjectHideFlags: 0
@@ -617,18 +617,18 @@ RectTransform:
   m_GameObject: {fileID: 1517141303310141647}
   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.1, y: 1.1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1517141303080194407}
   - {fileID: 1517141304639790582}
   m_Father: {fileID: 1517141303653900677}
-  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}
   m_AnchoredPosition: {x: 0, y: 60}
-  m_SizeDelta: {x: 1684, y: 504}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1517141303310141632
 CanvasRenderer:
@@ -776,7 +776,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -948,7 +948,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -1071,9 +1071,9 @@ RectTransform:
   m_Children:
   - {fileID: 1517141303755171934}
   - {fileID: 1517141304149557134}
-  - {fileID: 1517141304116027699}
   - {fileID: 1517141303310141644}
   - {fileID: 2634603240088007556}
+  - {fileID: 1517141304116027699}
   - {fileID: 1517141303817155308}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -1119,9 +1119,9 @@ MonoBehaviour:
   m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 1920, y: 1080}
-  m_ScreenMatchMode: 1
-  m_MatchWidthOrHeight: 1
+  m_ReferenceResolution: {x: 2532, y: 1170}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
@@ -1428,7 +1428,7 @@ RectTransform:
   m_GameObject: {fileID: 1517141303819933060}
   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.45, y: 1.45, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1517141304116027699}
@@ -1436,7 +1436,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: -48.9, y: 0}
+  m_AnchoredPosition: {x: -82.6, y: 0}
   m_SizeDelta: {x: 25.64, y: 29.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1517141303819933083
@@ -1489,6 +1489,7 @@ GameObject:
   - component: {fileID: 1517141304116027700}
   - component: {fileID: 1517141304116027703}
   - component: {fileID: 1517141304116027702}
+  - component: {fileID: 7023775813900577620}
   m_Layer: 5
   m_Name: BtnBack
   m_TagString: Untagged
@@ -1511,13 +1512,13 @@ RectTransform:
   - {fileID: 1517141303819933061}
   - {fileID: 1517141302923954735}
   m_Father: {fileID: 1517141303653900677}
-  m_RootOrder: 2
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -83.3, y: -93.359}
-  m_SizeDelta: {x: 250, y: 39}
-  m_Pivot: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 1009, y: 460}
+  m_SizeDelta: {x: 290, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1517141304116027700
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1612,6 +1613,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &7023775813900577620
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1517141304116027698}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 1517141304116027699}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1517141304149557129
 GameObject:
   m_ObjectHideFlags: 0
@@ -1646,11 +1670,11 @@ RectTransform:
   m_Father: {fileID: 1517141303653900677}
   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: 153, y: -90.4}
-  m_SizeDelta: {x: 350, y: 73.3}
-  m_Pivot: {x: 0, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -808, y: 460}
+  m_SizeDelta: {x: 600, y: 73.29999}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1517141304149557132
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1680,13 +1704,13 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 40
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
+    m_FontSize: 42
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 4
-    m_MaxSize: 40
-    m_Alignment: 0
+    m_MaxSize: 42
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -1776,7 +1800,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 32
     m_FontStyle: 0
     m_BestFit: 0
@@ -1917,9 +1941,9 @@ RectTransform:
   m_Father: {fileID: 1517141303310141644}
   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: 1268, y: -252}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 832, y: 504}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1517141304639790580
@@ -2221,7 +2245,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -2393,7 +2417,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -2781,7 +2805,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -2956,7 +2980,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -2998,13 +3022,13 @@ RectTransform:
   m_GameObject: {fileID: 8182981170997433197}
   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.1, y: 1.1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8003584932314172028}
   - {fileID: 8658198880407670476}
   m_Father: {fileID: 1517141303653900677}
-  m_RootOrder: 4
+  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}

+ 244 - 95
Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/PersonalView.prefab

@@ -389,8 +389,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: 0, y: -17.839722}
-  m_SizeDelta: {x: 263.1359, y: 35.679443}
+  m_AnchoredPosition: {x: 0, y: -19}
+  m_SizeDelta: {x: 268, y: 38}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5494506781445598537
 CanvasRenderer:
@@ -617,8 +617,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: 0, y: -17.839722}
-  m_SizeDelta: {x: 234.14633, y: 35.679443}
+  m_AnchoredPosition: {x: 0, y: -19}
+  m_SizeDelta: {x: 243, y: 38}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6209653098123002406
 CanvasRenderer:
@@ -959,8 +959,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: 304.5, y: -589.5}
-  m_SizeDelta: {x: 609, y: 89}
+  m_AnchoredPosition: {x: 401.5, y: -371.5}
+  m_SizeDelta: {x: 803, y: 89}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7555906436447852659
 CanvasRenderer:
@@ -1109,9 +1109,9 @@ RectTransform:
   m_Father: {fileID: 483308614463441237}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 127, y: -42.64}
   m_SizeDelta: {x: 254, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5198419289478713587
@@ -1905,8 +1905,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: 278.1359, y: -17.839722}
-  m_SizeDelta: {x: 140.48781, y: 35.679443}
+  m_AnchoredPosition: {x: 283, y: -19}
+  m_SizeDelta: {x: 147, y: 38}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3246656678750728427
 CanvasRenderer:
@@ -2230,7 +2230,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -4}
-  m_SizeDelta: {x: 645.2, y: 125}
+  m_SizeDelta: {x: 803, y: 125}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4518687568298449161
 CanvasRenderer:
@@ -2449,7 +2449,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 291, y: -31}
-  m_SizeDelta: {x: 418.62372, y: 35.679443}
+  m_SizeDelta: {x: 430, y: 38}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1463406045799750477
 CanvasRenderer:
@@ -3260,6 +3260,82 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: -20, y: -20}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &5930941268152877087
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3730536180869738222}
+  - component: {fileID: 1111605870357068716}
+  - component: {fileID: 6283197635285859875}
+  m_Layer: 5
+  m_Name: Panel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3730536180869738222
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5930941268152877087}
+  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: 7060471198553422499}
+  m_RootOrder: 5
+  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 &1111605870357068716
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5930941268152877087}
+  m_CullTransparentMesh: 1
+--- !u!114 &6283197635285859875
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5930941268152877087}
+  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.27058825}
+  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: 2286a23a8f866954ea70717a7ed395a9, 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 &6029731900343337491
 GameObject:
   m_ObjectHideFlags: 0
@@ -3287,7 +3363,7 @@ RectTransform:
   m_GameObject: {fileID: 6029731900343337491}
   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.1, y: 1.1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 483308614463441237}
@@ -3297,7 +3373,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -334}
+  m_AnchoredPosition: {x: 0, y: -347}
   m_SizeDelta: {x: 1077, y: 730}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &6499048052760202826
@@ -3619,7 +3695,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 291, y: 31}
-  m_SizeDelta: {x: 234.14633, y: 35.679443}
+  m_SizeDelta: {x: 243, y: 38}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1429144533602623144
 CanvasRenderer:
@@ -4313,7 +4389,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7060471198088231704
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4323,7 +4399,7 @@ RectTransform:
   m_GameObject: {fileID: 7060471198088231705}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.1, y: 1.1, z: 1.1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7060471199597415023}
@@ -4333,7 +4409,7 @@ RectTransform:
   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: -15}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3084511457747721303
@@ -4712,7 +4788,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 645, y: 0}
+  m_SizeDelta: {x: 820, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7060471198292044306
 CanvasRenderer:
@@ -4936,6 +5012,7 @@ GameObject:
   - component: {fileID: 7060471198382538036}
   - component: {fileID: 7060471198382538037}
   - component: {fileID: 7060471198382538042}
+  - component: {fileID: 511280558705306433}
   m_Layer: 5
   m_Name: BtnUserSettings
   m_TagString: Untagged
@@ -4964,7 +5041,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 129}
+  m_SizeDelta: {x: 0, y: 160}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7060471198382538036
 CanvasRenderer:
@@ -5023,7 +5100,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -5060,6 +5137,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &511280558705306433
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7060471198382538040}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 7060471198382538037}
+  selectedColor: {r: 0.2627451, g: 0.8392157, b: 0.8745098, a: 0.29803923}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &7060471198441907011
 GameObject:
   m_ObjectHideFlags: 0
@@ -5096,8 +5196,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 100, y: 0}
-  m_SizeDelta: {x: -200, y: 0}
+  m_AnchoredPosition: {x: 138, y: 0}
+  m_SizeDelta: {x: -276, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7060471198441907036
 CanvasRenderer:
@@ -5193,6 +5293,7 @@ RectTransform:
   - {fileID: 7060471198845178252}
   - {fileID: 520292027940795713}
   - {fileID: 3568271985103462570}
+  - {fileID: 3730536180869738222}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5505,7 +5606,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 4.449997, y: 0}
+  m_AnchoredPosition: {x: 40, y: 0}
   m_SizeDelta: {x: -98.899994, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7060471198707933194
@@ -6037,7 +6138,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: -178.3, y: 0}
+  m_AnchoredPosition: {x: -142.75003, y: 0}
   m_SizeDelta: {x: 26, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7060471199403189795
@@ -6115,8 +6216,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 322.5, y: 0}
-  m_SizeDelta: {x: -645, y: 0}
+  m_AnchoredPosition: {x: 410, y: 0}
+  m_SizeDelta: {x: -820, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7060471199435239512
 CanvasRenderer:
@@ -6168,6 +6269,7 @@ GameObject:
   - component: {fileID: 7060471199492895128}
   - component: {fileID: 7060471199492895129}
   - component: {fileID: 7060471199492895134}
+  - component: {fileID: 8355395750329756970}
   m_Layer: 5
   m_Name: BtnBack
   m_TagString: Untagged
@@ -6184,7 +6286,7 @@ RectTransform:
   m_GameObject: {fileID: 7060471199492895132}
   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.154367, y: 1.154367, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7060471199403189793}
@@ -6194,7 +6296,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: 135.99994, y: 50}
+  m_AnchoredPosition: {x: 130, y: 58}
   m_SizeDelta: {x: 385, y: 80}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &7060471199492895128
@@ -6291,6 +6393,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &8355395750329756970
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7060471199492895132}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 7060471199492895135}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &7060471199547570017
 GameObject:
   m_ObjectHideFlags: 0
@@ -6303,6 +6428,7 @@ GameObject:
   - component: {fileID: 7060471199547570045}
   - component: {fileID: 7060471199547570018}
   - component: {fileID: 7060471199547570019}
+  - component: {fileID: 4567027800672760413}
   m_Layer: 5
   m_Name: BtnPersonalProfile
   m_TagString: Untagged
@@ -6331,7 +6457,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 129}
+  m_SizeDelta: {x: 0, y: 160}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7060471199547570045
 CanvasRenderer:
@@ -6390,7 +6516,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -6427,6 +6553,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &4567027800672760413
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7060471199547570017}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 7060471199547570018}
+  selectedColor: {r: 0.2627451, g: 0.8392157, b: 0.8745098, a: 0.29803923}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &7060471199589365291
 GameObject:
   m_ObjectHideFlags: 0
@@ -6531,7 +6680,7 @@ RectTransform:
   m_GameObject: {fileID: 7060471199597415020}
   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.1, y: 1.1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7327544350314762464}
@@ -6619,8 +6768,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 100, y: 0}
-  m_SizeDelta: {x: -200, y: 0}
+  m_AnchoredPosition: {x: 138, y: 0}
+  m_SizeDelta: {x: -276, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7060471199604492253
 CanvasRenderer:
@@ -6717,7 +6866,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 644, y: 0}
+  m_SizeDelta: {x: 820, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &7060471199662546195
 MonoBehaviour:
@@ -7330,10 +7479,10 @@ RectTransform:
   m_Father: {fileID: 7327544349596488648}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -19}
+  m_SizeDelta: {x: 125, y: 38}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7327544348339659691
 CanvasRenderer:
@@ -7497,8 +7646,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: 146, y: -44.5}
-  m_SizeDelta: {x: 290, y: 89}
+  m_AnchoredPosition: {x: 200, y: -44.5}
+  m_SizeDelta: {x: 400, y: 89}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544348383879155
 CanvasRenderer:
@@ -7574,7 +7723,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 28.57, y: -14.4}
+  m_AnchoredPosition: {x: 28.570007, y: -14.400024}
   m_SizeDelta: {x: -28.57, y: -28.8}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7327544348439297863
@@ -7671,7 +7820,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 28.57, y: -14.4}
+  m_AnchoredPosition: {x: 28.570007, y: -14.400024}
   m_SizeDelta: {x: -28.57, y: -28.8}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7327544348523128369
@@ -7768,7 +7917,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -4}
-  m_SizeDelta: {x: 645.2, y: 125}
+  m_SizeDelta: {x: 803, y: 125}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544348524453418
 CanvasRenderer:
@@ -7932,7 +8081,7 @@ RectTransform:
   m_GameObject: {fileID: 7327544348609726808}
   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.3, y: 1.3, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7327544349774047088}
@@ -7946,8 +8095,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: -145}
-  m_SizeDelta: {x: 609, y: 634}
+  m_AnchoredPosition: {x: 0, y: -209.6}
+  m_SizeDelta: {x: 803, y: 416}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7327544348609726811
 MonoBehaviour:
@@ -8023,10 +8172,10 @@ RectTransform:
   m_Father: {fileID: 7327544349571032827}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -19}
+  m_SizeDelta: {x: 177, y: 38}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7327544348654066678
 CanvasRenderer:
@@ -8347,8 +8496,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: 304.5, y: -153.5}
-  m_SizeDelta: {x: 609, y: 89}
+  m_AnchoredPosition: {x: 401.5, y: -44.5}
+  m_SizeDelta: {x: 803, y: 89}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544348720492376
 CanvasRenderer:
@@ -8743,7 +8892,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: 131, y: -63}
+  m_AnchoredPosition: {x: 165, y: -81}
   m_SizeDelta: {x: 100, y: 70}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &7327544348893921459
@@ -8823,8 +8972,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: 304.5, y: -480.5}
-  m_SizeDelta: {x: 609, y: 89}
+  m_AnchoredPosition: {x: 401.5, y: -262.5}
+  m_SizeDelta: {x: 803, y: 89}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544348907805820
 CanvasRenderer:
@@ -8900,7 +9049,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -4}
-  m_SizeDelta: {x: 645.2, y: 125}
+  m_SizeDelta: {x: 803, y: 125}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544348930607357
 CanvasRenderer:
@@ -9061,8 +9210,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: 463, y: -44.5}
-  m_SizeDelta: {x: 290, y: 89}
+  m_AnchoredPosition: {x: 603, y: -44.5}
+  m_SizeDelta: {x: 400, y: 89}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544349054001379
 CanvasRenderer:
@@ -9137,7 +9286,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 14.285, y: -14.4}
+  m_AnchoredPosition: {x: 14.285004, y: -14.400024}
   m_SizeDelta: {x: -28.57, y: -28.8}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544349099431223
@@ -9218,7 +9367,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: -170, y: 0}
+  m_AnchoredPosition: {x: -210, y: 0}
   m_SizeDelta: {x: 45, y: 48}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544349112246352
@@ -9295,7 +9444,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 28.57, y: -14.4}
+  m_AnchoredPosition: {x: 28.570007, y: -14.400024}
   m_SizeDelta: {x: -28.57, y: -28.8}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7327544349167884124
@@ -9509,7 +9658,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -4}
-  m_SizeDelta: {x: 645.2, y: 125}
+  m_SizeDelta: {x: 803, y: 125}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544349271826859
 CanvasRenderer:
@@ -9793,7 +9942,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 90.6, y: 0}
+  m_AnchoredPosition: {x: 108, y: 0}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7327544349362426669
@@ -9826,7 +9975,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 40
+    m_FontSize: 48
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -9864,7 +10013,7 @@ RectTransform:
   m_GameObject: {fileID: 7327544349405985050}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.1, y: 1.1, z: 1.1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7327544349945154984}
@@ -10336,7 +10485,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 291, y: 31}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 352, y: 38}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7327544349571032807
 CanvasRenderer:
@@ -10456,7 +10605,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 291, y: -31}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 248, y: 38}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7327544349596488692
 CanvasRenderer:
@@ -10709,7 +10858,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7327544349694194258
 RectTransform:
   m_ObjectHideFlags: 0
@@ -10731,8 +10880,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: 304.5, y: -262.5}
-  m_SizeDelta: {x: 609, y: 89}
+  m_AnchoredPosition: {x: 401.5, y: -153.5}
+  m_SizeDelta: {x: 803, y: 89}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544349694194269
 CanvasRenderer:
@@ -10808,7 +10957,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -4}
-  m_SizeDelta: {x: 645.2, y: 125}
+  m_SizeDelta: {x: 803, y: 125}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544349732744169
 CanvasRenderer:
@@ -10956,7 +11105,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7327544349774047088
 RectTransform:
   m_ObjectHideFlags: 0
@@ -10978,8 +11127,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: 304.5, y: -44.5}
-  m_SizeDelta: {x: 609, y: 89}
+  m_AnchoredPosition: {x: 401.5, y: -44.5}
+  m_SizeDelta: {x: 803, y: 89}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544349774047091
 CanvasRenderer:
@@ -11201,8 +11350,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: 304.5, y: -371.5}
-  m_SizeDelta: {x: 609, y: 89}
+  m_AnchoredPosition: {x: 401.5, y: -153.5}
+  m_SizeDelta: {x: 803, y: 89}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7327544349788496971
 MonoBehaviour:
@@ -11222,7 +11371,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 4
-  m_Spacing: 25
+  m_Spacing: 3
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -11265,7 +11414,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 14.285, y: -14.4}
+  m_AnchoredPosition: {x: 14.285004, y: -14.400024}
   m_SizeDelta: {x: -28.57, y: -28.8}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544349821105071
@@ -11767,7 +11916,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -79}
+  m_AnchoredPosition: {x: 0, y: -150}
   m_SizeDelta: {x: 455.87, y: 306.85}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!1 &7327544349953523155
@@ -11803,10 +11952,10 @@ RectTransform:
   m_Father: {fileID: 7327544349571032827}
   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: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 192, y: -19}
+  m_SizeDelta: {x: 160, y: 38}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7327544349953523166
 CanvasRenderer:
@@ -12041,7 +12190,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 14.285, y: -14.4}
+  m_AnchoredPosition: {x: 14.285004, y: -14.400024}
   m_SizeDelta: {x: -28.57, y: -28.8}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544349999405605
@@ -12083,7 +12232,7 @@ MonoBehaviour:
     m_AlignByGeometry: 0
     m_RichText: 0
     m_HorizontalOverflow: 1
-    m_VerticalOverflow: 0
+    m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: "\u73A9\u5BB6\u6635\u79F0"
 --- !u!1 &7327544350014397028
@@ -12122,7 +12271,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: -170, y: 0}
+  m_AnchoredPosition: {x: -210, y: 0}
   m_SizeDelta: {x: 45, y: 48}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544350014397031
@@ -12540,10 +12689,10 @@ RectTransform:
   m_Father: {fileID: 7327544349596488648}
   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: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 140, y: -19}
+  m_SizeDelta: {x: 108, y: 38}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7327544350130913701
 CanvasRenderer:
@@ -12716,7 +12865,7 @@ MonoBehaviour:
   m_LineType: 0
   m_HideMobileInput: 0
   m_CharacterValidation: 0
-  m_CharacterLimit: 10
+  m_CharacterLimit: 18
   m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
@@ -12846,7 +12995,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -4}
-  m_SizeDelta: {x: 326.98, y: 125}
+  m_SizeDelta: {x: 400, y: 125}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544350179495032
 CanvasRenderer:
@@ -13173,7 +13322,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -4}
-  m_SizeDelta: {x: 326.98, y: 125}
+  m_SizeDelta: {x: 400, y: 125}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7327544350241898386
 CanvasRenderer:

+ 74 - 2
Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/RankingView.prefab

@@ -4612,6 +4612,7 @@ GameObject:
   - component: {fileID: 5398806816771545118}
   - component: {fileID: 5398806816771545119}
   - component: {fileID: 5398806816771545112}
+  - component: {fileID: 3394247830377936851}
   m_Layer: 5
   m_Name: BtnBack
   m_TagString: Untagged
@@ -4735,6 +4736,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &3394247830377936851
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5398806816771545114}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 5398806816771545113}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5398806816827039463
 GameObject:
   m_ObjectHideFlags: 0
@@ -4747,6 +4771,7 @@ GameObject:
   - component: {fileID: 5398806816827039483}
   - component: {fileID: 5398806816827039460}
   - component: {fileID: 5398806816827039461}
+  - component: {fileID: 1125953796659302631}
   m_Layer: 5
   m_Name: BtnGlobalRanking
   m_TagString: Untagged
@@ -4833,7 +4858,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -4870,6 +4895,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &1125953796659302631
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5398806816827039463}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 5398806816827039460}
+  selectedColor: {r: 0.2627451, g: 0.8392157, b: 0.8745098, a: 0.29803923}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5398806816848140761
 GameObject:
   m_ObjectHideFlags: 0
@@ -5574,6 +5622,7 @@ GameObject:
   - component: {fileID: 5398806817942918322}
   - component: {fileID: 5398806817942918323}
   - component: {fileID: 5398806817942918332}
+  - component: {fileID: 3986010491956040783}
   m_Layer: 5
   m_Name: BtnCountryRanking
   m_TagString: Untagged
@@ -5660,7 +5709,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -5697,6 +5746,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &3986010491956040783
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5398806817942918334}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 5398806817942918323}
+  selectedColor: {r: 0.2627451, g: 0.8392157, b: 0.8745098, a: 0.29803923}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5398806817987134359
 GameObject:
   m_ObjectHideFlags: 0

+ 224 - 8
Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/SettingsView.prefab

@@ -3077,6 +3077,7 @@ GameObject:
   - component: {fileID: 3494904711970219961}
   - component: {fileID: 3494904711970219960}
   - component: {fileID: 3494904711970219959}
+  - component: {fileID: 8857025594991221458}
   m_Layer: 5
   m_Name: BtnLevel
   m_TagString: Untagged
@@ -3163,7 +3164,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -3200,6 +3201,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &8857025594991221458
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3494904711970219957}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 3494904711970219960}
+  selectedColor: {r: 0.2627451, g: 0.8392157, b: 0.8745098, a: 0.29803923}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3494904711987874025
 GameObject:
   m_ObjectHideFlags: 0
@@ -7034,6 +7058,7 @@ GameObject:
   - component: {fileID: 3494904712628083795}
   - component: {fileID: 3494904712628083794}
   - component: {fileID: 3494904712628083793}
+  - component: {fileID: 8224407033521242612}
   m_Layer: 5
   m_Name: BtnNewUser
   m_TagString: Untagged
@@ -7120,7 +7145,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -7157,6 +7182,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &8224407033521242612
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3494904712628083791}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 3494904712628083794}
+  selectedColor: {r: 0.2627451, g: 0.8392157, b: 0.8745098, a: 0.29803923}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3494904712635966185
 GameObject:
   m_ObjectHideFlags: 0
@@ -7767,6 +7815,7 @@ GameObject:
   - component: {fileID: 3494904712738323613}
   - component: {fileID: 3494904712738323612}
   - component: {fileID: 3494904712738323611}
+  - component: {fileID: 2229057963173284159}
   m_Layer: 5
   m_Name: BtnUserAgreement
   m_TagString: Untagged
@@ -7853,7 +7902,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -7890,6 +7939,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &2229057963173284159
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3494904712738323609}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 3494904712738323612}
+  selectedColor: {r: 0.2627451, g: 0.8392157, b: 0.8745098, a: 0.29803923}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3494904712738515773
 GameObject:
   m_ObjectHideFlags: 0
@@ -8634,6 +8706,7 @@ GameObject:
   - component: {fileID: 3494904712865403326}
   - component: {fileID: 3494904712865403325}
   - component: {fileID: 3494904712865403324}
+  - component: {fileID: 5322865822876168888}
   m_Layer: 5
   m_Name: BtnScreenDistance
   m_TagString: Untagged
@@ -8720,7 +8793,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -8757,6 +8830,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &5322865822876168888
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3494904712865403322}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 3494904712865403325}
+  selectedColor: {r: 0.2627451, g: 0.8392157, b: 0.8745098, a: 0.29803923}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3494904712880476008
 GameObject:
   m_ObjectHideFlags: 0
@@ -9173,6 +9269,7 @@ GameObject:
   - component: {fileID: 3494904712937292256}
   - component: {fileID: 3494904712937292255}
   - component: {fileID: 3494904712937292254}
+  - component: {fileID: 6993001799086261412}
   m_Layer: 5
   m_Name: BtnLanguage
   m_TagString: Untagged
@@ -9259,7 +9356,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -9296,6 +9393,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &6993001799086261412
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3494904712937292252}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 3494904712937292255}
+  selectedColor: {r: 0.2627451, g: 0.8392157, b: 0.8745098, a: 0.29803923}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3494904713037318950
 GameObject:
   m_ObjectHideFlags: 0
@@ -10348,6 +10468,7 @@ GameObject:
   - component: {fileID: 3494904713253350896}
   - component: {fileID: 3494904713253350895}
   - component: {fileID: 3494904713253350894}
+  - component: {fileID: 265910298245585437}
   m_Layer: 5
   m_Name: BtnSound
   m_TagString: Untagged
@@ -10434,7 +10555,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -10471,6 +10592,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &265910298245585437
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3494904713253350892}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 3494904713253350895}
+  selectedColor: {r: 0.2627451, g: 0.8392157, b: 0.8745098, a: 0.29803923}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3494904713260212737
 GameObject:
   m_ObjectHideFlags: 0
@@ -10520,6 +10664,7 @@ GameObject:
   - component: {fileID: 3494904713265228565}
   - component: {fileID: 3494904713265228564}
   - component: {fileID: 3494904713265228563}
+  - component: {fileID: 8078963233558650669}
   m_Layer: 5
   m_Name: BtnBack
   m_TagString: Untagged
@@ -10643,6 +10788,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &8078963233558650669
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3494904713265228561}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 3494904713265228562}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3494904713277419604
 GameObject:
   m_ObjectHideFlags: 0
@@ -13034,6 +13202,7 @@ GameObject:
   - component: {fileID: 3494904713550978528}
   - component: {fileID: 3494904713550978527}
   - component: {fileID: 3494904713550978526}
+  - component: {fileID: 7475568127003173813}
   m_Layer: 5
   m_Name: BtnPrivacyPolicy
   m_TagString: Untagged
@@ -13120,7 +13289,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -13157,6 +13326,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &7475568127003173813
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3494904713550978524}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 3494904713550978527}
+  selectedColor: {r: 0.2627451, g: 0.8392157, b: 0.8745098, a: 0.29803923}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3494904713558203188
 GameObject:
   m_ObjectHideFlags: 0
@@ -13533,6 +13725,7 @@ GameObject:
   - component: {fileID: 3494904713634383393}
   - component: {fileID: 3494904713634383392}
   - component: {fileID: 3494904713634383391}
+  - component: {fileID: 6299002751481715842}
   m_Layer: 5
   m_Name: BtnAboutUs
   m_TagString: Untagged
@@ -13619,7 +13812,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -13656,6 +13849,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &6299002751481715842
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3494904713634383389}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 3494904713634383392}
+  selectedColor: {r: 0.2627451, g: 0.8392157, b: 0.8745098, a: 0.29803923}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3494904713641379324
 GameObject:
   m_ObjectHideFlags: 0

+ 161 - 9
Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/SocialView.prefab

@@ -734,6 +734,7 @@ GameObject:
   - component: {fileID: 3513275762139111393}
   - component: {fileID: 3513275762139111392}
   - component: {fileID: 3513275762139111395}
+  - component: {fileID: 2483714796241627012}
   m_Layer: 5
   m_Name: BtnFriendRequest
   m_TagString: Untagged
@@ -820,7 +821,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -857,6 +858,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &2483714796241627012
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3513275762139111405}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 3513275762139111392}
+  selectedColor: {r: 0.2627451, g: 0.8392157, b: 0.8745098, a: 0.29803923}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3513275762185273071
 GameObject:
   m_ObjectHideFlags: 0
@@ -869,6 +893,7 @@ GameObject:
   - component: {fileID: 3513275762185273059}
   - component: {fileID: 3513275762185273058}
   - component: {fileID: 3513275762185273069}
+  - component: {fileID: 271435669693944059}
   m_Layer: 5
   m_Name: BtnFriendList
   m_TagString: Untagged
@@ -955,7 +980,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -992,6 +1017,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &271435669693944059
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3513275762185273071}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 3513275762185273058}
+  selectedColor: {r: 0.2627451, g: 0.8392157, b: 0.8745098, a: 0.29803923}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3513275762194049188
 GameObject:
   m_ObjectHideFlags: 0
@@ -2878,8 +2926,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: 746, y: -81}
-  m_SizeDelta: {x: 1490, y: 160}
+  m_AnchoredPosition: {x: 746.5, y: -81}
+  m_SizeDelta: {x: 1491, y: 160}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &3513275762827449783
 GameObject:
@@ -3235,6 +3283,7 @@ GameObject:
   - component: {fileID: 3513275762935115570}
   - component: {fileID: 3513275762935115568}
   - component: {fileID: 3513275762935115571}
+  - component: {fileID: 8974372283676328280}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -3304,6 +3353,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Ignore
+--- !u!114 &8974372283676328280
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3513275762935115581}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: common_ignore
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &3513275762937079011
 GameObject:
   m_ObjectHideFlags: 0
@@ -3616,6 +3680,7 @@ GameObject:
   - component: {fileID: 3513275763007811619}
   - component: {fileID: 3513275763007811618}
   - component: {fileID: 3513275763007811629}
+  - component: {fileID: 7499472027199345042}
   m_Layer: 5
   m_Name: BtnSearchPlayer
   m_TagString: Untagged
@@ -3702,7 +3767,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -3739,6 +3804,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &7499472027199345042
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3513275763007811631}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 3513275763007811618}
+  selectedColor: {r: 0.2627451, g: 0.8392157, b: 0.8745098, a: 0.29803923}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3513275763031112399
 GameObject:
   m_ObjectHideFlags: 0
@@ -4513,7 +4601,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: Return
+  m_Text: "\u8FD4\u56DE"
 --- !u!114 &5258809219957414589
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4697,6 +4785,7 @@ GameObject:
   - component: {fileID: 3513275763255433767}
   - component: {fileID: 3513275763255433766}
   - component: {fileID: 3513275763255433761}
+  - component: {fileID: 347799865238686126}
   m_Layer: 5
   m_Name: BtnBack
   m_TagString: Untagged
@@ -4820,6 +4909,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &347799865238686126
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3513275763255433763}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 3513275763255433760}
+  targetGraphic: {fileID: 0}
+  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3513275763273976663
 GameObject:
   m_ObjectHideFlags: 0
@@ -5155,6 +5267,7 @@ GameObject:
   - component: {fileID: 3513275763361061188}
   - component: {fileID: 3513275763361061191}
   - component: {fileID: 3513275763361061190}
+  - component: {fileID: 617663711272900030}
   m_Layer: 5
   m_Name: BtnFriendRecommand
   m_TagString: Untagged
@@ -5241,7 +5354,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   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}
@@ -5278,6 +5391,29 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &617663711272900030
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3513275763361061184}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetRTF: {fileID: 0}
+  targetGraphic: {fileID: 3513275763361061191}
+  selectedColor: {r: 0.2627451, g: 0.8392157, b: 0.8745098, a: 0.29803923}
+  targetButton: {fileID: 0}
+  cellObj: {fileID: 0}
+  OnStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  OnEndEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3513275763361975520
 GameObject:
   m_ObjectHideFlags: 0
@@ -5812,6 +5948,7 @@ GameObject:
   - component: {fileID: 3513275763458312709}
   - component: {fileID: 3513275763458312731}
   - component: {fileID: 3513275763458312730}
+  - component: {fileID: 3715286795792458079}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -5881,6 +6018,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Agree
+--- !u!114 &3715286795792458079
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3513275763458312708}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: common_agree
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &3513275763471040188
 GameObject:
   m_ObjectHideFlags: 0
@@ -7131,8 +7283,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: 750.5, y: -90}
-  m_SizeDelta: {x: 1501, y: 160}
+  m_AnchoredPosition: {x: 751, y: -90}
+  m_SizeDelta: {x: 1502, y: 160}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &3513275763975939400
 GameObject:

+ 11 - 0
Assets/SmartBow/Scripts/Views/ConnectGuidanceView.cs

@@ -21,6 +21,17 @@ public class ConnectGuidanceView : MonoBehaviour
         else {
             ShowDeviceLayout(0);
         }
+
+        //FindObjectOfType<NewUserGuiderManager>().curConfigKey = "视角归位-触发";
+        ////进入射箭场景
+        //GlobalData.pkMatchType = PKMatchType.None;
+        //GameMgr.gameType = 1;
+        ////射一箭回到连接页面,Device.view
+        //GameMgr.bNavBack = true;
+        //GameMgr.bShowDistance = false;
+
+        //UnityEngine.SceneManagement.SceneManager.LoadScene(
+        //    "Game", UnityEngine.SceneManagement.LoadSceneMode.Single);
     }
     void ShowDeviceLayout(int index)
     {

+ 5 - 1
Assets/SmartBow/Scripts/Views/GameResultView.cs

@@ -17,7 +17,11 @@ public class GameResultView : MonoBehaviour
     public Action OnBackClicked;
     void Start()
     {
-
+        SimulateMouseController.ins?.AddOpenLocker(this);
+    }
+    void OnDestroy()
+    {
+        SimulateMouseController.ins?.RemoveOpenLocker(this);
     }
     public void setGameResultInfo(string gameNameID, int time, int shootCount)
     {

+ 28 - 31
Assets/SmartBow/Scripts/Views/GyrGuidanceView.cs

@@ -13,13 +13,21 @@ public class GyrGuidanceView : MonoBehaviour
     [SerializeField] List<GameObject> layouts;
 
     bool bAutoNext = false;
+
     void Start()
     {
         btnGyrCalibrate.GetComponent<Button>().onClick.AddListener(ClickGyrCalibrate);
         transform.Find("BtnNext").GetComponent<Button>().onClick.AddListener(OnClick_Next);
 
         _TextAutoLanguage2 = btnGyrCalibrate.transform.Find("Text").GetComponent<TextAutoLanguage2>();
-
+        if (!AimHandler.ins.IsGyrCompleted())
+        {
+            _TextAutoLanguage2.SetTextKey("Gyro_Initialization");
+        }
+        else
+        {
+            _TextAutoLanguage2.SetTextKey("Gyro_Reinitialize");
+        }
         if (AimHandler.ins.aimDeviceInfo.type == (int)AimDeviceType.ARTEMIS)
         {
             ShowDeviceLayout(1);
@@ -65,8 +73,6 @@ public class GyrGuidanceView : MonoBehaviour
     [NonSerialized] public bool gyrCalibrating = false;
     void ClickGyrCalibrate()
     {
-        if (bAutoNext) return;
-        bAutoNext = true;
         if (action_OnClickGyrCalibrateInterceptor != null)
         {
             if (action_OnClickGyrCalibrateInterceptor.Invoke()) return;
@@ -82,10 +88,12 @@ public class GyrGuidanceView : MonoBehaviour
             AimHandler.ins.gyrCalibrateCompleteCount = 0;
             canUpdateGyrCalibrateProgress = true;
             flag_GyrCalibarateOperateAndFinish = 0;
+            bAutoNext = true;
         }
         else
         {
             canUpdateGyrCalibrateProgress = false;
+            _TextAutoLanguage2.SetTextKey("Gyro_Reinitialize");
         }
         AimHandler.ins.ResetGyr();
         AimHandler.ins.CalibrateGyr(gyrCalibrating);
@@ -102,49 +110,38 @@ public class GyrGuidanceView : MonoBehaviour
     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);
             _TextAutoLanguage2.textFormatArgs = new object[] { progress };
             _TextAutoLanguage2.SetTextKey("Gyro_Initializing");
             if (progress >= 100)
             {
                 FinishGyrCalibrate();
-                //如果是点击连接的,判断成功后自动跳转
-                if (bAutoNext)
-                {
-                    bAutoNext = false;
-                    OnClick_Next();
-                }
                 if (flag_GyrCalibarateOperateAndFinish == 0)
                 {
                     flag_GyrCalibarateOperateAndFinish = 1;
                     action_GyrCalibarateOperateAndFinish?.Invoke();
-                }
-            }
-        }
-        else
-        {
-            //if (AimHandler.ins.IsGyrCompleted()) btnText.text = "Succeed";
-            //else btnText.text = "Gyr Initialization";
-
-            if (AimHandler.ins.IsGyrCompleted()) {
-                _TextAutoLanguage2.textFormatArgs = new object[] {};
-                _TextAutoLanguage2.SetTextKey("Gyro_Success");
 
-                //如果是点击连接的,判断成功后自动跳转
-                if (bAutoNext) {
-                    bAutoNext = false;
-                    OnClick_Next();
+                  
+                    if (AimHandler.ins.IsGyrCompleted())
+                    {
+                        _TextAutoLanguage2.SetTextKey("Gyro_Success");
+                        //如果是点击连接的,判断成功后自动跳转
+                        if (bAutoNext)
+                        {
+                            bAutoNext = false;
+                            OnClick_Next();
+                        }
+                    }
+                    else
+                    {
+                        //_TextAutoLanguage2.textFormatArgs = new object[] { };
+                        _TextAutoLanguage2.SetTextKey("Gyro_Initialization");
+                    }
+                  
                 }
             }
-            else {
-                _TextAutoLanguage2.textFormatArgs = new object[] { };
-                _TextAutoLanguage2.SetTextKey("Gyro_Initialization");
-            };
-         
         }
     }
     #endregion

+ 46 - 35
Assets/SmartBow/Scripts/Views/MagGuidanceView.cs

@@ -13,11 +13,21 @@ public class MagGuidanceView : MonoBehaviour
 
     [SerializeField] List<GameObject> layouts;
 
-    bool bAutoNext = false;
+    bool bStartResetMag = false;
+    //bool bAutoNext = false;
+
     void Start()
     {
         btnMagCalibrate.GetComponent<Button>().onClick.AddListener(ClickResetMag);
         _TextAutoLanguage2 = btnMagCalibrate.transform.Find("Text").GetComponent<TextAutoLanguage2>();
+        if (AimHandler.ins.IsMagCompleted() && PlayerPrefs.GetInt("entry-guider-one-" + LoginMgr.myUserInfo.id, 0) == 1)
+        {
+            //本机已经初始化流程第一次后
+            _TextAutoLanguage2.SetTextKey("Mag_Reinitialize");
+        }
+        else {
+            _TextAutoLanguage2.SetTextKey("Mag_Initialization");
+        }
         if (AimHandler.ins.aimDeviceInfo.type == (int)AimDeviceType.ARTEMIS)
         {
             ShowDeviceLayout(1);
@@ -26,6 +36,7 @@ public class MagGuidanceView : MonoBehaviour
         {
             ShowDeviceLayout(0);
         }
+       
     }
     void ShowDeviceLayout(int index)
     {
@@ -41,11 +52,6 @@ public class MagGuidanceView : MonoBehaviour
         UpdateForMag();
     }
 
-    void SetMagBtnText(string text)
-    {
-        btnMagCalibrate.GetComponentInChildren<Text>().text = text;
-    }
-
     public void OnClick_Back()
     {
         AudioMgr.ins.PlayBtn();
@@ -63,8 +69,7 @@ public class MagGuidanceView : MonoBehaviour
     public Func<bool> action_OnClickMagCalibrateInterceptor;
     void ClickResetMag()
     {
-        if (bAutoNext) return;
-        bAutoNext = true;
+    
 
         if (action_OnClickMagCalibrateInterceptor != null)
         {
@@ -87,6 +92,9 @@ public class MagGuidanceView : MonoBehaviour
             Axis9CalibrateRecord.ResumeCalibrateRecord(LoginMgr.myUserInfo.mac);
             Axis9CalibrateRecord.SetCalibrateOkRecord(LoginMgr.myUserInfo.mac, false);
         }
+      
+        //开始校准
+        bStartResetMag = true;
     }
     //取消地磁计校准(仅用在UpdateForMag中)
     void CancelResetMag()
@@ -95,6 +103,8 @@ public class MagGuidanceView : MonoBehaviour
     }
     void UpdateForMag()
     {
+        if (!bStartResetMag) return;
+        //假如还未初始化成功
         if (!AimHandler.ins.IsMagCompleted())
         {
             //地磁校准超时提示
@@ -104,8 +114,8 @@ public class MagGuidanceView : MonoBehaviour
                 float progress = Mathf.FloorToInt(doingTime / 20 * 100);
                 if (progress >= 100)
                 {
-                    _TextAutoLanguage2.textFormatArgs = new object[] { };
-                    _TextAutoLanguage2.SetTextKey("Mag_Initialization");
+                    //初始化超时
+                    _TextAutoLanguage2.SetTextKey("Mag_Fail");
                     CancelResetMag();
                     //地磁干扰提示页面-start
                     GameObject o = Instantiate(prefab_MagInterferenceTipView);
@@ -120,25 +130,24 @@ public class MagGuidanceView : MonoBehaviour
                     }
                     //地磁干扰提示页面-end
                     PopupMgr.ins.ShowTipTop(TextAutoLanguage2.GetTextByKey("tip_mag-calibrate_please-leave-interfere"));
+
+                    bStartResetMag = false;
                 }
                 else
                 {
+                    //模拟一个进度
                     _TextAutoLanguage2.textFormatArgs = new object[] { progress };
                     _TextAutoLanguage2.SetTextKey("Mag_Initializing2");
-                    //SetMagBtnText("Initializing");
                 }
             }
             else
             {
-                //SetMagBtnText("Mag Initialization");
-                _TextAutoLanguage2.textFormatArgs = new object[] { };
                 _TextAutoLanguage2.SetTextKey("Mag_Initialization");
+                bStartResetMag = false;
             }
         }
         else
         {
-            //SetMagBtnText("Succeed");
-            _TextAutoLanguage2.textFormatArgs = new object[] { };
             _TextAutoLanguage2.SetTextKey("Mag_Success");
             if (calibrateMagDoing)
             {
@@ -148,34 +157,36 @@ public class MagGuidanceView : MonoBehaviour
             {
                 flag_MagCalibarateOperateAndFinish = 1;
                 action_MagCalibarateOperateAndFinish?.Invoke();
-            }
 
-            //添加进入射箭场景
-            if (PlayerPrefs.GetInt("entry-guider-one-" + LoginMgr.myUserInfo.id, 0) != 1)
-            {
-                Debug.Log("-----进入射箭场景!");
-                FindObjectOfType<NewUserGuiderManager>().curConfigKey = "限时游戏-选择距离";
-                //进入射箭场景
-                GlobalData.pkMatchType = PKMatchType.None;
-                GameMgr.gameType = 1;
-                //射一箭回到连接页面,Device.view
-                GameMgr.bNavBack = true;
-                UnityEngine.SceneManagement.SceneManager.LoadScene(
-                    "Game", UnityEngine.SceneManagement.LoadSceneMode.Single);
 
-                PlayerPrefs.SetInt("entry-guider-one-" + LoginMgr.myUserInfo.id, 1);
+                //添加进入射箭场景
+                if (PlayerPrefs.GetInt("entry-guider-one-" + LoginMgr.myUserInfo.id, 0) != 1)
+                {
+                    Debug.Log("-----进入射箭场景!");
+                    //FindObjectOfType<NewUserGuiderManager>().curConfigKey = "限时游戏-选择距离";
+                    FindObjectOfType<NewUserGuiderManager>().curConfigKey = "视角归位-触发";
+                    //进入射箭场景
+                    GlobalData.pkMatchType = PKMatchType.None;
+                    GameMgr.gameType = 1;
+                    //射一箭回到连接页面,Device.view
+                    GameMgr.bNavBack = true;
+                    GameMgr.bShowDistance = false;
+                    AimHandler.ins.bInitOne = true;
 
-            }
-            else {
-                //如不是第一次,则应该跳转回连接界面
-                if (bAutoNext)
+                    UnityEngine.SceneManagement.SceneManager.LoadScene(
+                        "Game", UnityEngine.SceneManagement.LoadSceneMode.Single);
+
+                    PlayerPrefs.SetInt("entry-guider-one-" + LoginMgr.myUserInfo.id, 1);
+
+                }
+                else
                 {
-                    bAutoNext = false;
+                    //如不是第一次,则应该跳转回连接界面
                     ViewMgr.Instance.DestroyView<SmartArcheryView>();
                     ViewManager2.HideView(ViewManager2.Path_MagGuidanceView);
                 }
-              
             }
+            bStartResetMag = false;
         }
     }
     #endregion

+ 2 - 0
Assets/SmartBow/Scripts/Views/SettingsView.cs

@@ -37,6 +37,8 @@ namespace SmartBow
         {
             foreach (Transform item in panelLeftContent)
             {
+                if (item.name == "BtnSignOut") continue;
+
                 if (item == target)
                 {
                     item.Find("Text").GetComponent<Text>().fontStyle = FontStyle.Bold;

+ 9 - 2
Assets/ThirdAssets/JCUnityLib/Untiy/SimulateMouse/SimulateMouse.cs

@@ -107,8 +107,13 @@ namespace JC.Unity {
             public Selectable GetCurrentSelectable() {
                 return mScreenRayRaycasterUIWrapper.m_currentSelectable;
             }
+
+            public void onSetNullToSelectable(Selectable target)
+            {
+                //mScreenRayRaycasterUIWrapper.OnSelect(target);
+            }
         #endregion 对外提供的接口
-	}
+    }
 	public class ScreenRayRaycasterUIWrapper 
 	{
         public Selectable m_currentSelectable = null;
@@ -188,7 +193,9 @@ namespace JC.Unity {
 
             mIsClick = false;
         }
-
+        public void OnSelect(Selectable s) {
+            Select(s);
+        }
         void Select(Selectable s)
         {
             if (mIsDrag == true) return;

+ 1 - 1
Assets/WildAttack/Scenes/WildAttack.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44402242, g: 0.49316543, b: 0.5722324, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:

+ 1 - 0
Assets/WildAttack/Scripts/Manager/GameMananger.cs

@@ -550,6 +550,7 @@ namespace WildAttack
             // 在这里判断是否和ui交互? 优先判断ui 不是ui再射箭
 
             ShootOut(speed * smartBowSpeed,true);
+            //Debug.Log("OnModuleShooting:"+speed);
             //TipText.Show((speed * smartBowSpeed).ToString());
             // 角度 OnRotationUpdate
         }

+ 2 - 0
Assets/WildAttack/Scripts/Module/GameModule.cs

@@ -55,6 +55,8 @@ namespace WildAttack
         /// <returns></returns>
         public float GetData(string key)
         {
+            if (globalDataDic == null) return -1;
+
             if (globalDataDic.ContainsKey(key))
             {
                 if (key == "startMonsterXZ")

+ 3 - 1
Assets/WildAttack/Scripts/SmartBowController.cs

@@ -35,10 +35,12 @@ namespace WildAttack
             if (SB_EventSystem.ins.simulateMouseIsAwaked) return;
             GameMananger.GetInstance().OnRotationUpdate(rotation);
         }
-
+        float _lastShootTime = 0;
         public void OnShooting(float speed)
         {
             if (Time.time == 0) return;
+            if (Time.realtimeSinceStartup - _lastShootTime < 1) return;
+            _lastShootTime = Time.realtimeSinceStartup;
             GameMananger.GetInstance().OnModuleShooting(speed);
         }
 

Некоторые файлы не были показаны из-за большого количества измененных файлов