Browse Source

游戏大厅PK入口

lvjincheng 4 years ago
parent
commit
3b3c227ba9

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

@@ -1737,7 +1737,7 @@ Canvas:
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
-  m_SortingOrder: 3
+  m_SortingOrder: 4
   m_TargetDisplay: 0
 --- !u!114 &4507770291199562696
 MonoBehaviour:

+ 6 - 0
Assets/BowArrow/Scripts/GlobalData.cs

@@ -7,4 +7,10 @@ public class GlobalData
 {
     //本地双人PK,双方选择的角色ID
     public static int[] localPK_playerRoleIDs = new int[] {1, 2};
+    public static PKMatchType pkMatchType = PKMatchType.None;
+}
+public enum PKMatchType {
+    None, //不是PK,就是单击单人
+    LocalPK, //本地PK
+    OnlinePK //联网PK4444
 }

+ 6 - 1
Assets/BowArrow/Scripts/View/ChallengeOptionView.cs

@@ -6,8 +6,13 @@ using UnityEngine.SceneManagement;
 public class ChallengeOptionView : MonoBehaviour
 {
     public void StartGame(int gameType) {
-        AudioMgr.ins.PlayBtn();
+        if (GlobalData.pkMatchType == PKMatchType.LocalPK) {
+            if (gameType == 3) gameType = 6;
+            else if (gameType == 4) gameType = 7;
+            else if (gameType == 5) gameType = 8;
+        }
         GameMgr.gameType = gameType;
+        AudioMgr.ins.PlayBtn();
         SceneManager.LoadScene("GameChallenge", LoadSceneMode.Single);
     }
 

+ 3 - 0
Assets/BowArrow/Scripts/View/GameStartView.cs

@@ -10,13 +10,16 @@ public class GameStartView : MonoBehaviour
         switch (target)
         {
             case "闯关":
+                GlobalData.pkMatchType = PKMatchType.None;
                 GameObject.Instantiate(Resources.Load<GameObject>("Prefabs/Views/ChallengeOptionView"));
                 break;
             case "限时":
+                GlobalData.pkMatchType = PKMatchType.None;
                 GameMgr.gameType = 1;
                 SceneManager.LoadScene("Game", LoadSceneMode.Single);
                 break;
             case "PK":
+                GlobalData.pkMatchType = PKMatchType.LocalPK;
                 GameObject.Instantiate(Resources.Load<GameObject>("Prefabs/Views/RoleSelectView"));
                 break;
             default:

+ 1 - 1
Assets/BowArrow/Scripts/View/PKGameOptionView.cs

@@ -10,7 +10,7 @@ public class PKGameOptionView : MonoBehaviour
         switch (target)
         {
             case "双人闯关":
-                // GameObject.Instantiate(Resources.Load<GameObject>("Prefabs/Views/ChallengeOptionView"));
+                GameObject.Instantiate(Resources.Load<GameObject>("Prefabs/Views/ChallengeOptionView"));
                 break;
             case "静止靶":
                 GameMgr.gameType = 2;