1

Assets/Res/Config/ShopItemConfig.json

@@ -441,7 +441,7 @@
       "ID": 20,
       "giftID": "",
       "itemId": [
-        21010
+        21006
       ],
       "itemCount": [
         99
@@ -464,7 +464,7 @@
       "ID": 21,
       "giftID": "",
       "itemId": [
-        21011
+        21007
       ],
       "itemCount": [
         99
@@ -487,7 +487,7 @@
       "ID": 22,
       "giftID": "",
       "itemId": [
-        21012
+        21008
       ],
       "itemCount": [
         99
@@ -509,6 +509,98 @@
     {
       "ID": 23,
       "giftID": "",
+      "itemId": [
+        21009
+      ],
+      "itemCount": [
+        99
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 1,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Coin"
+      ]
+    },
+    {
+      "ID": 24,
+      "giftID": "",
+      "itemId": [
+        21010
+      ],
+      "itemCount": [
+        99
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 1,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Coin"
+      ]
+    },
+    {
+      "ID": 25,
+      "giftID": "",
+      "itemId": [
+        21011
+      ],
+      "itemCount": [
+        99
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 1,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Coin"
+      ]
+    },
+    {
+      "ID": 26,
+      "giftID": "",
+      "itemId": [
+        21012
+      ],
+      "itemCount": [
+        99
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 1,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Coin"
+      ]
+    },
+    {
+      "ID": 27,
+      "giftID": "",
       "itemId": [
         21013
       ],

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -168,9 +168,9 @@ namespace Excel2Json
 		///触发条件类型 只能配处于什么状态和数值，不能配变化的数值
 		/// </summary>
 #if !COMBAT_SERVER
-		public int EventConditionId;
+		public int[] EventConditionId;
 #else
-		public int EventConditionId{ set; get; }
+		public int[] EventConditionId{ set; get; }
 #endif
 		
 
@@ -178,9 +178,9 @@ namespace Excel2Json
 		///触发效果值
 		/// </summary>
 #if !COMBAT_SERVER
-		public int[] EventValue;
+		public string[] EventValue;
 #else
-		public int[] EventValue{ set; get; }
+		public string[] EventValue{ set; get; }
 #endif