添加道具来源

Assets/Res/Config/SubunlockConfig.json.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CnsYsi2oUnPlP7iH2ZIaEbsHc1WITvj0Shczjviwqe6OyBNburPZR5WAyXQD
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Res/UI/HeroInformainPanel/BreakthroughItemWidget.prefab

@@ -253,7 +253,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 173
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -297,6 +297,7 @@ RectTransform:
   - {fileID: 1310645453007886697}
   - {fileID: 8981834546738952748}
   - {fileID: 6116636856672540646}
+  - {fileID: 4181092973923743777}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -355,6 +356,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_BiXuan
+    gameObject: {fileID: 2225688117431386680}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1263351331824940359
 GameObject:
@@ -445,6 +451,96 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &2225688117431386680
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4181092973923743777}
+  - component: {fileID: 5486322802044342715}
+  - component: {fileID: 4699550697693137475}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_BiXuan
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4181092973923743777
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2225688117431386680}
+  m_LocalRotation: {x: -0, y: -0, z: -0.3291306, w: 0.94428444}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 475623016777946934}
+  m_Father: {fileID: 3856099267002940727}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -38.432}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 50.7, y: 67}
+  m_SizeDelta: {x: 52.7957, y: 25.5}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5486322802044342715
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2225688117431386680}
+  m_CullTransparentMesh: 1
+--- !u!114 &4699550697693137475
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2225688117431386680}
+  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: 1, g: 0.7971634, b: 0, 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: dec_juxing_fang
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3146607763712491281
 GameObject:
   m_ObjectHideFlags: 0
@@ -718,6 +814,86 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &4957369172553843102
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 475623016777946934}
+  - component: {fileID: 433291608530119299}
+  - component: {fileID: 5930638611014632509}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &475623016777946934
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4957369172553843102}
+  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: 4181092973923743777}
+  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 &433291608530119299
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4957369172553843102}
+  m_CullTransparentMesh: 1
+--- !u!114 &5930638611014632509
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4957369172553843102}
+  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: 1, g: 1, b: 1, 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: 21
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5FC5\u9009"
 --- !u!1 &5542988229873938906
 GameObject:
   m_ObjectHideFlags: 0
@@ -802,7 +978,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
-  imageH: 0
+  imageH: 49
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -545,7 +545,7 @@ 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: 14.6087, y: -121.8}
+  m_AnchoredPosition: {x: 14.6087, y: -65}
   m_SizeDelta: {x: 360.7261, y: 47.482}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9114512850496883058
@@ -780,7 +780,7 @@ 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: 24.578, y: -218.5}
+  m_AnchoredPosition: {x: 24.578, y: -161.70001}
   m_SizeDelta: {x: 0, y: 44.6864}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &3248700240164994911
@@ -1587,7 +1587,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &911137624813293350
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3386,7 +3386,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 148, y: -22.3432}
-  m_SizeDelta: {x: 0, y: 43.2862}
+  m_SizeDelta: {x: 210, y: 43.2862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8334097589539832799
 CanvasRenderer:

Assets/Res/UI/HeroInformainPanel/SelectBreakthroughItemPanel.prefab

@@ -1404,9 +1404,10 @@ GameObject:
   - component: {fileID: 9198324535325377333}
   - component: {fileID: 1919216458194637271}
   - component: {fileID: 161450581117546731}
+  - component: {fileID: 8687353150001497630}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: Btn_Source
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1483,6 +1484,50 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &8687353150001497630
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6159501268962948132}
+  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: 161450581117546731}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &6215852629805600750
 GameObject:
   m_ObjectHideFlags: 0
@@ -2056,6 +2101,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_Source
+    gameObject: {fileID: 8687353150001497630}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &7472297620610942561
 GameObject:

Assets/Res/UI/ItemDetailsPanel/ItemSourcePanel.prefab

@@ -76,6 +76,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_ItemCount
+    gameObject: {fileID: 4544817006371544017}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1512646988812651499
 GameObject:

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -3610,17 +3610,25 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 1617875011636537765}
     m_Modifications:
