Merge remote-tracking branch 'origin/master'

Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -2700,7 +2700,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6E21\u52AB"
+  m_Text: "\u7A81\u7834"
 --- !u!114 &4656492321929155628
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3586,7 +3586,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_xiulianDujie
+  _icon_name: btn_xiulianTupo
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
   packInfo:

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 8027710173212846871}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: bg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3639,6 +3639,7 @@ RectTransform:
   m_Children:
   - {fileID: 2394298463810824802}
   - {fileID: 8010219124151300276}
+  - {fileID: 5165456385084390663}
   - {fileID: 1713729240865209901}
   - {fileID: 7440752129834858667}
   - {fileID: 8258499293957039645}
@@ -4195,7 +4196,7 @@ GameObject:
   - component: {fileID: 9215601903000794814}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage (1)
+  m_Name: bg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -4271,6 +4272,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &7840973239030215349
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5165456385084390663}
+  - component: {fileID: 1035588383843407233}
+  - component: {fileID: 4903205536107700407}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_EventSuo
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5165456385084390663
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7840973239030215349}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 86604009502899239}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -18.149994, y: -11.5}
+  m_SizeDelta: {x: 22, y: 20}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &1035588383843407233
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7840973239030215349}
+  m_CullTransparentMesh: 1
+--- !u!114 &4903205536107700407
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7840973239030215349}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_map_suo
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: e09f56329289dea619e61cb78606497c
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &8048350266640076490
 GameObject:
   m_ObjectHideFlags: 0
@@ -5420,6 +5510,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_EventSuo
+    gameObject: {fileID: 4903205536107700407}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1001 &2784359978076376180
 PrefabInstance:

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -777,7 +777,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         CurrentEventList = evt;
         CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
