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

assets/prefabs/level_friend_item.prefab

@@ -56,8 +56,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 106,
-      "height": 140
+      "width": 120,
+      "height": 150
     },
     "_rotationX": 0,
     "_rotationY": 0,

assets/scene/game.fire

@@ -3447,7 +3447,7 @@
     "_scaleY": 1,
     "_position": {
       "__type__": "cc.Vec2",
-      "x": 74,
+      "x": 75,
       "y": -10
     },
     "_skewX": 0,
@@ -3558,8 +3558,8 @@
     "_scaleY": 1,
     "_position": {
       "__type__": "cc.Vec2",
-      "x": -272,
-      "y": 3
+      "x": -300,
+      "y": 4.5
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -3594,7 +3594,7 @@
     "_N$paddingRight": 10,
     "_N$paddingTop": 0,
     "_N$paddingBottom": 0,
-    "_N$spacingX": 10,
+    "_N$spacingX": 0,
     "_N$spacingY": 0,
     "_N$verticalDirection": 1,
     "_N$horizontalDirection": 0

assets/scripts/Tab.js

@@ -76,7 +76,14 @@ cc.Class({
         GameEvent.on(Notikey.RefreshFriendList, this, () => {
             
             this.loadFriendData().then((data) => {
-                Global.friendList = this.friends = data.users || [];  
+                let _friendList = data.users || [];
+                // 过滤好友申请项
+                _friendList = _friendList.filter(n => {
+                    return n.isApplied != 1
+                });
+                
+                Global.friendList = this.friends = _friendList;  
+
                 this.friendLayout();
             }).catch((err) => {
                 console.log(err); 

assets/scripts/data/city.js

@@ -1 +1 @@
-module.exports=[{"id":1,"name":"无名小镇","picId":60001,"unlockScore":250},{"id":2,"name":"长沙","picId":60002,"unlockScore":500},{"id":3,"name":"广州","picId":60003,"unlockScore":500},{"id":4,"name":"上海","picId":60004,"unlockScore":625},{"id":5,"name":"北京","picId":60005,"unlockScore":625}]
+module.exports=[{"id":1,"name":"无名小镇","picId":60001,"unlockScore":250},{"id":2,"name":"长沙","picId":60002,"unlockScore":500},{"id":3,"name":"广州","picId":60003,"unlockScore":625},{"id":4,"name":"上海","picId":60004,"unlockScore":750},{"id":5,"name":"北京","picId":60005,"unlockScore":875}]

assets/scripts/data/mainTask.js

@@ -1 +1 @@
-module.exports=[{"taskId":1,"name":"娱乐大亨","msg":"星级达到${num}","aim":[20,50,100,200,500],"bonus":[{"10003":100},{"4":50},{"10002":100},{"10003":200},{"10002":100}]},{"taskId":2,"name":"高朋满座","msg":"好友数量达到${num}","aim":[5,10,20,30,50],"bonus":[{"10003":100},{"3":5},{"4":100},{"10003":500},{"10002":100}]},{"taskId":3,"name":"环游世界","msg":"开启${num}个城市","aim":[2,3,4,5,6],"bonus":[{"10002":80},{"10003":200},{"10003":300},{"10002":100},{"10003":500}]},{"taskId":4,"name":"艺人多多","msg":"旗下艺人数量达到${num}","aim":[2,4,8,12,20],"bonus":[{"4":20},{"10003":200},{"3":8},{"10002":100},{"10003":500}]},{"taskId":5,"name":"众星云集","msg":"拥有${num}个6级以上的艺人","aim":[1,3,6,10,15],"bonus":[{"10002":80},{"4":100},{"10003":500},{"10002":200},{"10003":1000}]}]
+module.exports=[{"taskId":1,"name":"娱乐大亨","msg":"星级达到${num}","aim":[20,100,200,400,600],"bonus":[{"10003":100},{"4":50},{"10002":100},{"10003":200},{"10002":100}]},{"taskId":2,"name":"高朋满座","msg":"好友数量达到${num}","aim":[5,10,20,30,50],"bonus":[{"10003":100},{"3":5},{"4":100},{"10003":500},{"10002":100}]},{"taskId":3,"name":"环游世界","msg":"开启${num}个城市","aim":[2,3,4,5,6],"bonus":[{"10002":80},{"10003":200},{"10003":300},{"10002":100},{"10003":500}]},{"taskId":4,"name":"艺人多多","msg":"旗下艺人数量达到${num}","aim":[2,4,8,12,20],"bonus":[{"4":20},{"10003":200},{"3":8},{"10002":100},{"10003":500}]},{"taskId":5,"name":"众星云集","msg":"拥有${num}个6级以上的艺人","aim":[1,3,6,10,15],"bonus":[{"10002":80},{"4":100},{"10003":500},{"10002":200},{"10003":1000}]}]

assets/scripts/levelHome/LevelHome.js

@@ -2,6 +2,7 @@ const HomeApi = require("../net/HomeApi");
 const GameModule = require("../utils/GameModule");
 const { GameNotificationKey } = require("../utils/GameEnum")
 const AlertManager = require('../utils/AlertManager')
+const CityList = require("../data/city");
 cc.Class({
     extends: cc.Component,
 
@@ -227,7 +228,9 @@ cc.Class({
                     this._unlockBuilding[index] = model.isUnlocked ? 1 : 0;
                     if (model.isFull() && this.cityId === Global.devCityId) {
                         try {
-                            GameEvent.fire(GameNotificationKey.LevelHomeItemBuildingFull);
+                            if (this.cityId != CityList[CityList.length-1].id) {
+                                GameEvent.fire(GameNotificationKey.LevelHomeItemBuildingFull);   
+                            }
                         } catch (error) {
                             console.log(error);
                         }

assets/scripts/levelHome/LevelHomeItem.js

@@ -4,6 +4,7 @@ const { RoomState, GameNotificationKey, LevelHomeArtistItemStyle } = require("..
 const GameModule = require("../utils/GameModule");
 const ThemeManager = require("../utils/ThemeManger");
 const HomeApi = require("../net/HomeApi");
+const CityList = require("../data/city");
 // const StateMachine = require('../lib/StateMachine');
 // const StateMachineHistory = require('../lib/StateMachineHistory');
 
@@ -811,7 +812,7 @@ cc.Class({
         this.config(buildModel, this.uid);
 
         // 如果满级了, 就发通知告诉userinfo
-        if (buildModel.hasNext != 1) {
+        if (buildModel.hasNext != 1 && this.cityId != CityList[CityList.length-1].id) {
             GameEvent.fire(GameNotificationKey.LevelHomeItemBuildingFull);
         }
 

assets/scripts/talent/TalentMission.js

@@ -174,17 +174,17 @@ cc.Class({
         let ticket = model.ticket;
 
         if (coin > 0) {
-            let type = { 'type': 'coin', 'count': `金币 x ${coin}` };
+            let type = { 'type': 'coin', 'count': `金币 x ${DWTool.coinParse(coin)}` };
             this.showArray.push(type);
         }
 
         if (diamond > 0) {
-            let type = { 'type': 'diamond', 'count': `钻石 x ${diamond}` };
+            let type = { 'type': 'diamond', 'count': `钻石 x ${DWTool.coinParse(diamond)}` };
             this.showArray.push(type);
         }
 
         if (ticket > 0) {
-            let type = { 'type': 'ticket', 'count': `艺人券 x ${ticket}` };
+            let type = { 'type': 'ticket', 'count': `艺人券 x ${DWTool.coinParse(ticket)}` };
             this.showArray.push(type);
         }
 

protobuf/message.proto

@@ -38,7 +38,7 @@ message Message {
 
     // 即对 targetUid 做了什么操作 opt
     // e.g.: 向 targetUid 赎身; 向 targetUid 签约
-    // Enum opt {1: 赎身; 2: 抢夺; 3: 签约; 4: 解雇; 5: 入驻;6: 召回;7: 驱赶;8: 举报;9:通过好友申请;10:成为好友}
+    // Enum opt {1: 赎身; 2: 抢夺; 3: 签约; 4: 解雇; 5: 入驻;6: 召回;7: 驱赶;8: 举报;9:通过好友申请;10:成为好友;11:成为艺人}
     message RoleOptMessage {
         // 目标用户
         int64 targetUid = 1;

tools/sheet/city.json

@@ -1 +1 @@
-[{"id":1,"name":"无名小镇","picId":60001,"unlockScore":250},{"id":2,"name":"长沙","picId":60002,"unlockScore":500},{"id":3,"name":"广州","picId":60003,"unlockScore":500},{"id":4,"name":"上海","picId":60004,"unlockScore":625},{"id":5,"name":"北京","picId":60005,"unlockScore":625}]
+[{"id":1,"name":"无名小镇","picId":60001,"unlockScore":250},{"id":2,"name":"长沙","picId":60002,"unlockScore":500},{"id":3,"name":"广州","picId":60003,"unlockScore":625},{"id":4,"name":"上海","picId":60004,"unlockScore":750},{"id":5,"name":"北京","picId":60005,"unlockScore":875}]

tools/sheet/mainTask.json

@@ -1 +1 @@
-[{"taskId":1,"name":"娱乐大亨","msg":"星级达到${num}","aim":[20,50,100,200,500],"bonus":[{"10003":100},{"4":50},{"10002":100},{"10003":200},{"10002":100}]},{"taskId":2,"name":"高朋满座","msg":"好友数量达到${num}","aim":[5,10,20,30,50],"bonus":[{"10003":100},{"3":5},{"4":100},{"10003":500},{"10002":100}]},{"taskId":3,"name":"环游世界","msg":"开启${num}个城市","aim":[2,3,4,5,6],"bonus":[{"10002":80},{"10003":200},{"10003":300},{"10002":100},{"10003":500}]},{"taskId":4,"name":"艺人多多","msg":"旗下艺人数量达到${num}","aim":[2,4,8,12,20],"bonus":[{"4":20},{"10003":200},{"3":8},{"10002":100},{"10003":500}]},{"taskId":5,"name":"众星云集","msg":"拥有${num}个6级以上的艺人","aim":[1,3,6,10,15],"bonus":[{"10002":80},{"4":100},{"10003":500},{"10002":200},{"10003":1000}]}]
+[{"taskId":1,"name":"娱乐大亨","msg":"星级达到${num}","aim":[20,100,200,400,600],"bonus":[{"10003":100},{"4":50},{"10002":100},{"10003":200},{"10002":100}]},{"taskId":2,"name":"高朋满座","msg":"好友数量达到${num}","aim":[5,10,20,30,50],"bonus":[{"10003":100},{"3":5},{"4":100},{"10003":500},{"10002":100}]},{"taskId":3,"name":"环游世界","msg":"开启${num}个城市","aim":[2,3,4,5,6],"bonus":[{"10002":80},{"10003":200},{"10003":300},{"10002":100},{"10003":500}]},{"taskId":4,"name":"艺人多多","msg":"旗下艺人数量达到${num}","aim":[2,4,8,12,20],"bonus":[{"4":20},{"10003":200},{"3":8},{"10002":100},{"10003":500}]},{"taskId":5,"name":"众星云集","msg":"拥有${num}个6级以上的艺人","aim":[1,3,6,10,15],"bonus":[{"10002":80},{"4":100},{"10003":500},{"10002":200},{"10003":1000}]}]