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

Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab

@@ -1304,7 +1304,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7059812866358173867}
+  m_Father: {fileID: 8864025907727301406}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2417,12 +2417,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7059812866358173867}
+  m_Father: {fileID: 8864025907727301406}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0.07791138}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3522588436894383635
 CanvasRenderer:
@@ -3497,6 +3497,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 6574649598714536494, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6730899750744253868, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
       propertyPath: m_IsActive
       value: 1
@@ -3597,11 +3601,11 @@ PrefabInstance:
     - {fileID: 102496722109560873, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects:
-    - targetCorrespondingSourceObject: {fileID: 3764721290890148754, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
-      insertIndex: 0
-      addedObject: {fileID: 826528113821736969}
-    - targetCorrespondingSourceObject: {fileID: 3764721290890148754, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+    - targetCorrespondingSourceObject: {fileID: 3370061335406075943, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
       insertIndex: 1
+      addedObject: {fileID: 826528113821736969}
+    - targetCorrespondingSourceObject: {fileID: 3370061335406075943, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      insertIndex: 2
       addedObject: {fileID: 891011900833867173}
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
@@ -3610,11 +3614,6 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 5808298135736668641, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
   m_PrefabInstance: {fileID: 6181054649854434105}
   m_PrefabAsset: {fileID: 0}
---- !u!224 &7059812866358173867 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3764721290890148754, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
-  m_PrefabInstance: {fileID: 6181054649854434105}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &8864025907727301406 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 3370061335406075943, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}

Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -32,7 +32,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -143,7 +143,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -224,7 +224,7 @@ RectTransform:
   m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
   m_ConstrainProportionsScale: 1
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -313,7 +313,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1357364587688641971}
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -460,7 +460,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -594,7 +594,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9098093879968300551}
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -686,7 +686,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 595589076442330505}
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
@@ -910,23 +910,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8807649875490934103}
-  - {fileID: 1357522047238736597}
-  - {fileID: 5225875953063125181}
-  - {fileID: 3650536308811846443}
-  - {fileID: 7566769296908980725}
-  - {fileID: 712579681456886399}
-  - {fileID: 2781605243884814213}
-  - {fileID: 6760469126628422357}
-  - {fileID: 3042280114302172752}
-  - {fileID: 145896444123704845}
-  - {fileID: 7551747957602520090}
-  - {fileID: 7325153162450915011}
-  - {fileID: 8173313993394265504}
-  - {fileID: 6639653483637829207}
-  - {fileID: 1007467258602941415}
-  - {fileID: 2080350128756554473}
+  m_Children: []
   m_Father: {fileID: 3370061335406075943}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -973,7 +957,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1062,7 +1046,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -1151,7 +1135,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1231,7 +1215,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 3370061335406075943}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1321,6 +1305,10 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3764721290890148754}
+  - {fileID: 8807649875490934103}
+  - {fileID: 1357522047238736597}
+  - {fileID: 4942424813403464864}
+  - {fileID: 1073463540969944153}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1416,6 +1404,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Root
+    gameObject: {fileID: 6574649598714536494}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Tips
+    gameObject: {fileID: 4118340536173480420}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &6756300365015287303
 MonoBehaviour:
@@ -1657,7 +1655,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -1941,6 +1939,65 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u652F\u7EBF"
+--- !u!1 &6574649598714536494
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4942424813403464864}
+  - component: {fileID: 3941386581674135772}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Root
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4942424813403464864
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6574649598714536494}
+  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: 5225875953063125181}
+  - {fileID: 3650536308811846443}
+  - {fileID: 7566769296908980725}
+  - {fileID: 712579681456886399}
+  - {fileID: 2781605243884814213}
+  - {fileID: 6760469126628422357}
+  - {fileID: 3042280114302172752}
+  - {fileID: 145896444123704845}
+  - {fileID: 7551747957602520090}
+  - {fileID: 7325153162450915011}
+  - {fileID: 8173313993394265504}
+  - {fileID: 6639653483637829207}
+  - {fileID: 1007467258602941415}
+  - {fileID: 2080350128756554473}
+  m_Father: {fileID: 3370061335406075943}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3941386581674135772
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6574649598714536494}
+  m_CullTransparentMesh: 1
 --- !u!1 &6730899750744253868
 GameObject:
   m_ObjectHideFlags: 0
