Merge

assets/prefabs/level_home_item.prefab

@@ -1072,7 +1072,7 @@
     "node": {
       "__id__": 28
     },
-    "_enabled": false,
+    "_enabled": true,
     "_paused": false,
     "defaultSkin": "",
     "defaultAnimation": "jiasutiao_2",

assets/resources/artistOperation/color_full_bar.png.meta

@@ -0,0 +1,30 @@
+{
+  "ver": "2.0.0",
+  "uuid": "0ef341f1-201e-413d-9b61-2d39ebbc3b4d",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "subMetas": {
+    "color_full_bar": {
+      "ver": "1.0.3",
+      "uuid": "c0050c78-9d17-445c-a86e-c3af8a50e0c0",
+      "rawTextureUuid": "0ef341f1-201e-413d-9b61-2d39ebbc3b4d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 432,
+      "height": 96,
+      "rawWidth": 432,
+      "rawHeight": 96,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/prefabs/artist_man.prefab

@@ -20,18 +20,18 @@
         "__id__": 2
       },
       {
-        "__id__": 6
+        "__id__": 5
       }
     ],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 9
+        "__id__": 8
       }
     ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 9
     },
     "_id": "",
     "_opacity": 255,
@@ -82,13 +82,10 @@
     "_components": [
       {
         "__id__": 3
-      },
-      {
-        "__id__": 4
       }
     ],
     "_prefab": {
-      "__id__": 5
+      "__id__": 4
     },
     "_id": "",
     "_opacity": 255,
@@ -149,23 +146,6 @@
     "_N$overflow": 2
   },
   {
-    "__type__": "cc.LabelOutline",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_width": 2
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -188,11 +168,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 7
+        "__id__": 6
       }
     ],
     "_prefab": {
-      "__id__": 8
+      "__id__": 7
     },
     "_id": "",
     "_opacity": 255,
@@ -235,7 +215,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 6
+      "__id__": 5
     },
     "_enabled": true,
     "_paused": false,
@@ -271,10 +251,10 @@
       "__id__": 3
     },
     "runMan": {
-      "__id__": 6
+      "__id__": 5
     },
     "artistSkeleton": {
-      "__id__": 7
+      "__id__": 6
     },
     "_accSpeed": 50,
     "_maxX": 270

assets/resources/prefabs/artist_resident.prefab

@@ -338,7 +338,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 164,
+      "width": 167,
       "height": 50
     },
     "_rotationX": 0,
@@ -614,7 +614,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 84,
+      "width": 86,
       "height": 50
     },
     "_rotationX": 0,
@@ -1675,12 +1675,12 @@
       "__id__": 49
     },
     "_enabled": true,
-    "transition": 2,
+    "transition": 1,
     "pressedColor": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
+      "r": 204,
+      "g": 204,
+      "b": 204,
       "a": 255
     },
     "hoverColor": {

assets/resources/prefabs/notice_popup.prefab

@@ -26,18 +26,18 @@
         "__id__": 29
       },
       {
-        "__id__": 39
+        "__id__": 38
       }
     ],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 41
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 42
+      "__id__": 41
     },
     "_id": "",
     "_opacity": 255,
@@ -909,11 +909,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 37
     },
     "_id": "",
     "_opacity": 255,
@@ -1055,13 +1055,10 @@
     "_components": [
       {
         "__id__": 34
-      },
-      {
-        "__id__": 35
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 35
     },
     "_id": "",
     "_opacity": 255,
@@ -1080,7 +1077,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 86,
+      "width": 80,
       "height": 40
     },
     "_rotationX": 0,
@@ -1090,7 +1087,7 @@
     "_position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": 15
+      "y": 12.2
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -1122,23 +1119,6 @@
     "_N$overflow": 0
   },
   {
-    "__type__": "cc.LabelOutline",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 33
-    },
-    "_enabled": true,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 222,
-      "g": 87,
-      "b": 119,
-      "a": 255
-    },
-    "_width": 3
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1196,7 +1176,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 40
+      "__id__": 39
     },
     "_id": "",
     "_opacity": 255,

assets/resources/prefabs/other_artist_list.prefab

@@ -615,8 +615,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 316,
-      "height": 86
+      "width": 432,
+      "height": 96
     },
     "_rotationX": 0,
     "_rotationY": 0,