-        await DialogueManager.Instance.StartDialogue(CurrentEventList, dialogueID, eventConfig.ID, () =>
+        await DialogueManager.Instance.StartDialogue(CurrentEventList, dialogueID, eventConfig.ID, async() =>
         {
             EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(CurrentEventList.eventID);
             if (eventConfig.EventTriggerType != 4)
@@ -791,6 +791,12 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
                 onCompleteCallback?.Invoke();
                 onCompleteCallback = null;
+                if (eventConfig.ID != 10001)
+                {
+                    await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
+                    UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
+                }
+     
                 EventManager.Instance.Dispatch(CustomEventType.CompleteUpdate, null);
             }
 

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -213,9 +213,12 @@ namespace Fort23.Mono
                 return;
             AudioManager.Instance.PlayAudio("ui_shengshitansuo.wav");
             if (PlayerGuideManager.Instance.curPhase == 2)
+            {
                 PlayerGuideManager.Instance.StepInit();
-            if (PlayerGuideManager.Instance.curPhase == 3)
-                PlayerGuideManager.Instance.StepInit();
+                PlayerGuideManager.Instance.SetOnClickMask(true);
+            }
+                
+    
 
             EventSystemManager.Instance.isTriggerEvent = true;
             CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoPanel.cs

@@ -173,7 +173,7 @@ namespace Fort23.Mono
 
             for (var i = 0; i < Text_qs.Count; i++)
             {
-                Text_qs[i].text = $"{probabilities[i] * 100:F2}%";
+                Text_qs[i].text = $"{probabilities[i] * 100:F1}%";
             }
 
             DivineSenceInfoBtnWidget divineSenceInfoBtnWidget =

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

@@ -136,7 +136,7 @@ namespace Fort23.Mono.Phases
         {
             pgm.StepInit();
             await TimerComponent.Instance.WaitAsync(100);
-
+            PlayerGuideManager.Instance.SetOnClickMask(false);
             GameObject gameObject =
                 UIManager.Instance.GetComponent<DivineSenceEventPreviewPanel>().ContentRoot.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);

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

@@ -128,8 +128,9 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep302(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
-
+            PlayerGuideManager.Instance.SetOnClickMask(false);
             GameObject gameObject =
                 UIManager.Instance.GetComponent<DivineSenceEventPreviewPanel>().ContentRoot.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);

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

@@ -108,8 +108,8 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep402(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
-
             Vector2 size = new Vector2(735, 785);
             Vector3 localPos = new Vector2(0, -279);
             pgm.SetfxTransVisiable(true);
@@ -120,6 +120,7 @@ namespace Fort23.Mono.Phases
 
             pgm.SetFingerPos(localPos);
             pgm.SetFingerVisiable(true);
+            PlayerGuideManager.Instance.SetOnClickMask(false);
         }
 
 
@@ -130,9 +131,9 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep403(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
 
-
             pgm.SetfxTransVisiable(true);
 
             Vector2 size = new Vector2(743, 690);
@@ -143,6 +144,7 @@ namespace Fort23.Mono.Phases
 
             pgm.SetFingerPos(localPos);
             pgm.SetFingerVisiable(true);
+            PlayerGuideManager.Instance.SetOnClickMask(false);
         }
 
         /// <summary>
@@ -152,8 +154,9 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep404(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
-
+        
             GameObject gameObject =
                 UIManager.Instance.GetComponent<SkillSelectPanel>().Btn_Setting.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
@@ -167,6 +170,7 @@ namespace Fort23.Mono.Phases
 
             pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
             pgm.SetFingerVisiable(true);
+            PlayerGuideManager.Instance.SetOnClickMask(false);
         }
 
 
@@ -177,6 +181,7 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep405(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
 
             SkillSelectPanel skillSelectPanel =
@@ -204,6 +209,7 @@ namespace Fort23.Mono.Phases
 
             pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
             pgm.SetFingerVisiable(true);
+            PlayerGuideManager.Instance.SetOnClickMask(false);
         }
 
         /// <summary>
@@ -213,8 +219,9 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep406(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
-
+            PlayerGuideManager.Instance.SetOnClickMask(false);
 
             await pgm.ConfigLogic(406, delegate() { pgm.NextGuide(); });
         }
@@ -227,6 +234,7 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep407(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
 
             GameObject gameObject =
@@ -242,6 +250,7 @@ namespace Fort23.Mono.Phases
 
             pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
             pgm.SetFingerVisiable(true);
+            PlayerGuideManager.Instance.SetOnClickMask(false);
         }
         
         /// <summary>
@@ -251,6 +260,7 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep408(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
             SkillSelectPanel skillSelectPanel =
                 UIManager.Instance.GetComponent<SkillSelectPanel>();
@@ -275,6 +285,7 @@ namespace Fort23.Mono.Phases
 
             pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
             pgm.SetFingerVisiable(true);
+            PlayerGuideManager.Instance.SetOnClickMask(false);
         }
 
         
@@ -285,6 +296,7 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep409(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
 
             GameObject gameObject =
@@ -300,6 +312,7 @@ namespace Fort23.Mono.Phases
 
             pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
             pgm.SetFingerVisiable(true);
+            PlayerGuideManager.Instance.SetOnClickMask(false);
         }
 
 
@@ -310,6 +323,7 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep410(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
 
             GameObject gameObject =
@@ -325,6 +339,7 @@ namespace Fort23.Mono.Phases
 
             pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
             pgm.SetFingerVisiable(true);
+            PlayerGuideManager.Instance.SetOnClickMask(false);
         }
 
         public async CTask OnStepEnd(UnityEngine.Object obj)

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -438,6 +438,51 @@ namespace Fort23.Mono
                 Text_EventName.text = LanguageManager.Instance.Text(randomEventConfig.EventName);
                 Text_EventTag.text = EventHelper.GetEventType(randomEventConfig.EventTag);
 
+
+                SmallPlacesConfig smallPlacesConfig =
+                    ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
+                bool isUlock = true;
+                if (randomEventConfig.SmallPlacesId > 0)
+                {
+                    if (randomEventConfig.SmallPlacesId != PlayerManager.Instance.CurrentsmallPlaces.id)
+                    {
+                        AccountFileInfo.SmallPlacesData lastSmallPlacesData =
+                            PlayerManager.Instance.GetSmallPlacesData(randomEventConfig.SmallPlacesId - 1);
+                        SmallPlacesConfig lastSmallPlacesConfig =
+                            ConfigComponent.Instance.Get<SmallPlacesConfig>(randomEventConfig.SmallPlacesId - 1);
+
+                        SmallPlacesConfig currentSmallPlacesConfig =
+                            ConfigComponent.Instance.Get<SmallPlacesConfig>(randomEventConfig.SmallPlacesId);
+                        if (currentSmallPlacesConfig.ID > 1 && (lastSmallPlacesData == null ||
+                                                                lastSmallPlacesData.completionEventCount <
+                                                                lastSmallPlacesConfig.CompletionEventCount))
+                        {
+                            isUlock = false;
+                        }
+
+                        if (lastSmallPlacesConfig.UnlockEnvetid != 0)
+                        {
+                            AccountFileInfo.EventList eventList1 =
+                                AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce =>
+                                    ce.eventID == lastSmallPlacesConfig.UnlockEnvetid);
+                            if (eventList1 == null || !eventList1.isCompleted)
+                            {
+                                isUlock = false;
+                                return;
+                            }
+                        }
+                    }
+                }
+
+                // else if (randomEventConfig.placeID > 0)
+                // {
+                //     if (randomEventConfig.placeID != smallPlacesConfig.PlacesId)
+                //     {
+                //         
+                //     }
+                // }
+                Icon_EventSuo.gameObject.SetActive(!isUlock);
+
                 AccountFileInfo.EventLinkData eventLinkData =
                     eventList.eventLinks.FirstOrDefault(el => el.eventLinkId == eventList.curStep);
 

Assets/Scripts/GameUI/UI/MainPanel/MainPanelData.cs

@@ -329,6 +329,17 @@ namespace Fort23.Mono
 	      return _fx_ui_fengling_loop;
 	     }
 	   }
