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

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.20279515
+    - _Alpha: 0.2087822
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.20877719
+    - _MainTexOffsetU: 0.20158291
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/Config/LanguageChineseConfig.json

@@ -938,55 +938,55 @@
     },
     {
       "ID": 235,
-      "txt": "前期."
+      "txt": "前期"
     },
     {
       "ID": 236,
-      "txt": "中期."
+      "txt": "中期"
     },
     {
       "ID": 237,
-      "txt": "后期."
+      "txt": "后期"
     },
     {
       "ID": 238,
-      "txt": "一重"
+      "txt": ".一重"
     },
     {
       "ID": 239,
-      "txt": "二重"
+      "txt": ".二重"
     },
     {
       "ID": 240,
-      "txt": "三重"
+      "txt": ".三重"
     },
     {
       "ID": 241,
-      "txt": "四重"
+      "txt": ".四重"
     },
     {
       "ID": 242,
-      "txt": "五重"
+      "txt": ".五重"
     },
     {
       "ID": 243,
-      "txt": "六重"
+      "txt": ".六重"
     },
     {
       "ID": 244,
-      "txt": "七重"
+      "txt": ".七重"
     },
     {
       "ID": 245,
-      "txt": "八重"
+      "txt": ".八重"
     },
     {
       "ID": 246,
-      "txt": "九重"
+      "txt": ".九重"
     },
     {
       "ID": 247,
-      "txt": "十重"
+      "txt": ".十重"
     },
     {
       "ID": 248,
@@ -38554,7 +38554,7 @@
     },
     {
       "ID": 10379,
-      "txt": "该任务需要先解锁[{0}],完成{1}个事件后,可解锁."
+      "txt": "该主线尚未解锁，需再完成{0}个事件"
     },
     {
       "ID": 10380,
@@ -38718,7 +38718,7 @@
     },
     {
       "ID": 10420,
-      "txt": "仙缘宝券可以兑换稀有资源，我们先去兑换一些妖丹。"
+      "txt": "这里可以用代金卷免费兑换稀有资源"
     },
     {
       "ID": 10421,
@@ -38726,7 +38726,7 @@
     },
     {
       "ID": 10422,
-      "txt": "先花328买3280个妖丹吧！"
+      "txt": "这里可以用代金卷免费兑换稀有资源"
     },
     {
       "ID": 10423,

Assets/Res/Config/ReddotConfig.json

@@ -3,6 +3,9 @@
     {
       "ID": 1,
       "GroupID": 1,
+      "LinkGroupID": [
+        14
+      ],
       "EnableForTarget": 0,
       "Layer": 1,
       "Enable": 1
@@ -99,6 +102,13 @@
       "EnableForTarget": 0,
       "Layer": 1,
       "Enable": 1
+    },
+    {
+      "ID": 14,
+      "GroupID": 14,
+      "EnableForTarget": 0,
+      "Layer": 1,
+      "Enable": 1
     }
   ]
 }

Assets/Res/UI/DivineSence/ComBatFrontPanel.prefab

@@ -602,7 +602,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: -13, y: 21}
+  m_AnchoredPosition: {x: -1, y: 43}
   m_SizeDelta: {x: 295, y: 179}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7772893736343577417
@@ -1406,13 +1406,17 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 87.7
       objectReference: {fileID: 0}