@@ -625,7 +625,7 @@
     "_position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": 517
+      "y": 581
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -636,7 +636,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "New RichText",
+    "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
       "__id__": 17
@@ -669,8 +669,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 177,
-      "height": 50
+      "width": 168,
+      "height": 40
     },
     "_rotationX": 0,
     "_rotationY": 0,
@@ -679,7 +679,7 @@
     "_position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": 0
+      "y": 10
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -689,21 +689,26 @@
     "groupIndex": 0
   },
   {
-    "__type__": "cc.RichText",
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 18
     },
     "_enabled": true,
-    "_N$string": "<outline color=#e8e9e9 width=2><b><color=#584A47>TA的艺人</c></b></outline>",
-    "_N$horizontalAlign": 0,
-    "_N$fontSize": 40,
-    "_N$font": null,
-    "_N$maxWidth": 0,
-    "_N$lineHeight": 50,
-    "_N$imageAtlas": null,
-    "_N$handleTouchEvent": true
+    "_useOriginalSize": false,
+    "_actualFontSize": 40,
+    "_fontSize": 40,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_N$string": "TA的艺人",
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -713,7 +718,7 @@
     "asset": {
       "__uuid__": "d9ae91a9-1b4c-4744-a20c-6f5829c2f33a"
     },
-    "fileId": "02IX81QQRB1ohSGsOTOKlF",
+    "fileId": "5cpymDU9RIdoS3hkDqy7xE",
     "sync": false
   },
   {
@@ -725,7 +730,7 @@
     },
     "_enabled": true,
     "_spriteFrame": {
-      "__uuid__": "b9030c1a-bfd3-45dc-ac22-58bb1691bead"
+      "__uuid__": "1f630dc2-7256-457c-8b3a-ff103ec9a10c"
     },
     "_type": 1,
     "_sizeMode": 1,
@@ -789,7 +794,7 @@
       "a": 255
     },
     "_N$normalSprite": {
-      "__uuid__": "b9030c1a-bfd3-45dc-ac22-58bb1691bead"
+      "__uuid__": "1f630dc2-7256-457c-8b3a-ff103ec9a10c"
     },
     "_N$pressedSprite": null,
     "pressedSprite": null,

assets/resources/prefabs/quest_popup.prefab

@@ -23,18 +23,18 @@
         "__id__": 6
       },
       {
-        "__id__": 259
+        "__id__": 258
       }
     ],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 277
+        "__id__": 276
       }
     ],
     "_prefab": {
-      "__id__": 278
+      "__id__": 277
     },
     "_id": "",
     "_opacity": 255,
@@ -194,7 +194,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 258
+      "__id__": 257
     },
     "_id": "",
     "_opacity": 255,
@@ -7928,11 +7928,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 256
+        "__id__": 255
       }
     ],
     "_prefab": {
-      "__id__": 257
+      "__id__": 256
     },
     "_id": "",
     "_opacity": 255,
@@ -7983,13 +7983,10 @@
     "_components": [
       {
         "__id__": 253
-      },
-      {
-        "__id__": 254
       }
     ],
     "_prefab": {
-      "__id__": 255
+      "__id__": 254
     },
     "_id": "",
     "_opacity": 255,
@@ -8008,7 +8005,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 166,
+      "width": 160,
       "height": 40
     },
     "_rotationX": 0,
@@ -8050,23 +8047,6 @@
     "_N$overflow": 0
   },
   {
-    "__type__": "cc.LabelOutline",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 252
-    },
-    "_enabled": true,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 222,
-      "g": 87,
-      "b": 119,
-      "a": 255
-    },
-    "_width": 3
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -8134,24 +8114,24 @@
     },
     "_children": [
       {
-        "__id__": 260
+        "__id__": 259
       },
       {
-        "__id__": 263
+        "__id__": 262
       },
       {
-        "__id__": 267
+        "__id__": 266
       }
     ],
     "_tag": -1,
     "_active": false,
     "_components": [
       {
-        "__id__": 275
+        "__id__": 274
       }
     ],
     "_prefab": {
-      "__id__": 276
+      "__id__": 275
     },
     "_id": "",
     "_opacity": 255,
@@ -8194,18 +8174,18 @@
     "_name": "gift_sprite",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 259
+      "__id__": 258
     },
     "_children": [],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 261