+	  private MyImage _Icon_EventSuo;
+	  public MyImage Icon_EventSuo
+	   {
+	   get{
+	      if (_Icon_EventSuo == null)
+	       {
+	         _Icon_EventSuo  = GetUIUnit<MyImage>("Icon_EventSuo"); 
+	       }
+	      return _Icon_EventSuo;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/QiankundaiPanel/QiankundaiPanel.cs

@@ -73,6 +73,8 @@ namespace Fort23.Mono
 
                 RewardsPanel.OpenPanel(itemInfos);
                 CustomInit();
+                
+                RedDotManager.Instance.AllRedDotUpDate();
             });
 
             Btn_XiangQing.onClick.AddListener(() => { QiankundaiInfoPanel.OpenPanel(); });
@@ -97,12 +99,37 @@ namespace Fort23.Mono
                 LanguageManager.Instance.Text(10172,
                     UtilTools.TimeToHSM(AccountFileInfo.Instance.playerData.QiankundaiDropTimer),
                     UtilTools.TimeToHSM(PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime));
+    
+            
+            
+            //可以掉落每日刷新奖励
+            if (TimeHelper.ClientNow() >= AccountFileInfo.Instance.playerData.QiankundaiLingQuDailyDropTime)
+            {
+                List<QiankundaiConfig> qiankundaiConfigs = PlayerManager.Instance.GetFixedTimeQiankundaiConfigs();
+                foreach (var qiankundaiConfig in qiankundaiConfigs)
+                {
+                    for (var i = 0; i < qiankundaiConfig.ChoukaID.Length; i++)
+                    {
+                        List<ItemInfo> itemInfo = DropManager.Instance.Drop(qiankundaiConfig.ChoukaID[i],
+                            qiankundaiConfig.DropCount[i]);
+                        foreach (var info in itemInfo)
+                        {
+                            WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
+                            widgetItem.InitWidget(info);
+                            items.Add(widgetItem);
+                        }
+                    }
+                }
+            }
+            
+            
             foreach (var playerDataQiankundaiItemData in AccountFileInfo.Instance.playerData.QiankundaiItemDatas)
             {
                 WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
                 widgetItem.InitWidget(new ItemInfo(playerDataQiankundaiItemData));
                 items.Add(widgetItem);
             }
