修改表

Assets/Res/Config/EventConfig.json

@@ -22,8 +22,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 8,
+      "XiantuID": 4,
       "EventConditionId": 3,
       "EventValue": [
         5
@@ -56,8 +56,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 9,
+      "XiantuID": 4,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 175,
@@ -87,8 +87,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 3,
-      "XiantuID": 2,
+      "placeID": 10,
+      "XiantuID": 4,
       "EventConditionId": 1,
       "EventValue": [
         1004
@@ -115,8 +115,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 3,
-      "XiantuID": 2,
+      "placeID": 5,
+      "XiantuID": 3,
       "EventConditionId": 7,
       "EventValue": [
         500
@@ -143,7 +143,7 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 2,
+      "placeID": 5,
       "XiantuID": 3,
       "EventConditionId": null,
       "EventCount": null,
@@ -168,7 +168,7 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 2,
+      "placeID": 6,
       "XiantuID": 3,
       "EventConditionId": null,
       "EventCount": null,
@@ -193,7 +193,7 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 2,
+      "placeID": 7,
       "XiantuID": 3,
       "EventConditionId": null,
       "EventCount": null,
@@ -414,7 +414,7 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 1,
+      "placeID": 2,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -442,7 +442,7 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 1,
+      "placeID": 3,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -464,7 +464,7 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 1,
+      "placeID": 4,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -698,8 +698,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 2,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 2067,
@@ -726,8 +726,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 2,
+      "XiantuID": 2,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 2069,
@@ -751,8 +751,8 @@
       ],
       "RefreshProbability": 30,
       "RefreshCount": 2,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 3,
+      "XiantuID": 2,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 2071,

Assets/Res/Config/XianTuLogConfig.json

@@ -12,13 +12,20 @@
       "EventType": 2,
       "Title": 2088,
       "Desc": 2090,
-      "BigMapID": 2
+      "BigMapID": 1
     },
     {
       "ID": 3,
       "EventType": 2,
       "Title": 2088,
       "Desc": 2090,
+      "BigMapID": 2
+    },
+    {
+      "ID": 4,
+      "EventType": 2,
+      "Title": 2088,
+      "Desc": 2090,
       "BigMapID": 3
     }
   ]

Assets/Res/UI/XianTuLogPanel/EventLogTitleWidget.prefab

@@ -31,15 +31,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 4472651858344574542}
-  - {fileID: 2541634502081460392}
-  - {fileID: 7765210620252892146}
+  - {fileID: 5817581626957223903}
   m_Father: {fileID: 0}
   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: -0.00019455, y: 509.2}
-  m_SizeDelta: {x: 750, y: 71.8862}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 375, y: -812}
+  m_SizeDelta: {x: 750, y: 71.88623}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7526096831240874525
 CanvasRenderer:
@@ -79,6 +77,7 @@ GameObject:
   - component: {fileID: 2541634502081460392}
   - component: {fileID: 2341308512790474187}
   - component: {fileID: 2194615720204698487}
+  - component: {fileID: 36250349546045231}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -99,12 +98,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 619117239873045918}
+  m_Father: {fileID: 5817581626957223903}
   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: -4.636217, y: 1.1000366}
-  m_SizeDelta: {x: 90.42, y: 55.0878}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 319.2211, y: -35.9431}
+  m_SizeDelta: {x: 187, y: 55.0878}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2341308512790474187
 CanvasRenderer:
@@ -147,7 +146,21 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5317\u6D77"
+  m_Text: "\u5317\u6D77(0/2)"
+--- !u!114 &36250349546045231
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4156922756538168925}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &6073252669721531231
 GameObject:
   m_ObjectHideFlags: 0
@@ -179,11 +192,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 619117239873045918}
+  m_Father: {fileID: 5817581626957223903}
   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: -193.9998, y: -0.5796509}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 201.9211, y: 2.3595}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6087876044226702029
@@ -267,11 +280,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 619117239873045918}
+  m_Father: {fileID: 5817581626957223903}
   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: 177.12073, y: -0.5796509}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 201.9211, y: 2.3595}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3667131906997300648
