背包添加法宝和功法

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Common.Utility.CombatEvent;
 using Core.Utility;
 using Fort23.Core;
@@ -178,6 +179,57 @@ namespace GameLogic.Bag
 
             if( count <= 0 )
                 return false;
+
+
+            //法宝
+            if (item.config.itemTag == 11)
+            {
+                AccountFileInfo.FaBaoData faaData =  AccountFileInfo.Instance.playerData.AllFaBaoDatas.FirstOrDefault(f =>
+                    f.id == item.config.associateVlaue[1]);
+                if (faaData != null)
+                {
+                    return AddItem(item.config.associateVlaue[0], 1);
+                }
+                else
+                {
+                    faaData = new AccountFileInfo.FaBaoData();
+                    faaData.id =item.config.associateVlaue[1];
+                    faaData.level = 1;
+                    faaData.useIndex = -1;
+                    AccountFileInfo.Instance.playerData.AllFaBaoDatas.Add(faaData);
+                    return true;
+
+                }
+              
+            }
+            //功法
+            else if  (item.config.itemTag == 13)
+            {
+                AccountFileInfo.SkillData skillData =  AccountFileInfo.Instance.playerData.AllSkillDatas.FirstOrDefault(s =>
+                    s.id == item.config.associateVlaue[1]);
+                if (skillData != null)
+                {
+                     return AddItem(item.config.associateVlaue[0], 1);
+                }
+                else
+                {
+                    skillData = new AccountFileInfo.SkillData();
+                    skillData.id =item.config.associateVlaue[1];
+                    skillData.star = 1;
+                    skillData.level = 1;
+                    skillData.useIndex = -1;
+                    AccountFileInfo.Instance.playerData.AllSkillDatas.Add(skillData);
+                    return true;
+                }
+
+              
+
+            }
+            else if  (item.config.itemTag == 9)
+            {
+                return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[1]);
+            }
+            
             item.count += count;
 
             EventManager.Instance.Dispatch(CustomEventType.ItemUpdate, new ItemUpdateData() { ItemInfo = item, Count = (int)count });

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

@@ -97,7 +97,7 @@ namespace Fort23.Mono
                                     LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjie2) +
                                     LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjie3);
 
-                Text_Linggen.text = $"金：{PlayerManager.Instance.myHero.Metal_Injury} 木：{PlayerManager.Instance.myHero.Wood_Injury} 水：{PlayerManager.Instance.myHero.Water_Injury} 火：{PlayerManager.Instance.myHero.Fire_Injury} 土：{PlayerManager.Instance.myHero.Earth_Injury}";
+                Text_Linggen.text = $"金：{PlayerManager.Instance.myHero.Metal} 木：{PlayerManager.Instance.myHero.Wood} 水：{PlayerManager.Instance.myHero.Water} 火：{PlayerManager.Instance.myHero.Fire} 土：{PlayerManager.Instance.myHero.Earth}";
                 Text_Hp.text = PlayerManager.Instance.myHero.hp.Value.ToString();
 
                 using (CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer())
@@ -181,7 +181,7 @@ namespace Fort23.Mono
                 }
 
 
-                Text_Linggen.text = $"金：{combatHeroInfo.Metal_Injury} 木：{combatHeroInfo.Wood_Injury} 水：{combatHeroInfo.Water_Injury} 火：{combatHeroInfo.Fire_Injury} 土：{combatHeroInfo.Earth_Injury}";
+                Text_Linggen.text = $"金：{combatHeroInfo.Metal} 木：{combatHeroInfo.Wood} 水：{combatHeroInfo.Water} 火：{combatHeroInfo.Fire} 土：{combatHeroInfo.Earth}";
                 Text_Hp.text = combatHeroInfo.hp.Value.ToString();
             }
         }

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

@@ -133,23 +133,23 @@ namespace Fort23.Mono
 
 
             heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null, Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("金灵根", "", PlayerManager.Instance.myHero.Metal_Injury.ToString()));
+            heroAttributeWidget.CustomInit(new HeroAttributeData("金灵根", "", PlayerManager.Instance.myHero.Metal.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null, Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("木灵根", "", PlayerManager.Instance.myHero.Wood_Injury.ToString()));
+            heroAttributeWidget.CustomInit(new HeroAttributeData("木灵根", "", PlayerManager.Instance.myHero.Wood.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null, Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("水灵根", "", PlayerManager.Instance.myHero.Water_Injury.ToString()));
+            heroAttributeWidget.CustomInit(new HeroAttributeData("水灵根", "", PlayerManager.Instance.myHero.Water.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null, Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("火灵根", "", PlayerManager.Instance.myHero.Fire_Injury.ToString()));
+            heroAttributeWidget.CustomInit(new HeroAttributeData("火灵根", "", PlayerManager.Instance.myHero.Fire.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null, Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("土灵根", "", PlayerManager.Instance.myHero.Earth_Injury.ToString()));
+            heroAttributeWidget.CustomInit(new HeroAttributeData("土灵根", "", PlayerManager.Instance.myHero.Earth.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
         }