Merge branch '0.6' of http://svn.ouj.com:3000/DWG/allstar into 0.6

assets/scene/game.fire

@@ -71,10 +71,10 @@
         "__id__": 128
       },
       {
-        "__id__": 210
+        "__id__": 212
       },
       {
-        "__id__": 217
+        "__id__": 219
       },
       {
         "__id__": 5
@@ -92,26 +92,26 @@
         "__id__": 171
       },
       {
-        "__id__": 232
+        "__id__": 234
       },
       {
-        "__id__": 186
+        "__id__": 188
       },
       {
-        "__id__": 234
+        "__id__": 236
       }
     ],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 238
+        "__id__": 240
       },
       {
-        "__id__": 239
+        "__id__": 241
       },
       {
-        "__id__": 240
+        "__id__": 242
       }
     ],
     "_prefab": null,
@@ -267,13 +267,16 @@
       "__id__": 180
     },
     "homeGuide": {
-      "__id__": 186
+      "__id__": 188
     },
     "toastNode": {
-      "__id__": 210
+      "__id__": 212
     },
     "levelHomeSpeedUpTipsNode": {
-      "__id__": 217
+      "__id__": 219
+    },
+    "talentPoint": {
+      "__id__": 181
     }
   },
   {
@@ -6602,18 +6605,22 @@
     "_parent": {
       "__id__": 2
     },
-    "_children": [],
+    "_children": [
+      {
+        "__id__": 181
+      }
+    ],
     "_tag": -1,
     "_active": false,
     "_components": [
       {
-        "__id__": 181
+        "__id__": 183
       },
       {
-        "__id__": 182
+        "__id__": 184
       },
       {
-        "__id__": 183
+        "__id__": 185
       }
     ],
     "_prefab": null,
@@ -6654,6 +6661,84 @@
     "groupIndex": 0
   },
   {
+    "__type__": "cc.Node",
+    "_name": "notice_point",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 180
+    },
+    "_children": [],
+    "_tag": -1,
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 182
+      }
+    ],
+    "_prefab": null,
+    "_id": "2aHpb1pbdB9LQZG3nYg2Vn",
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_cascadeOpacityEnabled": true,
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 22,
+      "height": 23
+    },
+    "_rotationX": 0,
+    "_rotationY": 0,
+    "_scaleX": 1,
+    "_scaleY": 1,
+    "_position": {
+      "__type__": "cc.Vec2",
+      "x": 36.9,
+      "y": 34.9
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_localZOrder": 0,
+    "_globalZOrder": 0,
+    "_opacityModifyRGB": false,
+    "groupIndex": 0
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 181
+    },
+    "_enabled": true,
+    "_spriteFrame": {
+      "__uuid__": "58d3f5a3-1941-49af-822a-e8e04f7e457e"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_atlas": null
+  },
+  {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
@@ -6732,10 +6817,10 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 184
+        "__id__": 186
       },
       {
-        "__id__": 185
+        "__id__": 187
       }
     ],
     "_N$interactable": true,
@@ -6791,30 +6876,30 @@
     },
     "_children": [
       {
-        "__id__": 187
+        "__id__": 189
       },
       {
-        "__id__": 190
+        "__id__": 192
       },
       {
-        "__id__": 196
+        "__id__": 198
       },
       {
-        "__id__": 199
+        "__id__": 201
       },
       {
-        "__id__": 205
+        "__id__": 207
       }
     ],
     "_tag": -1,
     "_active": false,
     "_components": [
       {
-        "__id__": 208
+        "__id__": 210
       }
     ],
     "_prefab": {
-      "__id__": 209
+      "__id__": 211
     },
     "_id": "61yDbN9hlJroCnLqtStlIm",
     "_opacity": 255,
@@ -6857,18 +6942,18 @@
     "_name": "blockevent",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 186
+      "__id__": 188
     },
     "_children": [],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 188
+        "__id__": 190
       }
     ],
     "_prefab": {
-      "__id__": 189
+      "__id__": 191
     },
     "_id": "b5qWfnDWND0pO/DiJ51yqw",
     "_opacity": 0,
@@ -6911,14 +6996,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 187
+      "__id__": 189
     },
     "_enabled": true
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 186
+      "__id__": 188
     },
     "asset": {
       "__uuid__": "16886aa7-849f-4cd0-9f51-448767758664"
@@ -6931,22 +7016,22 @@
     "_name": "mask",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 186
+      "__id__": 188
     },
     "_children": [
       {
-        "__id__": 191
+        "__id__": 193
       }
     ],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 194
