Browse Source

修改bug

lzx 3 days ago
parent
commit
550e9ac7b6

+ 20 - 20
Assets/Res/Config/EventConfig.json

@@ -22,8 +22,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 5,
-      "XiantuID": 2,
+      "placeID": null,
+      "XiantuID": null,
       "EventConditionId": 3,
       "EventValue": [
         5
@@ -56,8 +56,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 5,
-      "XiantuID": 2,
+      "placeID": null,
+      "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 175,
@@ -87,8 +87,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 5,
-      "XiantuID": 2,
+      "placeID": null,
+      "XiantuID": null,
       "EventConditionId": 1,
       "EventValue": [
         1004
@@ -115,8 +115,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 6,
-      "XiantuID": 2,
+      "placeID": null,
+      "XiantuID": null,
       "EventConditionId": 7,
       "EventValue": [
         500
@@ -143,8 +143,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 6,
-      "XiantuID": 3,
+      "placeID": null,
+      "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 218,
@@ -168,8 +168,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 6,
-      "XiantuID": 3,
+      "placeID": null,
+      "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 219,
@@ -193,8 +193,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 6,
-      "XiantuID": 1,
+      "placeID": null,
+      "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 220,
@@ -565,8 +565,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 8,
-      "XiantuID": 3,
+      "placeID": null,
+      "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 174,
@@ -596,8 +596,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 8,
-      "XiantuID": 3,
+      "placeID": null,
+      "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 175,
@@ -626,8 +626,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 8,
-      "XiantuID": 3,
+      "placeID": null,
+      "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 2035,

+ 117 - 2
Assets/Res/UI/XianTuLogPanel/XianTuLogInfoPanel.prefab

@@ -35,6 +35,7 @@ RectTransform:
   - {fileID: 9037408276187403176}
   - {fileID: 4984119799780491756}
   - {fileID: 86150896025242752}
+  - {fileID: 3017899439440448584}
   - {fileID: 1239183305622828816}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -76,6 +77,26 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: EventLogTitleWidget
+    gameObject: {fileID: 7388315226818435012}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Marsk1
+    gameObject: {fileID: 86150896025242752}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Marsk2
+    gameObject: {fileID: 3017899439440448584}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Sv
+    gameObject: {fileID: 3581464887972855309}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1850343213030836377
 GameObject:
@@ -451,7 +472,7 @@ GameObject:
   - component: {fileID: 7883865494936010614}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Scroll View
+  m_Name: Sv
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -545,6 +566,51 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &6532941494030869132
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3017899439440448584}
+  - component: {fileID: 6976609981825819012}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Marsk2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3017899439440448584
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6532941494030869132}
+  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: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.27731323, y: -125.32001}
+  m_SizeDelta: {x: 0.5539923, y: -426.83887}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6976609981825819012
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6532941494030869132}
+  m_CullTransparentMesh: 1
 --- !u!1 &6833021426073465471
 GameObject:
   m_ObjectHideFlags: 0
@@ -692,7 +758,7 @@ GameObject:
   - component: {fileID: 6640372110663749329}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: Marsk1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -964,6 +1030,50 @@ PrefabInstance:
       propertyPath: m_Name
       value: EventLogTitleWidget
       objectReference: {fileID: 0}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.size
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[1].key
+      value: EventLogTitleWidgetGam
+      objectReference: {fileID: 0}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[2].key
+      value: Marsk1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[3].key
+      value: Sv
+      objectReference: {fileID: 0}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[4].key
+      value: Marsk2
+      objectReference: {fileID: 0}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[5].key
+      value: EventLogTitleWidgetGam
+      objectReference: {fileID: 0}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[1].gameObject
+      value: 
+      objectReference: {fileID: 7388315226818435012}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[2].gameObject
+      value: 
+      objectReference: {fileID: 86150896025242752}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[3].gameObject
+      value: 
+      objectReference: {fileID: 3581464887972855309}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[4].gameObject
+      value: 
+      objectReference: {fileID: 3017899439440448584}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[5].gameObject
+      value: 
+      objectReference: {fileID: 7388315226818435012}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -985,3 +1095,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &7388315226818435012 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3113180148145525686, guid: 034392a467bb69a46b538612078936bc, type: 3}
+  m_PrefabInstance: {fileID: 5601542614762144882}
+  m_PrefabAsset: {fileID: 0}

+ 105 - 8
Assets/Res/UI/XianTuLogPanel/XianTuLogPanel.prefab

@@ -102,6 +102,7 @@ RectTransform:
   - {fileID: 438881006348347736}
   - {fileID: 2738520516351410424}
   - {fileID: 6795257728327854590}
+  - {fileID: 1014077760537991407}
   - {fileID: 1239183305622828816}
   - {fileID: 1383581214779233778}
   - {fileID: 5859352838166277486}
@@ -205,6 +206,21 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: MarskRoot
+    gameObject: {fileID: 6795257728327854590}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Sv
+    gameObject: {fileID: 3581464887972855309}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: MarskRoot1
+    gameObject: {fileID: 1014077760537991407}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1688126664370609109
 GameObject:
@@ -706,6 +722,52 @@ MonoBehaviour:
   isAdaptationWidth: 0
   layoutType: 0
   overflowDistance: 0
+--- !u!1 &2636974454316377529
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1014077760537991407}
+  - component: {fileID: 6111515509897388727}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: MarskRoot (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1014077760537991407
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2636974454316377529}
+  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: 3581464887972855309}
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -4.6364136, y: -175}
+  m_SizeDelta: {x: -25.412476, y: -692.1988}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6111515509897388727
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2636974454316377529}
+  m_CullTransparentMesh: 1
 --- !u!1 &3651587731235081858
 GameObject:
   m_ObjectHideFlags: 0
@@ -934,7 +996,7 @@ GameObject:
   - component: {fileID: 4031749465507006431}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: MarskRoot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -951,8 +1013,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 3581464887972855309}
+  m_Children: []
   m_Father: {fileID: 8599819629026832582}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -1035,9 +1096,10 @@ GameObject:
   - component: {fileID: 5904849993517078433}
   - component: {fileID: 381179604564797926}
   - component: {fileID: 7883865494936010614}
+  - component: {fileID: 5677365914388646265}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Scroll View
+  m_Name: Sv
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1056,12 +1118,12 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6744614164039454483}
-  m_Father: {fileID: 6795257728327854590}
+  m_Father: {fileID: 1014077760537991407}
   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.00001335144, y: 48.104492}
-  m_SizeDelta: {x: 724.5875, y: 1028.009}
+  m_AnchoredPosition: {x: 0.00001335144, y: 43.1895}
+  m_SizeDelta: {x: 724.5875, y: 1018.179}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5904849993517078433
 CanvasRenderer:
@@ -1078,7 +1140,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4665951811628086642}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
@@ -1131,6 +1193,37 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &5677365914388646265
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4665951811628086642}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ef7878ea2dacc454894d556c1d97bca0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - StateInfos:
+    - Target: {fileID: 4665951811628086642}
+      UIStateV4Types: 00080000
+      UIStateV4Datas:
+      - {x: 724.5875, y: 1018.179, z: 0, w: 0}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 4665951811628086642}
+      UIStateV4Types: 00080000
+      UIStateV4Datas:
+      - {x: 724.5875, y: 1018.179, z: 0, w: 0}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  AllComs:
+  - {fileID: 4665951811628086642}
+  AllComsStateTypes: 00080000
+  CurrIndex: 0
 --- !u!1 &5462114408858244247
 GameObject:
   m_ObjectHideFlags: 0
@@ -2104,6 +2197,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: EventLogTitleWidgetGam
       objectReference: {fileID: 0}
+    - target: {fileID: 3113180148145525686, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

+ 0 - 6
Assets/Scripts/GameData/ExcelConfig/XianTuLogConfig.cs

@@ -26,12 +26,6 @@ public int ID;
 public int EventType;
 
 
-		/// <summary>
-		///章节
-		/// </summary>
-public int MapId;
-
-
 		/// <summary>
 		///名称
 		/// </summary>

+ 1 - 1
Assets/Scripts/GameUI/UI/XianTuLogPanel/EventLogWidget.cs

@@ -29,7 +29,7 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             base.AddButtonEvent();
-            Btn_HuiGu.onClick.AddListener(() => { XianTuLogInfoPanel.OpenPanel(_xianTuLogConfig.ID); });
+            Btn_HuiGu.onClick.AddListener(() => { XianTuLogInfoPanel.OpenPanel(2,_xianTuLogConfig.ID); });
         }
 
         public async CTask CustomInit(XianTuLogConfig xianTuLogConfig, List<int> places)

+ 1 - 1
Assets/Scripts/GameUI/UI/XianTuLogPanel/MainEventLogWidget.cs

@@ -24,7 +24,7 @@ namespace Fort23.Mono
 			base.AddButtonEvent();
 			Btn_HuiGu.onClick.AddListener(() =>
 			{
-				XianTuLogInfoPanel.OpenPanel(_xianTuLogConfig.ID);
+				XianTuLogInfoPanel.OpenPanel(1,_xianTuLogConfig.ID);
 			});
 		}
 

+ 8 - 3
Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogInfoPanel.cs

@@ -22,6 +22,8 @@ namespace Fort23.Mono
     [UIBinding(prefab = "XianTuLogInfoPanel")]
     public partial class XianTuLogInfoPanel : UIPanel, IScrollListContent
     {
+        private EventLogTitleWidget eventLogTitleWidget;
+        
         private XianTuLogConfig _xianTuLogConfig;
 
         List<XianTuLogInfoData> showXianTuLogInfoData = new List<XianTuLogInfoData>();
@@ -45,8 +47,11 @@ namespace Fort23.Mono
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
         }
 
