Browse Source

添加英雄经验

lzx 1 day ago
parent
commit
f3b169b151

+ 27 - 21
Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -132,8 +132,8 @@ namespace GameLogic.Bag
         public bool AddItem(int itemId, long count, string guid = "")
         public bool AddItem(int itemId, long count, string guid = "")
         {
         {
             string guidStr = string.IsNullOrEmpty(guid) ? itemId.ToString() : guid;
             string guidStr = string.IsNullOrEmpty(guid) ? itemId.ToString() : guid;
-            
-            if(count <= 0)
+
+            if (count <= 0)
                 return false;
                 return false;
 
 
             ItemInfo item = GetItemInfo(itemId, guidStr);
             ItemInfo item = GetItemInfo(itemId, guidStr);
@@ -178,15 +178,16 @@ namespace GameLogic.Bag
                 return false;
                 return false;
             }
             }
 
 
-            if( count <= 0 )
+            if (count <= 0)
                 return false;
                 return false;
 
 
 
 
             //法宝
             //法宝
             if (item.config.itemTag == 11)
             if (item.config.itemTag == 11)
             {
             {
-                AccountFileInfo.FaBaoData faaData =  AccountFileInfo.Instance.playerData.AllFaBaoDatas.FirstOrDefault(f =>
-                    f.id == item.config.associateVlaue[1]);
+                AccountFileInfo.FaBaoData faaData = AccountFileInfo.Instance.playerData.AllFaBaoDatas.FirstOrDefault(
+                    f =>
+                        f.id == item.config.associateVlaue[1]);
                 if (faaData != null)
                 if (faaData != null)
                 {
                 {
                     return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2]);
                     return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2]);
@@ -194,53 +195,57 @@ namespace GameLogic.Bag
                 else
                 else
                 {
                 {
                     faaData = new AccountFileInfo.FaBaoData();
                     faaData = new AccountFileInfo.FaBaoData();
-                    faaData.id =item.config.associateVlaue[1];
+                    faaData.id = item.config.associateVlaue[1];
                     faaData.level = 1;
                     faaData.level = 1;
                     faaData.useIndex = -1;
                     faaData.useIndex = -1;
                     AccountFileInfo.Instance.playerData.AllFaBaoDatas.Add(faaData);
                     AccountFileInfo.Instance.playerData.AllFaBaoDatas.Add(faaData);
                     FaBaoInfo faBaoInfo = new FaBaoInfo(faaData);
                     FaBaoInfo faBaoInfo = new FaBaoInfo(faaData);
                     PlayerManager.Instance.FaBaoControl.AddFaBao(faBaoInfo);
                     PlayerManager.Instance.FaBaoControl.AddFaBao(faBaoInfo);
                     return true;
                     return true;
-
                 }
                 }
-              
             }
             }
             //功法
             //功法
-            else if  (item.config.itemTag == 13)
+            else if (item.config.itemTag == 13)
             {
             {
-                AccountFileInfo.SkillData skillData =  AccountFileInfo.Instance.playerData.AllSkillDatas.FirstOrDefault(s =>
-                    s.id == item.config.associateVlaue[1]);
+                AccountFileInfo.SkillData skillData = AccountFileInfo.Instance.playerData.AllSkillDatas.FirstOrDefault(
+                    s =>
+                        s.id == item.config.associateVlaue[1]);
                 if (skillData != null)
                 if (skillData != null)
                 {
                 {
-                     return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2]);
+                    return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2]);
                 }
                 }
                 else
                 else
                 {
                 {
                     skillData = new AccountFileInfo.SkillData();
                     skillData = new AccountFileInfo.SkillData();
-                    skillData.id =item.config.associateVlaue[1];
+                    skillData.id = item.config.associateVlaue[1];
                     skillData.star = 1;
                     skillData.star = 1;
                     skillData.level = 1;
                     skillData.level = 1;
                     skillData.useIndex = -1;
                     skillData.useIndex = -1;
                     AccountFileInfo.Instance.playerData.AllSkillDatas.Add(skillData);
                     AccountFileInfo.Instance.playerData.AllSkillDatas.Add(skillData);
-                    
+
                     SkillInfo skillInfo = new SkillInfo(skillData);
                     SkillInfo skillInfo = new SkillInfo(skillData);
                     skillInfo.index = skillData.useIndex;
                     skillInfo.index = skillData.useIndex;
                     PlayerManager.Instance.GongFaControl.AddSkillInfo(skillInfo);
                     PlayerManager.Instance.GongFaControl.AddSkillInfo(skillInfo);
                     return true;
                     return true;
                 }
                 }
