Browse Source

修改bug

lzx 3 weeks ago
parent
commit
66b153ca8f

+ 9 - 9
Assets/Res/UI/ShopPanel/ShopBuyItemPanel.prefab

@@ -2480,8 +2480,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: -24, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_AnchoredPosition: {x: -16.9, y: 0}
+  m_SizeDelta: {x: 75.3278, y: 75.3278}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5929253866541863656
 CanvasRenderer:
@@ -2513,7 +2513,7 @@ MonoBehaviour:
       m_Calls: []
   m_Sprite: {fileID: 0}
   m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillAmount: 1
@@ -2521,14 +2521,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: icon_Coins_s
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 73bfe54518876535550be496297154c4
 --- !u!1 &8647841845764189340
 GameObject:
   m_ObjectHideFlags: 0

+ 12 - 417
Assets/Res/UI/WidgetItem.prefab

@@ -59,7 +59,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0.65882355, b: 1, a: 1}
+  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
@@ -67,7 +67,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -76,14 +76,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_Round09
+  _icon_name: dec_di_05
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 23f1ff3af41427347a63b9cc35608247, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 
 --- !u!1 &2131945247927171021
 GameObject:
   m_ObjectHideFlags: 0
@@ -120,7 +120,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: 90, y: 90}
+  m_SizeDelta: {x: 78.238, y: 78.2376}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &378238944744485029
 CanvasRenderer:
@@ -168,90 +168,6 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
     packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
     lasetJsonGUID: 73bfe54518876535550be496297154c4
---- !u!1 &2142678362332709341
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 964352678154303035}
-  - component: {fileID: 4342284182114600201}
-  - component: {fileID: 1283466631733007029}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: glow
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &964352678154303035
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2142678362332709341}
-  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: 1515036893769208877}
-  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, y: 0}
-  m_SizeDelta: {x: 90, y: 90}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4342284182114600201
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2142678362332709341}
-  m_CullTransparentMesh: 1
---- !u!114 &1283466631733007029
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2142678362332709341}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.03137255, g: 0.9372549, 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_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_BgGlow
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 23f1ff3af41427347a63b9cc35608247, type: 3}
-  packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &6624212208645409916
 GameObject:
   m_ObjectHideFlags: 0
@@ -288,8 +204,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: 24.2355, y: -30.7382}
-  m_SizeDelta: {x: 35.729, y: 25.5237}
+  m_AnchoredPosition: {x: 0.2597, y: -30.7382}
+  m_SizeDelta: {x: 83.6805, y: 25.5237}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3511437002229949790
 CanvasRenderer:
@@ -348,258 +264,6 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
---- !u!1 &7543347028993922308
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6033858037849463588}
-  - component: {fileID: 4164539319831174714}
-  - component: {fileID: 7794577998912831486}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Light
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &6033858037849463588
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7543347028993922308}
-  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: 1515036893769208877}
-  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, y: 26.6}
-  m_SizeDelta: {x: 90, y: 40.4}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4164539319831174714
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7543347028993922308}
-  m_CullTransparentMesh: 1
---- !u!114 &7794577998912831486
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7543347028993922308}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.20784314, g: 0.9843137, 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_Sprite: {fileID: 0}
-  m_Type: 1
-  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_BgLight
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 23f1ff3af41427347a63b9cc35608247, type: 3}
-  packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
---- !u!1 &7555558118397148106
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5410523429226151182}
-  - component: {fileID: 4212259591542464616}
-  - component: {fileID: 1450320523742611154}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Border
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &5410523429226151182
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7555558118397148106}
-  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: 1515036893769208877}
-  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, y: 0}
-  m_SizeDelta: {x: 95.5, y: 97.3}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4212259591542464616
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7555558118397148106}
-  m_CullTransparentMesh: 1
---- !u!114 &1450320523742611154
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7555558118397148106}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.09411765, g: 0.09411765, b: 0.20392157, 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: 1
-  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_Border
-  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: 8924b78c393d2a2d8f9dd44d02a397a9
---- !u!1 &7948008364224510343
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1614591406946658395}
-  - component: {fileID: 993756947673480146}
-  - component: {fileID: 1507289069375796058}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: CornerDeco
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1614591406946658395
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7948008364224510343}
-  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: 1515036893769208877}
-  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, y: 0}
-  m_SizeDelta: {x: 90, y: 90}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &993756947673480146
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7948008364224510343}
-  m_CullTransparentMesh: 1
---- !u!114 &1507289069375796058
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7948008364224510343}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.17254902, g: 0.74509805, 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_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_CornerDeco
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 23f1ff3af41427347a63b9cc35608247, type: 3}
-  packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &8408847998961895963
 GameObject:
   m_ObjectHideFlags: 0
@@ -610,7 +274,6 @@ GameObject:
   m_Component:
   - component: {fileID: 1515036893769208877}
   - component: {fileID: 5132790119407906693}
-  - component: {fileID: 1991110530740727775}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: WidgetItem
@@ -631,11 +294,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children:
-  - {fileID: 5410523429226151182}
   - {fileID: 1835098571422434311}
-  - {fileID: 1614591406946658395}
-  - {fileID: 6033858037849463588}
-  - {fileID: 964352678154303035}
   - {fileID: 3545244106223690488}
   - {fileID: 5126391295778819725}
   m_Father: {fileID: 0}
