Browse Source

仙途日志

lzx 3 weeks ago
parent
commit
26c66bb08b

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

@@ -343,8 +343,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 1906,
@@ -368,8 +368,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 1907,
@@ -393,8 +393,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 1908,
@@ -418,8 +418,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 1909,
@@ -652,8 +652,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 2,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 2067,
@@ -680,8 +680,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 2,
+      "XiantuID": 2,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 2069,
@@ -705,7 +705,7 @@
       ],
       "RefreshProbability": 30,
       "RefreshCount": 2,
-      "placeID": null,
+      "placeID": 1,
       "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,

+ 1 - 355
Assets/Res/UI/XianTuLogPanel/EventLogWidget.prefab

@@ -1,95 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &408149428465216976
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1372405486427223407}
-  - component: {fileID: 3913787194677461638}
-  - component: {fileID: 4993295788877533469}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: myImage (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1372405486427223407
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 408149428465216976}
-  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: 1929259240388031348}
-  - {fileID: 2528053386945005633}
-  m_Father: {fileID: 1871022461139175883}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 669.98, y: 53.6459}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3913787194677461638
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 408149428465216976}
-  m_CullTransparentMesh: 1
---- !u!114 &4993295788877533469
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 408149428465216976}
-  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.9960785, g: 0.9921569, b: 0.96470594, 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: 
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
-  packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
 --- !u!1 &1472859695811504642
 GameObject:
   m_ObjectHideFlags: 0
@@ -325,86 +235,6 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
---- !u!1 &4879675769935978763
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2528053386945005633}
-  - component: {fileID: 7259140763942368179}
-  - component: {fileID: 6411763976351109509}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Text_Name (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2528053386945005633
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4879675769935978763}
-  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: 1372405486427223407}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 546.6935, y: -0.00000047684}
-  m_SizeDelta: {x: 120.9065, y: 53.646}
-  m_Pivot: {x: 0, y: 0.5}
---- !u!222 &7259140763942368179
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4879675769935978763}
-  m_CullTransparentMesh: 1
---- !u!114 &6411763976351109509
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4879675769935978763}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, 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_FontData:
-    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 25
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u5317\u6D77"
 --- !u!1 &5646098362420776515
 GameObject:
   m_ObjectHideFlags: 0
@@ -675,86 +505,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
---- !u!1 &7579558291517089679
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1929259240388031348}
-  - component: {fileID: 9117025895806618041}
-  - component: {fileID: 903833710957954120}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Text_Name
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1929259240388031348
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7579558291517089679}
-  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: 1372405486427223407}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 38.6, y: -0.00000047684}
-  m_SizeDelta: {x: 160, y: 53.646}
-  m_Pivot: {x: 0, y: 0.5}
---- !u!222 &9117025895806618041
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7579558291517089679}
-  m_CullTransparentMesh: 1
---- !u!114 &903833710957954120
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7579558291517089679}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.6392157, g: 0.54901963, b: 0.32941177, 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_FontData:
-    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 25
-    m_FontStyle: 1
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u60E0\u5B50\u7684\u70E6\u607C"
 --- !u!1 &8342908203108568082
 GameObject:
   m_ObjectHideFlags: 0
@@ -786,9 +536,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5208499378456683232}
-  - {fileID: 1372405486427223407}
+  m_Children: []
   m_Father: {fileID: 2536002154273356826}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -945,105 +693,3 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
---- !u!1001 &2145346912620626996
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 1871022461139175883}
-    m_Modifications:
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 669.98
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 53.6459
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7027082775659811363, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-      propertyPath: m_Name
-      value: EventMinLogWidget
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
---- !u!224 &5208499378456683232 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6164727708320999124, guid: bdaaeeadadf2a1a4b9e67561dcd1a088, type: 3}
-  m_PrefabInstance: {fileID: 2145346912620626996}
-  m_PrefabAsset: {fileID: 0}

+ 103 - 158
Assets/Res/UI/XianTuLogPanel/XianTuLogPanel.prefab

@@ -37,7 +37,6 @@ RectTransform:
   - {fileID: 7996455914375576794}
   - {fileID: 3581464887972855309}
   - {fileID: 1239183305622828816}
-  - {fileID: 2792101737543178815}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -68,6 +67,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_Main
+    gameObject: {fileID: 3821727731485423146}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Event
+    gameObject: {fileID: 4236599677396176136}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1850343213030836377
 GameObject:
@@ -135,7 +144,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 2472751e4bb7ba04ba545e6700c26bee, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -548,9 +557,10 @@ GameObject:
   - component: {fileID: 4389887259738624222}
   - component: {fileID: 9059370227144255306}
   - component: {fileID: 5262371952481576886}
