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

Assets/Res/Config/SmallPlacesConfig.json

@@ -4,71 +4,71 @@
       "ID": 1,
       "placeName": 10037,
       "PlacesId": 1,
-      "CompletionEventCount": 0,
-      "UnlockEnvetid": 0
+      "CompletionEventCount": 10,
+      "UnlockEnvetid": 10001
     },
     {
       "ID": 2,
       "placeName": 10038,
       "PlacesId": 1,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10001
+      "UnlockEnvetid": 10004
     },
     {
       "ID": 3,
       "placeName": 10039,
       "PlacesId": 1,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10004
+      "UnlockEnvetid": 10009
     },
     {
       "ID": 4,
       "placeName": 10040,
       "PlacesId": 1,
-      "CompletionEventCount": 10,
-      "UnlockEnvetid": 10009
+      "CompletionEventCount": 5,
+      "UnlockEnvetid": 10012
     },
     {
       "ID": 5,
       "placeName": 10041,
       "PlacesId": 2,
-      "CompletionEventCount": 5,
-      "UnlockEnvetid": 10012
+      "CompletionEventCount": 10,
+      "UnlockEnvetid": 10013
     },
     {
       "ID": 6,
       "placeName": 10042,
       "PlacesId": 2,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10013
+      "UnlockEnvetid": 10018
     },
     {
       "ID": 7,
       "placeName": 10043,
       "PlacesId": 2,
-      "CompletionEventCount": 10,
-      "UnlockEnvetid": 10018
+      "CompletionEventCount": 5,
+      "UnlockEnvetid": 10022
     },
     {
       "ID": 8,
       "placeName": 10044,
       "PlacesId": 3,
-      "CompletionEventCount": 5,
-      "UnlockEnvetid": 10022
+      "CompletionEventCount": 10,
+      "UnlockEnvetid": 10025
     },
     {
       "ID": 9,
       "placeName": 10045,
       "PlacesId": 3,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10025
+      "UnlockEnvetid": 10028
     },
     {
       "ID": 10,
       "placeName": 10046,
       "PlacesId": 3,
-      "CompletionEventCount": 10,
-      "UnlockEnvetid": 10028
+      "CompletionEventCount": -1,
+      "UnlockEnvetid": -1
     }
   ]
 }

Assets/Scripts/GameData/ExcelConfig/SmallPlacesConfig.cs

@@ -45,7 +45,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///完成事件数量
+		///完成多少事件解锁下一个地点
 		/// </summary>
 #if !COMBAT_SERVER
 		public int CompletionEventCount;
@@ -55,7 +55,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///解锁当前地点事件Id
+		///完成某个事件接下下一个地点
 		/// </summary>
 #if !COMBAT_SERVER
 		public int UnlockEnvetid;

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/GameLogic/Player/AccountFileInfo.cs

@@ -692,7 +692,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         heroData.upTime = TimeHelper.ClientNow();
 
         HeroData yindaoHeroData = new HeroData();
-        playerData.yindaoHeroData = heroData;
+        playerData.yindaoHeroData = yindaoHeroData;
         heroData.heroModelId = 101;
         heroData.heroPowerId = 200;
         heroData.upTime = TimeHelper.ClientNow();

Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -242,7 +242,7 @@ namespace Fort23.Mono
 
         public void UpdateUi()
         {
-            summonData = PlayerManager.Instance.SummonManager.summonDataMap[1];
+            summonData = PlayerManager.Instance.SummonManager.summonDataMap[openBoxConfig.ID];
 
 
             if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1] && PlayerManager.Instance.serverTime >= summonData.nextTenFreeTime)

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/LevelChoosePanel/PlacesInfoPanel.cs

@@ -80,9 +80,9 @@ namespace Fort23.Mono
                 return;
             }
 
-            if (smallPlacesConfig.UnlockEnvetid != 0)
+            if (lastSmallPlacesConfig.UnlockEnvetid != 0)
             {
-                AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce => ce.eventID == smallPlacesConfig.UnlockEnvetid);
+                AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce => ce.eventID == lastSmallPlacesConfig.UnlockEnvetid);
                 if (eventList == null || !eventList.isCompleted)
                 {
                     TipMessagePanel.OpenTipMessagePanel("主线任务没有完成");

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);
         }