-        public void CustomInit(int id)
+        public async void CustomInit(int type, int id)
         {
+            // eventLogTitleWidget = await UIManager.Instance.CreateGComponentForObject<EventLogTitleWidget>(gam, null);
+
+            
             showXianTuLogInfoData.Clear();
             _xianTuLogConfig = ConfigComponent.Instance.Get<XianTuLogConfig>(id);
             XianTuLogInfoData xianTuLogInfoData3 = new XianTuLogInfoData();
@@ -155,10 +160,10 @@ namespace Fort23.Mono
             base.Close();
         }
 
-        public async static CTask OpenPanel(int id)
+        public async static CTask OpenPanel(int type,int id)
         {
             XianTuLogInfoPanel xianTuLogInfoPanel = await UIManager.Instance.LoadAndOpenPanel<XianTuLogInfoPanel>(null);
-            xianTuLogInfoPanel.CustomInit(id);
+            xianTuLogInfoPanel.CustomInit(type,id);
         }
     }
 }

+ 44 - 0
Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogInfoPanelData.cs

@@ -52,6 +52,50 @@ namespace Fort23.Mono
 	      return _Text_Title;
 	     }
 	   }
+	  private GameObject _EventLogTitleWidget;
+	  public GameObject EventLogTitleWidget
+	   {
+	   get{
+	      if (_EventLogTitleWidget == null)
+	       {
+	         _EventLogTitleWidget  = GetUIUnit<GameObject>("EventLogTitleWidget"); 
+	       }
+	      return _EventLogTitleWidget;
+	     }
+	   }
+	  private RectTransform _Marsk1;
+	  public RectTransform Marsk1
+	   {
+	   get{
+	      if (_Marsk1 == null)
+	       {
+	         _Marsk1  = GetUIUnit<RectTransform>("Marsk1"); 
+	       }
+	      return _Marsk1;
+	     }
+	   }
+	  private RectTransform _Marsk2;
+	  public RectTransform Marsk2
+	   {
+	   get{
+	      if (_Marsk2 == null)
+	       {
+	         _Marsk2  = GetUIUnit<RectTransform>("Marsk2"); 
+	       }
+	      return _Marsk2;
+	     }
+	   }
+	  private RectTransform _Sv;
+	  public RectTransform Sv
+	   {
+	   get{
+	      if (_Sv == null)
+	       {
+	         _Sv  = GetUIUnit<RectTransform>("Sv"); 
+	       }
+	      return _Sv;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 7 - 3
Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogPanel.cs

@@ -69,6 +69,8 @@ namespace Fort23.Mono
         {
             if (this.type == 1)
                 return;
+            Sv.transform.SetParent(MarskRoot1);
+            eventLogTitleWidget.own.gameObject.SetActive(false);
             ChangeList.ShowTargetIndex(0);
             Btn_XaiXuanClose.gameObject.SetActive(false);
             Btn_XaiXuan.gameObject.SetActive(false);
@@ -89,6 +91,8 @@ namespace Fort23.Mono
         {
             if (this.type == 2)
                 return;
+            Sv.transform.SetParent(MarskRoot);
+            eventLogTitleWidget.own.gameObject.SetActive(true);
             ChangeList.ShowTargetIndex(1);
             Btn_XaiXuanClose.gameObject.SetActive(false);
             Btn_XaiXuan.gameObject.SetActive(false);
@@ -128,12 +132,12 @@ namespace Fort23.Mono
                 {
                     foreach (var xianTuLogConfig in configs)
                     {
-                        if (!xiantuMap.ContainsKey(xianTuLogConfig.MapId))
+                        if (!xiantuMap.ContainsKey(xianTuLogConfig.BigMapID))
                         {
-                            xiantuMap.Add(xianTuLogConfig.MapId, new List<XianTuLogConfig>());
+                            xiantuMap.Add(xianTuLogConfig.BigMapID, new List<XianTuLogConfig>());
                         }
 
-                        xiantuMap[xianTuLogConfig.MapId].Add(xianTuLogConfig);
+                        xiantuMap[xianTuLogConfig.BigMapID].Add(xianTuLogConfig);
                     }
 
                     foreach (var keyValuePair in xiantuMap)

+ 33 - 0
Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogPanelData.cs

@@ -184,6 +184,39 @@ namespace Fort23.Mono
 	      return _EventLogTitleWidgetGam;
 	     }
 	   }
+	  private RectTransform _MarskRoot;
+	  public RectTransform MarskRoot
+	   {
+	   get{
+	      if (_MarskRoot == null)
+	       {
+	         _MarskRoot  = GetUIUnit<RectTransform>("MarskRoot"); 
+	       }
+	      return _MarskRoot;
+	     }
+	   }
+	  private RectTransform _Sv;
+	  public RectTransform Sv
+	   {
+	   get{
+	      if (_Sv == null)
+	       {
+	         _Sv  = GetUIUnit<RectTransform>("Sv"); 
+	       }
+	      return _Sv;
+	     }
+	   }
+	  private RectTransform _MarskRoot1 ;
+	  public RectTransform MarskRoot1 
+	   {
+	   get{
+	      if (_MarskRoot  == null)
+	       {
+	         _MarskRoot   = GetUIUnit<RectTransform>("MarskRoot "); 
+	       }
+	      return _MarskRoot ;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{