@@ -1972,7 +2029,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 3370061335406075943}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -2258,6 +2315,86 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   id: 10159
+--- !u!1 &8060125887827060197
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1073463540969944153}
+  - component: {fileID: 1997598539031156822}
+  - component: {fileID: 4118340536173480420}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Tips
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1073463540969944153
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8060125887827060197}
+  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: 3370061335406075943}
+  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.0000052452087, y: 0}
+  m_SizeDelta: {x: 564.0696, y: 29.6509}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1997598539031156822
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8060125887827060197}
+  m_CullTransparentMesh: 1
+--- !u!114 &4118340536173480420
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8060125887827060197}
+  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.34509805, g: 0.3137255, b: 0.3019608, 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: 24
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u900D\u9065\u6E38\u5DF2\u5B8C\u6210\uFF0C\u656C\u8BF7\u671F\u5F85\u540E\u7EED\u5185\u5BB9"
 --- !u!1 &8193172811373753691
 GameObject:
   m_ObjectHideFlags: 0
@@ -2284,13 +2421,13 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8193172811373753691}
-  m_LocalRotation: {x: 0, y: 0, z: -0.20791169, w: 0.9781476}
+  m_LocalRotation: {x: -0, y: -0, z: -0.20791169, w: 0.9781476}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1132527634272378842}
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -24}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2381,7 +2518,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1926551284965162357}
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -2475,7 +2612,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}

Assets/Res/UI/TowerPanel/TowerLevelWidget.prefab

@@ -398,14 +398,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_BubbleFrame01_Hexagon_Bg_Blue
+  _icon_name: 
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 23f1ff3af41427347a63b9cc35608247, type: 3}
+  CurrSpriteAtlas: {fileID: 0}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: ee9f4291814fb15d06fb06b5d297fabf
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
   imageH: 135.7429
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -197,8 +197,11 @@ public class EventSystemManager : Singleton<EventSystemManager>
             }
             else if (AccountFileInfo.Instance.playerData.eventList.Count > 0)
             {
-                AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId =
-                    AccountFileInfo.Instance.playerData.eventList[0].guid;
+                AccountFileInfo.EventList eventList1 =
+                    AccountFileInfo.Instance.playerData.eventList.FirstOrDefault(e =>
+                        !e.isCompleted && !e.isCompleted1);
+                if (eventList1 != null)
+                    AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId = eventList1.guid;
             }
         }
     }
@@ -482,6 +485,15 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 continue;
             }
 
+            if (itemInfoType1 != null)
+            {
+                PlayerManager.Instance.BagController.DeductItem(itemInfoType1.itemID, 1);
+            }
+
+            if (itemInfoType2 != null)
+            {
+                PlayerManager.Instance.BagController.DeductItem(itemInfoType2.itemID, 1);
+            }
 
             int randomValue1 = Random.Range(0, 101);
             // 达到怪率刷新场景特定事件
@@ -1071,6 +1083,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     {
                         return false;
                     }
+
                     return PlayerManager.Instance.BagController.GetItemCount(evt.EventValue[i]) >= evt.EventCount[i];
                 //境界判断
                 case 3:
@@ -1078,6 +1091,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     {
                         return false;
                     }
+
                     return PlayerManager.Instance.myHero.level >= evt.EventValue[i];
                 //概率判断
                 case 7:
@@ -1085,6 +1099,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     {
                         return false;
                     }
+
                     int randomValue1 = Random.Range(0, 1001);
 
                     return randomValue1 <= evt.EventValue[i];
@@ -1094,6 +1109,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     {
                         return false;
                     }
+
                     AccountFileInfo.EventList eventList =
                         AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce =>
                             ce.eventID == evt.EventValue[i]);
@@ -1309,7 +1325,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
             await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
             await UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
         }