@@ -659,7 +318,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   data:
   - key: btnClick
-    gameObject: {fileID: 1991110530740727775}
+    gameObject: {fileID: 0}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
@@ -673,73 +332,9 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: corner
-    gameObject: {fileID: 1507289069375796058}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: glow
-    gameObject: {fileID: 1283466631733007029}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: light
-    gameObject: {fileID: 7794577998912831486}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: border
-    gameObject: {fileID: 1450320523742611154}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: Text_Count
     gameObject: {fileID: 2040418680614370182}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 1
---- !u!114 &1991110530740727775
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8408847998961895963}
-  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: 0
-  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: 0}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []

+ 19 - 0
Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType3.cs

@@ -2,6 +2,8 @@ using System.Collections.Generic;
 using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
+using GameLogic.Bag;
+using GameLogic.Player;
 using UnityEngine;
 
 namespace Fort23.Mono
@@ -52,9 +54,26 @@ namespace Fort23.Mono
 
             if (conditionConfig.optionType == 3)
             {
+                List<ItemInfo> itemInfos = new List<ItemInfo>();
                 for (var i = 0; i < conditionConfig.PrizeIDs.Length; i++)
+                {
+                    DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(conditionConfig.PrizeIDs[i]);
+                    if (dropConfig.dropType == 3)
+                    {
+                        ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], conditionConfig.PrizeNums[i]);
+                        itemInfos.Add(itemInfo);
+                    }
+                    else
+                    {
+                        List<ItemInfo> items = DropManager.Instance.DropItem(conditionConfig.PrizeIDs[i]);
+                        itemInfos.AddRange(items);
+                    }
+                }
+
+                for (var i = 0; i < itemInfos.Count; i++)
                 {
                     WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
+                    widgetItem.InitWidget(itemInfos[i]);
                     widgetList.Add(widgetItem);
                 }
             }

+ 3 - 35
Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs

@@ -9,7 +9,7 @@ using Utility;
 namespace Fort23.Mono
 {
     [UIBinding(prefab = "WidgetItem")]
-    public partial class WidgetItem : UIComponent
+    public partial class WidgetItem : ItemWidgetBasic
     {
         public ItemInfo itemInfo;
 
@@ -28,40 +28,14 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            btnClick.onClick.AddListener(OnclickItem);
+            base.AddButtonEvent();
         }
 
-        private Action onClickItem;
 
-        private async void OnclickItem()
-        {
-            if (onClickItem != null)
-            {
-                onClickItem.Invoke();
-                return;
-            }
-
-            if (itemInfo == null)
-            {
-                return;
-            }
-
-
-            // ItemPanel itemPanel = await UIManager.Instance.LoadAndOpenPanel<ItemPanel>(null, layer: UILayer.Top);
-            // itemPanel.InitItemPanel(itemInfo);
-        }
-
-        public void InitWidget(ItemInfo itemInfo, Action onClickItem = null)
+        public void InitWidget(ItemInfo itemInfo)
         {
             this.itemInfo = itemInfo;
 
-            this.onClickItem = onClickItem;
-
-
-            border.gameObject.SetActive(false);
-            light.gameObject.SetActive(false);
-
-
             icon.gameObject.SetActive(true);
             icon.icon_name = itemInfo.config.icon;
 
@@ -74,12 +48,6 @@ namespace Fort23.Mono
             {
                 Text_Count.gameObject.SetActive(false);
             }
-
-
-      
         }
-
-   
-     
     }
 }

+ 0 - 44
Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItemData.cs

@@ -41,50 +41,6 @@ namespace Fort23.Mono
 	      return _icon;
 	     }
 	   }
-	  private MyImage _corner;
-	  public MyImage corner
-	   {
-	   get{
-	      if (_corner == null)
-	       {
-	         _corner  = GetUIUnit<MyImage>("corner"); 
-	       }
-	      return _corner;
-	     }
-	   }
-	  private MyImage _glow;
-	  public MyImage glow
-	   {
-	   get{
-	      if (_glow == null)
-	       {
-	         _glow  = GetUIUnit<MyImage>("glow"); 
-	       }
-	      return _glow;
-	     }
-	   }
-	  private MyImage _light;
-	  public MyImage light
-	   {
-	   get{
-	      if (_light == null)
-	       {
-	         _light  = GetUIUnit<MyImage>("light"); 
-	       }
-	      return _light;
-	     }
-	   }
-	  private MyImage _border;
-	  public MyImage border
-	   {
-	   get{
-	      if (_border == null)
-	       {
-	         _border  = GetUIUnit<MyImage>("border"); 
-	       }
-	      return _border;
-	     }
-	   }
 	  private Text _Text_Count;
 	  public Text Text_Count
 	   {

+ 7 - 2
Assets/Scripts/GameUI/UI/ShopPanel/ShopBuyItemPanel.cs

@@ -53,8 +53,13 @@ namespace Fort23.Mono
             {
                 LimitObj.SetActive(false);
                 Text_LimitCount.text = "无";
-                int total = (int)(PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId) / _shopItemConfig.price);
-                maxCount = total >= 10 ? 10 : total;
+                if (_shopItemConfig.price != 0)
+                {
+                    int total = (int)(PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId) / _shopItemConfig.price);
+                    maxCount = total >= 10 ? 10 : total;
+                }
+
+        
                 if (maxCount <= 1)
                 {
                     maxCount = 1;