+  - component: {fileID: 3821727731485423146}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Text (Legacy) (1)
+  m_Name: Btn_Main
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -617,6 +627,50 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E3B\u7EBF"
+--- !u!114 &3821727731485423146
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6002680713102466570}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 5262371952481576886}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &6833021426073465471
 GameObject:
   m_ObjectHideFlags: 0
@@ -761,9 +815,10 @@ GameObject:
   - component: {fileID: 7996455914375576794}
   - component: {fileID: 7908693561814886841}
   - component: {fileID: 6037209487185954565}
+  - component: {fileID: 4236599677396176136}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Text (Legacy) (2)
+  m_Name: Btn_Event
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -830,6 +885,50 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E8B\u4EF6"
+--- !u!114 &4236599677396176136
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8362329558097965615}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6037209487185954565}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &9135198254365544974
 GameObject:
   m_ObjectHideFlags: 0
@@ -921,157 +1020,3 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 0
---- !u!1001 &400320335202068005
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 8599819629026832582}
-    m_Modifications:
-    - target: {fileID: 1372405486427223407, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1372405486427223407, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1372405486427223407, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1372405486427223407, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1871022461139175883, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1871022461139175883, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1871022461139175883, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1871022461139175883, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 337.935
-      objectReference: {fileID: 0}
-    - target: {fileID: 1871022461139175883, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -109
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_Pivot.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 717.06
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -499.3
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5208499378456683232, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5208499378456683232, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5208499378456683232, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5208499378456683232, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7193835923914035927, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-      propertyPath: m_Name
-      value: EventLogWidget
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
---- !u!224 &2792101737543178815 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2536002154273356826, guid: 7864c8d88b7633b41ab7122be97eb47d, type: 3}
-  m_PrefabInstance: {fileID: 400320335202068005}
-  m_PrefabAsset: {fileID: 0}

+ 17 - 0
Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -30,6 +30,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
     public bool isOpenUi;
 
     Action onCompleteCallback;
+    
+    public Map<int,List<EventConfig>> eventConfigsMap = new Map<int,List<EventConfig>>();
 
     // public Map<int, AccountFileInfo.EventConditionData> EventConditionDataMap = new Map<int, AccountFileInfo.EventConditionData>();
 
@@ -37,6 +39,21 @@ public class EventSystemManager : Singleton<EventSystemManager>
     {
         eventConfigs = ConfigComponent.Instance.GetAll<EventConfig>().ToList();
         divineSenseConfigs = ConfigComponent.Instance.GetAll<DivineSenseConfig>().ToList();
+        
+        foreach (var eventConfig in eventConfigs)
+        {
+            if (eventConfig.XiantuID != 0)
+            {
+                if (eventConfigsMap.ContainsKey(eventConfig.XiantuID))
+                {
+                    eventConfigsMap[eventConfig.XiantuID].Add(eventConfig);
+                }
+                else
+                {
+                    eventConfigsMap.Add(eventConfig.XiantuID, new List<EventConfig>() { eventConfig });
+                }
+            }
+        }
 
         // foreach (var playerDataEventConditionData in AccountFileInfo.Instance.playerData.eventConditionDatas)
         // {

+ 61 - 34
Assets/Scripts/GameUI/UI/XianTuLogPanel/EventLogWidget.cs

@@ -1,39 +1,66 @@
+using System.Collections.Generic;
+using System.Linq;
 using Core.Language;
 using Excel2Json;
+using Fort23.Core;
+using UnityEngine;
+using UnityEngine.UI;
 
 namespace Fort23.Mono
 {
-	[UIBinding(prefab = "EventLogWidget"  )]
-	public partial class EventLogWidget : UIComponent
-	{
-		private XianTuLogConfig _xianTuLogConfig;
-		private void Init()
-		{
-
-		}
-		public override void AddEvent()
-		{
-
-		}
-		public override void DelEvent()
-		{
-
-		}
-		public override void AddButtonEvent()
-		{
-			base.AddButtonEvent();
-			Btn_HuiGu.onClick.AddListener(() =>
-			{
-				XianTuLogInfoPanel.OpenPanel(_xianTuLogConfig.ID);
-			});
-		}
-
-		public void CustomInit(XianTuLogConfig xianTuLogConfig)
-		{
-			_xianTuLogConfig = xianTuLogConfig;
-			Text_Title.text = LanguageManager.Instance.Text(xianTuLogConfig.Ttile);
-			Text_Desc.text = LanguageManager.Instance.Text(xianTuLogConfig.Desc);
-		}
-
-	}
-}
+    [UIBinding(prefab = "EventLogWidget")]
+    public partial class EventLogWidget : ItemWidgetBasic
+    {
+        private XianTuLogConfig _xianTuLogConfig;
+        List<EventMinLogWidget> eventMinLogWidgets = new List<EventMinLogWidget>();
+
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            base.AddButtonEvent();
+            Btn_HuiGu.onClick.AddListener(() => { XianTuLogInfoPanel.OpenPanel(_xianTuLogConfig.ID); });
+        }
+
+        public async CTask CustomInit(XianTuLogConfig xianTuLogConfig)
+        {
+            _xianTuLogConfig = xianTuLogConfig;
+            Text_Title.text = LanguageManager.Instance.Text(xianTuLogConfig.Ttile);
+            Text_Desc.text = LanguageManager.Instance.Text(xianTuLogConfig.Desc);
+
+            var configs = EventSystemManager.Instance.eventConfigsMap[_xianTuLogConfig.ID];
+            foreach (var eventConfig in configs)
+            {
+                AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(cl => cl.eventID == eventConfig.ID);
+                EventMinLogWidget eventMinLogWidget = await UIManager.Instance.CreateGComponent<EventMinLogWidget>(null, Connect);
+                eventMinLogWidget.CustomInit(eventConfig.ID,eventList);
+                eventMinLogWidgets.Add(eventMinLogWidget);
+            }
+            
+            LayoutRebuilder.ForceRebuildLayoutImmediate(Connect);
+            LayoutRebuilder.ForceRebuildLayoutImmediate(Connect.transform.parent.GetComponent<RectTransform>());
+        }
+
+        public override void DormancyObj()
+        {
+            foreach (var eventMinLogWidget in eventMinLogWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(eventMinLogWidget);
+            }
+
+            eventMinLogWidgets.Clear();
+
+            base.DormancyObj();
+        }
+    }
+}

