添加重置功能

Assets/Res/Config/EventLinkConfig.json

@@ -21058,6 +21058,9 @@
       "DialogueType": 0,
       "EventID": 9141,
       "step": 8,
+      "ConditionId": [
+        47
+      ],
       "optionType": 0,
       "ResultType": 0
     },
@@ -21113,9 +21116,6 @@
       "DialogueType": 0,
       "EventID": 9142,
       "step": 1,
-      "ConditionId": [
-        47
-      ],
       "optionType": 0,
       "ResultType": 1,
       "ResultOptions": [
@@ -21436,6 +21436,9 @@
       "DialogueType": 0,
       "EventID": 9143,
       "step": 12,
+      "ConditionId": [
+        48
+      ],
       "optionType": 0,
       "ResultType": 0
     },
@@ -21491,9 +21494,6 @@
       "DialogueType": 0,
       "EventID": 9144,
       "step": 1,
-      "ConditionId": [
-        48
-      ],
       "optionType": 0,
       "ResultType": 1,
       "ResultOptions": [

Assets/Res/Config/ItemAssociateConfig.json

@@ -69,6 +69,11 @@
       "ID": 14,
       "associateID": 14,
       "LanID": -1
+    },
+    {
+      "ID": 15,
+      "associateID": 15,
+      "LanID": -1
     }
   ]
 }

Assets/Res/Config/ItemConfig.json

@@ -7623,6 +7623,34 @@
       ],
       "sort": 0,
       "itemDesc2": 0
+    },
+    {
+      "ID": 23400,
+      "itemName": 10816,
+      "itemDesc": 0,
+      "icon": "icon_shenshifu",
+      "itemTag": 28,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 15,
+      "associateVlaue": [
+        30023
+      ],
+      "sort": 0,
+      "itemDesc2": 0
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -40278,7 +40278,7 @@
     },
     {
       "ID": 10810,
-      "txt": "感些道友参与本次测试，后续内容开发中，会尽管给大家见面，欢迎在tap给我们留言和评价，这对我们有很大的帮助，感谢！"
+      "txt": "感些道友参与本次测试，后续内容开发中，会尽快给大家见面，欢迎在tap给我们留言和评价，这对我们有很大的帮助，感谢！"
     },
     {
       "ID": 10811,
@@ -40295,6 +40295,14 @@
     {
       "ID": 10814,
       "txt": "警告"
+    },
+    {
+      "ID": 10815,
+      "txt": "重置会完全返还升级消耗的资源，确认么？"
+    },
+    {
+      "ID": 10816,
+      "txt": "任务"
     }
   ]
 }

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -2708,6 +2708,7 @@ RectTransform:
   m_Children:
   - {fileID: 6108060668469187376}
   - {fileID: 4516305854009966259}
+  - {fileID: 2800050384373934540}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
@@ -3482,6 +3483,95 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5912770761433871264
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8031678633856111332}
+  - component: {fileID: 5779418465940241964}
+  - component: {fileID: 220962094891475182}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Rest (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8031678633856111332
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5912770761433871264}
+  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: 2800050384373934540}
+  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: 35.3188, y: 31.7271}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5779418465940241964
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5912770761433871264}
+  m_CullTransparentMesh: 1
+--- !u!114 &220962094891475182
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5912770761433871264}
+  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_fuhao_cz
+  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
+  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 &5984202593501929817
 GameObject:
   m_ObjectHideFlags: 0
@@ -4789,6 +4879,141 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 0
+--- !u!1 &8682110629388281459
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2800050384373934540}
+  - component: {fileID: 5858072155003096754}
+  - component: {fileID: 1370713949987195190}
+  - component: {fileID: 880827185013602307}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Rest
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2800050384373934540
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8682110629388281459}
+  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: 8031678633856111332}
+  m_Father: {fileID: 3478042439320372479}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -22.5, y: -7.3}
+  m_SizeDelta: {x: 53.0398, y: 53.0398}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &5858072155003096754
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8682110629388281459}
+  m_CullTransparentMesh: 1
+--- !u!114 &1370713949987195190
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8682110629388281459}
+  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.24313727, g: 0.20784315, b: 0.14117648, 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_ty_yuan
+  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
+  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!114 &880827185013602307
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8682110629388281459}
+  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: 1370713949987195190}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &8994874510214016950
 GameObject:
   m_ObjectHideFlags: 0
@@ -5009,6 +5234,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_Rest
+    gameObject: {fileID: 880827185013602307}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1 &9056821549282551153
 GameObject:

Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -148,7 +148,8 @@ namespace Fort23.Core
       DialoguePanelOpen,
       RedDotUpdate,
       RedDotChangeState,
-      GuideComplete
+      GuideComplete,
+      AddEvent
 
     }
 }

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Common.Utility.CombatEvent;
+using Core.Event.Event;
 using Core.Utility;
 using Fort23.Core;
 using Fort23.UTool;
@@ -241,6 +242,12 @@ namespace GameLogic.Bag
             {
                 return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[1]);
             }
+            else if (item.config.itemTag == 28)
+            {
+                EventManager.Instance.Dispatch(CustomEventType.AddEvent,
+                    new DefaultEventData(){eventData = item.config.associateVlaue[0]});
+                return true;
+            }
 
 
             item.count += count;

Assets/Scripts/GameLogic/SDK.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Bi9KsXyrUnKQCHUlske0FNEOjevvOWZwJmZsXNqwdML3UtrPRYjnrk1SfUUO
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameLogic/SDK/DBManager.cs

@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using Utility;
+
+public class DBManager : Singleton<DBManager>
+{
+   
+    /// <summary>
+    /// 自定义打点
+    /// </summary>
+    /// <param name="key"></param>
+    /// <param name="lable"></param>
+    public void CustomEvent(string key, Dictionary<string, string> lable)
+    {
+
+    }
+}

