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

Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat

@@ -139,7 +139,7 @@ Material:
     - _MainSpeedU: 0
     - _MainSpeedV: 0
     - _MainTexOffsetU: 0
-    - _MainTexOffsetV: -0.3
+    - _MainTexOffsetV: 0.29740077
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0
+    - _Alpha: 0.9497664
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0
+    - _Alpha: 0.9028065
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.24745238
+    - _Alpha: 0.20827067
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.156618
+    - _MainTexOffsetU: 0.20219481
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/UI/DaoYouPanel/DaoYouInfoPanel.prefab

@@ -9728,7 +9728,7 @@ GameObject:
   - component: {fileID: 5720882546850458775}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: Icon_bodyIcon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -10034,6 +10034,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_bodyIcon
+    gameObject: {fileID: 5720882546850458775}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1001 &2591569182256414571
 PrefabInstance:

Assets/Res/UI/DaoYouPanel/DaoYouWidget.prefab

@@ -524,6 +524,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_Daoyou
+    gameObject: {fileID: 2328298552659041410}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &4309724099149842934
 MonoBehaviour:

Assets/Res/UI/HeroInformainPanel/BreakthroughItemWidget.prefab

@@ -398,7 +398,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0.000015258789, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 118.8268, y: 118.8268}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &380172200749822584
 CanvasRenderer:
@@ -438,15 +438,15 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_eq_3_2_1
+  _icon_name: icon_item_20012
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: allIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-    lasetJsonGUID: 4b54a953fcd0950cece7d4eeea1f40a9
-  imageH: 0
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 738ec5908281e178b7c40618cc12b514
+  imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/HeroInformainPanel/ElixirItemWidget.prefab

@@ -195,8 +195,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -0, y: -64.9}
-  m_SizeDelta: {x: 58.8736, y: 58.874}
+  m_AnchoredPosition: {x: -0, y: -64.9001}
+  m_SizeDelta: {x: 105.49, y: 105.4875}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2951448184634106011
 CanvasRenderer:
@@ -236,14 +236,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_eq_3_4_3
+  _icon_name: icon_item_20012
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: allIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-    lasetJsonGUID: 4b54a953fcd0950cece7d4eeea1f40a9
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 738ec5908281e178b7c40618cc12b514
   imageH: 58.874
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Res/UI/HeroInformainPanel/ExpElixirItemWidget.prefab

@@ -689,7 +689,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 43.997498, y: -12.5}
-  m_SizeDelta: {x: 24, y: 23.1372}
+  m_SizeDelta: {x: 0, y: 23.1372}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7796567445027890541
 CanvasRenderer:

Assets/Res/UI/HeroInformainPanel/ImmortalBondPanel.prefab

@@ -2570,7 +2570,7 @@ RectTransform:
   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: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/HeroInformainPanel/SelectBreakthroughItemPanel.prefab

@@ -391,8 +391,8 @@ RectTransform:
   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.0000050863, y: 4.2}
-  m_SizeDelta: {x: 70.4851, y: 70.4851}
+  m_AnchoredPosition: {x: 0.0000050863, y: 8.3}
+  m_SizeDelta: {x: 104.8072, y: 104.8072}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8151761943818166883
 CanvasRenderer:
@@ -432,14 +432,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_eq_3_4_3
+  _icon_name: icon_shenshidan
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: allIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-    lasetJsonGUID: 4b54a953fcd0950cece7d4eeea1f40a9
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 738ec5908281e178b7c40618cc12b514
   imageH: 70.43144
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Scenes/testCombat.scene

