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

Assets/Res/Config/DropItemConfig.json

@@ -206,16 +206,13 @@
         12003,
         12006,
         12007,
-        12008,
         12011,
         12012,
-        12013,
         12016,
         12017,
         12018,
         12021,
         12022,
-        12023,
         12511,
         12512,
         12513,
@@ -251,9 +248,7 @@
         10002,
         10004,
         10005,
-        10007,
-        10009,
-        10011
+        10007
       ],
       "dropMinV": 1,
       "dropMaxV": 1,

Assets/Res/Config/ShopItemConfig.json

@@ -625,10 +625,10 @@
       "ID": 101,
       "giftID": "",
       "itemId": [
-        11001
+        10001
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -648,10 +648,10 @@
       "ID": 102,
       "giftID": "",
       "itemId": [
-        11002
+        10002
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -671,10 +671,10 @@
       "ID": 103,
       "giftID": "",
       "itemId": [
-        11003
+        10003
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -694,10 +694,10 @@
       "ID": 104,
       "giftID": "",
       "itemId": [
-        11004
+        10004
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -717,10 +717,10 @@
       "ID": 105,
       "giftID": "",
       "itemId": [
-        11005
+        10005
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -740,10 +740,10 @@
       "ID": 106,
       "giftID": "",
       "itemId": [
-        11006
+        10006
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -763,10 +763,10 @@
       "ID": 107,
       "giftID": "",
       "itemId": [
-        11007
+        10007
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -786,10 +786,10 @@
       "ID": 108,
       "giftID": "",
       "itemId": [
-        11008
+        10008
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -806,13 +806,13 @@
       ]
     },
     {
-      "ID": 109,
+      "ID": 110,
       "giftID": "",
       "itemId": [
-        11009
+        10010
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -829,59 +829,59 @@
       ]
     },
     {
-      "ID": 110,
+      "ID": 201,
       "giftID": "",
       "itemId": [
-        11010
+        12001
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
       "oldPrice": 1,
       "buyCount": -1,
       "maxBuyCount": -1,
-      "shopItemGroup": 2,
+      "shopItemGroup": 3,
       "continueTime": -1,
       "shopName": 0,
       "shopDesc": 0,
       "shopShowTemplate": 3,
       "shopShowTemplateParm": [
-        "icon_Coins_s"
+        "icon_Gem_Star_Blue"
       ]
     },
     {
-      "ID": 111,
+      "ID": 202,
       "giftID": "",
       "itemId": [
-        11011
+        12002
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
       "oldPrice": 1,
       "buyCount": -1,
       "maxBuyCount": -1,
-      "shopItemGroup": 2,
+      "shopItemGroup": 3,
       "continueTime": -1,
       "shopName": 0,
       "shopDesc": 0,
       "shopShowTemplate": 3,
       "shopShowTemplateParm": [
-        "icon_Coins_s"
+        "icon_Gem_Star_Blue"
       ]
     },
     {
-      "ID": 201,
+      "ID": 203,
       "giftID": "",
       "itemId": [
-        13001
+        12003
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -898,13 +898,13 @@
       ]
     },
     {
-      "ID": 202,
+      "ID": 204,
       "giftID": "",
       "itemId": [
-        13002
+        12004
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -921,13 +921,13 @@
       ]
     },
     {
-      "ID": 203,
+      "ID": 205,
       "giftID": "",
       "itemId": [
-        13003
+        12005
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -944,13 +944,13 @@
       ]
     },
     {
-      "ID": 204,
+      "ID": 206,
       "giftID": "",
       "itemId": [
-        13004
+        12006
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -967,13 +967,13 @@
       ]
     },
     {
-      "ID": 205,
+      "ID": 207,
       "giftID": "",
       "itemId": [
-        13005
+        12007
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -990,13 +990,13 @@
       ]
     },
     {
-      "ID": 206,
+      "ID": 208,
       "giftID": "",
       "itemId": [
-        13006
+        12009
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1013,13 +1013,13 @@
       ]
     },
     {
-      "ID": 207,
+      "ID": 209,
       "giftID": "",
       "itemId": [
-        13007
+        12010
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1036,13 +1036,13 @@
       ]
     },
     {
-      "ID": 208,
+      "ID": 210,
       "giftID": "",
       "itemId": [
-        13008
+        12011
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1059,13 +1059,13 @@
       ]
     },
     {
-      "ID": 209,
+      "ID": 211,
       "giftID": "",
       "itemId": [
-        13009
+        12012
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1082,13 +1082,13 @@
       ]
     },
     {
-      "ID": 210,
+      "ID": 212,
       "giftID": "",
       "itemId": [
-        13010
+        12014
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1105,13 +1105,13 @@
       ]
     },
     {
-      "ID": 211,
+      "ID": 213,
       "giftID": "",
       "itemId": [
-        13011
+        12015
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1128,13 +1128,13 @@
       ]
     },
     {
-      "ID": 212,
+      "ID": 214,
       "giftID": "",
       "itemId": [
-        13012
+        12016
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1151,13 +1151,13 @@
       ]
     },
     {
-      "ID": 213,
+      "ID": 215,
       "giftID": "",
       "itemId": [
-        13013
+        12017
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1174,13 +1174,13 @@
       ]
     },
     {
-      "ID": 214,
+      "ID": 216,
       "giftID": "",
       "itemId": [
-        13014
+        12018
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1197,13 +1197,13 @@
       ]
     },
     {
-      "ID": 215,
+      "ID": 217,
       "giftID": "",
       "itemId": [
-        13015
+        12019
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1220,13 +1220,13 @@
       ]
     },
     {
-      "ID": 216,
+      "ID": 218,
       "giftID": "",
       "itemId": [
-        13016
+        12020
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1243,13 +1243,13 @@
       ]
     },
     {
-      "ID": 217,
+      "ID": 219,
       "giftID": "",
       "itemId": [
-        13017
+        12021
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1266,13 +1266,13 @@
       ]
     },
     {
-      "ID": 218,
+      "ID": 220,
       "giftID": "",
       "itemId": [
-        13018
+        12022
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1289,13 +1289,13 @@
       ]
     },
     {
-      "ID": 219,
+      "ID": 221,
       "giftID": "",
       "itemId": [
-        13019
+        12024
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1312,13 +1312,13 @@
       ]
     },
     {
-      "ID": 220,
+      "ID": 222,
       "giftID": "",
       "itemId": [
-        13020
+        12025
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1335,13 +1335,13 @@
       ]
     },
     {
-      "ID": 221,
+      "ID": 223,
       "giftID": "",
       "itemId": [
-        13021
+        12501
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1358,13 +1358,13 @@
       ]
     },
     {
-      "ID": 222,
+      "ID": 224,
       "giftID": "",
       "itemId": [
-        13022
+        12502
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1381,13 +1381,13 @@
       ]
     },
     {
-      "ID": 223,
+      "ID": 225,
       "giftID": "",
       "itemId": [
-        13023
+        12503
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1404,13 +1404,13 @@
       ]
     },
     {
-      "ID": 224,
+      "ID": 226,
       "giftID": "",
       "itemId": [
-        13024
+        12504
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1427,13 +1427,13 @@
       ]
     },
     {
-      "ID": 225,
+      "ID": 227,
       "giftID": "",
       "itemId": [
-        13025
+        12505
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1450,13 +1450,13 @@
       ]
     },
     {
-      "ID": 226,
+      "ID": 228,
       "giftID": "",
       "itemId": [
-        13501
+        12506
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1473,13 +1473,13 @@
       ]
     },
     {
-      "ID": 227,
+      "ID": 229,
       "giftID": "",
       "itemId": [
-        13502
+        12507
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1496,13 +1496,13 @@
       ]
     },
     {
-      "ID": 228,
+      "ID": 230,
       "giftID": "",
       "itemId": [
-        13503
+        12508
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1519,13 +1519,13 @@
       ]
     },
     {
-      "ID": 229,
+      "ID": 231,
       "giftID": "",
       "itemId": [
-        13504
+        12509
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1542,13 +1542,13 @@
       ]
     },
     {
-      "ID": 230,
+      "ID": 232,
       "giftID": "",
       "itemId": [
-        13505
+        12510
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1565,13 +1565,13 @@
       ]
     },
     {
-      "ID": 231,
+      "ID": 233,
       "giftID": "",
       "itemId": [
-        13506
+        12511
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1588,13 +1588,13 @@
       ]
     },
     {
-      "ID": 232,
+      "ID": 234,
       "giftID": "",
       "itemId": [
-        13507
+        12512
       ],
       "itemCount": [
-        100
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -1611,13 +1611,151 @@
       ]
     },
     {
-      "ID": 233,
+      "ID": 235,
+      "giftID": "",
+      "itemId": [
+        12513
+      ],
+      "itemCount": [
+        1
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 3,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 236,
+      "giftID": "",
+      "itemId": [
+        12514
+      ],
+      "itemCount": [
+        1
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 3,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 237,
+      "giftID": "",
+      "itemId": [
+        12515
+      ],
+      "itemCount": [
+        1
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 3,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 238,
+      "giftID": "",
+      "itemId": [
+        12516
+      ],
+      "itemCount": [
+        1
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 3,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 239,
       "giftID": "",
       "itemId": [
-        13508
+        12517
       ],
       "itemCount": [
-        100
+        1
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 3,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 240,
+      "giftID": "",
+      "itemId": [
+        12518
+      ],
+      "itemCount": [
+        1
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 3,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 241,
+      "giftID": "",
+      "itemId": [
+        12519
+      ],
+      "itemCount": [
+        1
       ],
       "costItemId": 1001,
       "price": 1,