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

Assets/Res/Config/UnlockConfig.json

@@ -1,3 +1,12 @@
 {
-  "configList": []
+  "configList": [
+    {
+      "ID": 1,
+      "ulockFunction": 1,
+      "ulockCondition": 1,
+      "ulockValue": 21,
+      "lockType": 1,
+      "UnlockTipsID": 0
+    }
+  ]
 }