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

Assets/Res/Config/InitialPlayerConfig.json

@@ -6,13 +6,15 @@
         1001,
         1005,
         1006,
-        1201
+        1201,
+        1002
       ],
       "itemAmount": [
         500000,
         5000,
         5000,
-        1
+        1,
+        3280
       ],
       "fabaoId": [
         10010

Assets/Res/Config/LanguageChineseConfig.json

@@ -37622,11 +37622,11 @@
     },
     {
       "ID": 10146,
-      "txt": "先点击功法"
+      "txt": "先上一个"
     },
     {
       "ID": 10147,
-      "txt": "功法前期只可放置在对应五行的绿圈内，后期则可以放置在任意位置"
+      "txt": "可以将功法放入功法盘的任意空位"
     },
     {
       "ID": 10148,
@@ -38742,11 +38742,11 @@
     },
     {
       "ID": 10426,
-      "txt": "0"
+      "txt": "再上阵一个辅助功法，它能加强其他功法的效果。"
     },
     {
       "ID": 10427,
-      "txt": "0"
+      "txt": "放在这里，可以让旁边的功法更强！！"
     },
     {
       "ID": 10428,

Assets/Res/Config/PlayerGuideConfig.json

@@ -726,6 +726,78 @@
       "NeedLevel": 0,
       "groupID": 4,
       "FingerType": 1,
+      "dialogPos": [
+        -182,
+        177
+      ],
+      "NpcPos": [
+        422,
+        -100
+      ],
+      "NpcSize": [
+        500,
+        500
+      ],
+      "SpeakerName": 0,
+      "SpeakerStyle": 1,
+      "SpeakerImage": 3,
+      "desc": 10426,
+      "Highlighting": 1,
+      "blackAlpha": 0.55,
+      "Handle": 1,
+      "IsSkip": 0,
+      "TextSize": [
+        1240,
+        157
+      ],
+      "reversalFinger": 1,
+      "reversalBox": 2,
+      "ForceOnclick": 1,
+      "forceText": 1,
+      "voiceFile": ""
+    },
+    {
+      "ID": 409,
+      "Index": 9,
+      "NeedLevel": 0,
+      "groupID": 4,
+      "FingerType": 1,
+      "dialogPos": [
+        -182,
+        177
+      ],
+      "NpcPos": [
+        422,
+        -100
+      ],
+      "NpcSize": [
+        500,
+        500
+      ],
+      "SpeakerName": 0,
+      "SpeakerStyle": 1,
+      "SpeakerImage": 3,
+      "desc": 10427,
+      "Highlighting": 1,
+      "blackAlpha": 0.55,
+      "Handle": 1,
+      "IsSkip": 0,
+      "TextSize": [
+        1240,
+        157
+      ],
+      "reversalFinger": 1,
+      "reversalBox": 2,
+      "ForceOnclick": 1,
+      "forceText": 1,
+      "voiceFile": ""
+    },
+    {
+      "ID": 410,
+      "Index": 10,
+      "NeedLevel": 0,
+      "groupID": 4,
+      "FingerType": 1,
       "dialogPos": [
         -182,
         -621
@@ -811,7 +883,7 @@
         500
       ],
       "SpeakerName": 0,
-      "SpeakerStyle": 4,
+      "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10416,
       "Highlighting": 1,
@@ -847,7 +919,7 @@
         500
       ],
       "SpeakerName": 0,
-      "SpeakerStyle": 4,
+      "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": -1,
       "Highlighting": 1,
@@ -883,7 +955,7 @@
         500
       ],
       "SpeakerName": 0,
-      "SpeakerStyle": 4,
+      "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10417,
       "Highlighting": 1,
@@ -919,7 +991,7 @@
         500
       ],
       "SpeakerName": 0,
-      "SpeakerStyle": 4,
+      "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10418,
       "Highlighting": 1,
@@ -955,7 +1027,7 @@
         500
       ],
       "SpeakerName": 0,
-      "SpeakerStyle": 4,
+      "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10419,
       "Highlighting": 1,
@@ -991,7 +1063,7 @@
         500
       ],
       "SpeakerName": 0,
-      "SpeakerStyle": 4,
+      "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10420,
       "Highlighting": 1,
@@ -1027,7 +1099,7 @@
         500
       ],
       "SpeakerName": 0,
-      "SpeakerStyle": 4,
+      "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10421,
       "Highlighting": 1,
@@ -1063,7 +1135,7 @@
         500
       ],
       "SpeakerName": 0,
-      "SpeakerStyle": 4,
+      "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10422,
       "Highlighting": 1,
@@ -1099,7 +1171,7 @@
         500
       ],
       "SpeakerName": 0,
-      "SpeakerStyle": 4,
+      "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10423,
       "Highlighting": 1,
@@ -1135,7 +1207,7 @@
         500
       ],
       "SpeakerName": 0,
-      "SpeakerStyle": 4,
+      "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10424,
       "Highlighting": 1,
