修改商店ui

Assets/Res/UI/ShopPanel/EnergyWidget.prefab

@@ -504,14 +504,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_Money_Coin
+  _icon_name: icon_Coins_s
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, 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: 8d9ab9e4149f177d8f9e24b21864b7f2
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 73bfe54518876535550be496297154c4
 --- !u!114 &8006296425618279164
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Res/UI/ShopPanel/ShopItemWidgetType2.prefab

@@ -1035,6 +1035,7 @@ GameObject:
   - component: {fileID: 7133505018926026809}
   - component: {fileID: 8305500091262592680}
   - component: {fileID: 7063260184671374462}
+  - component: {fileID: 2737949340872899341}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Num
@@ -1059,8 +1060,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -12.199997, y: -6.0999985}
-  m_SizeDelta: {x: 279.0612, y: 92.1}
+  m_AnchoredPosition: {x: -9, y: -8.7911}
+  m_SizeDelta: {x: 279.0612, y: 47.9477}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &8305500091262592680
 CanvasRenderer:
@@ -1092,10 +1093,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
+    m_FontSize: 34
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 2
     m_MaxSize: 40
     m_Alignment: 0
     m_AlignByGeometry: 0
@@ -1103,7 +1104,22 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 
+  m_Text: 999
+--- !u!114 &2737949340872899341
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7498906330654606191}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &7520844935006336794
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetItem.prefab

@@ -84,91 +84,6 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
---- !u!1 &1916043416167554874
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4888607739940384859}
-  - component: {fileID: 779412639187092613}
-  - component: {fileID: 688604031375068469}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: numDi
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4888607739940384859
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1916043416167554874}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5126391295778819725}
-  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: 36.5, y: -30.6}
-  m_SizeDelta: {x: 25, y: 25}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &779412639187092613
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1916043416167554874}
-  m_CullTransparentMesh: 1
---- !u!114 &688604031375068469
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1916043416167554874}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.70647913, g: 0.76551175, b: 0.7924528, 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_Round04
-  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 &2131945247927171021
 GameObject:
   m_ObjectHideFlags: 0
@@ -347,10 +262,11 @@ GameObject:
   m_Component:
   - component: {fileID: 5126391295778819725}
   - component: {fileID: 3511437002229949790}
-  - component: {fileID: 152719506220457532}
+  - component: {fileID: 2040418680614370182}
+  - component: {fileID: 3965198821937596680}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: txt
+  m_Name: Text_Count
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -368,12 +284,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 4888607739940384859}
+  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: -34.7, y: 0}
-  m_SizeDelta: {x: 72, y: 87}
+  m_AnchoredPosition: {x: 24.2355, y: -30.7382}
+  m_SizeDelta: {x: 35.729, y: 25.5237}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3511437002229949790
 CanvasRenderer:
@@ -383,7 +299,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6624212208645409916}
   m_CullTransparentMesh: 1
---- !u!114 &152719506220457532
+--- !u!114 &2040418680614370182
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -392,7 +308,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 6624212208645409916}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -403,75 +319,35 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 3
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 7137805b022d44869b12d93cb388c588, type: 2}
-  m_sharedMaterial: {fileID: 8527393934874279224, guid: 7137805b022d44869b12d93cb388c588, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 16
-  m_fontSizeBase: 16
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 42
-  m_fontStyle: 0
-  m_HorizontalAlignment: 4
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 22
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 8
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 3
+--- !u!114 &3965198821937596680
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6624212208645409916}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  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
@@ -761,7 +637,7 @@ RectTransform:
   - {fileID: 6033858037849463588}
   - {fileID: 964352678154303035}
   - {fileID: 3545244106223690488}
-  - {fileID: 4888607739940384859}
+  - {fileID: 5126391295778819725}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -797,16 +673,6 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: num
-    gameObject: {fileID: 152719506220457532}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: numObj
-    gameObject: {fileID: 1916043416167554874}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: corner
     gameObject: {fileID: 1507289069375796058}
     isAssetBundle: 0
