ソースを参照

任务完成把道具添加到背包

lzx 12 時間 前
コミット
28b0d26c52

+ 89 - 0
Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -633,6 +633,94 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4F60"
+--- !u!1 &4637709884184476223
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7449959451257012562}
+  - component: {fileID: 1758095285339168937}
+  - component: {fileID: 1757363523434306847}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Bag
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7449959451257012562
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4637709884184476223}
+  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: 1803833552231621266}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 47, y: -129}
+  m_SizeDelta: {x: 59, y: 70}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &1758095285339168937
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4637709884184476223}
+  m_CullTransparentMesh: 1
+--- !u!114 &1757363523434306847
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4637709884184476223}
+  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: 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_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_ziyuan2
+  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: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &5477700202101321355
 GameObject:
   m_ObjectHideFlags: 0
@@ -668,6 +756,7 @@ RectTransform:
   - {fileID: 5263293711959085783}
   - {fileID: 6880477143338550539}
   - {fileID: 8657432734085162108}
+  - {fileID: 7449959451257012562}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}

+ 1 - 1
Assets/Scenes/testCombat.scene

@@ -2333,7 +2333,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

+ 16 - 13
Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -790,7 +790,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
     /// 完成事件
     /// </summary>
     /// <param name="eventID">事件ID</param>
-    public void CompleteEvent(AccountFileInfo.EventList eventList, bool isTriggerEvent = false)
+    public async void CompleteEvent(AccountFileInfo.EventList eventList, bool isTriggerEvent = false)
     {
         this.isTriggerEvent = isTriggerEvent;
         LogTool.Log($"完成事件{eventList.eventID}");
@@ -825,6 +825,21 @@ public class EventSystemManager : Singleton<EventSystemManager>
         }
 
 
+        List<ItemInfo> itemInfos = new List<ItemInfo>();
+        if (eventConfig.PrizeIDs != null)
+        {
+            for (var i = 0; i < eventConfig.PrizeIDs.Length; i++)
+            {
+                itemInfos.Add(new ItemInfo(eventConfig.PrizeIDs[i], eventConfig.PrizeNums[i]));
+            }
+        }
+
+        itemInfos.AddRange(eventList.itemInfos);
+        PlayerManager.Instance.BagController.AddItem(itemInfos);
+        RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(itemInfos);
+        await rewardsPanel.UIClosed();
+
+
         if (eventConfig.EventTriggerType == 4)
         {
             AccountFileInfo.Instance.playerData.completeEvents.Add(eventList);
@@ -843,18 +858,6 @@ public class EventSystemManager : Singleton<EventSystemManager>
             UpdateZuizhongEventData();
         }
 
-        if (eventConfig.PrizeIDs != null)
-        {
-            List<ItemInfo> itemInfos = new List<ItemInfo>();
-            for (var i = 0; i < eventConfig.PrizeIDs.Length; i++)
-            {
-                itemInfos.Add(new ItemInfo(eventConfig.PrizeIDs[i], eventConfig.PrizeNums[i]));
-            }
-
-            PlayerManager.Instance.BagController.AddItem(itemInfos);
-            PlayerManager.Instance.BagController.AddItem(eventList.itemInfos);
-        }
-
 
         AccountFileInfo.Instance.SavePlayerData();