+    - target: {fileID: 190212745799934930, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
     - target: {fileID: 190212745799934930, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 190212745799934930, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 190212745799934930, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 190212745799934930, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 132
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 190212745799934930, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_SizeDelta.y
@@ -3628,16 +3636,24 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 190212745799934930, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 126.5
+      value: 0.0000038146973
       objectReference: {fileID: 0}
     - target: {fileID: 190212745799934930, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -40
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 223390331332690867, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 478771495642520220, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 912377578735023465, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 988966570303324014, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: imageH
       value: 80
@@ -3656,16 +3672,32 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1428057306796271496, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 72.3319
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1428057306796271496, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 1428057306796271496, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 1428057306796271496, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1.2
       objectReference: {fileID: 0}
     - target: {fileID: 1428057306796271496, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 80
+      value: 66
       objectReference: {fileID: 0}
     - target: {fileID: 1428057306796271496, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -52.5471
       objectReference: {fileID: 0}
+    - target: {fileID: 1428057306796271496, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1857144795658525653, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_Text
       value: "\u5347\u7EA7"
@@ -3678,6 +3710,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3316492997268049364, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -3692,7 +3728,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchorMin.x
@@ -3700,7 +3736,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_SizeDelta.x
@@ -3740,11 +3776,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 403.3
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -3778,6 +3814,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -23.3427
       objectReference: {fileID: 0}
+    - target: {fileID: 6527365135982362874, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6631462235644381492, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchorMax.y
       value: 1
@@ -3834,6 +3874,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -16.0056
       objectReference: {fileID: 0}
+    - target: {fileID: 8314412305974709541, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8876077731990523891, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0
@@ -4119,17 +4163,25 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 1617875011636537765}
     m_Modifications:
+    - target: {fileID: 190212745799934930, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
     - target: {fileID: 190212745799934930, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 190212745799934930, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 190212745799934930, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 190212745799934930, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 132
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 190212745799934930, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_SizeDelta.y
@@ -4137,11 +4189,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 190212745799934930, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 126.5
+      value: -0.0000038146973
       objectReference: {fileID: 0}
     - target: {fileID: 190212745799934930, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -40
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 988966570303324014, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: imageH
@@ -4171,6 +4223,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3316492997268049364, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -4185,7 +4241,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchorMin.x
@@ -4193,11 +4249,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 253
+      value: 25
       objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_SizeDelta.y
@@ -4233,11 +4289,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 126.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -4251,10 +4307,18 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6527365135982362874, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6681106713277912565, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_Name
       value: Btn_UpStar
       objectReference: {fileID: 0}
+    - target: {fileID: 6681106713277912565, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7321088728748222176, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_AnchorMax.y
       value: 1
@@ -4275,6 +4339,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -18.27075
       objectReference: {fileID: 0}
+    - target: {fileID: 8314412305974709541, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Scripts/GameData/ExcelConfig/SubunlockConfig.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: DHpJ5i2pVX6jCRs87+oHyO04Msx3eUtseOnA1iTSJXW4Dc/YLmilZFNZ1/07
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/GameLogic/Hero/SkillInfo.cs

@@ -97,8 +97,8 @@ namespace GameLogic.Hero
             {
                 for (int i = 0; i < skillConfig.intensifierIndex.Length; i++)
                 {
-                    // int index = skillConfig.intensifierIndex[i] - 1;
-                    int index = skillConfig.intensifierIndex[i] ;
+                    int index = skillConfig.intensifierIndex[i] - 1;
+                    // int index = skillConfig.intensifierIndex[i] ;
                     if (index >= 0 && index < effectValue.Length)
                     {
                         effectValue[index] = effectValue[index] * SkillPowerupConfig.SkillPower1 * 0.01f;

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -88,28 +88,34 @@ namespace Fort23.Mono
 
                 if (PlayerManager.Instance.myHero.level.Value < _skillInfo.SkillPowerupConfig.PlayerLevelLimit)
                 {
-                    HeroPowerUpConfig heroPowerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(_skillInfo.SkillPowerupConfig.PlayerLevelLimit);
-                    TipMessagePanel.OpenTipMessagePanel($"需境界达到{LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2])}");
+                    HeroPowerUpConfig heroPowerUpConfig =
+                        ConfigComponent.Instance.Get<HeroPowerUpConfig>(_skillInfo.SkillPowerupConfig.PlayerLevelLimit);
+                    TipMessagePanel.OpenTipMessagePanel(
+                        $"需境界达到{LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2])}");
                     return;
                 }
 
                 for (var i = 0; i < _skillInfo.SkillPowerupConfig.LevelupItem.Length; i++)
                 {
-                    if (!PlayerManager.Instance.BagController.IsEnough(_skillInfo.SkillPowerupConfig.LevelupItem[i], _skillInfo.SkillPowerupConfig.LevelupItemNum[i]))
+                    if (!PlayerManager.Instance.BagController.IsEnough(_skillInfo.SkillPowerupConfig.LevelupItem[i],
+                            _skillInfo.SkillPowerupConfig.LevelupItemNum[i]))
                     {
+                        ItemSourcePanel.OpenPanel(_skillInfo.SkillPowerupConfig.LevelupItem[i]);
                         TipMessagePanel.OpenTipMessagePanel("道具不足！");
                         return;
                     }
                 }
 
-                for (var i = 0; i < _skillInfo.SkillPowerupConfig.LevelupItem.Length; i++)
-                {
-                    if (!PlayerManager.Instance.BagController.DeductItem(_skillInfo.SkillPowerupConfig.LevelupItem[i], _skillInfo.SkillPowerupConfig.LevelupItemNum[i]))
-                    {
-                        TipMessagePanel.OpenTipMessagePanel("道具不足！");
-                        return;
-                    }
-                }
+                // for (var i = 0; i < _skillInfo.SkillPowerupConfig.LevelupItem.Length; i++)
+                // {
+                //     if (!PlayerManager.Instance.BagController.DeductItem(_skillInfo.SkillPowerupConfig.LevelupItem[i],
+                //             _skillInfo.SkillPowerupConfig.LevelupItemNum[i]))
+                //     {
+                //         ItemSourcePanel.OpenPanel(_skillInfo.SkillPowerupConfig.LevelupItem[i]);
+                //         TipMessagePanel.OpenTipMessagePanel("道具不足！");
+                //         return;
+                //     }
+                // }
 
                 _skillInfo.SkillData.level++;
                 _skillInfo.CustomInt(_skillInfo.SkillData);
@@ -141,6 +147,7 @@ namespace Fort23.Mono
 
                 if (!PlayerManager.Instance.BagController.DeductItem(_skillInfo.skillConfig.PieceID, count))
                 {
+                    ItemSourcePanel.OpenPanel(_skillInfo.skillConfig.PieceID);
                     TipMessagePanel.OpenTipMessagePanel("道具不足！");
                     return;
                 }
@@ -174,7 +181,8 @@ namespace Fort23.Mono
 
             UpdateStarBtn();
 
-            Text_GongFaDesc.text = UtilTools.GetString(LanguageManager.Instance.Text(skillConfig.dec), _skillInfo.effectValue);
+            Text_GongFaDesc.text =
+                UtilTools.GetString(LanguageManager.Instance.Text(skillConfig.dec), _skillInfo.effectValue);
             Text_GongFaName.text = LanguageManager.Instance.Text(skillConfig.name) + " ";
             LayoutRebuilder.ForceRebuildLayoutImmediate(Text_GongFaName.GetComponent<RectTransform>());
             LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Level.GetComponent<RectTransform>());
@@ -253,8 +261,10 @@ namespace Fort23.Mono
             {
                 if (configs[i].level == 1)
                     continue;
-                SkillInfo skillInfo1 = new SkillInfo(configs[i].IDGroup, _skillInfo.SkillPowerupConfig.ID, configs[i].level);
-                GongFaUpgradeInfoWidget gongFaUpgradeInfoWidget = await UIManager.Instance.CreateGComponent<GongFaUpgradeInfoWidget>(null, Content);
+                SkillInfo skillInfo1 =
+                    new SkillInfo(configs[i].IDGroup, _skillInfo.SkillPowerupConfig.ID, configs[i].level);
+                GongFaUpgradeInfoWidget gongFaUpgradeInfoWidget =
+                    await UIManager.Instance.CreateGComponent<GongFaUpgradeInfoWidget>(null, Content);
                 gongFaUpgradeInfoWidget.CustomInit(_skillInfo, skillInfo1, false);
                 _gongFaUpgradeInfoWidgets.Add(gongFaUpgradeInfoWidget);
             }
@@ -297,22 +307,29 @@ namespace Fort23.Mono
                         }
                         else
                         {
-                            effs[i] = $"{_skillInfo.effectValue[i].ToString()}<color=green>→({nextSkillInfo.effectValue[i]})</color>";
+                            effs[i] =
+                                $"{_skillInfo.effectValue[i].ToString()}<color=green>→({nextSkillInfo.effectValue[i]})</color>";
                         }
                     }
 
 
                     Text_NextLevel.gameObject.SetActive(true);
-                    Text_NextLevel.text = $"{_skillInfo.SkillPowerupConfig.ID}级  →  {nextSkillInfo.SkillPowerupConfig.ID}级";
+                    Text_NextLevel.text =
+                        $"{_skillInfo.SkillPowerupConfig.ID}级  →  {nextSkillInfo.SkillPowerupConfig.ID}级";
 
 
-                    Text_GongFaDesc.text = UtilTools.GetString(LanguageManager.Instance.Text(_skillInfo.skillConfig.dec), effs);
+                    Text_GongFaDesc.text =
+                        UtilTools.GetString(LanguageManager.Instance.Text(_skillInfo.skillConfig.dec), effs);
 
                     Btn_UpStar.gameObject.SetActive(false);
+                    Btn_UpGrade.GetComponent<RectTransform>().sizeDelta = new Vector2(481, 80);
                     if (PlayerManager.Instance.myHero.level.Value < _skillInfo.SkillPowerupConfig.PlayerLevelLimit)
                     {
-                        HeroPowerUpConfig heroPowerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(_skillInfo.SkillPowerupConfig.PlayerLevelLimit);
-                        Text_UpGrade.text = $"需境界达到{LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2])}";
+                        HeroPowerUpConfig heroPowerUpConfig =
+                            ConfigComponent.Instance.Get<HeroPowerUpConfig>(_skillInfo.SkillPowerupConfig
+                                .PlayerLevelLimit);
+                        Text_UpGrade.text =
+                            $"需境界达到{LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2])}";
                         Btn_UpGrade.gameObject.transform.Gray(true);
                         UpGradeItemRoot.SetActive(false);
                     }
@@ -323,8 +340,11 @@ namespace Fort23.Mono
                         UpGradeItemRoot.SetActive(true);
                         for (var i = 0; i < _skillInfo.SkillPowerupConfig.LevelupItem.Length; i++)
                         {
-                            ItemWidgetType1 itemWidgetType1 = await UIManager.Instance.CreateGComponentForObject<ItemWidgetType1>(ItemWidgetType1Gam, null, UpGradeItemRoot.GetComponent<RectTransform>(), isInstance: true);
-                            itemWidgetType1.CustomInit(_skillInfo.SkillPowerupConfig.LevelupItem[i], _skillInfo.SkillPowerupConfig.LevelupItemNum[i]);
+                            ItemWidgetType1 itemWidgetType1 =
+                                await UIManager.Instance.CreateGComponentForObject<ItemWidgetType1>(ItemWidgetType1Gam,
+                                    null, UpGradeItemRoot.GetComponent<RectTransform>(), isInstance: true);
+                            itemWidgetType1.CustomInit(_skillInfo.SkillPowerupConfig.LevelupItem[i],
+                                _skillInfo.SkillPowerupConfig.LevelupItemNum[i]);
                             _itemWidgetType1.Add(itemWidgetType1);
 
                             // EnergyWidget energyWidget =
@@ -338,6 +358,7 @@ namespace Fort23.Mono
                 }
                 else
                 {
+                  
                     Text_NextLevel.gameObject.SetActive(true);
                     Text_NextLevel.text = $"{_skillInfo.skillConfig.level}级  →  Max级";
                     Text_UpGrade.text = "已满级";
@@ -349,6 +370,7 @@ namespace Fort23.Mono
 
             if (isUpStar)
             {
+                Btn_UpStar.GetComponent<RectTransform>().sizeDelta = new Vector2(481, 80);
                 foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)
                 {
                     gongFaUpgradeInfoWidget.SelectWidget(true);
@@ -361,7 +383,9 @@ namespace Fort23.Mono
                     Btn_UpGrade.gameObject.SetActive(false);
                     UpStarItemRoot.SetActive(true);
                     int count = skillConstant.SkillPromoteNeedPieceNum[_skillInfo.skillConfig.level];
-                    ItemWidgetType1 itemWidgetType1 = await UIManager.Instance.CreateGComponentForObject<ItemWidgetType1>(ItemWidgetType1Gam, null, UpStarItemRoot.GetComponent<RectTransform>(), isInstance: true);
+                    ItemWidgetType1 itemWidgetType1 =
+                        await UIManager.Instance.CreateGComponentForObject<ItemWidgetType1>(ItemWidgetType1Gam, null,
+                            UpStarItemRoot.GetComponent<RectTransform>(), isInstance: true);
                     itemWidgetType1.CustomInit(_skillInfo.skillConfig.PieceID, count);
                     _itemWidgetType1.Add(itemWidgetType1);
 
@@ -381,6 +405,9 @@ namespace Fort23.Mono
 
             if (!isUpGrad && !isUpStar)
             {
+                Btn_UpGrade.GetComponent<RectTransform>().sizeDelta = new Vector2(253, 80);
+                Btn_UpStar.GetComponent<RectTransform>().sizeDelta = new Vector2(253, 80);
+                
                 Btn_UpGrade.gameObject.SetActive(true);
                 Btn_UpStar.gameObject.SetActive(true);
                 UpStarItemRoot.SetActive(false);
@@ -394,7 +421,8 @@ namespace Fort23.Mono
                 }
 
                 Text_NextLevel.gameObject.SetActive(false);
-                Text_GongFaDesc.text = UtilTools.GetString(LanguageManager.Instance.Text(_skillInfo.skillConfig.dec), _skillInfo.effectValue);
+                Text_GongFaDesc.text = UtilTools.GetString(LanguageManager.Instance.Text(_skillInfo.skillConfig.dec),
+                    _skillInfo.effectValue);
             }
 
             LayoutRebuilder.ForceRebuildLayoutImmediate(UpStarItemRoot.GetComponent<RectTransform>());
@@ -424,6 +452,7 @@ namespace Fort23.Mono
             {
                 UIManager.Instance.DormancyGComponent(itemWidgetType1);
             }
+
             //
             // foreach (var energyWidget in _energyWidgets)
             // {

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

@@ -108,11 +108,12 @@ namespace Fort23.Mono
         }
 
 
-        public void CustomInit(int type, int itemId)
+        public void CustomInit(int type, int itemId,bool isBiXuan)
         {
             this.type = type;
             this.itemId = itemId;
 
+            Icon_BiXuan.SetActive(isBiXuan);
             if (type == 1)
             {
                 Text_Bl.text = $"+{0}";

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

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

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

@@ -313,19 +313,19 @@ namespace Fort23.Mono
 
                 breakthroughItemWidgets = await cTaskAwaitBuffer.WaitAll();
 
-                breakthroughItemWidgets[0].CustomInit(1, 0);
+                breakthroughItemWidgets[0].CustomInit(1, 0,false);
 
 
                 //必选道具
                 for (var i = 0; i < heroPowerUpConfig.DujieMustItemIDs.Length; i++)
                 {
-                    breakthroughItemWidgets[i + 1].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i]);
+                    breakthroughItemWidgets[i + 1].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i],true);
                 }
 
                 //可选道具
                 for (var i = 0; i < heroPowerUpConfig.DujieItemIDs.Length; i++)
                 {
-                    breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1].CustomInit(2, heroPowerUpConfig.DujieItemIDs[i]);
+                    breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1].CustomInit(2, heroPowerUpConfig.DujieItemIDs[i],false);
                 }
 
                 for (var i = 0; i < breakthroughItemWidgets.Count; i++)
@@ -554,19 +554,19 @@ namespace Fort23.Mono
 
                 breakthroughItemWidgets = await cTaskAwaitBuffer.WaitAll();
 
-                breakthroughItemWidgets[0].CustomInit(1, 0);
+                breakthroughItemWidgets[0].CustomInit(1, 0,false);
 
 
                 //必选道具
                 for (var i = 0; i < heroPowerUpConfig.DujieMustItemIDs.Length; i++)
                 {
-                    breakthroughItemWidgets[i + 1].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i]);
+                    breakthroughItemWidgets[i + 1].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i],true);
                 }
 
                 //可选道具
                 for (var i = 0; i < heroPowerUpConfig.DujieItemIDs.Length; i++)
                 {
-                    breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1].CustomInit(2, heroPowerUpConfig.DujieItemIDs[i]);
+                    breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1].CustomInit(2, heroPowerUpConfig.DujieItemIDs[i],false);
                 }
 
                 for (var i = 0; i < breakthroughItemWidgets.Count; i++)

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

@@ -45,6 +45,11 @@ namespace Fort23.Mono
                 UIManager.Instance.HideUIUIPanel(this);
             });
             Btn_Cancel.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+            