@@ -827,6 +693,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_Count
+    gameObject: {fileID: 2040418680614370182}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &1991110530740727775
 MonoBehaviour:

Assets/Scripts/GameLogic/EventManager/DialogueManager.cs

@@ -8,6 +8,7 @@ using Fort23.Mono;
 using Fort23.UTool;
 using GameLogic.Bag;
 using GameLogic.Combat.CombatTool;
+using GameLogic.Player;
 using UnityEngine;
 using Utility;
 
@@ -42,7 +43,6 @@ public class DialogueManager : Singleton<DialogueManager>
         {
             PlayDialogue(dialogueID);
         }
-      
     }
 
     private void PlayDialogue(int dialogueID)
@@ -131,11 +131,20 @@ public class DialogueManager : Singleton<DialogueManager>
                 List<ItemInfo> itemInfos = new List<ItemInfo>();
                 for (var i = 0; i < dialogueConfig.PrizeIDs.Length; i++)
                 {
-                    ItemInfo itemInfo = new ItemInfo(dialogueConfig.PrizeIDs[i], dialogueConfig.PrizeNums[i]);
-                    itemInfos.Add(itemInfo);
+                    DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(dialogueConfig.PrizeIDs[i]);
+                    if (dropConfig.dropType == 3)
+                    {
+                        ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], dialogueConfig.PrizeNums[i]);
+                        itemInfos.Add(itemInfo);
+                    }
+                    else
+                    {
+                        List<ItemInfo> items = DropManager.Instance.DropItem(dialogueConfig.PrizeIDs[i]);
+                        itemInfos.AddRange(items);
+                    }
                 }
 
-                await dialogue.OpenRewardsPanel(eventConfig.ID,itemInfos);
+                await dialogue.OpenRewardsPanel(eventConfig.ID, itemInfos);
                 LogTool.Log("对话结束，获得奖励");
                 break;
         }

Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs

@@ -63,15 +63,16 @@ namespace Fort23.Mono
 
 
             icon.gameObject.SetActive(true);
+            icon.icon_name = itemInfo.config.icon;
 
             if (itemInfo.count.Value > 0)
             {
-                numObj.SetActive(true);
-                num.text = itemInfo.count.Value.ToStringEx();
+                Text_Count.gameObject.SetActive(true);
+                Text_Count.text = itemInfo.count.Value.ToStringEx();
             }
             else
             {
-                numObj.SetActive(false);
+                Text_Count.gameObject.SetActive(false);
             }
 
 

Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItemData.cs

@@ -3,8 +3,6 @@ using Fort23.UTool;
 using UnityEngine.UI;
 using UnityEngine;
 using System.Collections.Generic;
-using TMPro;
-
 namespace Fort23.Mono
 {
 	public partial class WidgetItem 
@@ -43,28 +41,6 @@ namespace Fort23.Mono
 	      return _icon;
 	     }
 	   }
-	  private TextMeshProUGUI _num;
-	  public TextMeshProUGUI num
-	   {
-	   get{
-	      if (_num == null)
-	       {
-	         _num  = GetUIUnit<TextMeshProUGUI>("num"); 
-	       }
-	      return _num;
-	     }
-	   }
-	  private GameObject _numObj;
-	  public GameObject numObj
-	   {
-	   get{
-	      if (_numObj == null)
-	       {
-	         _numObj  = GetUIUnit<GameObject>("numObj"); 
-	       }
-	      return _numObj;
-	     }
-	   }
 	  private MyImage _corner;
 	  public MyImage corner
 	   {
@@ -109,6 +85,17 @@ namespace Fort23.Mono
 	      return _border;
 	     }
 	   }
+	  private Text _Text_Count;
+	  public Text Text_Count
+	   {
+	   get{
+	      if (_Text_Count == null)
+	       {
+	         _Text_Count  = GetUIUnit<Text>("Text_Count"); 
+	       }
+	      return _Text_Count;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{