Assets/Scripts/GameLogic/SDK/DBManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: XXwftyL5B3NYIr2Orcv8PJPbejdStHI2czOwyFfI2O+WZ/hSkRL/RevL941n
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Common.Utility.CombatEvent;
 using Core.Audio;
+using Core.Event.Event;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
@@ -71,6 +72,18 @@ public class EventSystemManager : Singleton<EventSystemManager>
         EventManager.Instance.AddEventListener(CustomEventType.ItemUpdate, ItemUpdate);
         EventManager.Instance.AddEventListener(CustomEventType.JingJieUpgrade, JingJieUpgrade);
         EventManager.Instance.AddEventListener(CustomEventType.CancelEvent, Cancel);
+        EventManager.Instance.AddEventListener(CustomEventType.AddEvent,BagAddEvent);
+    }
+
+    private void BagAddEvent(IEventData e)
+    {
+        DefaultEventData defaultEventData = e as DefaultEventData;
+        AccountFileInfo.EventList eventList = AddEvent((int)defaultEventData.eventData);
+        if (eventList != null)
+        {
+            AccountFileInfo.Instance.playerData.eventList.Add(eventList);
+            AccountFileInfo.Instance.SavePlayerData();
+        }
     }
 
     private void Cancel(IEventData e)

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

@@ -5,6 +5,7 @@ using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
+using GameLogic.Bag;
 using GameLogic.Hero;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using UnityEngine;
@@ -108,6 +109,69 @@ namespace Fort23.Mono
                 UpdataGradeUI(false);
                 UpdateBjUI(true);
             });
+
+            Btn_Rest.onClick.AddListener(async () =>
+            {
+                if (selectedFaBaoInfo.FaBaoData.level == 1)
+                {
+                    return;
+                }
+
+                bool isOk = await TipsPanle.OpenPnael(10815);
+                if (!isOk)
+                    return;
+
+                Dictionary<int, ItemInfo> itemInfo = new Dictionary<int, ItemInfo>();
+                for (int i = 1; i < selectedFaBaoInfo.FabaoPowerupConfig.ID; i++)
+                {
+                    FabaoPowerupConfig fabaoPowerupConfig = ConfigComponent.Instance.Get<FabaoPowerupConfig>(i);
+                    for (var j = 0; j < fabaoPowerupConfig.PowerupItemIDs.Length; j++)
+                    {
+                        if (itemInfo.ContainsKey(fabaoPowerupConfig.PowerupItemIDs[j]))
+                        {
+                            itemInfo[fabaoPowerupConfig.PowerupItemIDs[j]].count +=   fabaoPowerupConfig.PowerupItemCosts[j];
+                        }
+                        else
+                        {
+                            itemInfo.Add(fabaoPowerupConfig.PowerupItemIDs[j], new ItemInfo(
+                                fabaoPowerupConfig.PowerupItemIDs[j],
+                                fabaoPowerupConfig.PowerupItemCosts[j]));
+                        }
+       
+                    }
+
+                    ItemConfig itemConfig =
+                        ConfigComponent.Instance.Get<ItemConfig>(selectedFaBaoInfo.FabaoConfig.ItemID);
+                    ItemConfig itemConfig2 = ConfigComponent.Instance.Get<ItemConfig>(itemConfig.associateVlaue[0]);
+                    if (fabaoPowerupConfig.PromotePieceNum != null &&
+                        fabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1] != -1)
+                    {
+                        if (itemInfo.ContainsKey(itemConfig.associateVlaue[0]))
+                        {
+                            itemInfo[itemConfig.associateVlaue[0]].count +=     fabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1];
+                        }
+                        else
+                        {
+                            itemInfo.Add(itemConfig.associateVlaue[0], new ItemInfo(
+                                itemConfig.associateVlaue[0],
+                                fabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1]));
+                        }
+       
+                    }
+                }
+                foreach (var keyValuePair in itemInfo)
+                {
+                    PlayerManager.Instance.BagController.AddItem(keyValuePair.Value);
+                }
+                RewardsPanel.OpenPanel(itemInfo);
+                selectedFaBaoInfo.FaBaoData.level = 1;
+                selectedFaBaoInfo.CustomInit(selectedFaBaoInfo.FaBaoData);
+                AccountFileInfo.Instance.SavePlayerData();
+                UpdateCurrentFaBaoWidget();
+                UpadaFabaoBag();
+                UpdateUI(selectedFaBaoInfo);
+                UpdataGradeUI(true);
+            });
         }
 
 
@@ -125,7 +189,8 @@ namespace Fort23.Mono
 
                 if (PlayerManager.Instance.myHero.powerUpConfig.ID < selectedFaBaoInfo.FabaoPowerupConfig.NeedLv)
                 {
-                    HeroPowerUpConfig heroPowerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(selectedFaBaoInfo.FabaoPowerupConfig.NeedLv);
+                    HeroPowerUpConfig heroPowerUpConfig =
+                        ConfigComponent.Instance.Get<HeroPowerUpConfig>(selectedFaBaoInfo.FabaoPowerupConfig.NeedLv);
                     string jingjie =
                         LanguageManager.Instance.Text(heroPowerUpConfig
                             .jingjieLanIDs[0]) +
@@ -437,6 +502,8 @@ namespace Fort23.Mono
 
         private async CTask UpdateUI(FaBaoInfo faBaoInfo)
         {
+            Btn_Rest.gameObject.SetActive(faBaoInfo != null && faBaoInfo.FaBaoData.level > 1);
+
             if (faBaoInfo != null)
             {
                 FaBaoInfoRoot.SetActive(true);

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

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