+    - target: {fileID: 3144987251888430088, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: -132.16257
+      objectReference: {fileID: 0}
     - target: {fileID: 3144987251888430088, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 10.8
+      value: 17
       objectReference: {fileID: 0}
     - target: {fileID: 3144987251888430088, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -38.5
+      value: -40.08128
       objectReference: {fileID: 0}
     - target: {fileID: 3195684101753423275, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_FontData.m_Alignment
@@ -1448,11 +1452,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9156683410866268513, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 51.2
+      value: 36
       objectReference: {fileID: 0}
     - target: {fileID: 9156683410866268513, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 30.2
+      value: 27
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Res/UI/DivineSence/ComBatFrontWidget.prefab

@@ -595,8 +595,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: 75.26347, y: -43.400818}
-  m_SizeDelta: {x: -185.763, y: -131.8486}
+  m_AnchoredPosition: {x: 45.6905, y: -41.66256}
+  m_SizeDelta: {x: -151.381, y: -135.32512}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6875849157855808906
 CanvasRenderer:
@@ -628,10 +628,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 40
+    m_FontSize: 28
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 4
+    m_MinSize: 2
     m_MaxSize: 40
     m_Alignment: 3
     m_AlignByGeometry: 0
@@ -639,7 +639,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u7B51\u57FA\u524D\u671F"
+  m_Text: "\u7B51\u57FA\u524D\u671F.\u7B2C\u4E00\u91CD"
 --- !u!114 &4491841701166917159
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -652,7 +652,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  effectColor: {r: 0.10196079, g: 0.17254902, b: 0.07450981, a: 1}
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
   effectDistanceX: 2
   effectDistanceY: 2
   samplingRate: 10
@@ -772,7 +772,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: 114.32349, y: 22.523483}
+  m_AnchoredPosition: {x: 69.2, y: 22.523483}
   m_SizeDelta: {x: 42.1514, y: 42.1514}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &2055311934404833937

Assets/Res/UI/MainHeroPanel/FaBaoSkillWidget.prefab

@@ -443,8 +443,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: 31.3, y: -1.7}
-  m_SizeDelta: {x: 227.8363, y: 61.48}
+  m_AnchoredPosition: {x: 114.68706, y: -1.7}
+  m_SizeDelta: {x: 394.6104, y: 61.48}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1155897890668048683
 CanvasRenderer:

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -1443,6 +1443,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7820611370538219087}
+  - {fileID: 7203466323980298071}
   m_Father: {fileID: 6870355629153732168}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -2086,7 +2087,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8355865228313168032
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2219,7 +2220,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3727605509090450065
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2236,8 +2237,8 @@ RectTransform:
   - {fileID: 5985873034990668332}
   - {fileID: 4047916813180227560}
   - {fileID: 111880961769183880}
-  - {fileID: 8355865228313168032}
   - {fileID: 1450357347166671142}
+  - {fileID: 8355865228313168032}
   m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -7739,6 +7740,116 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
   m_PrefabInstance: {fileID: 4131293543597701602}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &4794029153667740339
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 4487645842108660236}
+    m_Modifications:
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Pivot.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 3.9634461
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -13.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -6.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2789586574518551789, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3073202858500431554, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Name
+      value: RedDotCom
+      objectReference: {fileID: 0}
+    - target: {fileID: 4409762847385456447, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: RedDotConfigId
+      value: 14
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+--- !u!224 &7203466323980298071 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+  m_PrefabInstance: {fileID: 4794029153667740339}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7547607250917142542
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scripts/GameLogic/RedDot/RedDotData.cs

@@ -47,12 +47,14 @@ namespace Fort23.Mono
                 //上阵的功法可以升级显示红点
                 case 1:
                     isEnable = false;
-                    switch (EnableId) 
+                    switch (EnableId)
                     {
                         case 0: //没有自己的红点逻辑根据下层红点来决定
                             isEnable = RedDotManager.Instance.AllRedDotGroupData[GroupId].TargetLayerIsEnable(Layer);
                             break;
                         case 1:
+
+
                             foreach (var _skillInfo in PlayerManager.Instance.GongFaControl.allSkill)
                             {
                                 if (RedDotManager.Instance.isSkillStar(_skillInfo))
@@ -62,7 +64,7 @@ namespace Fort23.Mono
                                 }
                             }
 
-                         
+
                             foreach (var _skillInfo in PlayerManager.Instance.GongFaControl.allUseSkill)
                             {
                                 if (RedDotManager.Instance.isSkillUpgradeDaYu4(_skillInfo))
@@ -75,11 +77,41 @@ namespace Fort23.Mono
                             break;
                     }
 
+                    break;
+
+                case 14:
+                    isEnable = false;
+                    switch (EnableId)
+                    {
+                        case 0: //没有自己的红点逻辑根据下层红点来决定
+                            isEnable = RedDotManager.Instance.AllRedDotGroupData[GroupId].TargetLayerIsEnable(Layer);
+                            break;
+                        case 1:
+
+                            int count = 0;
+                            for (var i = 0; i < PlayerManager.Instance.GongFaControl.allUseSkill.Length; i++)
+                            {
+                                if (PlayerManager.Instance.GongFaControl.allUseSkill[i] != null &&
+                                    PlayerManager.Instance.GongFaControl.allUseSkill[i].skillConfig.SkillType == 1)
+                                {
+                                    count++;
+                                }
+                            }
+
+                            if (count < PlayerManager.Instance.myHero.powerUpConfig.MaxActiveGongfaNum)
+                            {
+                                isEnable = true;
+                            }
+
+
+                            break;
+                    }
+
                     break;
                 //境界升级
-                case 5: 
+                case 5:
                     isEnable = false;
-                    switch (EnableId) 
+                    switch (EnableId)
                     {
                         case 0: //没有自己的红点逻辑根据下层红点来决定
                             isEnable = RedDotManager.Instance.AllRedDotGroupData[GroupId].TargetLayerIsEnable(Layer);

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -703,7 +703,6 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 {
                     TipMessagePanel tipMessagePanel = await TipMessagePanel.OpenTipMessagePanel(
                         LanguageManager.Instance.Text(10379,
-                            LanguageManager.Instance.Text(lastSmallPlacesConfig.placeName),
                             lastSmallPlacesConfig.CompletionEventCount - lastSmallPlacesData?.completionEventCount));
                     if (PlayerGuideManager.Instance.GuideIsCanDo(3))
                     {

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

@@ -165,7 +165,7 @@ namespace Fort23.Mono
                     allKongSkill[i].InitWidget(allKongSkill[i].index, this);
                 }
 
-                for (var i = 0; i < indexList.Count; i++)
+                for (var i = 0; i < indexList.Count - 1; i++)
                 {
                     if (skills[i] == null)
                         continue;
@@ -181,7 +181,10 @@ namespace Fort23.Mono
                 isAlter = true;
 
                 UpdateSkillWidget();
+                ChangeFuZhuYingXiang();
                 BaoChun();
+
+                RedDotManager.Instance.TarGetRedDotUpDate(14);
             });
 
             Btn_ChangeOk.onClick.AddListener(() =>
@@ -384,6 +387,7 @@ namespace Fort23.Mono
                 showSkillInfo.Sort(Sort);
                 Content.Init(this, showSkillInfo.Count);
                 AudioManager.Instance.PlayAudio("ui_xiazhenggongfa.wav");
+                RedDotManager.Instance.TarGetRedDotUpDate(14);
             });
 
             Sv.onValueChanged.AddListener((s) =>
@@ -845,7 +849,7 @@ namespace Fort23.Mono
                 CloseSelect();
                 BaoChun();
 
-
+                RedDotManager.Instance.TarGetRedDotUpDate(14);
                 showSkillInfo.Sort(Sort);
                 Content.Init(this, showSkillInfo.Count);
             }
@@ -1176,6 +1180,7 @@ namespace Fort23.Mono
             }
         }
 