+        "__id__": 260
       }
     ],
     "_prefab": {
-      "__id__": 262
+      "__id__": 261
     },
     "_id": "",
     "_opacity": 255,
@@ -8248,7 +8228,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 260
+      "__id__": 259
     },
     "_enabled": true,
     "_spriteFrame": null,
@@ -8283,21 +8263,21 @@
     "_name": "gift_label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 259
+      "__id__": 258
     },
     "_children": [],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 264
+        "__id__": 263
       },
       {
-        "__id__": 265
+        "__id__": 264
       }
     ],
     "_prefab": {
-      "__id__": 266
+      "__id__": 265
     },
     "_id": "",
     "_opacity": 255,
@@ -8340,7 +8320,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 263
+      "__id__": 262
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -8362,7 +8342,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 263
+      "__id__": 262
     },
     "_enabled": true,
     "_color": {
@@ -8390,25 +8370,25 @@
     "_name": "gift_btn",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 259
+      "__id__": 258
     },
     "_children": [
       {
-        "__id__": 268
+        "__id__": 267
       }
     ],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 271
+        "__id__": 270
       },
       {
-        "__id__": 272
+        "__id__": 271
       }
     ],
     "_prefab": {
-      "__id__": 274
+      "__id__": 273
     },
     "_id": "",
     "_opacity": 255,
@@ -8451,18 +8431,18 @@
     "_name": "label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 267
+      "__id__": 266
     },
     "_children": [],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 269
+        "__id__": 268
       }
     ],
     "_prefab": {
-      "__id__": 270
+      "__id__": 269
     },
     "_id": "",
     "_opacity": 255,
@@ -8505,7 +8485,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 268
+      "__id__": 267
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -8538,7 +8518,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 267
+      "__id__": 266
     },
     "_enabled": true,
     "_spriteFrame": {
@@ -8564,7 +8544,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 267
+      "__id__": 266
     },
     "_enabled": true,
     "transition": 1,
@@ -8586,7 +8566,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 273
+        "__id__": 272
       }
     ],
     "_N$interactable": true,
@@ -8612,7 +8592,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 267
+      "__id__": 266
     }
   },
   {
@@ -8640,7 +8620,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 259
+      "__id__": 258
     },
     "_enabled": true,
     "_paused": false,