+            Btn_Source.onClick.AddListener(() =>
+            {
+                ItemSourcePanel.OpenPanel(itemConfig.ID);
+            });
         }
 
         public void CustomInit(BreakthroughItemWidget breakthroughItemWidget, Action callBack)

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

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

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

@@ -101,6 +101,12 @@ namespace Fort23.Mono
         {
             ElixirItemWidget elixirItemWidget = obj as ElixirItemWidget;
 
+            if (!PlayerManager.Instance.BagController.IsEnough(elixirItemWidget._itemConfig.ID, 1))
+            {
+                ItemSourcePanel.OpenPanel(elixirItemWidget._itemConfig.ID);
+                return;
+            }
+
             if (elixirItemWidget == this.elixirItemWidget)
             {
                 this.elixirItemWidget = null;

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

@@ -7,9 +7,9 @@ using Mono.Utility;
 
 namespace Fort23.Mono
 {
-	[UIBinding(prefab = "ItemSourcePanel"  )]
-	public partial class ItemSourcePanel : UIPanel
-	{
+    [UIBinding(prefab = "ItemSourcePanel")]
+    public partial class ItemSourcePanel : UIPanel
+    {
         List<SkipToWidget> skipToWidgets = new List<SkipToWidget>();
         private CTask<bool> callBack;
         private bool isSkipto = false;
@@ -30,23 +30,28 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-           
         }
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
-           int itemId = (int)uiData[0];
+            int itemId = (int)uiData[0];
             callBack = uiData[1] as CTask<bool>;
             ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(itemId);
             Text_ItemName.text = LanguageManager.Instance.Text(itemConfig.itemName);
-     
-            // foreach (var skiptoId in eventConditionConfig.SkiptoIds)
-            // {
-            //     SkipToWidget skipToWidget = await UIManager.Instance.CreateGComponent<SkipToWidget>(null, Content);
-            //     skipToWidget.CustonInit(skiptoId);
-            //     skipToWidgets.Add(skipToWidget);
-            //     skipToWidget.OnClick = OnClick;
-            // }
+            Icon_quality.icon_name = "dec_wupin_pinzhi" + itemConfig.quality;
+
+            Icon_Item.icon_name = itemConfig.icon;
+            Text_ItemCount.text = PlayerManager.Instance.BagController.GetItemCount(itemId).ToString();
+            if (itemConfig.SkiptoID != null)
+            {
+                foreach (var skiptoId in itemConfig.SkiptoID)
+                {
+                    SkipToWidget skipToWidget = await UIManager.Instance.CreateGComponent<SkipToWidget>(null, Content);
+                    skipToWidget.CustonInit(skiptoId);
+                    skipToWidgets.Add(skipToWidget);
+                    skipToWidget.OnClick = OnClick;
+                }
+            }
 
 
             return await base.AsyncInit(uiData);
@@ -63,7 +68,8 @@ namespace Fort23.Mono
         public static async CTask<bool> OpenPanel(int itemId)
         {
             CTask<bool> callBack = CTask<bool>.Create();
-            await UIManager.Instance.LoadAndOpenPanel<ItemSourcePanel>(null, UILayer.Top, uiData: new object[] { itemId, callBack },isShowBG:true);
+            await UIManager.Instance.LoadAndOpenPanel<ItemSourcePanel>(null, UILayer.Top,
+                uiData: new object[] { itemId, callBack }, isShowBG: true);
             return await callBack;
         }
 
@@ -80,6 +86,5 @@ namespace Fort23.Mono
 
             base.Close();
         }
-
-	}
-}
+    }
+}

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

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

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs

@@ -88,6 +88,7 @@ namespace Fort23.Mono
                     {
                         if (!PlayerManager.Instance.BagController.IsEnough(selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i], selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemCosts[i]))
                         {
+                            ItemSourcePanel.OpenPanel(selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i]);
                             TipMessagePanel.OpenTipMessagePanel("道具不足");
                             return;
                         }
@@ -97,6 +98,7 @@ namespace Fort23.Mono
                     {
                         if (!PlayerManager.Instance.BagController.IsEnough(selectedFaBaoInfo.FabaoConfig.ItemID, selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[0]))
                         {
+                            ItemSourcePanel.OpenPanel(selectedFaBaoInfo.FabaoConfig.ItemID);
                             TipMessagePanel.OpenTipMessagePanel("道具不足");
                             return;
                         }