Merge remote-tracking branch 'remotes/origin/master' into insertcoin

Assets/BowArrow/InfraredCamera/Resources/InfraredDemo.prefab

@@ -1662,7 +1662,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: 488, y: 40}
+  m_AnchoredPosition: {x: 458, y: 21}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &7874301958488855308
@@ -9888,7 +9888,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: 215.4, y: 30}
+  m_AnchoredPosition: {x: 454, y: 60}
   m_SizeDelta: {x: 150, y: 40}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &3418442180573849833
@@ -10251,7 +10251,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 24
+    m_FontSize: 21
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2

Assets/BowArrow/Resources/Audios/Other/GoHareHunt.mp3.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1e201ba22c7b5bf468d20a7d06ac7895
+guid: 8c8c10f357a14e74685975cc4b74c356
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Assets/BowArrow/Resources/Audios/Other/GoPheasuntHunt.wav.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: afb0e665df558524783c76f03d575061
+guid: 85dab73306fb6964dbed4dc63465407e
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Assets/BowArrow/Scripts/Bluetooth/AimHandler.cs

@@ -556,6 +556,9 @@ public class AimDeviceInfos
     /// </summary>
     private void CrossBtnEvent()
     {
+        //b端不处理准心
+        if (CommonConfig.StandaloneModeOrPlatformB) return;
+
         Debug.Log("CrossBtnEvent");
         //准心开关
         InvokeOnCrossBtnEvent();
@@ -566,8 +569,19 @@ public class AimDeviceInfos
             if (infraredGuider == null)
             {
                 //显示控制准心按钮
-                Button crossHairBtn = GameAssistUI.ins.transform.Find("Button5").GetComponent<Button>();
-                crossHairBtn.onClick.Invoke();
+                Transform _button5 = GameAssistUI.ins.transform.Find("Button5");
+                if (_button5.gameObject.activeSelf)
+                {
+                    Button crossHairBtn = _button5.GetComponent<Button>();
+                    crossHairBtn.onClick.Invoke();
+                }
+                else 
+                {
+                    bool onlyShow = !CrossHair.ins.GetOnlyShow();
+                    CrossHair.ins.SetOnlyShow(onlyShow);
+                    //保存准心状态
+                    if (InfraredDemo._ins) InfraredDemo._ins.setCrosshairValue(onlyShow);
+                }
             }
             else {
                 
@@ -590,20 +604,53 @@ public class AimDeviceInfos
         else if (DuckHunter.GameUI.Instance)
         {
             //显示控制准心按钮
-            Button crossHairBtn = DuckHunter.GameUI.Instance.transform.Find("BtnCrosshair").GetComponent<Button>();
-            crossHairBtn.onClick.Invoke();
+            Transform _btnCrosshair = DuckHunter.GameUI.Instance.transform.Find("BtnCrosshair");
+            if (_btnCrosshair.gameObject.activeSelf)
+            {
+                Button crossHairBtn = _btnCrosshair.GetComponent<Button>();
+                crossHairBtn.onClick.Invoke();
+            }
+            else {
+                bool onlyShow = !DuckHunter.CrossHair.Instance.GetOnlyShow();
+                DuckHunter.CrossHair.Instance.SetOnlyShow(onlyShow);
+                //记录准心值
+                if (InfraredDemo._ins) InfraredDemo._ins.setCrosshairValue(onlyShow);
+            }
+         
         }
         else if (HyperspaceGame.UIManager._ins) {
             //打枪
-            Button crossHairBtn = HyperspaceGame.UIManager._ins.transform.Find("BtnCrosshair").GetComponent<Button>();
-            crossHairBtn.onClick.Invoke();
+            Transform _btnCrosshair = HyperspaceGame.UIManager._ins.transform.Find("BtnCrosshair");
+            if (_btnCrosshair.gameObject.activeSelf)
+            {
+                Button crossHairBtn = _btnCrosshair.GetComponent<Button>();
+                crossHairBtn.onClick.Invoke();
+            }
+            else {
+                bool onlyShow = !HyperspaceGame.UIManager._ins.GetOnlyShow();
+                HyperspaceGame.UIManager._ins.SetOnlyShow(onlyShow);
+                //记录准心值
+                if (InfraredDemo._ins) InfraredDemo._ins.setCrosshairValue(onlyShow);
+            }
+             
         }
         else
         {
             if (UnityEngine.SceneManagement.SceneManager.GetActiveScene().name.StartsWith("FruitMaster")){
                 //水果
-                Button crossHairBtn = GameObject.Find("PermanentCanvas/CrossHair_Btn").GetComponent<Button>();
-                crossHairBtn.onClick.Invoke();
+                GameObject _crosshairBtn = GameObject.Find("PermanentCanvas/CrossHair_Btn");
+                if (_crosshairBtn.gameObject.activeSelf)
+                {
+                    Button crossHairBtn = _crosshairBtn.GetComponent<Button>();
+                    crossHairBtn.onClick.Invoke();
+                }
+                else {
+                    bool onlyShow = !JCFruitMaster.ins.GetOnlyShow();
+                    JCFruitMaster.ins.SetOnlyShow(onlyShow);
+                    //记录准心值
+                    if (InfraredDemo._ins) InfraredDemo._ins.setCrosshairValue(onlyShow);
+                }
+              
             }
          
         }

Assets/BowArrow/Scripts/Game/CrossHair.cs

@@ -54,7 +54,14 @@ public class CrossHair : MonoBehaviour
         }
         else {
             //按照条件显示图标
-            if (open) SetVisiable(onlyShow && ArmBow.ins && ArmBow.ins.IsCanShoot());
+            if (open) 
+            {
+                SetVisiable(onlyShow && ArmBow.ins && ArmBow.ins.IsCanShoot());
+            }
+            else 
+            {
+                SetVisiable(false);
+            }
         }
     }
 

