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

Assets/Res/Config/EventConfig.json

@@ -11,7 +11,7 @@
         100,
         102
       ],
-      "EventTriggerType": 1,
+      "EventTriggerType": 99,
       "EventTag": 7,
       "EventType": 1,
       "Score": 0,

Assets/Res/Config/EventLinkConfig.json

@@ -55,7 +55,7 @@
       "LanID": [
         5004
       ],
-      "DialogueType": 0,
+      "DialogueType": 2,
       "EventID": 1,
       "optionType": 1,
       "optionPara1": [
@@ -78,7 +78,7 @@
       "LanID": [
         5007
       ],
-      "DialogueType": 0,
+      "DialogueType": 2,
       "EventID": 1,
       "optionType": 2,
       "optionPara1": [
@@ -100,7 +100,7 @@
       "LanID": [
         5008
       ],
-      "DialogueType": 0,
+      "DialogueType": 2,
       "EventID": 1,
       "optionType": 1,
       "optionPara1": [
@@ -121,7 +121,7 @@
       "LanID": [
         5009
       ],
-      "DialogueType": 0,
+      "DialogueType": 2,
       "EventID": 1,
       "optionType": 3,
       "PrizeIDs": [
@@ -142,7 +142,7 @@
       "LanID": [
         5010
       ],
-      "DialogueType": 0,
+      "DialogueType": 2,
       "EventID": 1,
       "optionType": 3,
       "PrizeIDs": [

Assets/Res/Config/InitialPlayerConfig.json

@@ -0,0 +1,29 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "itemId": [
+        1001,
+        1002,
+        1003,
+        1004,
+        1005
+      ],
+      "itemAmount": [
+        10,
+        10,
+        10,
+        10,
+        10
+      ],
+      "fabaoId": [
+        10002
+      ],
+      "gongfaId": [
+        1405,
+        1501
+      ],
+      "shenshiPoint": 100
+    }
+  ]
+}

Assets/Res/Config/InitialPlayerConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: C3Ie4yv7ASnRd3uMbvxeZuDKvRXyLLnXTyFeDIqMWAs7BOEsqsS3Y1qnGIBo
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameData/ExcelConfig/InitialPlayerConfig.cs

@@ -0,0 +1,80 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\InitialPlayer.xlsx. SheetName: InitialPlayerConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "InitialPlayerConfig.json")]
+	public partial class InitialPlayerConfigHolder : ConfigHolder<InitialPlayerConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct InitialPlayerConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+#if !COMBAT_SERVER
+		public int ID;
+#else
+		public int ID{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///道具id
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] itemId;
+#else
+		public int[] itemId{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///道具数量
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] itemAmount;
+#else
+		public int[] itemAmount{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///法宝id
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] fabaoId;
+#else
+		public int[] fabaoId{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///功法id
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] gongfaId;
+#else
+		public int[] gongfaId{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///初始神识点数
+		/// </summary>
+#if !COMBAT_SERVER
+		public int shenshiPoint;
+#else
+		public int shenshiPoint{ set; get; }
+#endif
+		
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/InitialPlayerConfig.cs.meta

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

Assets/Scripts/GameData/ExcelConfig/OpenBoxProgressReward.cs.meta

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

Assets/Scripts/GameData/ExcelConfig/OpenBoxScoreRule.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Wi4d4S+uVHMRFi/8dOTskVh7f1XLN0VBhLXTVkVia5/viIf8eaLpYYKZkLnw
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -64,6 +64,8 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// 英雄信息
         /// </summary>
         public HeroData heroData;
+        
+        public HeroData yindaoHeroData;
 
         public int CurrentZuiZhongEventListId;
 
@@ -140,7 +142,6 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         public bool boxFree;
 
         public bool isTiggerPlot;
-
     }
 
 
@@ -293,7 +294,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     /// <summary>
     /// 小地图数据
     /// </summary>