+
         List<int> yingxiang = new List<int>();
 
         private void CloseSelect()

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

@@ -113,10 +113,15 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep103(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            
+            PlayerGuideManager.Instance.SetOnClickMask(true);
+            await TimerComponent.Instance.WaitAsync(100);
+          
+            
             GameObject gameObject = UIManager.Instance.GetComponent<MainPanel>().Btn_StartEvent.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
-
+            PlayerGuideManager.Instance.SetOnClickMask(false);
             pgm.SetfxTransVisiable(true);
             pgm.SetMaskTarget(gameObject);
             pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);

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

@@ -86,6 +86,9 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep401(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
+            await TimerComponent.Instance.WaitAsync(100);
+       
             GameObject gameObject = UIManager.Instance.GetComponent<AppBarPanel>().Btn_GongFa.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
@@ -94,7 +97,7 @@ namespace Fort23.Mono.Phases
             pgm.SetfxTransVisiable(true);
             pgm.SetMaskTarget(gameObject);
             pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);
-
+            PlayerGuideManager.Instance.SetOnClickMask(false);
             await pgm.ConfigLogic(401, delegate() { });
 
             pgm.SetFingerPos(localPos);

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

@@ -30,7 +30,7 @@ namespace Fort23.Mono.Phases
             actionList.Add(OnStep703);
             actionList.Add(OnStep704);
             actionList.Add(OnStep705);
-            actionList.Add(OnStep706);
+            // actionList.Add(OnStep706);
             actionList.Add(OnStepEnd);
         }
 
@@ -181,21 +181,8 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep705(UnityEngine.Object obj)
         {
             pgm.StepInit();
-            await TimerComponent.Instance.WaitAsync(100);
-
-            GameObject gameObject =
-                (UIManager.Instance.GetComponent<ShopPanel>()._shopGroupWidgetType1s[0] as ShopGroupWidgetType1)
-                ._shopItemWidgetType2s[4].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(705, delegate() { });
 
-            pgm.SetFingerPos(localPos);
-            pgm.SetFingerVisiable(true);
+            await pgm.ConfigLogic(705, delegate() { pgm.NextGuide(); });
         }
 
 

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -82,7 +82,7 @@ namespace Fort23.Mono
                     for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length; i++)
                     {
                         bool isHave = false;
-                        for (var i1 = 1; i1 < breakthroughItemWidgets.Count; i1++)
+                        for (var i1 = 0; i1 < breakthroughItemWidgets.Count; i1++)
                         {
                             if (breakthroughItemWidgets[i1].itemInfo != null &&
                                 PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i] ==
@@ -432,7 +432,7 @@ namespace Fort23.Mono
                         ? 0
                         : heroPowerUpConfig.DujieItemIDs.Length;
                     for (int i = 0;
-                         i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + dujieItemCount;
+                         i < heroPowerUpConfig.DujieMustItemIDs.Length + dujieItemCount;
                          i++)
                     {
                         cTaskAwaitBuffer.AddTask(
@@ -441,19 +441,19 @@ namespace Fort23.Mono
 
                     breakthroughItemWidgets = await cTaskAwaitBuffer.WaitAll();
 
-                    breakthroughItemWidgets[0].CustomInit(1, 0, false);
+                    // breakthroughItemWidgets[0].CustomInit(1, 0, false);
 
 
                     //必选道具
                     for (var i = 0; i < heroPowerUpConfig.DujieMustItemIDs.Length; i++)
                     {
-                        breakthroughItemWidgets[i + 1].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i], true);
+                        breakthroughItemWidgets[i ].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i], true);
                     }
 
                     //可选道具
                     for (var i = 0; i < heroPowerUpConfig.DujieItemIDs?.Length; i++)
                     {
-                        breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1]
+                        breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length ]
                             .CustomInit(2, heroPowerUpConfig.DujieItemIDs[i], false);
                     }
 

UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615