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

Assets/Res/Config/ItemAssociateConfig.json

@@ -13,12 +13,12 @@
     {
       "ID": 3,
       "associateID": 3,
-      "LanID": 10700
+      "LanID": -1
     },
     {
       "ID": 4,
       "associateID": 4,
-      "LanID": 10701
+      "LanID": -1
     },
     {
       "ID": 5,
@@ -28,12 +28,12 @@
     {
       "ID": 6,
       "associateID": 6,
-      "LanID": 10703
+      "LanID": -1
     },
     {
       "ID": 7,
       "associateID": 7,
-      "LanID": 10704
+      "LanID": -1
     },
     {
       "ID": 8,
@@ -43,32 +43,32 @@
     {
       "ID": 9,
       "associateID": 9,
-      "LanID": 10706
+      "LanID": -1
     },
     {
       "ID": 10,
       "associateID": 10,
-      "LanID": 10707
+      "LanID": -1
     },
     {
       "ID": 11,
       "associateID": 11,
-      "LanID": 10708
+      "LanID": -1
     },
     {
       "ID": 12,
       "associateID": 12,
-      "LanID": 10709
+      "LanID": -1
     },
     {
       "ID": 13,
       "associateID": 13,
-      "LanID": 10710
+      "LanID": -1
     },
     {
       "ID": 14,
       "associateID": 14,
-      "LanID": 10711
+      "LanID": -1
     }
   ]
 }