-   [System.Serializable]
+    [System.Serializable]
     public class SmallPlacesData
     {
         public int id;
@@ -625,92 +626,52 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     /// </summary>
     public void ClearInitPlayerData()
     {
-        ItemData coin = new ItemData(GlobalParam.Item_Coin_ID, 0);
-
-        ItemData diamond = new ItemData(GlobalParam.Item_Diamond_ID);
-
-        ItemData heroExp = new ItemData(GlobalParam.Item_HeroExp_ID, 0);
-
-        playerData.ItemListData.Add(coin);
-        playerData.ItemListData.Add(diamond);
-        playerData.ItemListData.Add(heroExp);
-
-        // DaoYouData daoYouData = new DaoYouData();
-        // daoYouData.id = 1;
-        // daoYouData.favorabilityLv = 1;
-        // playerData.daoYouDatas.Add(daoYouData);
-
-
-        //测试道具
-        playerData.ItemListData.Add(new ItemData(1201, 10));
-        playerData.ItemListData.Add(new ItemData(1202, 10));
-
-        playerData.ItemListData.Add(new ItemData(1301, 10));
-        playerData.ItemListData.Add(new ItemData(1302, 10));
-        playerData.ItemListData.Add(new ItemData(1303, 10));
-        playerData.ItemListData.Add(new ItemData(1304, 10));
-        //
-        playerData.ItemListData.Add(new ItemData(1401, 10));
-        playerData.ItemListData.Add(new ItemData(1402, 10));
-        playerData.ItemListData.Add(new ItemData(1403, 10));
-        playerData.ItemListData.Add(new ItemData(1404, 10));
-        playerData.ItemListData.Add(new ItemData(1601, 10));
-
-        playerData.ItemListData.Add(new ItemData(21012, 10));
-        playerData.ItemListData.Add(new ItemData(21013, 10));
-
-
-        playerData.ItemListData.Add(new ItemData(21001, 10));
-        playerData.ItemListData.Add(new ItemData(21002, 10));
-        playerData.ItemListData.Add(new ItemData(21003, 10));
-
-        // var allSkill = new[] { 1101};
-        // foreach (var i in allSkill)
-        // {
-        //     SkillData skillData = new SkillData();
-        //     skillData.id = i;
-        //     skillData.star = 1;
-        //     skillData.level = 1;
-        //     skillData.useIndex = -1;
-        //     playerData.AllSkillDatas.Add(skillData);
-        // }
-
-
-        //添加所有测试法宝和功法
-
-        List<SkillConfig> fabaoPowerupConfigs = ConfigComponent.Instance.GetAll<SkillConfig>().ToList();
-        List<SkillConfig> gongfa = fabaoPowerupConfigs.Where(s => s.SkillType == 1 || s.SkillType == 2).ToList();
-
-        var fanappower = gongfa.GroupBy(f => f.IDGroup).Select(g => new { config = g.OrderBy(f => f.ID).FirstOrDefault() }).ToList();
-        foreach (var x1 in fanappower)
+        //初始化道具
+        InitialPlayerConfig initialPlayerConfig = ConfigComponent.Instance.Get<InitialPlayerConfig>(1);
+        for (var i = 0; i < initialPlayerConfig.itemId.Length; i++)
         {
-            SkillData skillData = new SkillData();
-            skillData.id = x1.config.IDGroup;
-            skillData.star = 1;
-            skillData.level = 1;
-            skillData.useIndex = -1;
-            playerData.AllSkillDatas.Add(skillData);
+            ItemData coin = new ItemData(initialPlayerConfig.itemId[i], initialPlayerConfig.itemAmount[i]);
+            playerData.ItemListData.Add(coin);
         }
 
-        FabaoConfig[] fabaoConfig = ConfigComponent.Instance.GetAll<FabaoConfig>();
 
-        foreach (var i in fabaoConfig)
+        //初始化法宝
+        for (var i = 0; i < initialPlayerConfig.fabaoId.Length; i++)
         {
             FaBaoData faaData = new FaBaoData();
-            faaData.id = i.ID;
+            faaData.id = initialPlayerConfig.fabaoId[i];
             faaData.level = 1;
-            faaData.useIndex = -1;
+            faaData.useIndex = i;
             playerData.AllFaBaoDatas.Add(faaData);
         }
 
+        //初始化功法
+        for (var i = 0; i < initialPlayerConfig.gongfaId.Length; i++)
+        {
+            SkillData skillData = new SkillData();
+            skillData.id = initialPlayerConfig.gongfaId[i];
+            skillData.star = 1;
+            skillData.level = 1;
+            skillData.useIndex = i;
+            playerData.AllSkillDatas.Add(skillData);
+        }
 
+        playerData.divineSensePoint = initialPlayerConfig.shenshiPoint;
+
+        //添加英雄数据
         HeroData heroData = new HeroData();
         playerData.heroData = heroData;
         heroData.heroModelId = 101;
         heroData.heroPowerId = 1;
         heroData.upTime = TimeHelper.ClientNow();
+        
+        HeroData yindaoHeroData = new HeroData();
+        playerData.yindaoHeroData = heroData;
+        heroData.heroModelId = 101;
+        heroData.heroPowerId = 200;
+        heroData.upTime = TimeHelper.ClientNow();
 
-        //添加第一关
+        //添加第一关地图数据
         PlacesData placesData = new PlacesData();
         placesData.id = 1;
         playerData.placesDatas.Add(placesData);

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -32,6 +32,10 @@ public class PlayerManager : Singleton<PlayerManager>
     /// </summary>
     public HeroInfo myHero;
 
+    public HeroInfo yindaoHeroData;
+    
+    
+    
     public long serverTime => TimeHelper.ServerNow();
     private AccountFileInfo.SmallPlacesData currentPlaces;
 
@@ -278,6 +282,13 @@ public class PlayerManager : Singleton<PlayerManager>
         heroInfo.InitHero(AccountFileInfo.Instance.playerData.heroData);
         myHero = heroInfo;
         myHero.TaoismSkillId = 601011;
+        
+        
+        
+        HeroInfo yindaoHeroData = new HeroInfo();
+        yindaoHeroData.InitHero(AccountFileInfo.Instance.playerData.yindaoHeroData);
+        yindaoHeroData = heroInfo;
+        yindaoHeroData.TaoismSkillId = 601011;
 
         BagController.Init();
 
@@ -639,19 +650,16 @@ public class PlayerManager : Singleton<PlayerManager>
         if (tian > 0)
         {
             return $"{tian}天{xiaoShi}小時";
-            // return string.Format(LanguageManager.Instance.Text(818), tian, xiaoShi);
         }
         else
         {
             if (xiaoShi <= 0 && fen <= 59)
             {
                 return $"{fen}分{miao}秒";
-                // return string.Format(LanguageManager.Instance.Text(819), fen, miao);
             }
             else
             {
                 return $"{xiaoShi}小時{fen}分";
-                // return string.Format(LanguageManager.Instance.Text(820), xiaoShi, fen);
             }
         }
     }

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -521,7 +521,9 @@ public class EventSystemManager : Singleton<EventSystemManager>
         }
 
 