@@ -2310,6 +2310,221 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!213 &1357740138
+Sprite:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: dec_jianbian_tiao(Clone)
+  m_Rect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 115
+    height: 33
+  m_Offset: {x: 0, y: 0}
+  m_Border: {x: 0, y: 0, z: 0, w: 0}
+  m_PixelsToUnits: 100
+  m_Pivot: {x: 0.5, y: 0.5}
+  m_Extrude: 1
+  m_IsPolygon: 0
+  m_AtlasName: 
+  m_PackingTag: 
+  m_RenderDataKey:
+    c0c46614f24bc234b92e828eae8336c3: 21300000
+  m_AtlasTags:
+  - tongyong
+  m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  m_RD:
+    serializedVersion: 3
+    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 0
+      y: 0
+      width: 115
+      height: 33
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
+    downscaleMultiplier: 1
+  m_AtlasRD:
+    serializedVersion: 3
+    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 389
+      y: 1229
+      width: 115
+      height: 33
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: 389, y: 1229}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 446.5, z: 100, w: 1245.5}
+    downscaleMultiplier: 1
+  m_PhysicsShape:
+  - - {x: 0.345, y: 0.16499999}
+    - {x: 0.345, y: -0.16499999}
+    - {x: 0.575, y: -0.16499999}
+    - {x: 0.575, y: 0.16499999}
+  m_Bones: []
+  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!224 &1469808077 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 4202026612452094680, guid: 2e16b8f8d28965a45ab1457a3656d5e2, type: 3}
@@ -2730,7 +2945,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 1881818885}
+  m_Sprite: {fileID: 1357740138}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2761,221 +2976,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1831378551}
   m_CullTransparentMesh: 1
---- !u!213 &1881818885
-Sprite:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: dec_jianbian_tiao(Clone)
-  m_Rect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 115
-    height: 33
-  m_Offset: {x: 0, y: 0}
-  m_Border: {x: 0, y: 0, z: 0, w: 0}
-  m_PixelsToUnits: 100
-  m_Pivot: {x: 0.5, y: 0.5}
-  m_Extrude: 1
-  m_IsPolygon: 0
-  m_AtlasName: 
-  m_PackingTag: 
-  m_RenderDataKey:
-    c0c46614f24bc234b92e828eae8336c3: 21300000
-  m_AtlasTags:
-  - tongyong
-  m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-  m_RD:
-    serializedVersion: 3
-    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 0
-      y: 0
-      width: 115
-      height: 33
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: -1, y: -1}
-    settingsRaw: 64
-    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
-    downscaleMultiplier: 1
-  m_AtlasRD:
-    serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 389
-      y: 1229
-      width: 115
-      height: 33
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 389, y: 1229}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 446.5, z: 100, w: 1245.5}
-    downscaleMultiplier: 1
-  m_PhysicsShape:
-  - - {x: 0.345, y: 0.16499999}
-    - {x: 0.345, y: -0.16499999}
-    - {x: 0.575, y: -0.16499999}
-    - {x: 0.575, y: 0.16499999}
-  m_Bones: []
-  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!114 &4237119297094294473
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Scripts/GameLogic/Player/DropManager.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using Excel2Json;
 using Fort23.UTool;
 using GameLogic.Bag;
@@ -168,6 +169,7 @@ namespace GameLogic.Player
                 itemInfo = new ItemInfo(dropItemConfig.itemID[itemIndex], c);
             }
 
+
             itemInfos.Add(itemInfo);
             // for (int j = 0; j < dropItemConfig.itemID.Length; j++)
             // {