@@ -324,3 +337,93 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &6282881445875391342
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5817581626957223903}
+  - component: {fileID: 7730591695276860124}
+  - component: {fileID: 7687747220777130965}
+  - component: {fileID: 6429287572169146635}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Root
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5817581626957223903
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6282881445875391342}
+  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:
+  - {fileID: 4472651858344574542}
+  - {fileID: 2541634502081460392}
+  - {fileID: 7765210620252892146}
+  m_Father: {fileID: 619117239873045918}
+  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: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 71.8862}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7730591695276860124
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6282881445875391342}
+  m_CullTransparentMesh: 1
+--- !u!114 &7687747220777130965
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6282881445875391342}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 23.8
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &6429287572169146635
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6282881445875391342}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogInfoPanel.cs

@@ -121,7 +121,16 @@ namespace Fort23.Mono
                                 {
                                     XianTuLogInfoData xianTuLogInfoData1 = new XianTuLogInfoData();
                                     xianTuLogInfoData1.type = 3;
-                                    xianTuLogInfoData1.message = LanguageManager.Instance.Text(i);
+                                    if (eventLinkConfig.NPCID != 0)
+                                    {
+                                        xianTuLogInfoData1.message = $"<color=#A6A6A6>{LanguageManager.Instance.Text(i)}</color>";
+                                    }
+                                    else
+                                    {
+                                        xianTuLogInfoData1.message = $"<color=#867169>{LanguageManager.Instance.Text(i)}</color>";
+                                    }
+                                  
+                                  
                                     showXianTuLogInfoData.Add(xianTuLogInfoData1);
                                 }
                             }

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogPanel.cs

@@ -69,7 +69,7 @@ namespace Fort23.Mono
         {
             if (this.type == 1)
                 return;
-            Sv.transform.SetParent(MarskRoot1,false);
+            Sv.transform.SetParent(MarskRoot1, false);
             eventLogTitleWidget.own.gameObject.SetActive(false);
             ChangeList.ShowTargetIndex(0);
             Btn_XaiXuanClose.gameObject.SetActive(false);
@@ -91,11 +91,11 @@ namespace Fort23.Mono
         {
             if (this.type == 2)
                 return;
-            Sv.transform.SetParent(MarskRoot,false);
+            Sv.transform.SetParent(MarskRoot, false);
             eventLogTitleWidget.own.gameObject.SetActive(true);
             ChangeList.ShowTargetIndex(1);
             Btn_XaiXuanClose.gameObject.SetActive(false);
-            Btn_XaiXuan.gameObject.SetActive(false);
+            Btn_XaiXuan.gameObject.SetActive(true);
             bigMaoXaiXuan = 0;
             placesXaiXuan = 0;
             places.Clear();
@@ -106,7 +106,16 @@ namespace Fort23.Mono
             type = 2;
             shoeXianTuLogConfigs = GetTypeXiantuLogConfigs(type);
             XaiXuanMap(shoeXianTuLogConfigs);
-            eventLogTitleWidget.CustomInit(xianTuDatas[0].name);
+            if (xianTuDatas.Count > 0)
+            {
+                eventLogTitleWidget.own.SetActive(true);
+                eventLogTitleWidget.CustomInit(xianTuDatas[0].name);
+            }
+            else
+            {
+                eventLogTitleWidget.own.SetActive(false);
+            }
+
             Content.Init(this, xianTuDatas.Count);
         }
 
@@ -127,6 +136,8 @@ namespace Fort23.Mono
                         xianTuData2.xianTuLogConfig = xianTuLogConfig;
                         xianTuDatas.Add(xianTuData2);
                     }
+
+                    return;
                 }
                 else
                 {
@@ -139,53 +150,36 @@ namespace Fort23.Mono
 
                         xiantuMap[xianTuLogConfig.BigMapID].Add(xianTuLogConfig);
                     }
