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

Assets/Res/Config/EventLinkConfig.json

@@ -1143,7 +1143,7 @@
       "conciseEventMessage": 5071,
       "EventConditionMessage": 5072,
       "PreShow": 1,
-      "PreShowPar": 1,
+      "PreShowPar": 5,
       "NPCID": 0,
       "DialogueType": 0,
       "EventID": 10002,

Assets/Res/Config/PlacesConfig.json

@@ -5,6 +5,11 @@
       "placeName": 1924,
       "placePrefabName": 0,
       "bigMapID": 1,
+      "SmallPlacersIds": [
+        1,
+        2,
+        3
+      ],
       "to3DPrefab": "a",
       "placeDesc": 0,
       "TotalScore": 130,
@@ -37,6 +42,11 @@
       "placeName": 1925,
       "placePrefabName": 0,
       "bigMapID": 1,
+      "SmallPlacersIds": [
+        4,
+        5,
+        6
+      ],
       "to3DPrefab": "b",
       "placeDesc": 0,
       "TotalScore": 100,
@@ -59,6 +69,11 @@
       "placeName": 1926,
       "placePrefabName": 0,
       "bigMapID": 1,
+      "SmallPlacersIds": [
+        7,
+        8,
+        9
+      ],
       "to3DPrefab": "c",
       "placeDesc": 0,
       "TotalScore": 40,
@@ -69,96 +84,6 @@
         10025
       ],
       "DivineSenseGeneralProbability": 0
-    },
-    {
-      "ID": 4,
-      "placeName": 1927,
-      "placePrefabName": 0,
-      "bigMapID": 1,
-      "to3DPrefab": "h",
-      "placeDesc": 0,
-      "TotalScore": 0,
-      "DivineSenseGeneralProbability": 0
-    },
-    {
-      "ID": 5,
-      "placeName": 1928,
-      "placePrefabName": 0,
-      "bigMapID": 2,
-      "to3DPrefab": "j",
-      "placeDesc": 0,
-      "TotalScore": 0,
-      "DivineSenseGeneralProbability": 0
-    },
-    {
-      "ID": 6,
-      "placeName": 1929,
-      "placePrefabName": 0,
-      "bigMapID": 2,
-      "to3DPrefab": "j",
-      "placeDesc": 0,
-      "TotalScore": 0,
-      "DivineSenseGeneralProbability": 0
-    },
-    {
-      "ID": 7,
-      "placeName": 1930,
-      "placePrefabName": 0,
-      "bigMapID": 2,
-      "to3DPrefab": "j",
-      "placeDesc": 0,
-      "TotalScore": 0,
-      "DivineSenseGeneralProbability": 0
-    },
-    {
-      "ID": 8,
-      "placeName": 1931,
-      "placePrefabName": 0,
-      "bigMapID": 3,
-      "to3DPrefab": "j",
-      "placeDesc": 0,
-      "TotalScore": 0,
-      "DivineSenseGeneralProbability": 0
-    },
-    {
-      "ID": 9,
-      "placeName": 1932,
-      "placePrefabName": 0,
-      "bigMapID": 3,
-      "to3DPrefab": "j",
-      "placeDesc": 0,
-      "TotalScore": 0,
-      "DivineSenseGeneralProbability": 0
-    },
-    {
-      "ID": 10,
-      "placeName": 1933,
-      "placePrefabName": 0,
-      "bigMapID": 3,
-      "to3DPrefab": "j",
-      "placeDesc": 0,
-      "TotalScore": 0,
-      "DivineSenseGeneralProbability": 0
-    },
-    {
-      "ID": 11,
-      "placeName": 1934,
-      "placePrefabName": 0,
-      "bigMapID": 3,
-      "to3DPrefab": "j",
-      "placeDesc": 0,
-      "TotalScore": 0,
-      "DivineSenseGeneralProbability": 0
-    },
-    {
-      "ID": 12,
-      "placeName": 1935,
-      "placePrefabName": 0,
-      "bigMapID": 3,
-      "to3DPrefab": "j",
-      "placeDesc": 0,
-      "TotalScore": 0,
-      "DivineSenseGeneralProbability": 0
     }
   ]
 }

Assets/Res/Config/SmallPlacesConfig.json