-
-              
-
             }
             }
-            else if  (item.config.itemTag == 9)
+            else if (item.config.itemTag == 2)
+            {
+                PlayerManager.Instance.myHero.heroData.exp += count;
+                AccountFileInfo.Instance.SavePlayerData();
+                return true;
+            }
+            else if (item.config.itemTag == 9)
             {
             {
                 return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[1]);
                 return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[1]);
             }
             }
-            
+
             item.count += count;
             item.count += count;
 
 
-            EventManager.Instance.Dispatch(CustomEventType.ItemUpdate, new ItemUpdateData() { ItemInfo = item, Count = (int)count });
-            EventManager.Instance.Dispatch(CustomEventType.AddItem, new ItemUpdateData() { ItemInfo = item, Count = (int)count });
+            EventManager.Instance.Dispatch(CustomEventType.ItemUpdate,
+                new ItemUpdateData() { ItemInfo = item, Count = (int)count });
+            EventManager.Instance.Dispatch(CustomEventType.AddItem,
+                new ItemUpdateData() { ItemInfo = item, Count = (int)count });
             AccountFileInfo.Instance.SaveItemData(item);
             AccountFileInfo.Instance.SaveItemData(item);
 
 
             return true;
             return true;
@@ -414,6 +419,7 @@ namespace GameLogic.Bag
             {
             {
                 return false;
                 return false;
             }
             }
+
             if (item.config.ID <= 0)
             if (item.config.ID <= 0)
             {
             {
                 return false;
                 return false;

+ 1 - 1
Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -36,7 +36,7 @@ namespace Fort23.Mono
         private void DivineSensePointChange(IEventData e)
         private void DivineSensePointChange(IEventData e)
         {
         {
             Text_divineSensePoint.text =
             Text_divineSensePoint.text =
-                $"{AccountFileInfo.Instance.playerData.divineSensePoint}/{PlayerManager.Instance.gameConstantConfig.DetectEventCount}";
+                $"{(int)AccountFileInfo.Instance.playerData.divineSensePoint}/{PlayerManager.Instance.gameConstantConfig.DetectEventCount}";
         }
         }
 
 
         public override void AddButtonEvent()
         public override void AddButtonEvent()

+ 2 - 2
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -219,7 +219,7 @@ namespace Fort23.Mono
 
 
 
 
             Text_exp.text =
             Text_exp.text =
-                $"{PlayerManager.Instance.myHero.exp}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
+                $"{PlayerManager.Instance.myHero.exp.Value}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
 
 
             if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
             if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
             {
             {
@@ -241,7 +241,7 @@ namespace Fort23.Mono
             Slider_Exp.value = PlayerManager.Instance.myHero.heroData.exp + allexp;
             Slider_Exp.value = PlayerManager.Instance.myHero.heroData.exp + allexp;
 
 
             Text_exp.text =
             Text_exp.text =
-                $"{PlayerManager.Instance.myHero.heroData.exp + allexp}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
+                $"{PlayerManager.Instance.myHero.heroData.exp + (int)allexp}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
 
 
             int miao = (int)((PlayerManager.Instance.myHero.powerUpConfig.levelUpExp -
             int miao = (int)((PlayerManager.Instance.myHero.powerUpConfig.levelUpExp -
                               (PlayerManager.Instance.myHero.heroData.exp + allexp)) /
                               (PlayerManager.Instance.myHero.heroData.exp + allexp)) /