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

# Conflicts:
#	Assets/Res/Config/SentimentEffectConfig.json   resolved by master version

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -309,40 +309,48 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 bool isRefence = false;
                 foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)
                 {
-                    EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
-                    for (var i1 = 0; i1 < eventConfig.RelatedEvents?.Length; i1++)
+                    foreach (var eventListEventLink in eventList.eventLinks)
                     {
-                        EventConfig eventConfig1 = ConfigComponent.Instance.Get<EventConfig>(eventConfig.RelatedEvents[i1]);
-                        int count = 0;
-                        foreach (var list in eventLists)
+                        foreach (var eventConditionData in eventListEventLink.eventConditions)
                         {
-                            if (list.eventID == eventConfig1.ID)
+                            if (IsEvenkLinkComplete(eventConditionData))
+                                continue;
+                            EventConditionConfig eventConditionConfig = ConfigComponent.Instance.Get<EventConditionConfig>(eventConditionData.eventCondition);
+                            for (var i1 = 0; i1 < eventConditionConfig.RelatedEvents?.Length; i1++)
                             {
-                                count++;
+                                EventConfig eventConfig1 = ConfigComponent.Instance.Get<EventConfig>(eventConditionConfig.RelatedEvents[i1]);
+                                int count = 0;
+                                foreach (var list in eventLists)
+                                {
+                                    if (list.eventID == eventConfig1.ID)
+                                    {
+                                        count++;
+                                    }
+                                }
+
+                                if (GetBagEventCount(eventConfig1.ID) + count >= eventConfig1.RefreshCount)
+                                {
+                                    continue;
+                                }
+
+                                int randomValue4 = Random.Range(0, 101);
+                                if (randomValue4 <= eventConfig1.RefreshProbability)
+                                {
+                                    var eventList1 = AddEvent(eventConfig1.ID);
+                                    if (eventList1 != null)
+                                    {
+                                        eventLists.Add(AddEvent(eventConfig1.ID));
+                                        isRefence = true;
+                                    }
+                                    else
+                                    {
+                                        LogTool.Error("管理事件没有刷新出来 id:" + eventConfig1.ID);
+                                    }
+
+                                    break;
+                                }
                             }
                         }
-
-                        if (GetBagEventCount(eventConfig1.ID) + count >= eventConfig1.RefreshCount)
-                        {
-                            continue;
-                        }
-
-                        int randomValue4 = Random.Range(0, 101);
-                        if (randomValue4 <= eventConfig1.RefreshProbability)
-                        {
-                            var eventList1 = AddEvent(eventConfig1.ID);
-                            if (eventList1 != null)
-                            {
-                                eventLists.Add(AddEvent(eventConfig1.ID));
-                                isRefence = true;
-                            }
-                            else
-                            {
-                                LogTool.Error("管理事件没有刷新出来 id:" + eventConfig1.ID);
-                            }
-
-                            break;
-                        }
                     }
                 }
 
@@ -837,13 +845,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 itemInfos.Add(new ItemInfo(eventConfig.PrizeIDs[i], eventConfig.PrizeNums[i]));
             }
         }
-        
+
         foreach (var eventListItemInfo in eventList.itemInfos)
         {
             itemInfos.Add(new ItemInfo(eventListItemInfo));
         }
 
-       
+
         PlayerManager.Instance.BagController.AddItem(itemInfos);
         RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(itemInfos);
         await rewardsPanel.UIClosed();

Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs

@@ -39,12 +39,14 @@ namespace Fort23.Mono
             itemDetailsWidget1.CustomInit("用途", LanguageManager.Instance.Text(itemInfo.config.itemDesc));
             itemDetailsWidgets.Add(itemDetailsWidget1);
 
+            //突破丹
             if (itemInfo.config.associateID == 1)
             {
                 ItemDetailsWidget itemDetailsWidge2 = await UIManager.Instance.CreateGComponent<ItemDetailsWidget>(null, Connect);
                 itemDetailsWidge2.CustomInit("服用效果", $"增加成功概率{itemInfo.config.associateVlaue[2]},突破失败降低修为损耗{itemInfo.config.associateVlaue[3]}%");
                 itemDetailsWidgets.Add(itemDetailsWidge2);
             }
+            //修为丹
             else if (itemInfo.config.associateID == 2)
             {
                 ItemDetailsWidget itemDetailsWidge2 = await UIManager.Instance.CreateGComponent<ItemDetailsWidget>(null, Connect);