+ 34 - 17
Assets/Scripts/GameUI/UI/XianTuLogPanel/EventMinLogWidget.cs

@@ -1,24 +1,41 @@
+using Core.Language;
+using Excel2Json;
+using Fort23.UTool;
+
 namespace Fort23.Mono
 {
-	[UIBinding(prefab = "EventMinLogWidget"  )]
-	public partial class EventMinLogWidget : UIComponent
-	{
-		private void Init()
-		{
+    [UIBinding(prefab = "EventMinLogWidget")]
+    public partial class EventMinLogWidget : UIComponent
+    {
+        private EventConfig eventConfig;
 
-		}
-		public override void AddEvent()
-		{
+        private void Init()
+        {
+        }
 
-		}
-		public override void DelEvent()
-		{
+        public override void AddEvent()
+        {
+        }
 
-		}
-		public override void AddButtonEvent()
-		{
+        public override void DelEvent()
+        {
+        }
 
-		}
+        public override void AddButtonEvent()
+        {
+        }
 
-	}
-}
+        public void CustomInit(int id, AccountFileInfo.EventList eventList)
+        {
+            eventConfig = ConfigComponent.Instance.Get<EventConfig>(id);
+            if (eventList == null)
+            {
+                Text_Name.text = "???";
+            }
+            else
+            {
+                Text_Name.text = LanguageManager.Instance.Text(eventConfig.EventName);
+            }
+        }
+    }
+}

+ 19 - 13
Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogInfoPanel.cs

@@ -53,22 +53,28 @@ namespace Fort23.Mono
             xianTuLogInfoData3.type = 1;
             xianTuLogInfoData3.message = "北海";
             showXianTuLogInfoData.Add(xianTuLogInfoData3);