Assets/BowArrow/Scripts/Manager/AudioMgr.cs

@@ -193,17 +193,20 @@ public class AudioMgr : MonoBehaviour
     public void PlayStartAudioByGameType() {
 
         if (!CommonConfig.StandaloneModeOrPlatformB) return;
-
+  
         if (GameMgr.gameType == 3)
-        {
-            PlayGoPheasuntHunt();
+        {   
+            //兔子
+            PlayGoHareHunt();
         }
         else if (GameMgr.gameType == 4)
         {
-            PlayGoHareHunt();
+            //野鸡
+            PlayGoPheasuntHunt();
         }
         else if (GameMgr.gameType == 5)
         {
+            //狼
             PlayGoWolfHunt();
         }
     }

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

@@ -19,6 +19,10 @@ public class SmartArcheryView  : JCUnityLib.ViewBase
         //ins = this;
         for (int i = 0; i < smartArcheryButtons.Count; i++)
         {
+            // b¶ËÒþ²ØÇ°3¸ö°´Å¥
+            if (CommonConfig.StandaloneModeOrPlatformB && i < 3) {
+                smartArcheryButtons[i].gameObject.SetActive(false);
+            }
             int temp = i;
             smartArcheryButtons[i].onClick.AddListener(() => {
                 AudioMgr.ins.PlayBtn();

Assets/DuckHunter/Scripts/CrossHair.cs

@@ -43,7 +43,10 @@ namespace DuckHunter
                 //进入校准时候，一定显示准心
                 SetVisiable(true);
             } else {
-                if (open) SetVisiable(onlyShow);
+                if (open) 
+                    SetVisiable(onlyShow);
+                else 
+                    SetVisiable(false);
             }
          
         }

Assets/FruitMaster/Scripts/JCFruitMaster.cs

@@ -68,7 +68,10 @@ public class JCFruitMaster : MonoBehaviour
         }
         else
         {
-            if (open) SetVisiable(onlyShow && !SB_EventSystem.ins.simulateMouseIsAwaked);
+            if (open) 
+                SetVisiable(onlyShow && !SB_EventSystem.ins.simulateMouseIsAwaked);
+            else
+                SetVisiable(false);
         }
     }
 

Assets/Game_Hyperspace/Script/UIManager.cs

@@ -171,7 +171,10 @@ namespace HyperspaceGame
             }
             else
             {
-                if (open) SetVisiable(onlyShow);
+                if (open) 
+                    SetVisiable(onlyShow);
+                else
+                    SetVisiable(false);
             }
 
         }