-
-                    foreach (var keyValuePair in xiantuMap)
-                    {
-                        XianTuData xianTuData = new XianTuData();
-                        xianTuData.type = 1;
-                        BigMapConfig bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(keyValuePair.Key);
-                        xianTuData.name = LanguageManager.Instance.Text(bigMapConfig.mapName);
-                        xianTuDatas.Add(xianTuData);
-                        foreach (var xianTuLogConfig in keyValuePair.Value)
-                        {
-                            XianTuData xianTuData2 = new XianTuData();
-                            xianTuData2.type = 2;
-                            xianTuData2.xianTuLogConfig = xianTuLogConfig;
-                            xianTuDatas.Add(xianTuData2);
-                        }
-                    }
                 }
-
-
-                return;
             }
-
-
-            List<EventConfig> eventConfigs;
-            foreach (var xianTuLogConfig in configs)
+            else
             {
-                if (EventSystemManager.Instance.eventConfigsMap.ContainsKey(xianTuLogConfig.ID))
+                List<EventConfig> eventConfigs;
+                foreach (var xianTuLogConfig in configs)
                 {
-                    eventConfigs = EventSystemManager.Instance.eventConfigsMap[xianTuLogConfig.ID];
-                    foreach (var eventConfig in eventConfigs)
+                    if (EventSystemManager.Instance.eventConfigsMap.ContainsKey(xianTuLogConfig.ID))
                     {
-                        if (places.Contains(eventConfig.placeID))
+                        eventConfigs = EventSystemManager.Instance.eventConfigsMap[xianTuLogConfig.ID];
+                        foreach (var eventConfig in eventConfigs)
                         {
-                            PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(eventConfig.placeID);
-                            if (!xiantuMap.ContainsKey(placesConfig.bigMapID))
+                            if (places.Contains(eventConfig.placeID))
                             {
-                                xiantuMap.Add(placesConfig.bigMapID, new List<XianTuLogConfig>());
-                            }
+                                PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(eventConfig.placeID);
+                                if (!xiantuMap.ContainsKey(placesConfig.bigMapID))
+                                {
+                                    xiantuMap.Add(placesConfig.bigMapID, new List<XianTuLogConfig>());
+                                }
+
+                                xiantuMap[placesConfig.bigMapID].Add(xianTuLogConfig);
 
-                            xiantuMap[placesConfig.bigMapID].Add(xianTuLogConfig);
-                            // showConfigs.Add(xianTuLogConfig);
-                            break;
+                                break;
+                            }
                         }
                     }
                 }
             }
 
+
             foreach (var keyValuePair in xiantuMap)
             {
                 XianTuData xianTuData = new XianTuData();
@@ -202,14 +196,17 @@ namespace Fort23.Mono
                         var eventConfigs1 = EventSystemManager.Instance.eventConfigsMap[xianTuLogConfig.ID];
                         foreach (var eventConfig in eventConfigs1)
                         {
-                            AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(cl => cl.eventID == eventConfig.ID);
-                            if (eventList != null)
+                            if (places.Contains(eventConfig.placeID) || places.Count <= 0)
                             {
-                                count++;
+                                AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(cl => cl.eventID == eventConfig.ID);
+                                if (eventList != null)
+                                {
+                                    count++;
+                                }
+
+                                allCount++;
                             }
                         }
-
-                        allCount += eventConfigs1.Count;
                     }
 
                     XianTuData xianTuData2 = new XianTuData();
@@ -321,6 +318,18 @@ namespace Fort23.Mono
             UIManager.Instance.DormancyAllGComponent<EventLogWidget>();
             shoeXianTuLogConfigs = GetTypeXiantuLogConfigs(type);
             XaiXuanMap(shoeXianTuLogConfigs);
+
+            if (xianTuDatas.Count > 0)
+            {
+                eventLogTitleWidget.own.SetActive(true);
+                eventLogTitleWidget.CustomInit(xianTuDatas[0].name);
+            }
+            else
+            {
+                eventLogTitleWidget.own.SetActive(false);
+            }
+
+
             Content.Init(this, xianTuDatas.Count);
         }