-        eventList.heroLevel = PlayerManager.Instance.myHero.level.Value;
+        //记录英雄等级 神识刷出来的战斗等级不变
+        if( PlayerManager.Instance.myHero != null)
+            eventList.heroLevel = PlayerManager.Instance.myHero.level.Value;
 
         //初始化神识链条，用于监听条件是否完成
         if (eventList != null && eventConfig.EventType != 2)

Assets/Scripts/GameUI/GameApplction.cs

@@ -171,9 +171,10 @@ public class GameApplction : IGameStart
             .TaoismSkillId);
         if (startCombatInfo.CombatType != CombatType.TestCombat)
         {
-            // if (AccountFileInfo.Instance.playerData.isTiggerPlot)
+            MainPanel mainPanel = await MainPanel.OpenPanel();
+            if (AccountFileInfo.Instance.playerData.isTiggerPlot)
             {
-                await MainPanel.OpenPanel();
+                mainPanel.GObjectPoolInterface.SetActive(false);
             }
         }
 
@@ -181,15 +182,15 @@ public class GameApplction : IGameStart
         gameStartUIPanel.ShowMassge("loadFinish");
         gameStartUIPanel.SetSlider(1f);
 
-        // XinShouYinDao();
+        XinShouCombat();
     }
 
-    public async void XinShouYinDao()
+    public async void XinShouCombat()
     {
         if (!AccountFileInfo.Instance.playerData.isTiggerPlot)
         {
             CTask cTask = CTask.Create();
-            CombatDrive.Instance.LoadLevelBattleCombat(1002, false,1,
+            CombatDrive.Instance.LoadLevelBattleCombat(1002, false, -1,
                 delegate(bool isWin)
                 {
                     LogTool.Log("战斗完成" + isWin);
@@ -203,8 +204,8 @@ public class GameApplction : IGameStart
             AccountFileInfo.Instance.playerData.isTiggerPlot = true;
 
             AccountFileInfo.Instance.SavePlayerData();
-
-            // await MainPanel.OpenPanel();
+            MainPanel mainPanel = UIManager.Instance.GetComponent<MainPanel>();
+            mainPanel.GObjectPoolInterface.SetActive(true);
         }
     }
 }

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -283,9 +283,10 @@ namespace Fort23.Mono
         }
 
 
-        public async static CTask OpenPanel()
+        public async static CTask<MainPanel> OpenPanel()
         {
-            await UIManager.Instance.LoadAndOpenPanel<MainPanel>(null);
+            MainPanel mainPanel =  await UIManager.Instance.LoadAndOpenPanel<MainPanel>(null);
+            return mainPanel;
         }
 
         public override void Close()