@@ -1171,7 +1243,7 @@
         500
       ],
       "SpeakerName": 0,
-      "SpeakerStyle": 4,
+      "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": -1,
       "Highlighting": 1,
@@ -1207,7 +1279,7 @@
         500
       ],
       "SpeakerName": 0,
-      "SpeakerStyle": 4,
+      "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10425,
       "Highlighting": 1,

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

@@ -37,7 +37,8 @@ namespace Fort23.Mono
         {
             AppBarPanel.ClosePanel();
             TitlePanel.ClosePanel();
-            
+
+
             if (PlayerGuideManager.Instance.GuideIsCanDo(8, 2))
             {
                 PlayerGuideManager.Instance.NextGuide();
@@ -62,7 +63,7 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            tenButton.onClick.AddListener(async() =>
+            tenButton.onClick.AddListener(async () =>
             {
 #if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
                       if (TakuSDKManager.Instance.IsReady())
@@ -192,6 +193,7 @@ namespace Fort23.Mono
 
             await MarskPanel.ClosePanel();
             root.gameObject.SetActive(true);
+
         }
 
 

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -346,7 +346,7 @@ namespace Fort23.Mono
 
             guanbi.onClick.AddListener(() =>
             {
-                if (PlayerGuideManager.Instance.GuideIsCanDo(4, 8))
+                if (PlayerGuideManager.Instance.GuideIsCanDo(4, 10))
                 {
                     PlayerGuideManager.Instance.NextGuide();
                 }
@@ -760,6 +760,11 @@ namespace Fort23.Mono
                 PlayerGuideManager.Instance.NextGuide();
             }
 
+            if (PlayerGuideManager.Instance.GuideIsCanDo(4, 9))
+            {
+                PlayerGuideManager.Instance.NextGuide();
+            }
+
             SkillKongWidget skillKongWidget = obj as SkillKongWidget;
             if (infoType == 1)
             {
@@ -1331,6 +1336,11 @@ namespace Fort23.Mono
             {
                 PlayerGuideManager.Instance.NextGuide();
             }
+
+            if (PlayerGuideManager.Instance.GuideIsCanDo(4, 8))
+            {
+                PlayerGuideManager.Instance.NextGuide();
+            }
         }
 
         /// <summary>

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

@@ -32,6 +32,8 @@ namespace Fort23.Mono.Phases
             actionList.Add(OnStep406);
             actionList.Add(OnStep407);
             actionList.Add(OnStep408);
+            actionList.Add(OnStep409);
+            actionList.Add(OnStep410);
 
 
             actionList.Add(OnStepEnd);
@@ -229,13 +231,62 @@ namespace Fort23.Mono.Phases
             pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
             pgm.SetFingerVisiable(true);
         }
+        
+        /// <summary>
+        /// 上辅助功法
+        /// </summary>
+        /// <param name="obj"></param>
+        public async CTask OnStep408(UnityEngine.Object obj)
+        {
+            pgm.StepInit();
+            await TimerComponent.Instance.WaitAsync(100);
+
+            GameObject gameObject =
+                UIManager.Instance.GetComponent<SkillSelectPanel>()._skillWidgets[2].own;
+            Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
+            Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
+
+            pgm.SetfxTransVisiable(true);
+            pgm.SetMaskTarget(gameObject);
+            pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);
+
+            await pgm.ConfigLogic(408, delegate() { });
+
+            pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
+            pgm.SetFingerVisiable(true);
+        }
+
+        
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="obj"></param>
+        public async CTask OnStep409(UnityEngine.Object obj)
+        {
+            pgm.StepInit();
+            await TimerComponent.Instance.WaitAsync(100);
+
+            GameObject gameObject =
+                UIManager.Instance.GetComponent<SkillSelectPanel>().allKongSkill[6].own;
+            Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
+            Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
+
+            pgm.SetfxTransVisiable(true);
+            pgm.SetMaskTarget(gameObject);
+            pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);
+
+            await pgm.ConfigLogic(409, delegate() { });
+
+            pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
+            pgm.SetFingerVisiable(true);
+        }
 
 
         /// <summary>
         /// 功法调整完毕，点这里返回
         /// </summary>
         /// <param name="obj"></param>
-        public async CTask OnStep408(UnityEngine.Object obj)
+        public async CTask OnStep410(UnityEngine.Object obj)
         {
             pgm.StepInit();
             await TimerComponent.Instance.WaitAsync(100);
@@ -249,7 +300,7 @@ namespace Fort23.Mono.Phases
             pgm.SetMaskTarget(gameObject);
             pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);
 
-            await pgm.ConfigLogic(408, delegate() { });
+            await pgm.ConfigLogic(410, delegate() { });
 
             pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
             pgm.SetFingerVisiable(true);

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

@@ -80,6 +80,9 @@ namespace Fort23.Mono.Phases
         /// <param name="obj"></param>
         public async CTask OnStep701(UnityEngine.Object obj)
         {
+            pgm.StepInit();
+            await TimerComponent.Instance.WaitAsync(100);
+            
             GameObject gameObject = UIManager.Instance.GetComponent<ShopPanel>()._shopBtnWidgets[0].own;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
@@ -87,7 +90,7 @@ namespace Fort23.Mono.Phases
             pgm.SetfxTransVisiable(true);
             pgm.SetMaskTarget(gameObject);
             pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);
-            await pgm.ConfigLogic(6701, delegate() { });
+            await pgm.ConfigLogic(701, delegate() { });
 
             pgm.SetFingerPos(localPos);
             pgm.SetFingerVisiable(true);
@@ -99,6 +102,10 @@ namespace Fort23.Mono.Phases
         /// <param name="obj"></param>
         public async CTask OnStep702(UnityEngine.Object obj)
         {
+            
+            pgm.StepInit();
+            await TimerComponent.Instance.WaitAsync(100);
+            
             GameObject gameObject = null;
             ShopPanel shopPanel = UIManager.Instance.GetComponent<ShopPanel>();
             foreach (var shopPanelShopGroupWidgetType1 in shopPanel._shopGroupWidgetType1s)
@@ -129,6 +136,10 @@ namespace Fort23.Mono.Phases
         /// <param name="obj"></param>
         public async CTask OnStep703(UnityEngine.Object obj)
         {
+            
+            pgm.StepInit();
+            await TimerComponent.Instance.WaitAsync(100);
+            
             GameObject gameObject = UIManager.Instance.GetComponent<ShopGachaPanel>().Btn_LingQu.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
@@ -148,6 +159,9 @@ namespace Fort23.Mono.Phases
         /// <param name="obj"></param>
         public async CTask OnStep704(UnityEngine.Object obj)
         {
+            pgm.StepInit();
+            await TimerComponent.Instance.WaitAsync(100);
+            
             GameObject gameObject = UIManager.Instance.GetComponent<ShopPanel>()._shopBtnWidgets[1].own;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
@@ -168,8 +182,11 @@ namespace Fort23.Mono.Phases
         /// <param name="obj"></param>
         public async CTask OnStep705(UnityEngine.Object obj)
         {
+            pgm.StepInit();
+            await TimerComponent.Instance.WaitAsync(100);
+            
             GameObject gameObject =
-                (UIManager.Instance.GetComponent<ShopPanel>()._shopGroupWidgetType1s[1] as ShopGroupWidgetType1)
+                (UIManager.Instance.GetComponent<ShopPanel>()._shopGroupWidgetType1s[0] as ShopGroupWidgetType1)
                 ._shopItemWidgetType2s[4].own;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
@@ -190,6 +207,9 @@ namespace Fort23.Mono.Phases
         /// <param name="obj"></param>
         public async CTask OnStep706(UnityEngine.Object obj)
         {
+            pgm.StepInit();
+            await TimerComponent.Instance.WaitAsync(100);
+            
             GameObject gameObject =
                 UIManager.Instance.GetComponent<ShopBuyItemPanel>().Btn_Function.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);

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

@@ -119,15 +119,16 @@ namespace Fort23.Mono.Phases
             pgm.StepInit();
 
             await pgm.ConfigLogic(803, delegate() { pgm.NextGuide(); });
-            UIManager.Instance.HideUIUIPanel<GachaPanel>();
 
-            UIManager.Instance.HideUIUIPanel<BoxPanel>();
         }
 
         public async CTask OnStepEnd(UnityEngine.Object obj)
         {
             pgm.StepInit();
             pgm.SetBlackBaseVisiable(false);
+            await UIManager.Instance.HideUIUIPanel<GachaPanel>();
+
+            UIManager.Instance.HideUIUIPanel<BoxPanel>();
             ForceGuideOver();
         }
 

Assets/Scripts/GameUI/UI/ShopPanel/ShopPanel.cs

@@ -125,6 +125,11 @@ namespace Fort23.Mono
 
         private async void OnClick(ItemWidgetBasic obj)
         {
+            if (PlayerGuideManager.Instance.GuideIsCanDo(7, 1))
+            {
+                PlayerGuideManager.Instance.NextGuide();
+            }
+
             ShopBtnWidget shopBtnWidget = obj as ShopBtnWidget;
             TitlePanel.OpenPanel(shopBtnWidget.ShopGroupConfig.titleShowItemIds.ToList());
             Text_Title.text = LanguageManager.Instance.Text(shopBtnWidget.ShopGroupConfig.shopName);
@@ -173,10 +178,6 @@ namespace Fort23.Mono
             }
 
 
-            if (PlayerGuideManager.Instance.GuideIsCanDo(7, 1))
-            {
-                PlayerGuideManager.Instance.NextGuide();
-            }
             if (PlayerGuideManager.Instance.GuideIsCanDo(7, 4))
             {
                 PlayerGuideManager.Instance.NextGuide();