+        "__id__": 196
       }
     ],
     "_prefab": {
-      "__id__": 195
+      "__id__": 197
     },
     "_id": "660m+MI/JGrYOwOrTteyGd",
     "_opacity": 255,
@@ -6989,18 +7074,18 @@
     "_name": "bg",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 190
+      "__id__": 192
     },
     "_children": [],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 192
+        "__id__": 194
       }
     ],
     "_prefab": {
-      "__id__": 193
+      "__id__": 195
     },
     "_id": "01akOM0v5O5KvNdVpZxY6N",
     "_opacity": 105,
@@ -7043,7 +7128,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 191
+      "__id__": 193
     },
     "_enabled": true,
     "_spriteFrame": {
@@ -7067,7 +7152,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 186
+      "__id__": 188
     },
     "asset": {
       "__uuid__": "16886aa7-849f-4cd0-9f51-448767758664"
@@ -7080,7 +7165,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 190
+      "__id__": 192
     },
     "_enabled": true,
     "_type": 0,
@@ -7094,7 +7179,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 186
+      "__id__": 188
     },
     "asset": {
       "__uuid__": "16886aa7-849f-4cd0-9f51-448767758664"
@@ -7107,18 +7192,18 @@
     "_name": "secretary",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 186
+      "__id__": 188
     },
     "_children": [],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 197
+        "__id__": 199
       }
     ],
     "_prefab": {
-      "__id__": 198
+      "__id__": 200
     },
     "_id": "98Jfxx3I9Jjo0FZ+ECDG4j",
     "_opacity": 255,
@@ -7161,7 +7246,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 196
+      "__id__": 198
     },
     "_enabled": true,
     "_spriteFrame": {
@@ -7185,7 +7270,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 186
+      "__id__": 188
     },
     "asset": {
       "__uuid__": "16886aa7-849f-4cd0-9f51-448767758664"
@@ -7198,22 +7283,22 @@
     "_name": "dialog",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 186
+      "__id__": 188
     },
     "_children": [
       {
-        "__id__": 200
+        "__id__": 202
       }
     ],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 203
+        "__id__": 205
       }
     ],
     "_prefab": {
-      "__id__": 204
+      "__id__": 206
     },
     "_id": "3ciIoJ1IxN8bJ/zrMLTDLL",
     "_opacity": 255,
@@ -7256,18 +7341,18 @@
     "_name": "text",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 199
+      "__id__": 201
     },
     "_children": [],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 201
+        "__id__": 203
       }
     ],
     "_prefab": {
-      "__id__": 202
+      "__id__": 204
     },
     "_id": "16HY46lAdIhp+rIvFPaXIt",
     "_opacity": 255,
@@ -7310,7 +7395,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 200
+      "__id__": 202
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -7330,7 +7415,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 186
+      "__id__": 188
     },
     "asset": {
       "__uuid__": "16886aa7-849f-4cd0-9f51-448767758664"
@@ -7343,7 +7428,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 199
+      "__id__": 201
     },
     "_enabled": true,
     "_spriteFrame": {
@@ -7367,7 +7452,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 186
+      "__id__": 188
     },
     "asset": {
       "__uuid__": "16886aa7-849f-4cd0-9f51-448767758664"
@@ -7380,18 +7465,18 @@
     "_name": "finger",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 186
+      "__id__": 188
     },
     "_children": [],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 206
+        "__id__": 208
       }
     ],
     "_prefab": {
-      "__id__": 207
+      "__id__": 209
     },
     "_id": "ebLpVPqDpEt62Ftrde8x0V",
     "_opacity": 255,
@@ -7434,7 +7519,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 205
+      "__id__": 207
     },
     "_enabled": true,
     "_spriteFrame": {
@@ -7458,7 +7543,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 186
+      "__id__": 188
     },
     "asset": {
       "__uuid__": "16886aa7-849f-4cd0-9f51-448767758664"
@@ -7471,35 +7556,35 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 186
+      "__id__": 188
     },
     "_enabled": true,
     "guideText": {
-      "__id__": 201
+      "__id__": 203
     },
     "dialog": {
-      "__id__": 199
+      "__id__": 201
     },
     "finger": {
-      "__id__": 205
+      "__id__": 207
     },
     "secretary": {
-      "__id__": 196
+      "__id__": 198
     },
     "mask": {
-      "__id__": 190
+      "__id__": 192
     },
     "maskBg": {
-      "__id__": 191
+      "__id__": 193
     },
     "blockEvent": {
-      "__id__": 187
+      "__id__": 189
     }
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 186
+      "__id__": 188
     },
     "asset": {
       "__uuid__": "16886aa7-849f-4cd0-9f51-448767758664"
@@ -7516,21 +7601,21 @@
     },
     "_children": [
       {
-        "__id__": 211
+        "__id__": 213
       }
     ],
     "_tag": -1,
     "_active": false,
     "_components": [
       {
-        "__id__": 214
+        "__id__": 216
       },
       {
-        "__id__": 215
+        "__id__": 217
       }
     ],
     "_prefab": {
-      "__id__": 216
+      "__id__": 218
     },
     "_id": "9d1W+BuKZIlK8ExY5yxaQI",
     "_opacity": 255,