+
         }
 
         public static async CTask OpenPanel()

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -88,6 +88,7 @@ namespace Fort23.Mono
                 }
 
                 UpdateRestBtn();
+                PlayerManager.Instance.myHero.ComputeHeroInfo();
                 AccountFileInfo.Instance.SavePlayerData();
             });
             Btn_LingWu.onClick.AddListener(() =>
@@ -140,6 +141,7 @@ namespace Fort23.Mono
 
                 UpdateRestBtn();
                 UpdateUi();
+                PlayerManager.Instance.myHero.ComputeHeroInfo();
                 currentSentimentEffectWidget.CustomInit(curretnSentimentProperty);
             });
         }

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

@@ -5,6 +5,8 @@ using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Bag;
+using GameLogic.Hero;
+using Utility;
 
 namespace Fort23.Mono
 {
@@ -33,6 +35,7 @@ namespace Fort23.Mono
             {
                 PlayerGuideManager.Instance.NextGuide();
             }
+
             return base.GetFocus();
         }
 
@@ -50,7 +53,40 @@ namespace Fort23.Mono
             itemWidget.InitWidget(new ItemInfo(_shopItemConfig.itemId[0], _shopItemConfig.itemCount[0]));
             ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(_shopItemConfig.itemId[0]);
             Text_name.text = LanguageManager.Instance.Text(itemConfig.itemName);
-            Text_desc.text = LanguageManager.Instance.Text(itemWidget.itemInfo.config.itemDesc);
+
+
+            //法宝
+            if (itemWidget.itemInfo.config.itemTag == 11)
+            {
+                AccountFileInfo.FaBaoData faaData = new AccountFileInfo.FaBaoData();
+                faaData.id = itemWidget.itemInfo.config.associateVlaue[1];
+                faaData.level = 1;
+                faaData.useIndex = -1;
+                FaBaoInfo faBaoInfo = new FaBaoInfo(faaData);
+                Text_desc.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec),
+                    faBaoInfo.effectValue);
+            }
+            //功法
+            else if (itemWidget.itemInfo.config.itemTag == 13)
+            {
+                AccountFileInfo.SkillData skillData = new AccountFileInfo.SkillData();
+                skillData.id = itemWidget.itemInfo.config.associateVlaue[1];
+                skillData.star = 1;
+                skillData.level = 1;
+                skillData.useIndex = -1;
+                SkillInfo skillInfo = new SkillInfo(skillData);
+
+                SkillConfig skillConfig =
+                    ConfigComponent.Instance.Get<SkillConfig>(itemConfig.associateVlaue[1] * 10 + 1);
+                Text_desc.text =
+                    UtilTools.GetString(LanguageManager.Instance.Text(skillConfig.dec), skillInfo.effectValue);
+            }
+            else
+            {
+                Text_desc.text = LanguageManager.Instance.Text(itemWidget.itemInfo.config.itemDesc);
+            }
+
+
             Text_ItemCount.text =
                 "当前持有：" + PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.itemId[0]);
             // UseSlider.value = 1;
@@ -156,7 +192,7 @@ namespace Fort23.Mono
         {
             _buyMark = true;
             UIManager.Instance.HideUIUIPanel(this);
-            
+
             if (PlayerGuideManager.Instance.GuideIsCanDo(7, 6))
             {
                 PlayerGuideManager.Instance.NextGuide();