zg 4 tuần trước cách đây
mục cha
commit
a3af14caa2

+ 44 - 0
Assets/Res/Config/ChanllegeResource.json

@@ -0,0 +1,44 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "name": null,
+      "type": 1945,
+      "freetime": 3,
+      "maxtime": 10,
+      "NeedItem": [
+        1002
+      ],
+      "itemNum": [
+        10
+      ],
+      "paraType": 1,
+      "para1": [
+        20001
+      ],
+      "para2": [
+        20002
+      ],
+      "para3": [
+        20003
+      ]
+    },
+    {
+      "ID": 2,
+      "name": null,
+      "type": 1946,
+      "freetime": 3,
+      "maxtime": 10,
+      "NeedItem": [
+        1002
+      ],
+      "itemNum": [
+        10
+      ],
+      "paraType": 2,
+      "para1": [
+        5
+      ]
+    }
+  ]
+}

+ 59 - 0
Assets/Res/Config/EventConfig.json

@@ -283,6 +283,65 @@
       "EventCount": null,
       "EventName": 1943,
       "Description": 1944
+    },
+    {
+      "ID": 20001,
+      "EventLinksId": [
+        1001,
+        1002,
+        1003,
+        1004,
+        1005
+      ],
+      "EventTriggerType": 5,
+      "EventTag": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 174,
+      "Description": 1936
+    },
+    {
+      "ID": 20002,
+      "EventLinksId": [
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016
+      ],
+      "EventTriggerType": 5,
+      "EventTag": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 175,
+      "Description": 1937
+    },
+    {
+      "ID": 20003,
+      "EventLinksId": [
+        1001,
+        1002,
+        1003,
+        1004,
+        1005
+      ],
+      "EventTriggerType": 5,
+      "EventTag": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 1943,
+      "Description": 1944
     }
   ]
 }

+ 0 - 4
Assets/Res/Config/GroupConfig.json

@@ -2,28 +2,24 @@
   "configList": [
     {
       "ID": 100001,
-      "GroupMonsterLevel": -1,
       "GroupMonster": [
         9101
       ]
     },
     {
       "ID": 100002,
-      "GroupMonsterLevel": -1,
       "GroupMonster": [
         9102
       ]
     },
     {
       "ID": 100003,
-      "GroupMonsterLevel": -1,
       "GroupMonster": [
         9103
       ]
     },
     {
       "ID": 100004,
-      "GroupMonsterLevel": -1,
       "GroupMonster": [
         9201
       ]

+ 2 - 2
Assets/Res/Config/LanguageChineseConfig.json

@@ -7778,11 +7778,11 @@
     },
     {
       "ID": 1945,
-      "txt": "0"
+      "txt": "论道大会"
     },
     {
       "ID": 1946,
-      "txt": "0"
+      "txt": "仙山探险"
     },
     {
       "ID": 1947,

+ 98 - 0
Assets/Scripts/GameData/ExcelConfig/ChanllegeResource.cs

@@ -0,0 +1,98 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\ChanllegeResource.xlsx. SheetName: ChanllegeResource
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "ChanllegeResource.json")]
+	public partial class ChanllegeResourceHolder : ConfigHolder<ChanllegeResource>
	{
+	}
+
+
+	[Serializable]
+	public struct ChanllegeResource : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///名称
+		/// </summary>
+public int name;
+
+
+		/// <summary>
+		///大类 1=论道 2=探险
+		/// </summary>
+public int type;
+
+
+		/// <summary>
+		///每日免费次数
+		/// </summary>
+public int freetime;
+
+
+		/// <summary>
+		///每日最大次数
+		/// </summary>
+public int maxtime;
+
+
+		/// <summary>
+		///额外消耗道具
+		/// </summary>
+public int[] NeedItem;
+
+
+		/// <summary>
+		///额外消耗数量
+		/// </summary>
+public int[] itemNum;
+
+
+		/// <summary>
+		///奖励预览道具
+		/// </summary>
+public int[] prizeid;
+
+
+		/// <summary>
+		///奖励预览数量
+		/// </summary>
+public int[] prizeNum;
+
+
+		/// <summary>
+		///特殊参数类型
+		/// </summary>
+public int paraType;
+
+
+		/// <summary>
+		///特殊参数值1
+		/// </summary>
+public int[] para1;
+
+
+		/// <summary>
+		///特殊参数值2
+		/// </summary>
+public int[] para2;
+
+
+		/// <summary>
+		///特殊参数值3
+		/// </summary>
+public int[] para3;
+
+
+	}
+
+}
+// End of Auto Generated Code

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -27,7 +27,7 @@ public int[] EventLinksId;
 
 
 		/// <summary>
-		///事件类型: 1.通用事件 2.挂机事件 4.主线任务 99.无标记 
+		///事件类型: 1.通用事件 2.挂机事件 4.主线任务 5.仙山探险 99.无标记 
 		/// </summary>
 public int EventTriggerType;
 

+ 2 - 2
Assets/Scripts/GameData/ExcelConfig/GroupConfig.cs

@@ -21,9 +21,9 @@ public int ID;
 
 
 		/// <summary>
-		///具体怪物等级 -1代表跟随玩家等级
+		///具体怪物等级 -1代表跟随玩家等级 -1后面可填动态修正等级
 		/// </summary>
-public int GroupMonsterLevel;
+public int[] GroupMonsterLevel;
 
 
 		/// <summary>

BIN
Excel2Json/Excel/ChanllegeResource.xlsx


BIN
Excel2Json/Excel/DaoyouConfig.xlsx


BIN
Excel2Json/Excel/DivineSenseConfig.xlsx


BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/Language.xlsx


BIN
Excel2Json/Excel/LevelBattle.xlsx


BIN
Excel2Json/Excel/Maps.xlsx