提交1.1.7版本

assets/resources/prefabs/precedence/skill_content.prefab

@@ -570,7 +570,7 @@
     "asset": {
       "__uuid__": "515ad1c6-1cc8-4069-9798-62a1eb5a61c8"
     },
-    "fileId": "c3meL2T5RJ1qnhxuJO2wIh",
+    "fileId": "62j9aSSiJHYodBeUcTY3T7",
     "sync": false
   },
   {
@@ -6003,7 +6003,7 @@
     "asset": {
       "__uuid__": "515ad1c6-1cc8-4069-9798-62a1eb5a61c8"
     },
-    "fileId": "bb4bGyjIBA56a+kUlKHBbF",
+    "fileId": "61iROy51JL8rldRnhiw3qw",
     "sync": false
   },
   {
@@ -6233,7 +6233,7 @@
     "asset": {
       "__uuid__": "515ad1c6-1cc8-4069-9798-62a1eb5a61c8"
     },
-    "fileId": "f22ZMOpiVI051JH8/U6Pde",
+    "fileId": "1acVRvbbVEg6bfFeoBnqVI",
     "sync": false
   },
   {
@@ -6332,7 +6332,7 @@
     "asset": {
       "__uuid__": "515ad1c6-1cc8-4069-9798-62a1eb5a61c8"
     },
-    "fileId": "e3jUM8OMFIOJ0X1hxUK8s/",
+    "fileId": "ed35/kyg1G5qH2M/J9QjKH",
     "sync": false
   },
   {
@@ -8136,7 +8136,7 @@
     "asset": {
       "__uuid__": "515ad1c6-1cc8-4069-9798-62a1eb5a61c8"
     },
-    "fileId": "46l94MqTtE7Ju007+wZRCm",
+    "fileId": "ff8cqEhNJHSYTi4tT1BpfT",
     "sync": false
   },
   {
@@ -8235,7 +8235,7 @@
     "asset": {
       "__uuid__": "515ad1c6-1cc8-4069-9798-62a1eb5a61c8"
     },
-    "fileId": "c1p21Vu8xGW4IEK7gchFTZ",
+    "fileId": "fcYWRHXc1OAo5g3dSj8gce",
     "sync": false
   },
   {

assets/scripts/skill/SkillTopItem.js

@@ -437,7 +437,7 @@ cc.Class({
     },
 
     skillResetCancelAction() {
-        this.button = true;
+        this.button.interactable = true;
         this.resetSkillAlertNode.active = false;
     },
 

assets/scripts/utils/Global.js

@@ -12,9 +12,9 @@ window.Global = {
     // 建筑管理
     BuildingManager: BuildingManager.instance,
 
-    debug: true,
+    debug: false,
 
-    ver: 116, //游戏版本号发版时需要核对
+    ver: 117, //游戏版本号发版时需要核对
     
     isCheck: false,
 

settings/builder.json

@@ -41,7 +41,7 @@
     "appid": "wx36581990a2e76fba",
     "isSubdomain": false,
     "orientation": "portrait",
-    "subContext": ""
+    "subContext": "wechatgame-subcontext"
   },
   "xxteaKey": "7480184a-3b45-4d",
   "zipCompressJs": true