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

# Conflicts:
#	Excel2Json/Excel/EventConfig.xlsx   resolved by origin/master(远端) version

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -693,9 +693,9 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
 
         HeroData yindaoHeroData = new HeroData();
         playerData.yindaoHeroData = yindaoHeroData;
-        heroData.heroModelId = 101;
-        heroData.heroPowerId = 200;
-        heroData.upTime = TimeHelper.ClientNow();
+        yindaoHeroData.heroModelId = 101;
+        yindaoHeroData.heroPowerId = 200;
+        yindaoHeroData.upTime = TimeHelper.ClientNow();
 
         //添加第一关地图数据
         PlacesData placesData = new PlacesData();

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -1008,6 +1008,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         if (eventConfig.EventTriggerType == 4)
         {
+            eventList.isCompleted = true;
             AccountFileInfo.Instance.playerData.completeEvents.Add(eventList);
             AccountFileInfo.Instance.playerData.eventList.Remove(eventList);
             TaskInfoPanel taskInfoPanel = await TaskInfoPanel.OpenPanel(eventList, 2);

Assets/Scripts/GameUI/GameApplction.cs

@@ -172,17 +172,17 @@ public class GameApplction : IGameStart
         if (startCombatInfo.CombatType != CombatType.TestCombat)
         {
             MainPanel mainPanel = await MainPanel.OpenPanel();
-            if (!AccountFileInfo.Instance.playerData.isTiggerPlot)
+            /*if (!AccountFileInfo.Instance.playerData.isTiggerPlot)
             {
                 mainPanel.GObjectPoolInterface.SetActive(false);
-            }
+            }*/
         }
 
 
         gameStartUIPanel.ShowMassge("loadFinish");
         gameStartUIPanel.SetSlider(1f);
 
-        XinShouCombat();
+        //XinShouCombat();
     }
 
     public async void XinShouCombat()