@@ -7573,18 +7658,18 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 210
+      "__id__": 212
     },
     "_children": [],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 212
+        "__id__": 214
       }
     ],
     "_prefab": {
-      "__id__": 213
+      "__id__": 215
     },
     "_id": "47ZJ/FkptJjLnJtJmnRixF",
     "_opacity": 255,
@@ -7627,7 +7712,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 211
+      "__id__": 213
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -7647,7 +7732,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 210
+      "__id__": 212
     },
     "asset": {
       "__uuid__": "5e67ae80-f1fb-43c5-abf0-096b96f582cc"
@@ -7660,7 +7745,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 210
+      "__id__": 212
     },
     "_enabled": true,
     "_spriteFrame": {
@@ -7686,17 +7771,17 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 210
+      "__id__": 212
     },
     "_enabled": true,
     "label": {
-      "__id__": 212
+      "__id__": 214
     }
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 210
+      "__id__": 212
     },
     "asset": {
       "__uuid__": "5e67ae80-f1fb-43c5-abf0-096b96f582cc"
@@ -7713,27 +7798,27 @@
     },
     "_children": [
       {
-        "__id__": 218
+        "__id__": 220
       },
       {
-        "__id__": 221
+        "__id__": 223
       },
       {
-        "__id__": 225
+        "__id__": 227
       }
     ],
     "_tag": -1,
     "_active": false,
     "_components": [
       {
-        "__id__": 229
+        "__id__": 231
       },
       {
-        "__id__": 230
+        "__id__": 232
       }
     ],
     "_prefab": {
-      "__id__": 231
+      "__id__": 233
     },
     "_id": "595xx7N0NI17pTg55RfXgl",
     "_opacity": 255,
@@ -7776,18 +7861,18 @@
     "_name": "room_name",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 217
+      "__id__": 219
     },
     "_children": [],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 219
+        "__id__": 221
       }
     ],
     "_prefab": {
-      "__id__": 220
+      "__id__": 222
     },
     "_id": "0eC9dR6oJC1aw1xfAG2kzh",
     "_opacity": 255,
@@ -7830,7 +7915,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 218
+      "__id__": 220
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -7850,7 +7935,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 217
+      "__id__": 219
     },
     "asset": {
       "__uuid__": "ed0b46f7-3f5c-4c43-a38a-a896d8bef41f"
@@ -7863,21 +7948,21 @@
     "_name": "content",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 217
+      "__id__": 219
     },
     "_children": [],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 222
+        "__id__": 224
       },
       {
-        "__id__": 223
+        "__id__": 225
       }
     ],
     "_prefab": {
-      "__id__": 224
+      "__id__": 226
     },
     "_id": "784qAGUEBA3IqGyim9Ou6M",
     "_opacity": 255,
@@ -7920,7 +8005,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 221
+      "__id__": 223
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -7942,7 +8027,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 221
+      "__id__": 223
     },
     "_enabled": true,
     "_color": {
@@ -7957,7 +8042,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 217
+      "__id__": 219
     },
     "asset": {
       "__uuid__": "ed0b46f7-3f5c-4c43-a38a-a896d8bef41f"
@@ -7970,21 +8055,21 @@
     "_name": "speed_type",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 217
+      "__id__": 219
     },
     "_children": [],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 226
+        "__id__": 228
       },
       {
-        "__id__": 227
+        "__id__": 229
       }
     ],
     "_prefab": {
-      "__id__": 228
+      "__id__": 230
     },
     "_id": "56Ro5sRzhPuYzqApTJjuZu",
     "_opacity": 255,
@@ -8027,7 +8112,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 225
+      "__id__": 227
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -8049,7 +8134,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 225
+      "__id__": 227
     },
     "_enabled": true,
     "_color": {
@@ -8064,7 +8149,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 217
+      "__id__": 219
     },
     "asset": {
       "__uuid__": "ed0b46f7-3f5c-4c43-a38a-a896d8bef41f"
@@ -8077,7 +8162,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 217
+      "__id__": 219
     },
     "_enabled": true,
     "_spriteFrame": {
@@ -8103,23 +8188,23 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 217
+      "__id__": 219
     },
     "_enabled": true,
     "nameLabel": {
-      "__id__": 219
+      "__id__": 221
     },
     "contentLabel": {
-      "__id__": 222
+      "__id__": 224
     },
     "typeLabel": {
-      "__id__": 226
+      "__id__": 228
     }
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 217
+      "__id__": 219
     },
     "asset": {
       "__uuid__": "ed0b46f7-3f5c-4c43-a38a-a896d8bef41f"
@@ -8139,7 +8224,7 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 233
+        "__id__": 235
       }
     ],
     "_prefab": null,