@@ -254,17 +256,35 @@ namespace GameLogic.Player
         public List<ItemInfo> Drop(int itemID, int count)
         {
             List<ItemInfo> itemInfos = new List<ItemInfo>();
+            DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(itemID);
+
+
             if (count < 0)
             {
                 itemInfos.Add(DropResourceLevel(itemID, count));
             }
+
             else
             {
-                DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(itemID);
                 if (dropConfig.dropType == 3)
                 {
-                    ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], count);
-                    itemInfos.Add(itemInfo);
+                    ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(dropConfig.dropGroupID[0]);
+                    if (itemConfig.associateID == 14)
+                    {
+                        ResourceLevelConfig resourceLevelConfig =
+                            ConfigComponent.Instance.Get<ResourceLevelConfig>(PlayerManager.Instance.myHero
+                                .powerUpConfig.ID);
+                        FieldInfo scoreField =
+                            resourceLevelConfig.GetType().GetField("value" + itemConfig.associateVlaue);
+                        int itemId = (int)scoreField.GetValue(resourceLevelConfig);
+                        ItemInfo itemInfo = new ItemInfo(itemId, count);
+                        itemInfos.Add(itemInfo);
+                    }
+                    else
+                    {
+                        ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], count);
+                        itemInfos.Add(itemInfo);
+                    }
                 }
                 else
                 {
@@ -278,7 +298,8 @@ namespace GameLogic.Player
 
         public ItemInfo DropResourceLevel(int itemID, int count)
         {
-            ResourceLevelConfig resourceLevelConfig = ConfigComponent.Instance.Get<ResourceLevelConfig>(PlayerManager.Instance.myHero.powerUpConfig.ID);
+            ResourceLevelConfig resourceLevelConfig =
+                ConfigComponent.Instance.Get<ResourceLevelConfig>(PlayerManager.Instance.myHero.powerUpConfig.ID);
             ItemInfo itemInfo = null;
             float c = Math.Abs(count / (float)1000);
             switch (itemID)

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -1067,17 +1067,33 @@ public class EventSystemManager : Singleton<EventSystemManager>
             {
                 //背包道具检测
                 case 1:
+                    if (evt.EventCount == null)
+                    {
+                        return false;
+                    }
                     return PlayerManager.Instance.BagController.GetItemCount(evt.EventValue[i]) >= evt.EventCount[i];
                 //境界判断
                 case 3:
+                    if (evt.EventValue == null)
+                    {
+                        return false;
+                    }
                     return PlayerManager.Instance.myHero.level >= evt.EventValue[i];
                 //概率判断
                 case 7:
+                    if (evt.EventValue == null)
+                    {
+                        return false;
+                    }
                     int randomValue1 = Random.Range(0, 1001);
 
                     return randomValue1 <= evt.EventValue[i];
                 //完成事件判断
                 case 10:
+                    if (evt.EventValue == null)
+                    {
+                        return false;
+                    }
                     AccountFileInfo.EventList eventList =
                         AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce =>
                             ce.eventID == evt.EventValue[i]);
@@ -1289,8 +1305,9 @@ public class EventSystemManager : Singleton<EventSystemManager>
             await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
             await UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
         }
+        
 
-        if (PlayerGuideManager.Instance.GuideIsCanDo(2))
+        if (eventConfig.ID == 10001 && PlayerGuideManager.Instance.GuideIsCanDo(2))
         {
             PlayerGuideManager.Instance.SetGuid(2);
         }

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -164,6 +164,7 @@ namespace Fort23.Mono
                             daoYouData.favorabilityLv++;
                         }
                     }
+
                     AudioManager.Instance.PlayAudio("ui_shiyonghuode");
                     AccountFileInfo.Instance.SavePlayerData();
                 }
@@ -203,6 +204,7 @@ namespace Fort23.Mono
             emotionConfig emotionConfig = ConfigComponent.Instance.Get<emotionConfig>(daoYouData.emotion);
             Text_message.text = LanguageManager.Instance.Text(emotionConfig.des);
             ShowMessage();
+            Icon_bodyIcon.icon_name = _daoyouModelConfig.bodyIcon;
             await UpdateUI();
             return await base.AsyncInit(uiData);
         }
@@ -286,7 +288,7 @@ namespace Fort23.Mono
             // DaoyouLevelupConfig daoyouLevelupConfig1 = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(daoYouData.favorabilityLv);
             Text_GiftGailv.text = LanguageManager.Instance.Text(10278,
                 PlayerManager.Instance.GetBl(daoYouData, _daoyouModelConfig.guajiBuffID[0]));
-                // "送礼概率:" + PlayerManager.Instance.GetBl(daoYouData, _daoyouModelConfig.guajiBuffID[0]) + "%";
+            // "送礼概率:" + PlayerManager.Instance.GetBl(daoYouData, _daoyouModelConfig.guajiBuffID[0]) + "%";
             for (var i = 1; i < _daoyouModelConfig.guajiBuffID.Length; i++)
             {
                 DaoYouIdleEarningsWidget daoYouIdleEarningsWidget =

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanelData.cs

@@ -393,6 +393,17 @@ namespace Fort23.Mono
 	      return _Slider_Emotion;
 	     }
 	   }