-        
+
 
         if (eventConfig.ID == 10001 && PlayerGuideManager.Instance.GuideIsCanDo(2))
         {

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

@@ -131,16 +131,21 @@ namespace Fort23.Mono
                 // Rect_Sv.anchoredPosition = new Vector2(2.61f, -190.52f);
                 Text_Tips.gameObject.SetActive(false);
                 AccountFileInfo.EventList eventList = EventSystemManager.Instance.GetMainEventDta();
+                if (mainShengShiEventWidgetType2 == null)
+                    mainShengShiEventWidgetType2 =
+                        await UIManager.Instance.CreateGComponentForObject<ShengShiEventWidgetType2>(
+                            ShengShiEventWidgetType2Game, null, ShengShiEventWidgetType2Root);
                 if (eventList != null)
                 {
-                    if (mainShengShiEventWidgetType2 == null)
-                        mainShengShiEventWidgetType2 =
-                            await UIManager.Instance.CreateGComponentForObject<ShengShiEventWidgetType2>(
-                                ShengShiEventWidgetType2Game, null, ShengShiEventWidgetType2Root);
                     mainShengShiEventWidgetType2.own.SetActive(true);
                     mainShengShiEventWidgetType2.CustomInit(eventList, GoOnClick);
                     mainShengShiEventWidgetType2.OnClick = OnClick;
                 }
+                else
+                {
+                    mainShengShiEventWidgetType2.own.SetActive(true);
+                    mainShengShiEventWidgetType2.CustomInit1();
+                }
             }
             //道友
             else

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

@@ -43,6 +43,7 @@ namespace Fort23.Mono
                     ItemInfo = null;
                     Icon_ItemIcon.gameObject.SetActive(false);
                     Icon_ShenIcon.gameObject.SetActive(false);
+                    Icon_ItemIcon2.gameObject.SetActive(false);
                     Text_ItemCount.text = "";
                     icon_Jia.gameObject.SetActive(true);
                 }

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

@@ -75,6 +75,8 @@ namespace Fort23.Mono
 
         public async void CustomInit(AccountFileInfo.EventList eventList, Action<ItemWidgetBasic> goCallBack)
         {
+            Text_Tips.gameObject.SetActive(false);
+            Root.gameObject.SetActive(true);
             foreach (var widgetItem in widgetList)
             {
                 UIManager.Instance.DormancyGComponent(widgetItem);
@@ -265,6 +267,11 @@ namespace Fort23.Mono
             }
         }
 
+        public async void CustomInit1()
+        {
+            Text_Tips.gameObject.SetActive(true);
+Root.gameObject.SetActive(false);
+        }
 
         public override void DormancyObj()
         {

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

@@ -173,6 +173,28 @@ namespace Fort23.Mono
 	      return _csc;
 	     }
 	   }
+	  private GameObject _Root;
+	  public GameObject Root
+	   {
+	   get{
+	      if (_Root == null)
+	       {
+	         _Root  = GetUIUnit<GameObject>("Root"); 
+	       }
+	      return _Root;
+	     }
+	   }
+	  private Text _Text_Tips;
+	  public Text Text_Tips
+	   {
+	   get{
+	      if (_Text_Tips == null)
+	       {
+	         _Text_Tips  = GetUIUnit<Text>("Text_Tips"); 
+	       }
+	      return _Text_Tips;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -223,8 +223,14 @@ namespace Fort23.Mono
 
                 AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.eventList.FirstOrDefault(e =>
                     e.guid == AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId);
+                if (eventList == null)
+                {
+                    return;
+                }
 
                 EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
+
+
                 if (eventConfig.EventTriggerType == 4)
                 {
                     if (eventList.isCompleted1)

Assets/Scripts/GameUI/UI/TowerPanel/TowerLevelWidget.cs

@@ -40,8 +40,12 @@ namespace Fort23.Mono
                 }
 
                 List<ItemInfo> itemInfos = new List<ItemInfo>();
-                ItemInfo itemInfo = new ItemInfo(_towerInfoConfig.reward[0], 1);
-                itemInfos.Add(itemInfo);
+                for (var i = 0; i < _towerInfoConfig.reward.Length; i++)
+                {
+                    ItemInfo itemInfo = new ItemInfo(_towerInfoConfig.reward[i], 1);
+                    itemInfos.Add(itemInfo);
+                }
+             
                 towerLevelData.reward = true;
                 AccountFileInfo.Instance.SavePlayerData();
                 RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(itemInfos);