@@ -8184,7 +8269,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 232
+      "__id__": 234
     },
     "_enabled": true,
     "coinPrefab": {
@@ -8203,13 +8288,13 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 235
+        "__id__": 237
       },
       {
-        "__id__": 236
+        "__id__": 238
       },
       {
-        "__id__": 237
+        "__id__": 239
       }
     ],
     "_prefab": null,
@@ -8254,7 +8339,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 234
+      "__id__": 236
     },
     "_enabled": true,
     "_paused": false,
@@ -8274,7 +8359,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 234
+      "__id__": 236
     },
     "_enabled": true,
     "alignMode": 1,
@@ -8300,7 +8385,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 234
+      "__id__": 236
     },
     "_enabled": true,
     "_N$zIndex": 100

assets/scripts/Game.js

@@ -62,6 +62,8 @@ cc.Class({
         toastNode: cc.Node,
 
         levelHomeSpeedUpTipsNode: cc.Node,
+
+        talentPoint: cc.Node,
     },
 
 
@@ -254,6 +256,10 @@ cc.Class({
                         // 任务大厅通知
                         this.toggleNoticePoint('quest', true)
                         break;
+                    case 6:
+                        //星探红点通知
+                        this.talentPoint.active = true;
+                        break;
                     default:
                         break;
                 }
@@ -692,6 +698,7 @@ cc.Class({
     }, 1000, true),
 
     handleShowTalent: _.debounce(() => {
+        GameEvent.fire('TalentIconPoint');
         cc.loader.loadRes('/prefabs/talent_mission', cc.Prefab, (error, prefab) => {
             if (error === null) {
                 let mission = cc.instantiate(prefab);
@@ -755,6 +762,8 @@ cc.Class({
 
         GameEvent.on(GameNotificationKey.LevelHomeSpeedUp, this, this.showLevelHomeSpeedUpTips);
 
+        GameEvent.on('TalentIconPoint', this, this.hideTanlentPoint);
+
     },
 
     onDestroy() {
@@ -771,7 +780,9 @@ cc.Class({
         GameEvent.off(GameNotificationKey.ShowCityMap, this);
         GameEvent.off(GameNotificationKey.CurrentCompanyMax, this);
         GameEvent.off(GameNotificationKey.afterCatFly, this);
-        GameEvent.on(GameNotificationKey.LevelHomeSpeedUp, this);
+        GameEvent.off(GameNotificationKey.LevelHomeSpeedUp, this);
+        GameEvent.off('TalentIconPoint', this);
+
     },
 
     processShareAction() {
@@ -825,6 +836,10 @@ cc.Class({
         Global.shareType = ShareAction.None;
     },
 
+    hideTanlentPoint() {
+        this.talentPoint.active = false;
+    },
+
     refreshActorNoJob() {
         JobApi.actorsNoJob(
             (response) => {

assets/scripts/net/Api.js

@@ -225,6 +225,7 @@ class Api {
     }
 
     static wxRequestPromise(url, data, method, header) {
+        console.log('wxRequestPromise: ');
         return new Promise((resolve, reject) => {
             wx.request({
                 url: url,
@@ -232,6 +233,7 @@ class Api {
                 method: method,
                 header: header === undefined ? {} : header,
                 success: (res) => {
+                    console.log('request success: ', res);
                     //直接处理登录失效的逻辑
                     if (res.data.code === ResponseStateCode.LOGIN_INVALIDATE) {
                         Global.needLogin = true;
@@ -246,6 +248,7 @@ class Api {
                     // }
                 },
                 fail: (res) => {
+                    console.log('request fail: ', res);
                     reject({
                         code: -1,
                         msg: '微信接口调用失败'

assets/scripts/net/FriendSystemApi.js

@@ -146,7 +146,7 @@ class FriendSystemApi {
     }
 
     static becomeArtistPromise(uid) {
-        return Api.httpGetPromise('friend/beMyArtist.do', { fid: uid });
+        return Api.httpPostPromise('/friend/beMyArtist.do', { fid: uid });
     }
 
     static shareSuccessNotice() {