+	  private MyImage _Icon_bodyIcon;
+	  public MyImage Icon_bodyIcon
+	   {
+	   get{
+	      if (_Icon_bodyIcon == null)
+	       {
+	         _Icon_bodyIcon  = GetUIUnit<MyImage>("Icon_bodyIcon"); 
+	       }
+	      return _Icon_bodyIcon;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidget.cs

@@ -34,6 +34,7 @@ namespace Fort23.Mono
         {
             _daoyouModelConfig = ConfigComponent.Instance.Get<DaoyouModelConfig>(configId);
             _daoYouData = AccountFileInfo.Instance.playerData.daoYouDatas.FirstOrDefault(dy => dy.id == configId);
+            Icon_Daoyou.icon_name = _daoyouModelConfig.bodyIcon;
 
             Text_Name.text = LanguageManager.Instance.Text(_daoyouModelConfig.name);
             if (_daoYouData != null)
@@ -53,7 +54,7 @@ namespace Fort23.Mono
             {
                 Slider_Emotion.fillAmount = _daoYouData.emotionValue / 100;
             }
-           
+
 
             if (_daoYouData == null)
             {
@@ -74,7 +75,8 @@ namespace Fort23.Mono
 
                 Icon_Emotion.gameObject.SetActive(false);
 
-                DaoyouLevelupConfig daoyouLevelupConfig = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(_daoYouData.favorabilityLv);
+                DaoyouLevelupConfig daoyouLevelupConfig =
+                    ConfigComponent.Instance.Get<DaoyouLevelupConfig>(_daoYouData.favorabilityLv);
                 Text_DaoyouLvName.text = LanguageManager.Instance.Text(daoyouLevelupConfig.name);
                 if (_daoYouData.favorabilityLv >= _daoyouModelConfig.EmotionLvforQuest
                     && EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.EventCompleteforQuest)

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidgetData.cs

@@ -85,6 +85,17 @@ namespace Fort23.Mono
 	      return _Slider_Emotion;
 	     }
 	   }
+	  private MyImage _Icon_Daoyou;
+	  public MyImage Icon_Daoyou
+	   {
+	   get{
+	      if (_Icon_Daoyou == null)
+	       {
+	         _Icon_Daoyou  = GetUIUnit<MyImage>("Icon_Daoyou"); 
+	       }
+	      return _Icon_Daoyou;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -115,7 +115,7 @@ namespace Fort23.Mono
                         }
                     }
 
-                    for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs.Length; i++)
+                    for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs?.Length; i++)
                     {
                         PlayerManager.Instance.BagController.DeductItem(
                             PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs[i], 1);

Assets/Scripts/GameUI/UI/HeroInformationPanel/ImmortalBondPanel.cs

@@ -81,6 +81,7 @@ namespace Fort23.Mono
             {
                 DaoYouaaFfixWidget daoLvSkillWidget =
                     await UIManager.Instance.CreateGComponent<DaoYouaaFfixWidget>(null, JiachengContent);
+                daoLvSkillWidget.transform.localScale = Vector3.one;
                 daoLvSkillWidget.CustomInit(i);
                 _daoLvSkillWidgets.Add(daoLvSkillWidget);
             }

Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectBreakthroughItemPanel.cs

@@ -13,7 +13,7 @@ namespace Fort23.Mono
     {
         ItemConfig itemConfig;
         private Action callBack;
-        
+
         private Transform weidgetFater;
 
         BreakthroughItemWidget breakthrough;
@@ -26,18 +26,22 @@ namespace Fort23.Mono
 
         protected override void AddEvent()
         {
+            EventManager.Instance.AddEventListener(CustomEventType.ItemUpdate, ItemUpdateEvent);
+        }
+
+        private void ItemUpdateEvent(IEventData e)
+        {
+            CustomInit(breakthrough, callBack);
         }
 
         protected override void DelEvent()
         {
+            EventManager.Instance.RemoveEventListener(CustomEventType.ItemUpdate, ItemUpdateEvent);
         }
 
         public override void AddButtonEvent()
         {
-            Btn_Close.onClick.AddListener(() =>
-            {
-                UIManager.Instance.HideUIUIPanel(this);
-            });
+            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
             Btn_Affirm.onClick.AddListener(() =>
             {
                 this.callBack?.Invoke();
@@ -45,11 +49,8 @@ namespace Fort23.Mono
                 UIManager.Instance.HideUIUIPanel(this);
             });
             Btn_Cancel.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
-            
-            Btn_Source.onClick.AddListener(() =>
-            {
-                ItemSourcePanel.OpenPanel(itemConfig.ID);
-            });
+
+            Btn_Source.onClick.AddListener(() => { ItemSourcePanel.OpenPanel(itemConfig.ID); });
         }
 
         public void CustomInit(BreakthroughItemWidget breakthroughItemWidget, Action callBack)
@@ -97,8 +98,6 @@ namespace Fort23.Mono
                 Btn_Cancel.gameObject.SetActive(true);
                 Text_NoEnough.gameObject.SetActive(false);
             }
-
-          
         }
 
         public async override CTask Close()