@@ -8699,7 +8679,7 @@
       "__id__": 6
     },
     "actGift": {
-      "__id__": 259
+      "__id__": 258
     },
     "actGiftFrames": [
       {

assets/scripts/Game.js

@@ -175,7 +175,7 @@ cc.Class({
 
         let Message = tutorial.Message;
 
-        let ws = this.ws = new WsManager(testUrl, {
+        let ws = this.ws = new WsManager(pUrl, {
             binaryType: 'arraybuffer',
             autoConnect: true,          // 自动连接
             reconnection: true,         // 断开自动重连
@@ -533,7 +533,15 @@ cc.Class({
     },
 
     _showFriendSystem() {
-        this.friendSystem.show(this.wechatFriendNode);
+        // 关闭好友列表时强制销毁这个节点，不然会出现滚动列表不显示问题
+        // 国庆节后再做优化处理，暂时先这样
+        if(!this.friendSystem.node) {
+            let friendSystem = cc.instantiate(this.friendSystemPrefab);
+            this.friendSystem = friendSystem.getComponent('FriendSystem');
+            this.friendSystem.show(this.wechatFriendNode);
+        } else {
+            this.friendSystem.show(this.wechatFriendNode);
+        }
     },
 
     _closeFriendSystem() {

assets/scripts/Tab.js

@@ -116,7 +116,7 @@ cc.Class({
 
     init(game) {
         this.game = game;
-
+        this.initFriendList = false;
         this.updateFriendList();
     },
 
@@ -132,6 +132,29 @@ cc.Class({
             this.friends = _friendList.slice(0, 20);
             this.noArtistTipNode.active = false;
             this.friendLayout();
+
+            // 暂时注释，国庆回来可能要用到
+            // if(!this.initFriendList) {
+            //     Global.friendList = this.friends = _friendList;
+
+            //     if(_friendList.length > 0) {
+            //         this.initFriendList = true;
+            //     }
+
+            //     this.noArtistTipNode.active = false;
+            //     this.friendLayout();
+            // } else {
+            //     // 判断列表是否有更改，如果没有更改则不重新渲染
+            //     let fChange = _friendList[0].uid != this.friends[0].uid;
+            //     let lChange = _friendList[_friendList.length - 1].uid != this.friends[this.friends.length - 1].uid;
+    
+            //     if(fChange || lChange) {
+            //         Global.friendList = this.friends = _friendList;
+            //         this.noArtistTipNode.active = false;
+            //         this.friendLayout();
+            //     }
+            // }
+
         }).catch((err) => { // 捕获到报错
             console.log(err);
         });
@@ -198,6 +221,7 @@ cc.Class({
     },
 
     friendLayout() {
+        console.log('friendLayout');
         for (let child of this.friendScrollView.content.children) {
             child.destroy();
         }

assets/scripts/artistOperation/ArtistOperationAlert.js

@@ -10,7 +10,7 @@ cc.Class({
 
     properties: {
 
-        titleRichText: cc.RichText,
+        titleText: cc.Label,
 
         headSprite: cc.Sprite,
 
@@ -323,7 +323,7 @@ cc.Class({
     },
 
     setTitleString(title) {
-        this.titleRichText.string = `<outline color=#e8e9e9 width=2><b><color=#584A47>${title}</c></b></outline>`;
+        this.titleText.string = title;
     },
 
     getNickString(nick) {

assets/scripts/artistOperation/ArtistResident.js

@@ -155,12 +155,14 @@ cc.Class({
                         let item = cc.instantiate(canBeStationedItem);
                         let itemScript = item.getComponent(`ArtistResidentItem`);
                         this._itemScripts.push(itemScript)
-                        itemScript.init(this.uid, this.buildingInfo, this.isSelf, this.canBeStationedList[i], (artistData) => {
-                            this._currentResidentArtist = artistData;
-                            this._itemScripts.forEach(itemScript => {
-                                itemScript.setStyle(this._currentResidentArtist.uid);
-                            });
-                        });
+                        itemScript.init(this, this.canBeStationedList[i]
+                        //     , (artistData) => {
+                            
+                        //     this._itemScripts.forEach(itemScript => {
+                        //         itemScript.setStyle(this._currentResidentArtist.uid);
+                        //     });
+                        // }
+                        );
                         this.scrollView.content.addChild(item);
                     }
                     if (this.cannotBeStationedList.length > 0) {
@@ -189,6 +191,10 @@ cc.Class({
         }
     },
 
+    handleStation (artistData) {
+        this._currentResidentArtist = artistData;
+    },
+
     guide() {
 
         if (this._itemScripts.length > 0) {

assets/scripts/artistOperation/ArtistResidentItem.js

@@ -58,13 +58,13 @@ cc.Class({
 
     },
 
-    init(uid, buildingInfo, isSelf, artistData, selectedCallback) {
-
-        this.uid = uid;
-        this.buildingInfo = buildingInfo;
+    init(parent, artistData) {
+        console.log(artistData);
+        this.parent = parent;
+        this.uid = parent.uid;
+        this.buildingInfo = parent.buildingInfo;
+        this.isSelf = parent.isSelf;
         this.artistData = artistData;
-        this.isSelf = isSelf;
-        this.selectedCallback = selectedCallback;
         this.jobLevelLabel.string = this.artistData.jobLevel;
         this.jobTitleLabel.string = this.artistData.jobName;
 
@@ -106,10 +106,9 @@ cc.Class({
         this.bgSprite = this.getComponent(cc.Sprite);
 
         this.node.on(cc.Node.EventType.TOUCH_END, () => {
-            this.selectedCallback(this.artistData); 
+            this.handleSelect();
         }, this);
 
-
         this.recallArtistEvent = _.debounce(() => {
             AlertManager.showArtistOperationAlert(this.buildingInfo, this.uid, this.isSelf, this.artistData);
         }, 1000, true);
@@ -127,13 +126,21 @@ cc.Class({
         }, 1000, true);
     },
 
-    setStyle(uid) {
-        this.flag = (this.artistData.uid === uid) ? 1 : 0;
+    handleSelect() {
+        if(this.flag) {
+            this.flag = 0;
+            this.parent.handleStation(null);
+        } else {
+            this.parent.handleStation(this.artistData);
+            this.flag = 1;
+        }
+        // this.flag = (this.artistData.uid === uid) ? 1 : 0;
     },
 
     selectItem() {
         this.flag = 1;
-        this.selectedCallback(this.artistData);    
+        this.parent.handleStation(this.artistData);
+        // this.selectedCallback(this.artistData);    
     },
 
     start () {

assets/scripts/friendlist/FriendList.js

@@ -77,7 +77,7 @@ cc.Class({
                 let offset = (Date.parse(new Date()) - this.friendLastRequestTime) / 1000;
                 if (ignoneRequestDuration || this.friendLastRequestTime === -1 || offset > this.requestDuration) {
                     this.friendLastRequestTime = Date.parse(new Date());
-                    FriendSystemApi.getFriend(this.timeline, 20, this.configData.bind(self), this.networkError.bind(self));
+                    FriendSystemApi.getFriend(this.timeline, 50, this.configData.bind(self), this.networkError.bind(self));
                 }
             } else {
                 let offset = (Date.parse(new Date()) - this.recommentRequestTime) / 1000;

assets/scripts/friendlist/FriendSystem.js

@@ -101,7 +101,8 @@ cc.Class({
     closeFriendSystem: function () {
         this.friendNode.getComponent('FriendList').friendLastRequestTime = -1;
         this.currentIndex = -1;
-        this.node.active = false;
+        // this.node.active = false;
+        this.node.destroy();
         this._wechatFriendNode.active = false;
     },
 

assets/scripts/job/ChangeJob.js

@@ -9,15 +9,16 @@ cc.Class({
     extends: cc.Component,
 
     properties: {
-        titleText: cc.RichText,
+        titleText: cc.Label,
         confirmButton: cc.Button,
-        confirmText: cc.RichText,
+        confirmText: cc.Label,
         pageView: cc.PageView,
         levelUpNode: cc.Node,
         bgNode: cc.Node,
         top: cc.Node,
 
         consume: cc.Node,
+        consumeLevelUp: cc.Node,
         user: cc.Node,
 
         myActorList: [],
@@ -42,6 +43,8 @@ cc.Class({
         }
 
         this.consume.getComponent('Consume').setConfirmButton(this.confirmButton);
+        
+        this.consumeLevelUp.getComponent('Consume').setConfirmButton(this.confirmButton);
     },
 
     start() {
@@ -82,8 +85,8 @@ cc.Class({
         this.pageViewScript = this.pageView.getComponent('PVCtrl');
         this.pageViewScript.bind(this.actorInfo.jobId, this.actorInfo.gender);
 
-        this.titleText.string = '<b>职业转换</b>';
-        this.confirmText.string = '<outline color=#690802 width=1><b>转职</b></outline>';
+        this.titleText.string = '职业转换';
+        this.confirmText.string = '转职';
 
         JobApi.changeJobList(this.actorInfo.uid,
             (response) => {
@@ -117,37 +120,36 @@ cc.Class({
         this.pageViewScript = this.pageView.getComponent('PVCtrl');
         this.pageViewScript.bind(0, this.actorInfo.gender);
 
-        this.titleText.string = '<b>选择职业</b>';
-        this.confirmText.string = '<outline color=#690802 width=1><b>确定</b></outline>';
+        this.titleText.string = '选择职业';
+        this.confirmText.string = '确定';
 
         this.pageViewScript.bindSelectedJobText();
         this.bindChooseJob(this.actorInfo);
     },
 
     levelUp() {
-        this.consume.active = true;
+        this.consume.active = false;
+        this.consumeLevelUp.active = true;
         this.user.active = false;
         this.pageView.node.active = false;
         this.levelUpNode.active = true;
 
-        this.titleText.string = '<b>进阶</b>';
-        this.confirmText.string = '<outline color=#690802 width=1><b>进阶</b></outline>';
+        this.titleText.string = '进阶';
+        this.confirmText.string = '进阶';
 
 
         this.currentJobLevel = null;
         this.nextJobLevel = null;
+        
+        this.currentJobLevel = jobLevelList.find(n => {
+            return this.actorInfo.jobId == n.jobId && this.actorInfo.jobLevel == n.level
+        })
 
-        for (var i = 0; i < jobLevelList.length; i++) {
-            let jobLevelInfo = jobLevelList[i];
-            if (this.actorInfo.jobId === jobLevelInfo.jobId && this.actorInfo.jobLevel === jobLevelInfo.level) {
-                this.currentJobLevel = jobLevelInfo;
-                if (i >= jobLevelList.length - 1) {
-                    return;
-                }
-                this.nextJobLevel = jobLevelList[i + 1];
-                this.spend = this.nextJobLevel.salary;
-            }
-        }
+        this.nextJobLevel = jobLevelList.find(n => {
+            return this.actorInfo.jobId == n.jobId && this.actorInfo.jobLevel == n.level - 1
+        })
+
+        this.spend = this.currentJobLevel.salary
 
         let needCard = '';
         let itemKey = Object.keys(this.nextJobLevel.itemInfo)[0];
@@ -164,7 +166,7 @@ cc.Class({
         let self = this;
         JobApi.levelUpInfo(this.actorInfo.uid,
             (response) => {
-                this.consume.getComponent('Consume').bindDataLevelUp(self.nextJobLevel.salary, needCard, response.userPack);
+                this.consumeLevelUp.getComponent('Consume').bindDataLevelUp(self.currentJobLevel.salary, needCard, response.userPack);
                 this.levelUpNode.getComponent('LevelUp').bind(self.actorInfo, self.nextJobLevel, response.wish);
             },
             (code, msg) => {
@@ -267,7 +269,8 @@ cc.Class({
 
 
     onLevelUpSuccess() {
-        GameModule.userInfo.grossIncome -= this.spend;
+        // 进阶不用扣钱
+        // GameModule.userInfo.grossIncome -= this.spend;
         let self = this;
         this.levelUpSuccess = cc.instantiate(this.levelUpSuccessPrefab);
         this.levelUpSuccess = this.levelUpSuccess.getComponent('JobLevelUpSuccess');

assets/scripts/job/Consume.js

@@ -91,9 +91,9 @@ cc.Class({
         this.secondText.string = this.stringFormat(cardInfo.name, cardCount, cardInfo.number);
 
 
-        cc.loader.loadRes('./job/level_up_consume_icon', cc.SpriteFrame, (error, spriteFrame) => {
-            this.iconSprite.spriteFrame = spriteFrame;
-        });
+        // cc.loader.loadRes('./job/level_up_consume_icon', cc.SpriteFrame, (error, spriteFrame) => {
+        //     this.iconSprite.spriteFrame = spriteFrame;
+        // });
 
         cc.loader.loadRes('./job/level_up_card', cc.SpriteFrame, (error, spriteFrame) => {
             this.secondSprite.spriteFrame = spriteFrame;

assets/scripts/levelHome/OtherArtistItem.js

@@ -27,15 +27,14 @@ cc.Class({
     },
 
     onLoad() {
-        this.node.on(cc.Node.EventType.TOUCH_END, () => {
-
-            if (this.user.isFriend) {
-                this.cb();
-                GameEvent.fire(GameNotificationKey.VisitFriendHome, this.user.uid);
-            }
-
-        }, this);
-
+        // 这个地方不用跳转到别人的家园了
+        // this.node.on(cc.Node.EventType.TOUCH_END, () => {
+        //     if (this.user.isFriend) {
+        //         this.cb();
+        //         GameEvent.fire(GameNotificationKey.VisitFriendHome, this.user.uid);
+        //     }
+
+        // }, this);
     },
 
     /**

assets/scripts/utils/Global.js

@@ -7,7 +7,7 @@ window.Global = {
     // 建筑管理
     BuildingManager: BuildingManager.instance,
 
-    debug: true,
+    debug: false,
 
     /**
      * 点击别人分享的链接需要进行的操作 加好友

assets/textures/friendList/aa/color_full_bar.png.meta

@@ -0,0 +1,30 @@
+{
+  "ver": "2.0.0",
+  "uuid": "bad42198-f116-4081-a832-6de4f56d5c80",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "subMetas": {
+    "color_full_bar": {
+      "ver": "1.0.3",
+      "uuid": "1f630dc2-7256-457c-8b3a-ff103ec9a10c",
+      "rawTextureUuid": "bad42198-f116-4081-a832-6de4f56d5c80",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 432,
+      "height": 96,
+      "rawWidth": 432,
+      "rawHeight": 96,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}