-            foreach (var @e in _xianTuLogConfig.Events)
+            var configs = EventSystemManager.Instance.eventConfigsMap[_xianTuLogConfig.ID];
+            foreach (var @c in configs)
             {
-                EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(e);
-                AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(cl => cl.eventID == e);
+                EventConfig eventConfig = c;
+                AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(cl => cl.eventID == c.ID);
                 if (eventList == null)
                 {
-                    // XianTuLogInfoData xianTuLogInfoData = new XianTuLogInfoData();
-                    // xianTuLogInfoData.type = 2;
-                    // xianTuLogInfoData.message = "????????";
-                    //
-                    // XianTuLogInfoData xianTuLogInfoData1 = new XianTuLogInfoData();
-                    // xianTuLogInfoData1.type = 3;
-                    // xianTuLogInfoData1.message = "?????????????????????????????????";
-                    //
-                    // showXianTuLogInfoData.Add(xianTuLogInfoData);
-                    // showXianTuLogInfoData.Add(xianTuLogInfoData1);
+                    //主线没有做不显示问好
+                    if (_xianTuLogConfig.EventType == 2)
+                    {
+                        XianTuLogInfoData xianTuLogInfoData = new XianTuLogInfoData();
+                        xianTuLogInfoData.type = 2;
+                        xianTuLogInfoData.message = "????????";
+                    
+                        XianTuLogInfoData xianTuLogInfoData1 = new XianTuLogInfoData();
+                        xianTuLogInfoData1.type = 3;
+                        xianTuLogInfoData1.message = "?????????????????????????????????";
+                    
+                        showXianTuLogInfoData.Add(xianTuLogInfoData);
+                        showXianTuLogInfoData.Add(xianTuLogInfoData1);
+                    }
+                    
                 }
                 else
                 {

+ 46 - 4
Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogPanel.cs

@@ -11,6 +11,8 @@ namespace Fort23.Mono
     [UIBinding(prefab = "XianTuLogPanel")]
     public partial class XianTuLogPanel : UIPanel, IScrollListContent
     {
+        private int type = 1;
+
         List<XianTuLogConfig> xianTuLogConfigs = new List<XianTuLogConfig>();
         List<XianTuLogConfig> shoeXianTuLogConfigs = new List<XianTuLogConfig>();
 
@@ -31,16 +33,39 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+
+            Btn_Main.onClick.AddListener(() =>
+            {
+                if(this.type == 1)
+                    return;
+                UIManager.Instance.DormancyAllGComponent<MainEventLogWidget>();
+                UIManager.Instance.DormancyAllGComponent<EventLogWidget>();
+                type = 1;
+                shoeXianTuLogConfigs = GetTypeXiantuLogConfigs(type);
+                Content.Init(this, shoeXianTuLogConfigs.Count);
+            });
+
+            Btn_Event.onClick.AddListener(() =>
+            {
+                if(this.type == 2)
+                    return;
+                UIManager.Instance.DormancyAllGComponent<MainEventLogWidget>();
+                UIManager.Instance.DormancyAllGComponent<EventLogWidget>();
+                type = 2;
+                shoeXianTuLogConfigs = GetTypeXiantuLogConfigs(type);
+                Content.Init(this, shoeXianTuLogConfigs.Count);
+            });
         }
 
         public override CTask<bool> AsyncInit(object[] uiData)
         {
             xianTuLogConfigs = ConfigComponent.Instance.GetAll<XianTuLogConfig>().ToList();
-            shoeXianTuLogConfigs = GetTypeXiantuLogConfigs(1);
+            shoeXianTuLogConfigs = GetTypeXiantuLogConfigs(type);
             Content.Init(this, shoeXianTuLogConfigs.Count);
             return base.AsyncInit(uiData);
         }
 
+
         private List<XianTuLogConfig> GetTypeXiantuLogConfigs(int type)
         {
             List<XianTuLogConfig> xiaNTYULogConfigs = new List<XianTuLogConfig>();
@@ -62,11 +87,20 @@ namespace Fort23.Mono
                 return null;
             }
 
+            if (type == 1)
+            {
+                MainEventLogWidget mainEventLogWidget = await UIManager.Instance.CreateGComponent<MainEventLogWidget>(null, Content.GetComponent<RectTransform>());
+                mainEventLogWidget.CustomInit(shoeXianTuLogConfigs[index]);
 
-            MainEventLogWidget mainEventLogWidget = await UIManager.Instance.CreateGComponent<MainEventLogWidget>(null, Content.GetComponent<RectTransform>());
-            mainEventLogWidget.CustomInit(shoeXianTuLogConfigs[index]);
+                return mainEventLogWidget;
+            }
+            else
+            {
+                EventLogWidget EventLogWidget = await UIManager.Instance.CreateGComponent<EventLogWidget>(null, Content.GetComponent<RectTransform>());
+                await EventLogWidget.CustomInit(shoeXianTuLogConfigs[index]);
 
-            return mainEventLogWidget;
+                return EventLogWidget;
+            }
         }
 
         public void HindIScorllListWidget(IScorllListWidget widget)
@@ -78,5 +112,13 @@ namespace Fort23.Mono
         {
             XianTuLogPanel xianTuLogPanel = await UIManager.Instance.LoadAndOpenPanel<XianTuLogPanel>(null);
         }
+
+        public override void Close()
+        {
+            UIManager.Instance.DormancyAllGComponent<MainEventLogWidget>();
+            UIManager.Instance.DormancyAllGComponent<EventLogWidget>();
+            type = 2;
+            base.Close();
+        }
     }
 }

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

@@ -30,6 +30,28 @@ namespace Fort23.Mono
 	      return _Btn_Close;
 	     }
 	   }
+	  private Button _Btn_Main;
+	  public Button Btn_Main
+	   {
+	   get{
+	      if (_Btn_Main == null)
+	       {
+	         _Btn_Main  = GetUIUnit<Button>("Btn_Main"); 
+	       }
+	      return _Btn_Main;
+	     }
+	   }
+	  private Button _Btn_Event;
+	  public Button Btn_Event
+	   {
+	   get{
+	      if (_Btn_Event == null)
+	       {
+	         _Btn_Event  = GetUIUnit<Button>("Btn_Event"); 
+	       }
+	      return _Btn_Event;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

File diff suppressed because it is too large
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


BIN
Excel2Json/Excel/EventConfig.xlsx


Some files were not shown because too many files changed in this diff