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

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}

Assets/Scenes/testCombat.scene

@@ -2394,7 +2394,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: []

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -349,6 +349,8 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         public int guid;
 
         public int eventID;
+        
+        public List<ItemInfo> itemInfos = new List<ItemInfo>();
 
         public List<EventLinkData> eventLinks = new List<EventLinkData>();
 

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -350,8 +350,10 @@ public class DialogueManager : Singleton<DialogueManager>
         }
         else
         {
-            RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(rewardsDic, onClose, titleId);
-            await rewardsPanel.UIClosed();
+            CurrentEventList.itemInfos.AddRange(rewardsDic);
+            AccountFileInfo.Instance.SavePlayerData();
+            // RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(rewardsDic, onClose, titleId);
+            // await rewardsPanel.UIClosed();
         }
     }
 

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -7,6 +7,7 @@ using Excel2Json;
 using Fort23.Core;
 using Fort23.Mono;
 using Fort23.UTool;
+using GameLogic.Bag;
 using GameLogic.Combat;
 using GameLogic.Combat.CombatTool;
 using UnityEngine;
@@ -789,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}");
@@ -824,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);
@@ -842,6 +858,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
             UpdateZuizhongEventData();
         }
 
+
         AccountFileInfo.Instance.SavePlayerData();
 
 

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -36,9 +36,9 @@ namespace Fort23.Mono
         {
             base.AddButtonEvent();
             Btn_RemoveEvent.onClick.AddListener(async () =>
-            { 
+            {
                 var isOk = await TipsPanle.OpenPnael("", "放弃后，事件会从列表消失。已消耗的神识不会返还。是否确认？");
-                if(isOk)
+                if (isOk)
                     EventSystemManager.Instance.RemoveEvent(eventList);
             });
             Btn_Go.onClick.AddListener(() => { goCallBack?.Invoke(this); });
@@ -97,6 +97,7 @@ namespace Fort23.Mono
                 {
                     Text_Eventcondition.text = "";
                 }
+
                 EventconditionState.ChangeState(0);
             }
             else
@@ -109,6 +110,7 @@ namespace Fort23.Mono
                     {
                         isComplete = false;
                     }
+
                     desc += EventHelper.GetTaskMessage(eventConditionData) + "\n";
                 }
 
@@ -120,8 +122,7 @@ namespace Fort23.Mono
                 {
                     EventconditionState.ChangeState(0);
                 }
-                
-             
+
 
                 Text_Eventcondition.text = desc;
             }
@@ -132,22 +133,6 @@ namespace Fort23.Mono
             Icon_Marsk.gameObject.SetActive(eventList.isCompleted);
 
 
-            List<ItemInfo> itemInfos = new List<ItemInfo>();
-            for (var i = 0; i < randomEventConfig.PrizeIDs.Length; i++)
-            {
-                DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(randomEventConfig.PrizeIDs[i]);
-                if (dropConfig.dropType == 3)
-                {
-                    ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], randomEventConfig.PrizeNums[i]);
-                    itemInfos.Add(itemInfo);
-                }
-                else
-                {
-                    List<ItemInfo> items = DropManager.Instance.DropItem(randomEventConfig.PrizeIDs[i]);
-                    itemInfos.AddRange(items);
-                }
-            }
-
             if (randomEventConfig.placeID != 0)
             {
                 PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(randomEventConfig.placeID);
@@ -158,11 +143,39 @@ namespace Fort23.Mono
             {
                 Text_Mapname.gameObject.SetActive(false);
             }
+
             Text_Type.text = EventHelper.GetEventType(randomEventConfig.EventTag);
-            for (var i = 0; i < itemInfos.Count; i++)
+
+            if (randomEventConfig.PrizeIDs != null)
+            {
+                List<ItemInfo> itemInfos = new List<ItemInfo>();
+                for (var i = 0; i < randomEventConfig.PrizeIDs.Length; i++)
+                {
+                    DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(randomEventConfig.PrizeIDs[i]);
+                    if (dropConfig.dropType == 3)
+                    {
+                        ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], randomEventConfig.PrizeNums[i]);
+                        itemInfos.Add(itemInfo);
+                    }
+                    else
+                    {
+                        List<ItemInfo> items = DropManager.Instance.DropItem(randomEventConfig.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);
+                }
+            }
+
+            foreach (var eventListItemInfo in eventList.itemInfos)
             {
                 WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
-                widgetItem.InitWidget(itemInfos[i]);
+                widgetItem.InitWidget(eventListItemInfo);
                 widgetList.Add(widgetItem);
             }
         }

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentPanel.cs

@@ -40,6 +40,8 @@ namespace Fort23.Mono
 		private void OnClick(ItemWidgetBasic obj)
 		{
 			SentimentWidget sentimentWidget = obj as SentimentWidget;
+			if(sentimentWidget.sentimentData == null)
+				return;
 			SentimentInfoPanel.OpenPanel(sentimentWidget.sentimentData);
 		}