@@ -0,0 +1,49 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "placeName": 0,
+      "UnlockEnvetid": 0
+    },
+    {
+      "ID": 2,
+      "placeName": 0,
+      "UnlockEnvetid": 0
+    },
+    {
+      "ID": 3,
+      "placeName": 0,
+      "UnlockEnvetid": 0
+    },
+    {
+      "ID": 4,
+      "placeName": 0,
+      "UnlockEnvetid": 0
+    },
+    {
+      "ID": 5,
+      "placeName": 0,
+      "UnlockEnvetid": 0
+    },
+    {
+      "ID": 6,
+      "placeName": 0,
+      "UnlockEnvetid": 0
+    },
+    {
+      "ID": 7,
+      "placeName": 0,
+      "UnlockEnvetid": 0
+    },
+    {
+      "ID": 8,
+      "placeName": 0,
+      "UnlockEnvetid": 0
+    },
+    {
+      "ID": 9,
+      "placeName": 0,
+      "UnlockEnvetid": 0
+    }
+  ]
+}

Assets/Res/Config/SmallPlacesConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XnkZtSikAS+5E7YPSjvZ4t1DpoAtQ8XHOHcX9zzZTa1yvJwtHE/QLy82LoDz
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Core/UI/Core/UIManager.cs

@@ -238,7 +238,7 @@ namespace Fort23.Mono
 
         public void SetEventSystemEnable(bool value)
         {
-            // current.isClose = !value;
+            current.enabled = value;
         }
 
         [CustomMethod(CustomMethodType.Update)]

Assets/Scripts/Core/UI/Core/UIPanel.cs

@@ -160,12 +160,12 @@ namespace Fort23.Mono
             {
                 if (_openAnimationTimeCount > 0)
                 {
-                    UIManager.Instance.SetEventSystemEnable(false);
+                    // UIManager.Instance.SetEventSystemEnable(false);
                     Animator.Play("open");
                     Animator.Update(0.01f);
                     openTimerEntity = TimerComponent.Instance.AddTimer(_openAnimationTimeCount, delegate
                     {
-                        UIManager.Instance.SetEventSystemEnable(true);
+                        // UIManager.Instance.SetEventSystemEnable(true);
                         showcCTask.SetResult();
                     });
                 }

Assets/Scripts/GameData/ExcelConfig/PlacesConfig.cs

@@ -54,6 +54,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///包含的小地点
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] SmallPlacersIds;
+#else
+		public int[] SmallPlacersIds{ set; get; }
+#endif
+		
+
 		/// <summary>
 		///3D世界
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/SmallPlacesConfig.cs

@@ -0,0 +1,50 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\Maps.xlsx. SheetName: SmallPlacesConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "SmallPlacesConfig.json")]
+	public partial class SmallPlacesConfigHolder : ConfigHolder<SmallPlacesConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct SmallPlacesConfig : 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 placeName;
+#else
+		public int placeName{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///解锁当前地点事件Id
+		/// </summary>
+#if !COMBAT_SERVER
+		public int UnlockEnvetid;
+#else
+		public int UnlockEnvetid{ set; get; }
+#endif
+		
+
+	}
+
+}
+// End of Auto Generated Code

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

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

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -67,7 +67,7 @@ public class DialogueManager : Singleton<DialogueManager>
         }
     }
 
-    private void PlayDialogue(int dialogueID)
+    private async void PlayDialogue(int dialogueID)
     {
         currentDialogueID = dialogueID;
 
@@ -113,6 +113,20 @@ public class DialogueManager : Singleton<DialogueManager>
         }
 
 
+        //处理前置表现
+        if (dialogueConfig.PreShow == 1)
+        {
+            UIManager.Instance.HindCurrAllShowPanel();
+            CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
+            CombatController.currActiveCombat.CombatHeroController.Flight(dialogueConfig.PreShowPar, -90, 10);
+            UIManager.Instance.SetEventSystemEnable(false);
+            await TimerComponent.Instance.WaitAsync(dialogueConfig.PreShowPar * 1000 + 700);
+            CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
+            UIManager.Instance.SetEventSystemEnable(true);
+            UIManager.Instance.ShowLastHindAllShowPanel();
+        }
+
+
         AccountFileInfo.Instance.SavePlayerData();
 
         //挂机事件 弹出简单气泡对话
@@ -362,6 +376,7 @@ public class DialogueManager : Singleton<DialogueManager>
             {
                 CurrentEventList.itemInfos.Add(itemInfo.ToItemData());
             }
+
             AccountFileInfo.Instance.SavePlayerData();
             // RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(rewardsDic, onClose, titleId);
             // await rewardsPanel.UIClosed();