Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/Config/PlayerGuideConfig.json

@@ -1211,6 +1211,12 @@
       "SpeakerImage": 3,
       "desc": 10424,
       "Highlighting": 1,
+      "AwardItem": [
+        1002
+      ],
+      "AwardItemNum": [
+        2700
+      ],
       "blackAlpha": 0.0,
       "Handle": 1,
       "IsSkip": 0,

Assets/Scripts/GameLogic/Player/SummonManager.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using Excel2Json;
 using Fort23.Core;
+using Fort23.Mono;
 using Fort23.UTool;
 using GameLogic.Bag;
 using UnityEngine;

Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -35,6 +35,7 @@ namespace Fort23.Mono
                     return null;
                 }
 
+
                 return await PlayerManager.Instance.SummonManager.Summon(configId, 10);
             }
         }
@@ -60,6 +61,15 @@ namespace Fort23.Mono
                     return null;
                 }
 
+                if (PlayerGuideManager.Instance.curPhase == 8 && openBoxConfig.ID == 2)
+                {
+                    PlayerManager.Instance.BagController.DeductItem(openBoxConfig.CostItemID, openBoxConfig.oneConsume);
+
+                    var item = DropManager.Instance.DropItem(999011);
+                    PlayerManager.Instance.BagController.AddItem(item);
+                    return item;
+                }
+
                 return await PlayerManager.Instance.SummonManager.Summon(configId, 1);
             }
         }
@@ -87,11 +97,12 @@ namespace Fort23.Mono
         {
             // AppBarPanel.ClosePanel();
             TitlePanel.OpenPanel(new List<int>() { openBoxConfig.CostItemID });
-            
+
             if (PlayerGuideManager.Instance.GuideIsCanDo(8, 1))
             {
                 PlayerGuideManager.Instance.NextGuide();
             }
+
             return base.GetFocus();
         }
 

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase4.cs

@@ -179,8 +179,20 @@ namespace Fort23.Mono.Phases
             pgm.StepInit();
             await TimerComponent.Instance.WaitAsync(100);
 
-            GameObject gameObject =
-                UIManager.Instance.GetComponent<SkillSelectPanel>()._skillWidgets[1].own;
+            SkillSelectPanel skillSelectPanel =
+                UIManager.Instance.GetComponent<SkillSelectPanel>();
+            GameObject gameObject = null;
+            foreach (var skillWidget in skillSelectPanel._skillWidgets)
+            {
+                if (skillWidget.skillConfigId.skillConfig.IDGroup == 1405)
+                {
+                    gameObject = skillWidget.own;
+                    break;
+                }
+            }
+
+            // GameObject gameObject =
+            //     UIManager.Instance.GetComponent<SkillSelectPanel>()._skillWidgets[1].own;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
 
@@ -240,9 +252,18 @@ namespace Fort23.Mono.Phases
         {
             pgm.StepInit();
             await TimerComponent.Instance.WaitAsync(100);
+            SkillSelectPanel skillSelectPanel =
+                UIManager.Instance.GetComponent<SkillSelectPanel>();
+            GameObject gameObject = null;
+            foreach (var skillWidget in skillSelectPanel._skillWidgets)
+            {
+                if (skillWidget.skillConfigId.skillConfig.IDGroup == 2006)
+                {
+                    gameObject = skillWidget.own;
+                    break;
+                }
+            }
 
-            GameObject gameObject =
-                UIManager.Instance.GetComponent<SkillSelectPanel>()._skillWidgets[2].own;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
 

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase8.cs

@@ -97,7 +97,7 @@ namespace Fort23.Mono.Phases
         {
             pgm.StepInit();
             await TimerComponent.Instance.WaitAsync(100);
-            GameObject gameObject = UIManager.Instance.GetComponent<BoxPanel>().tenButton.gameObject;
+            GameObject gameObject = UIManager.Instance.GetComponent<BoxPanel>().oneButton.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;