@@ -111,9 +110,12 @@ namespace Fort23.Mono
             await base.Close();
         }
 
-        public async static CTask<SelectBreakthroughItemPanel> OpenPanel(BreakthroughItemWidget breakthroughItemWidget, Action callBack)
+        public async static CTask<SelectBreakthroughItemPanel> OpenPanel(BreakthroughItemWidget breakthroughItemWidget,
+            Action callBack)
         {
-            SelectBreakthroughItemPanel selectBreakthroughItemPanel = await UIManager.Instance.LoadAndOpenPanel<SelectBreakthroughItemPanel>(null,UILayer.Middle,isFocus:false);
+            SelectBreakthroughItemPanel selectBreakthroughItemPanel =
+                await UIManager.Instance.LoadAndOpenPanel<SelectBreakthroughItemPanel>(null, UILayer.Middle,
+                    isFocus: false);
 
             selectBreakthroughItemPanel.CustomInit(breakthroughItemWidget, callBack);
             return selectBreakthroughItemPanel;

Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectElixirPanel.cs

@@ -30,10 +30,17 @@ namespace Fort23.Mono
 
         protected override void AddEvent()
         {
+            EventManager.Instance.AddEventListener(CustomEventType.ItemUpdate, ItemUpdateEvent);
+        }
+
+        private void ItemUpdateEvent(IEventData e)
+        {
+            CustomInit(breakthrough, callback);
         }
 
         protected override void DelEvent()
         {
+            EventManager.Instance.RemoveEventListener(CustomEventType.ItemUpdate, ItemUpdateEvent);
         }
 
         public override void AddButtonEvent()

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

@@ -65,6 +65,7 @@ namespace Fort23.Mono
             SkipToWidget skipToWidget = obj as SkipToWidget;
             isSkipto = true;
             await UIManager.Instance.HideUIUIPanel(this);
+            
             SkiptoHelper.Skipto(skipToWidget.SkiptoConfig.ID);
         }
 

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

@@ -78,7 +78,12 @@ namespace Fort23.Mono
                 //     await PlayerGuideManager.Instance.SetGuid(8);
                 // }
 
-                if (PlayerGuideManager.Instance.GuideIsCanDo(4))
+                if (PlayerGuideManager.Instance.GuideIsCanDo(4) && PlayerManager.Instance.GongFaControl.allSkill
+                                                                    .FirstOrDefault(s =>
+                                                                        s.skillConfig.IDGroup == 1405) != null
+                                                                && PlayerManager.Instance.GongFaControl.allSkill
+                                                                    .FirstOrDefault(s =>
+                                                                        s.skillConfig.IDGroup == 2006) != null)
                 {
                     await PlayerGuideManager.Instance.SetGuid(4);
                 }

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

@@ -198,6 +198,7 @@ namespace Fort23.Mono
             _towerData = null;
             ulockId = 0;
             currentLevelWidget = null;
+            CombatController.currActiveCombat.ChangeState(CombatController.update);
             await base.Close();
         }
     }

Assets/Scripts/GameUI/Utility/SkiptoHelper.cs

@@ -1,4 +1,6 @@
-using Excel2Json;
+using System.Collections.Generic;
+using System.Linq;
+using Excel2Json;
 using Fort23.Core;
 using Fort23.Mono;
 using Fort23.UTool;
@@ -36,6 +38,18 @@ namespace Mono.Utility
                     return;
                 //实用神识界面
                 case 5:
+                    List<UIPanel> TopUIPanels = UIManager.Instance.TopUIPanels.ToList();
+                    for (var i = TopUIPanels.Count - 1; i >= 0; i--)
+                    {
+                        if (!(TopUIPanels[i] is MainPanel))
+                        {
+                            await UIManager.Instance.HideUIUIPanel(TopUIPanels[i], isBreadcrumbBarPanel: false);
+                        }
+                    }
+
+
+                    await MainPanel.OpenPanel();
+
                     UIManager.Instance.GetComponent<AppBarPanel>().Bnt_ShengShi_Click();
                     return;
 
@@ -55,7 +69,7 @@ namespace Mono.Utility
                 case 9:
                     QiankundaiPanel.OpenPanel();
                     return;
-       
+
 
                 default:
                     return;