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

assets/font/FZLanTingHeiS-H-GB-Min.fnt

@@ -1,7 +1,7 @@
 info face="FZLTTHJW--GB1-0" size=40 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1
 common lineHeight=50 base=36 scaleW=256 scaleH=256 pages=1 packed=0
 page id=0 file="FZLanTingHeiS-H-GB-Min.png"
-chars count=25
+chars count=28
 char id=20806 x=1 y=1 width=46 height=46 xoffset=1 yoffset=-0 xadvance=40 page=0 chnl=0 letter="兆"
 char id=28385 x=48 y=1 width=45 height=46 xoffset=1 yoffset=-1 xadvance=40 page=0 chnl=0 letter="满"
 char id=20159 x=94 y=1 width=46 height=45 xoffset=1 yoffset=1 xadvance=40 page=0 chnl=0 letter="亿"
@@ -18,12 +18,15 @@ char id=48 x=37 y=94 width=35 height=44 xoffset=1 yoffset=1 xadvance=29 page=0 c
 char id=51 x=73 y=94 width=34 height=44 xoffset=2 yoffset=1 xadvance=29 page=0 chnl=0 letter="3"
 char id=24050 x=108 y=94 width=44 height=43 xoffset=3 yoffset=1 xadvance=40 page=0 chnl=0 letter="已"
 char id=86 x=153 y=94 width=42 height=43 xoffset=0 yoffset=1 xadvance=35 page=0 chnl=0 letter="V"
-char id=52 x=196 y=94 width=36 height=43 xoffset=1 yoffset=1 xadvance=30 page=0 chnl=0 letter="4"
-char id=50 x=1 y=139 width=34 height=43 xoffset=1 yoffset=1 xadvance=28 page=0 chnl=0 letter="2"
-char id=53 x=36 y=139 width=34 height=43 xoffset=1 yoffset=2 xadvance=29 page=0 chnl=0 letter="5"
-char id=76 x=71 y=139 width=34 height=43 xoffset=3 yoffset=1 xadvance=29 page=0 chnl=0 letter="L"
-char id=49 x=106 y=139 width=27 height=43 xoffset=1 yoffset=1 xadvance=23 page=0 chnl=0 letter="1"
-char id=55 x=134 y=139 width=34 height=42 xoffset=1 yoffset=2 xadvance=28 page=0 chnl=0 letter="7"
-char id=118 x=169 y=139 width=35 height=33 xoffset=0 yoffset=11 xadvance=27 page=0 chnl=0 letter="v"
-char id=46 x=205 y=139 width=16 height=16 xoffset=2 yoffset=28 xadvance=11 page=0 chnl=0 letter="."
-char id=32 x=222 y=139 width=0 height=0 xoffset=11 yoffset=56 xadvance=11 page=0 chnl=0 letter="space"
+char id=88 x=196 y=94 width=42 height=43 xoffset=0 yoffset=1 xadvance=35 page=0 chnl=0 letter="X"
+char id=52 x=1 y=139 width=36 height=43 xoffset=1 yoffset=1 xadvance=30 page=0 chnl=0 letter="4"
+char id=50 x=38 y=139 width=34 height=43 xoffset=1 yoffset=1 xadvance=28 page=0 chnl=0 letter="2"
+char id=53 x=73 y=139 width=34 height=43 xoffset=1 yoffset=2 xadvance=29 page=0 chnl=0 letter="5"
+char id=76 x=108 y=139 width=34 height=43 xoffset=3 yoffset=1 xadvance=29 page=0 chnl=0 letter="L"
+char id=49 x=143 y=139 width=27 height=43 xoffset=1 yoffset=1 xadvance=23 page=0 chnl=0 letter="1"
+char id=55 x=171 y=139 width=34 height=42 xoffset=1 yoffset=2 xadvance=28 page=0 chnl=0 letter="7"
+char id=120 x=206 y=139 width=36 height=33 xoffset=0 yoffset=11 xadvance=29 page=0 chnl=0 letter="x"
+char id=118 x=1 y=183 width=35 height=33 xoffset=0 yoffset=11 xadvance=27 page=0 chnl=0 letter="v"
+char id=58 x=37 y=183 width=16 height=33 xoffset=2 yoffset=11 xadvance=12 page=0 chnl=0 letter=":"
+char id=46 x=54 y=183 width=16 height=16 xoffset=2 yoffset=28 xadvance=11 page=0 chnl=0 letter="."
+char id=32 x=71 y=183 width=0 height=0 xoffset=11 yoffset=56 xadvance=11 page=0 chnl=0 letter="space"

assets/font/FZLanTingHeiS-H-GB-Min.png.meta

@@ -12,12 +12,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -11,
-      "offsetY": 36.5,
+      "offsetX": -7,
+      "offsetY": 19.5,
       "trimX": 1,
       "trimY": 1,
-      "width": 232,
-      "height": 181,
+      "width": 240,
+      "height": 215,
       "rawWidth": 256,
       "rawHeight": 256,
       "borderTop": 0,

assets/prefabs/level_home_item.prefab

@@ -387,7 +387,7 @@
     "_position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": 0
+      "y": 3
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -1461,7 +1461,7 @@
     "_scaleY": 1,
     "_position": {
       "__type__": "cc.Vec2",
-      "x": 60.400000000000006,
+      "x": 58.8,
       "y": 1
     },
     "_skewX": 0,
@@ -1543,8 +1543,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 50,
-      "height": 25
+      "width": 58,
+      "height": 16
     },
     "_rotationX": 0,
     "_rotationY": 0,
@@ -1571,13 +1571,15 @@
     },
     "_enabled": true,
     "_useOriginalSize": false,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_lineHeight": 25,
+    "_actualFontSize": 16,
+    "_fontSize": 16,
+    "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
+    "_N$file": {
+      "__uuid__": "5c54c001-9dcf-49e1-a061-f5eec186a5d0"
+    },
+    "_isSystemFontUsed": false,
+    "_spacingX": 1,
     "_N$string": "00:00",
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,

assets/prefabs/level_home_prop_item.prefab

@@ -160,7 +160,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "New RichText",
+    "_name": "name_text",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
@@ -193,8 +193,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 9,
-      "height": 20
+      "width": 0,
+      "height": 18
     },
     "_rotationX": 0,
     "_rotationY": 0,
@@ -203,7 +203,7 @@
     "_position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": -33.9
+      "y": -33
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -213,21 +213,28 @@
     "groupIndex": 0
   },
   {
-    "__type__": "cc.RichText",
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 5
     },
     "_enabled": true,
-    "_N$string": "<b><color=#ffffff>0</c></b>",
-    "_N$horizontalAlign": 1,
-    "_N$fontSize": 16,
-    "_N$font": null,
-    "_N$maxWidth": 0,
-    "_N$lineHeight": 20,
-    "_N$imageAtlas": null,
-    "_N$handleTouchEvent": true
+    "_useOriginalSize": false,
+    "_actualFontSize": 18,
+    "_fontSize": 18,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "5c54c001-9dcf-49e1-a061-f5eec186a5d0"
+    },
+    "_isSystemFontUsed": false,
+    "_spacingX": 1,
+    "_N$string": "",
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 0,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -251,7 +258,7 @@
     "propSprite": {
       "__id__": 3
     },
-    "nameRichText": {
+    "nameText": {
       "__id__": 6
     }
   },

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

@@ -27,11 +27,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 59
+        "__id__": 58
       }
     ],
     "_prefab": {
-      "__id__": 60
+      "__id__": 59
     },
     "_id": "",
     "_opacity": 255,
@@ -190,18 +190,18 @@
         "__id__": 25
       },
       {
-        "__id__": 50
+        "__id__": 49
       }
     ],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 57
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 58
+      "__id__": 57
     },
     "_id": "",
     "_opacity": 255,
@@ -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,
@@ -813,14 +813,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 47
+        "__id__": 46
       },
       {
-        "__id__": 48
+        "__id__": 47
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 48
     },
     "_id": "",
     "_opacity": 255,
@@ -1220,7 +1220,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "New RichText",
+    "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
       "__id__": 36
@@ -1240,9 +1240,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
+      "r": 81,
+      "g": 39,
+      "b": 15,
       "a": 255
     },
     "_cascadeOpacityEnabled": true,
@@ -1253,7 +1253,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 222,
+      "width": 216,
       "height": 50
     },
     "_rotationX": 0,
@@ -1263,7 +1263,7 @@
     "_position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": 0
+      "y": -4
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -1273,21 +1273,26 @@
     "groupIndex": 0
   },
   {
-    "__type__": "cc.RichText",
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 37
     },
     "_enabled": true,
-    "_N$string": "<outline color=#f1db95 width=3><b><color=##51270f>选择驻场艺人</c></b></outline>",
-    "_N$horizontalAlign": 0,
-    "_N$fontSize": 36,
-    "_N$font": null,
-    "_N$maxWidth": 0,
-    "_N$lineHeight": 50,
-    "_N$imageAtlas": null,
-    "_N$handleTouchEvent": true
+    "_useOriginalSize": false,
+    "_actualFontSize": 36,
+    "_fontSize": 36,
+    "_lineHeight": 50,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_N$string": "选择驻场艺人",
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1297,7 +1302,7 @@
     "asset": {
       "__uuid__": "f0a9cf27-5e7c-4d23-98f5-8835eb16d81f"
     },
-    "fileId": "a0oPDuqNRLzJ687ZsX5atM",
+    "fileId": "384etRaK5EyZoaCCSWbof9",
     "sync": false
   },
   {
@@ -1376,13 +1381,10 @@
     "_components": [
       {
         "__id__": 44
-      },
-      {
-        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 45
     },
     "_id": "",
     "_opacity": 255,
@@ -1443,32 +1445,6 @@
     "_N$overflow": 3
   },
   {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 43
-    },
-    "_enabled": true,
-    "alignMode": 1,
-    "_target": null,
-    "_alignFlags": 17,
-    "_left": 0,
-    "_right": 0,
-    "_top": 125.5,
-    "_bottom": 0,
-    "_verticalCenter": 0,
-    "_horizontalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 0,
-    "_originalHeight": 0
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1551,18 +1527,18 @@
     },
     "_children": [
       {
-        "__id__": 51
+        "__id__": 50
       }
     ],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 54
+        "__id__": 53
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 55
     },
     "_id": "",
     "_opacity": 255,
@@ -1605,18 +1581,18 @@
     "_name": "New Sprite",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 50
+      "__id__": 49
     },
     "_children": [],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 53
+      "__id__": 52
     },
     "_id": "",
     "_opacity": 255,
@@ -1659,7 +1635,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 51
+      "__id__": 50
     },
     "_enabled": true,
     "_spriteFrame": {
@@ -1696,15 +1672,15 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 50
+      "__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": {
@@ -1718,7 +1694,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 55
+        "__id__": 54
       }
     ],
     "_N$interactable": true,
@@ -1744,7 +1720,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 50
+      "__id__": 49
     }
   },
   {

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,
@@ -66,7 +66,7 @@
     "_position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": -1000
+      "y": 0
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -114,7 +114,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1000,
-      "height": 3600
+      "height": 1800
     },
     "_rotationX": 0,
     "_rotationY": 0,
@@ -123,7 +123,7 @@
     "_position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": 650
+      "y": 0
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -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,
@@ -63,7 +63,7 @@
     "_position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": -1400
+      "y": 0
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -111,7 +111,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1000,
-      "height": 3600
+      "height": 1800
     },
     "_rotationX": 0,
     "_rotationY": 0,
@@ -120,7 +120,7 @@
     "_position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": 650
+      "y": 0
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -194,7 +194,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 258
+      "__id__": 257
     },
     "_id": "",
     "_opacity": 255,
@@ -473,7 +473,7 @@
         "__id__": 29
       },
       {
-        "__id__": 44
+        "__id__": 32
       }
     ],
     "_tag": -1,
@@ -995,37 +995,128 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "btn_main",
+    "_name": "tab_fade",
     "_objFlags": 0,
     "_parent": {
       "__id__": 13
     },
-    "_children": [
+    "_children": [],
+    "_tag": -1,
+    "_active": true,
+    "_components": [
       {
         "__id__": 30
-      },
+      }
+    ],
+    "_prefab": {
+      "__id__": 31
+    },
+    "_id": "",
+    "_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": 498,
+      "height": 16
+    },
+    "_rotationX": 0,
+    "_rotationY": 0,
+    "_scaleX": 1,
+    "_scaleY": 1,
+    "_position": {
+      "__type__": "cc.Vec2",
+      "x": -25,
+      "y": -39
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_localZOrder": 0,
+    "_globalZOrder": 0,
+    "_opacityModifyRGB": false,
+    "groupIndex": 0
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 29
+    },
+    "_enabled": true,
+    "_spriteFrame": {
+      "__uuid__": "6d90bf76-6384-47a4-bb4d-ad68afd4b550"
+    },
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "8e7e448a-d1f6-4d66-9ea8-e580b6ebc596"
+    },
+    "fileId": "e03QyXAN1FS6A0LeRtPTPn",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btn_main",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 13
+    },
+    "_children": [
       {
         "__id__": 33
       },
       {
         "__id__": 36
+      },
+      {
+        "__id__": 39
       }
     ],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 42
       },
       {
-        "__id__": 40
+        "__id__": 43
       },
       {
-        "__id__": 42
+        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 46
     },
     "_id": "",
     "_opacity": 255,
@@ -1068,18 +1159,18 @@
     "_name": "icon",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 29
+      "__id__": 32
     },
     "_children": [],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 34
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 35
     },
     "_id": "",
     "_opacity": 255,
@@ -1122,7 +1213,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 33
     },
     "_enabled": true,
     "_spriteFrame": {
@@ -1159,18 +1250,18 @@
     "_name": "text",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 29
+      "__id__": 32
     },
     "_children": [],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 38
     },
     "_id": "",
     "_opacity": 255,
@@ -1213,7 +1304,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 36
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -1246,18 +1337,18 @@
     "_name": "arrow",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 29
+      "__id__": 32
     },
     "_children": [],
     "_tag": -1,
-    "_active": false,
+    "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 41
     },
     "_id": "",
     "_opacity": 255,
@@ -1300,7 +1391,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 36
+      "__id__": 39
     },
     "_enabled": true,
     "_spriteFrame": {
@@ -1337,7 +1428,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 32
     },
     "_enabled": true,
     "_spriteFrame": {
@@ -1363,7 +1454,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 32
     },
     "_enabled": true,
     "transition": 1,
@@ -1385,7 +1476,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 41
+        "__id__": 44
       }
     ],
     "_N$interactable": true,
@@ -1411,7 +1502,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 29
+      "__id__": 32
     }
   },
   {
@@ -1428,7 +1519,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 32
     },
     "_enabled": true,
     "bgFrames": [
@@ -1448,13 +1539,13 @@
       }
     ],
     "icon": {
-      "__id__": 30
+      "__id__": 33
     },
     "arrow": {
-      "__id__": 36
+      "__id__": 39
     },
     "text": {
-      "__id__": 33
+      "__id__": 36
     }
   },
   {
@@ -1469,97 +1560,6 @@
     "sync": false
   },
   {
-    "__type__": "cc.Node",
-    "_name": "tab_fade",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 13
-    },
-    "_children": [],
-    "_tag": -1,
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 45
-      }
-    ],
-    "_prefab": {
-      "__id__": 46
-    },
-    "_id": "",
-    "_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": 498,
-      "height": 16
-    },
-    "_rotationX": 0,
-    "_rotationY": 0,
-    "_scaleX": 1,
-    "_scaleY": 1,
-    "_position": {
-      "__type__": "cc.Vec2",
-      "x": -25,
-      "y": -39
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_localZOrder": 0,
-    "_globalZOrder": 0,
-    "_opacityModifyRGB": false,
-    "groupIndex": 0
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 44
-    },
-    "_enabled": true,
-    "_spriteFrame": {
-      "__uuid__": "6d90bf76-6384-47a4-bb4d-ad68afd4b550"
-    },
-    "_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.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "8e7e448a-d1f6-4d66-9ea8-e580b6ebc596"
-    },
-    "fileId": "25lQAo3sJHdoiRamxMqgT+",
-    "sync": false
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -5423,7 +5423,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 610,
-      "height": 135
+      "height": 0
     },
     "_rotationX": 0,
     "_rotationY": 0,
@@ -5463,7 +5463,7 @@
       }
     ],
     "_tag": -1,
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 239
@@ -7745,7 +7745,7 @@
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 610,
-      "height": 135
+      "height": 0
     },
     "_resize": 1,
     "_N$layoutType": 2,
@@ -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,
@@ -8682,14 +8662,14 @@
     },
     "tab": [
       {
-        "__id__": 29
+        "__id__": 32
       },
       {
         "__id__": 14
       }
     ],
     "tabFade": {
-      "__id__": 44
+      "__id__": 29
     },
     "tabIndex": 0,
     "mask": {
@@ -8699,7 +8679,7 @@
       "__id__": 6
     },
     "actGift": {
-      "__id__": 259
+      "__id__": 258
     },
     "actGiftFrames": [
       {

assets/resources/prefabs/rank_artist_item.prefab

@@ -29,33 +29,33 @@
         "__id__": 11
       },
       {
-        "__id__": 15
+        "__id__": 14
       },
       {
-        "__id__": 21
+        "__id__": 20
       },
       {
-        "__id__": 24
+        "__id__": 23
       },
       {
-        "__id__": 27
+        "__id__": 26
       },
       {
-        "__id__": 31
+        "__id__": 29
       }
     ],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 32
       },
       {
-        "__id__": 36
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 34
     },
     "_id": "",
     "_opacity": 255,
@@ -377,21 +377,18 @@
     "_components": [
       {
         "__id__": 12
-      },
-      {
-        "__id__": 13
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 13
     },
     "_id": "",
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
+      "r": 105,
+      "g": 46,
+      "b": 14,
       "a": 255
     },
     "_cascadeOpacityEnabled": true,
@@ -402,7 +399,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 94,
+      "width": 90,
       "height": 40
     },
     "_rotationX": 0,
@@ -444,23 +441,6 @@
     "_N$overflow": 0
   },
   {
-    "__type__": "cc.LabelOutline",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 11
-    },
-    "_enabled": true,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 105,
-      "g": 46,
-      "b": 14,
-      "a": 255
-    },
-    "_width": 2
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -480,18 +460,18 @@
     },
     "_children": [
       {
-        "__id__": 16
+        "__id__": 15
       }
     ],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 20
+      "__id__": 19
     },
     "_id": "",
     "_opacity": 255,
@@ -534,18 +514,18 @@
     "_name": "gender",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 15
+      "__id__": 14
     },
     "_children": [],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 17
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 17
     },
     "_id": "",
     "_opacity": 255,
@@ -588,7 +568,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 16
+      "__id__": 15
     },
     "_enabled": true,
     "_spriteFrame": null,
@@ -623,7 +603,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 14
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -663,11 +643,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 21
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 22
     },
     "_id": "",
     "_opacity": 255,
@@ -710,7 +690,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 20
     },
     "_enabled": true,
     "_spriteFrame": null,
@@ -752,11 +732,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 25
     },
     "_id": "",
     "_opacity": 255,
@@ -799,7 +779,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 23
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -839,14 +819,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 28
-      },
-      {
-        "__id__": 29
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 28
     },
     "_id": "",
     "_opacity": 255,
@@ -865,7 +842,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 48,
+      "width": 44,
       "height": 30
     },
     "_rotationX": 0,
@@ -889,7 +866,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 26
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -907,23 +884,6 @@
     "_N$overflow": 0
   },
   {
-    "__type__": "cc.LabelOutline",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 27
-    },
-    "_enabled": true,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_width": 2
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -946,14 +906,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 32
-      },
-      {
-        "__id__": 33
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 31
     },
     "_id": "",
     "_opacity": 255,
@@ -972,7 +929,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 17,
+      "width": 13,
       "height": 40
     },
     "_rotationX": 0,
@@ -996,7 +953,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 31
+      "__id__": 29
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -1014,23 +971,6 @@
     "_N$overflow": 0
   },
   {
-    "__type__": "cc.LabelOutline",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 31
-    },
-    "_enabled": true,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_width": 2
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1085,22 +1025,22 @@
       "__id__": 12
     },
     "nameLabel": {
-      "__id__": 19
+      "__id__": 18
     },
     "genderSprite": {
-      "__id__": 17
+      "__id__": 16
     },
     "artistLevelSprite": {
-      "__id__": 22
+      "__id__": 21
     },
     "jobLevelNameLabel": {
-      "__id__": 25
+      "__id__": 24
     },
     "incomeLabel": {
-      "__id__": 28
+      "__id__": 27
     },
     "incomeNumberLabel": {
-      "__id__": 32
+      "__id__": 30
     },
     "rankFrames": [
       {

assets/resources/prefabs/rank_company_item.prefab

@@ -29,27 +29,27 @@
         "__id__": 11
       },
       {
-        "__id__": 15
+        "__id__": 14
       },
       {
-        "__id__": 21
+        "__id__": 20
       },
       {
-        "__id__": 24
+        "__id__": 23
       }
     ],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 27
       },
       {
-        "__id__": 29
+        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 29
     },
     "_id": "",
     "_opacity": 255,
@@ -371,21 +371,18 @@
     "_components": [
       {
         "__id__": 12
-      },
-      {
-        "__id__": 13
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 13
     },
     "_id": "",
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
+      "r": 105,
+      "g": 46,
+      "b": 14,
       "a": 255
     },
     "_cascadeOpacityEnabled": true,
@@ -396,7 +393,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 94,
+      "width": 90,
       "height": 40
     },
     "_rotationX": 0,
@@ -438,23 +435,6 @@
     "_N$overflow": 0
   },
   {
-    "__type__": "cc.LabelOutline",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 11
-    },
-    "_enabled": true,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 105,
-      "g": 46,
-      "b": 14,
-      "a": 255
-    },
-    "_width": 2
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -474,18 +454,18 @@
     },
     "_children": [
       {
-        "__id__": 16
+        "__id__": 15
       }
     ],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 20
+      "__id__": 19
     },
     "_id": "",
     "_opacity": 255,
@@ -528,18 +508,18 @@
     "_name": "gender",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 15
+      "__id__": 14
     },
     "_children": [],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 17
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 17
     },
     "_id": "",
     "_opacity": 255,
@@ -582,7 +562,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 16
+      "__id__": 15
     },
     "_enabled": true,
     "_spriteFrame": null,
@@ -617,7 +597,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 14
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -657,11 +637,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 21
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 22
     },
     "_id": "",
     "_opacity": 255,
@@ -704,7 +684,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 20
     },
     "_enabled": true,
     "_spriteFrame": {
@@ -748,14 +728,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 24
       },
       {
-        "__id__": 26
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 27
+      "__id__": 26
     },
     "_id": "",
     "_opacity": 255,
@@ -774,7 +754,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 44,
+      "width": 40,
       "height": 30
     },
     "_rotationX": 0,
@@ -798,7 +778,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 23
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -820,9 +800,9 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 23
     },
-    "_enabled": true,
+    "_enabled": false,
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
@@ -887,16 +867,16 @@
       "__id__": 12
     },
     "nameLabel": {
-      "__id__": 19
+      "__id__": 18
     },
     "genderSprite": {
-      "__id__": 17
+      "__id__": 16
     },
     "starCountLabel": {
-      "__id__": 25
+      "__id__": 24
     },
     "starNode": {
-      "__id__": 21
+      "__id__": 20
     },
     "rankFrames": [
       {

assets/resources/prefabs/talent_mission.prefab

@@ -30,14 +30,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 91
+        "__id__": 92
       },
       {
-        "__id__": 92
+        "__id__": 93
       }
     ],
     "_prefab": {
-      "__id__": 93
+      "__id__": 94
     },
     "_id": "",
     "_opacity": 255,
@@ -2114,21 +2114,17 @@
         "__id__": 76
       },
       {
-        "__id__": 80
-      }
-    ],
-    "_tag": -1,
-    "_active": false,
-    "_components": [
-      {
-        "__id__": 88
+        "__id__": 79
       },
       {
-        "__id__": 89
+        "__id__": 83
       }
     ],
+    "_tag": -1,
+    "_active": false,
+    "_components": [],
     "_prefab": {
-      "__id__": 90
+      "__id__": 91
     },
     "_id": "",
     "_opacity": 255,
@@ -2271,7 +2267,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "gift_sprite",
+    "_name": "linqu_light",
     "_objFlags": 0,
     "_parent": {
       "__id__": 68
@@ -2304,6 +2300,91 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_rotationX": 0,
+    "_rotationY": 0,
+    "_scaleX": 1,
+    "_scaleY": 1,
+    "_position": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_localZOrder": 0,
+    "_globalZOrder": 0,
+    "_opacityModifyRGB": false,
+    "groupIndex": 0
+  },
+  {
+    "__type__": "sp.Skeleton",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 73
+    },
+    "_enabled": true,
+    "_paused": false,
+    "defaultSkin": "",
+    "defaultAnimation": "linqu_efc",
+    "loop": true,
+    "_premultipliedAlpha": true,
+    "_N$skeletonData": {
+      "__uuid__": "5f2310c0-090c-4676-b40d-4de1bc9f630f"
+    },
+    "_N$timeScale": 1,
+    "_N$debugSlots": false,
+    "_N$debugBones": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "3fbe9b53-a727-4e1a-8df1-9b5a6cb322c8"
+    },
+    "fileId": "5cbPkACrdPrbIBF58DCHAG",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "gift_sprite",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 68
+    },
+    "_children": [],
+    "_tag": -1,
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 77
+      }
+    ],
+    "_prefab": {
+      "__id__": 78
+    },
+    "_id": "",
+    "_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": 40,
       "height": 36
     },
@@ -2328,7 +2409,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 73
+      "__id__": 76
     },
     "_enabled": true,
     "_spriteFrame": null,
@@ -2370,14 +2451,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 77
+        "__id__": 80
       },
       {
-        "__id__": 78
+        "__id__": 81
       }
     ],
     "_prefab": {
-      "__id__": 79
+      "__id__": 82
     },
     "_id": "",
     "_opacity": 255,
@@ -2396,7 +2477,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 6,
+      "width": 0,
       "height": 60
     },
     "_rotationX": 0,
@@ -2420,7 +2501,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 76
+      "__id__": 79
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -2442,7 +2523,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 76
+      "__id__": 79
     },
     "_enabled": true,
     "_color": {
@@ -2474,21 +2555,21 @@
     },
     "_children": [
       {
-        "__id__": 81
+        "__id__": 84
       }
     ],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 84
+        "__id__": 87
       },
       {
-        "__id__": 85
+        "__id__": 88
       }
     ],
     "_prefab": {
-      "__id__": 87
+      "__id__": 90
     },
     "_id": "",
     "_opacity": 255,
@@ -2507,8 +2588,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 136,
-      "height": 78
+      "width": 130,
+      "height": 72
     },
     "_rotationX": 0,
     "_rotationY": 0,
@@ -2531,18 +2612,18 @@
     "_name": "label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 80
+      "__id__": 83
     },
     "_children": [],
     "_tag": -1,
     "_active": true,
     "_components": [
       {
-        "__id__": 82
+        "__id__": 85
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 86
     },
     "_id": "",
     "_opacity": 255,
@@ -2585,7 +2666,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 81
+      "__id__": 84
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -2618,7 +2699,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 80
+      "__id__": 83
     },
     "_enabled": true,
     "_spriteFrame": {
@@ -2644,7 +2725,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 80
+      "__id__": 83
     },
     "_enabled": true,
     "transition": 1,
@@ -2666,7 +2747,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 86
+        "__id__": 89
       }
     ],
     "_N$interactable": true,
@@ -2692,7 +2773,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 80
+      "__id__": 83
     }
   },
   {
@@ -2716,52 +2797,6 @@
     "sync": false
   },
   {
-    "__type__": "sp.Skeleton",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 68
-    },
-    "_enabled": true,
-    "_paused": false,
-    "defaultSkin": "",
-    "defaultAnimation": "linqu_efc",
-    "loop": true,
-    "_premultipliedAlpha": true,
-    "_N$skeletonData": {
-      "__uuid__": "5f2310c0-090c-4676-b40d-4de1bc9f630f"
-    },
-    "_N$timeScale": 1,
-    "_N$debugSlots": false,
-    "_N$debugBones": false
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 68
-    },
-    "_enabled": true,
-    "alignMode": 1,
-    "_target": null,
-    "_alignFlags": 0,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
-    "_verticalCenter": 0,
-    "_horizontalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 0,
-    "_originalHeight": 0
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -2804,6 +2839,7 @@
     "missionPrefab": {
       "__uuid__": "2f67ccba-8e5d-4202-954b-4fbc4ad487e9"
     },
+    "invitedItemArray": [],
     "actGift": {
       "__id__": 68
     },
@@ -2819,10 +2855,10 @@
       }
     ],
     "actGiftSprite": {
-      "__id__": 74
+      "__id__": 77
     },
     "actGiftLabel": {
-      "__id__": 77
+      "__id__": 80
     }
   },
   {

assets/scene/login.fire

@@ -593,7 +593,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 72,
+      "width": 40,
       "height": 38
     },
     "_rotationX": 0,
@@ -628,7 +628,7 @@
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
-    "_N$string": "100%",
+    "_N$string": "0%",
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",

assets/scripts/Game.js

@@ -3,8 +3,6 @@ const GameModule = require("./utils/GameModule");
 const FriendSystemApi = require('./net/FriendSystemApi');
 const ShareAction = require('./utils/ShareAction');
 const DWTool = require('./utils/DWTool');
-const DWAlert = require('./utils/DWAlert');
-const HomeApi = require("./net/HomeApi");
 const JobApi = require('./net/JobApi');
 const { GameNotificationKey, SenceMap, JobPageType } = require('./utils/GameEnum');
 const AlertManager = require('./utils/AlertManager');
@@ -167,15 +165,14 @@ cc.Class({
     },
 
     _initSocketMng() {
-        let ja0ckUrl = 'ws://172.16.15.170:8108/connect'
+        // let ja0ckUrl = 'ws://172.16.15.170:8108/connect'
 
-        let testUrl = 'wss://test-message-allstar.duowan.com/connect'
+        // let testUrl = 'wss://test-message-allstar.duowan.com/connect'
 
-        let pUrl = 'wss://message-allstar.duowan.com/connect'
+        // let pUrl = 'wss://message-allstar.duowan.com/connect'
 
         let Message = tutorial.Message;
-
-        let ws = this.ws = new WsManager(testUrl, {
+        let ws = this.ws = new WsManager(Global.socketUrl, {
             binaryType: 'arraybuffer',
             autoConnect: true,          // 自动连接
             reconnection: true,         // 断开自动重连
@@ -229,9 +226,9 @@ cc.Class({
 
             console.log("[Response text msg]: ", decodeMsg);
 
-            if (decodeMsg.type == 0) {
-                this.toastNotification(decodeMsg.msg);//成为我的老板，我的艺人，我的好友主界面toast提醒。
-            }
+            // if (decodeMsg.type == 0) {
+            //     this.toastNotification(decodeMsg.msg);//成为我的老板，我的艺人，我的好友主界面toast提醒。
+            // }
 
             if (decodeMsg.notificationMessage) {
                 switch (decodeMsg.notificationMessage.nType) {
@@ -533,7 +530,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/Init.js

@@ -40,31 +40,31 @@ cc.Class({
 
     onUpdateGame() {
 
-        if (CC_WECHATGAME) {
+        // if (CC_WECHATGAME) {
 
-            const updateManager = wx.getUpdateManager();
-            updateManager.onCheckForUpdate(function (res) {
-                // 请求完新版本信息的回调
-                console.log(res.hasUpdate)
-            })
+        //     const updateManager = wx.getUpdateManager();
+        //     updateManager.onCheckForUpdate(function (res) {
+        //         // 请求完新版本信息的回调
+        //         console.log(res.hasUpdate)
+        //     })
 
-            updateManager.onUpdateReady(function () {
-                wx.showModal({
-                    title: '更新提示',
-                    content: '新版本已经准备好，是否重启应用？',
-                    success: function (res) {
-                        if (res.confirm) {
-                            // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-                            updateManager.applyUpdate()
-                        }
-                    }
-                })
+        //     updateManager.onUpdateReady(function () {
+        //         wx.showModal({
+        //             title: '更新提示',
+        //             content: '新版本已经准备好，是否重启应用？',
+        //             success: function (res) {
+        //                 if (res.confirm) {
+        //                     // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+        //                     updateManager.applyUpdate()
+        //                 }
+        //             }
+        //         })
 
-            })
+        //     })
 
-            updateManager.onUpdateFailed(function () {
-                // 新的版本下载失败
-            })
-        }
+        //     updateManager.onUpdateFailed(function () {
+        //         // 新的版本下载失败
+        //     })
+        // }
     }
 });

assets/scripts/LoginCtrl.js

@@ -20,12 +20,57 @@ cc.Class({
 
     onLoad() {
         if (CC_WECHATGAME) {
-            window.wx.postMessage({ //初始化的时候关闭子域刷新
+            wx.postMessage({ //初始化的时候关闭子域刷新
                 messageType: 8,
             });
-        }
 
-        this.loadAllGameRes();
+            // 先请求微信版本更新管理器
+            if (typeof wx.getUpdateManager === 'function') {
+                const updateManager = wx.getUpdateManager();
+                
+                updateManager.onCheckForUpdate((res) => {
+                    // 请求完新版本信息的回调
+                    if(res.hasUpdate) {
+                        wx.showLoading({
+                            title: '发现新版本内容，正在更新，请稍后...',
+                            success: function () {}
+                        })
+                    } else {
+                        // 无新版本内容，直接开始加载游戏资源
+                        this.loadAllGameRes();
+                    }
+                })
+
+                // 有新版本内容，则等待新版本下载完，再提示
+                updateManager.onUpdateReady(() => {
+                    wx.hideLoading();
+
+                    wx.showModal({
+                        title: '更新提示',
+                        content: '新版本已经准备好，是否重启应用？',
+                        success: function (ret) {
+                            if (ret.confirm) {
+                                // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+                                updateManager.applyUpdate()
+                            }
+                        }
+                    })
+                })
+
+                updateManager.onUpdateFailed(() => {
+                    // 新版本下载失败
+                    wx.hideLoading();
+                    
+                    this.loadAllGameRes();
+                })                          
+            } else {
+                // 不支持版本更新管理器的情况，直接开始加载游戏资源
+                this.loadAllGameRes();
+            }
+        } else {
+            // 非微信环境，直接开始加载游戏资源
+            this.loadAllGameRes();
+        }
     },
 
     loadAllGameRes() {

assets/scripts/Tab.js

@@ -116,7 +116,7 @@ cc.Class({
 
     init(game) {
         this.game = game;
-
+        this.initFriendList = false;
         this.updateFriendList();
     },
 
@@ -128,9 +128,33 @@ cc.Class({
                 return n.isApplied != 1
             });
 
-            Global.friendList = this.friends = _friendList;
+            Global.friendList = _friendList;
+            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);
         });
@@ -197,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,
 
@@ -75,20 +75,20 @@ cc.Class({
             this.gainDetailLabel.string = `演出时长: ${DWTool.calculateTime(time)}` 
 
             if (data.role === 2) {
-                // if (time < 900) { // 入驻15分钟才可以召回
-                //     this.setStyleByOperation(ArtistOperation.RecalArtistlFail);
-                // } else {
-                //     this.setStyleByOperation(ArtistOperation.RecallArtist);    
-                // }
-                this.setStyleByOperation(ArtistOperation.RecallArtist);   
+                if (time < 900) { // 入驻15分钟才可以召回
+                    this.setStyleByOperation(ArtistOperation.RecalArtistlFail);
+                } else {
+                    this.setStyleByOperation(ArtistOperation.RecallArtist);    
+                }
+                // this.setStyleByOperation(ArtistOperation.RecallArtist);   
             } else {
                 if (this.isSelf) {
-                    // if (time < 900) { // 入驻15分钟才可以驱赶
-                    //     this.setStyleByOperation(ArtistOperation.DriveAwayArtistFail);
-                    // } else {
-                    //     this.setStyleByOperation(ArtistOperation.DriveAwayArtist);
-                    // }
-                    this.setStyleByOperation(ArtistOperation.DriveAwayArtist);
+                    if (time < 900) { // 入驻15分钟才可以驱赶
+                        this.setStyleByOperation(ArtistOperation.DriveAwayArtistFail);
+                    } else {
+                        this.setStyleByOperation(ArtistOperation.DriveAwayArtist);
+                    }
+                    // this.setStyleByOperation(ArtistOperation.DriveAwayArtist);
                 } else {
 
                     if (data.isReported) { // 是否举报过；0:否;1:是
@@ -201,13 +201,13 @@ cc.Class({
 
     start() {
         
-        this.content.y = -cc.view.getVisibleSize().height;
+        // this.content.y = -cc.view.getVisibleSize().height;
 
-        this.scheduleOnce(() => {
-            // 调整弹窗y轴位置，以适应引导系统的UI [-40 ~ 100]
-            let s = cc.sequence(cc.moveTo(0.2, 0, 100).easing(cc.easeCubicActionOut()), cc.moveBy(0.05, 0, -20));
-            this.content.runAction(s);
-        }, 0.1);
+        // this.scheduleOnce(() => {
+        //     // 调整弹窗y轴位置，以适应引导系统的UI [-40 ~ 100]
+        //     let s = cc.sequence(cc.moveTo(0.2, 0, 100).easing(cc.easeCubicActionOut()), cc.moveBy(0.05, 0, -20));
+        //     this.content.runAction(s);
+        // }, 0.1);
     },
 
     showCollectAnim(pos, colNums) {
@@ -311,11 +311,11 @@ cc.Class({
     },
 
     dissmiss() {
-        let finish = cc.callFunc(() => {
-            this.node.destroy();
-        }, this);
-        let sequence = cc.sequence(cc.scaleTo(0.2, 0, 0).easing(cc.easeBackIn()), finish)
-        this.content.runAction(sequence);
+        this.node.destroy();
+        // let finish = cc.callFunc(() => {
+        // }, this);
+        // let sequence = cc.sequence(cc.scaleTo(0.2, 0, 0).easing(cc.easeBackIn()), finish)
+        // this.content.runAction(sequence);
     },
 
     close() {
@@ -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

@@ -85,9 +85,9 @@ cc.Class({
 
     start() {
 
-        this.content.y = -cc.view.getVisibleSize().height;
-        let s = cc.sequence(cc.moveTo(0.2, 0, this.contentY + 20).easing(cc.easeCubicActionOut()), cc.moveBy(0.05, 0, -20));
-        this.content.runAction(s);
+        // this.content.y = -cc.view.getVisibleSize().height;
+        // let s = cc.sequence(cc.moveTo(0.2, 0, this.contentY + 20).easing(cc.easeCubicActionOut()), cc.moveBy(0.05, 0, -20));
+        // this.content.runAction(s);
     },
 
     getNetworkData() {
@@ -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) {
@@ -263,10 +269,10 @@ cc.Class({
     },
 
     close() {
-        let finish = cc.callFunc(() => {
-            this.node.destroy();
-        }, this)
-        this.content.runAction(cc.sequence(cc.moveTo(0.2, 0, -cc.view.getVisibleSize().height).easing(cc.easeCubicActionIn()), finish));
+        this.node.destroy();
+        // let finish = cc.callFunc(() => {
+        // }, this)
+        // this.content.runAction(cc.sequence(cc.moveTo(0.2, 0, -cc.view.getVisibleSize().height).easing(cc.easeCubicActionIn()), finish));
         // this.node.destroy();
     },
 

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

@@ -78,7 +78,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/HomeGuide.js

@@ -92,7 +92,7 @@ cc.Class({
                 pos: [-305, -720]
             },
             state14 : {
-                tips: '艺人不够怎么办？\n点击这里抢夺的艺人',
+                tips: '艺人不够怎么办？\n点击想要抢夺的艺人',
                 pass: 0,
                 mask: 1,
                 rect: [700, 190],

assets/scripts/levelHome/LevelFriendHome.js

@@ -29,12 +29,14 @@ cc.Class({
         let target = Global.friendList.find(n => {
             return n.uid == uid
         })
-
-        this.nick = target.nick
-
-        this.stars = target.stars
-
-        this.head = target.head
+        
+        if(target) {
+            this.nick = target.nick
+    
+            this.stars = target.stars
+    
+            this.head = target.head
+        }
 
         this.buildingInfos = [];
 

assets/scripts/levelHome/LevelHomePropItem.js

@@ -10,7 +10,7 @@ cc.Class({
        
         propSprite: cc.Sprite,
 
-        nameRichText: cc.RichText,
+        nameText: cc.Label,
     },
 
     init(buildingId, propData, pickupCallback) {
@@ -27,13 +27,13 @@ cc.Class({
             console.log(err);
         });
 
-        this.nameRichText.string = `<b><color=#ffffff>X${this.propData.count}</c></b>`;
+        this.nameText.string = `x${this.propData.count}`;
 
         this.pickupCallback = pickupCallback;
     },
 
     updateProp(propData) {
-        this.nameRichText.string = `<b><color=#ffffff>X${propData.count}</c></b>`;
+        this.nameText.string = `x${propData.count}`;
     },
 
     // LIFE-CYCLE CALLBACKS:

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/net/HomeApi.js

@@ -51,7 +51,7 @@ class HomeApi {
 
         let data = {
             timeline: 0,
-            count: 20
+            count: 50
         };
 
         Api.httpGet(this.setRequestBody(url, data, success, fail));

assets/scripts/net/WeChat.js

@@ -93,16 +93,18 @@ class WeChat {
                 this.js_code = code;
                 //如果支持用户信息按钮
                 if (this.isSupportInfoBtn) {
-                    wx.getSetting({
-                        success: (res) => {
-                            // 已经授权，可以直接调用 getUserInfo 获取头像昵称
-                            if (res.authSetting['scope.userInfo']) {
-                                this._getUserInfo()
-                            } else {
-                                this._createBtn();
-                            }
-                        }
-                    })
+                    this._createBtn();
+                    // 10月10日起微信禁止直接使用wx.getUserInfo获取用户信息
+                    // 需要先创建登录按钮
+                    // wx.getSetting({
+                    //     success: (res) => {
+                    //         // 已经授权，可以直接调用 getUserInfo 获取头像昵称
+                    //         if (res.authSetting['scope.userInfo']) {
+                    //             this._getUserInfo()
+                    //         } else {
+                    //         }
+                    //     }
+                    // })
                 } else {
                     this._getUserInfo()
                 }
@@ -167,6 +169,7 @@ class WeChat {
             if (res.errMsg == 'getUserInfo:ok') {
                 button.destroy();
                 this._login(res);
+                console.log(res);
             }
         })
         return button;

assets/scripts/notice/NoticePopup.js

@@ -23,18 +23,18 @@ cc.Class({
 
     init() {
     },
-
+    
     start() {
-        let bouncesActionArray = [];
+        // let bouncesActionArray = [];
 
-        let space = 50;
-        let upAction = cc.moveTo(0.25, cc.v2(0, space));
-        let downAction = cc.moveBy(0.1, cc.v2(0, -space));
+        // let space = 50;
+        // let upAction = cc.moveTo(0.25, cc.v2(0, space));
+        // let downAction = cc.moveBy(0.1, cc.v2(0, -space));
 
-        bouncesActionArray.push(upAction);
-        bouncesActionArray.push(downAction);
+        // bouncesActionArray.push(upAction);
+        // bouncesActionArray.push(downAction);
 
-        this.node.runAction(cc.sequence(bouncesActionArray));
+        // this.node.runAction(cc.sequence(bouncesActionArray));
         setTimeout(() => {
             this._initNoticeList()
         }, 300)

assets/scripts/quest/QuestDailyItem.js

@@ -1,4 +1,5 @@
 const Api = require('../net/Api');
+const DWTool = require("../utils/DWTool");
 
 cc.Class({
     extends: cc.Component,
@@ -92,7 +93,7 @@ cc.Class({
         })
         
         this.giftNode.getComponent('cc.Sprite').spriteFrame = _sprite
-        this.giftCounts.string = `x ${_count}`
+        this.giftCounts.string = `x ${DWTool.coinParseNoFixed(_count)}`
     },
 
     /**

assets/scripts/quest/QuestMainItem.js

@@ -210,7 +210,7 @@ cc.Class({
 
                 this.giftItem.giftFrame = spriteFrame
 
-                countNode.getComponent('cc.Label').string = `${this.giftItem.itemCount}`
+                countNode.getComponent('cc.Label').string = `${DWTool.coinParseNoFixed(this.giftItem.itemCount)}`
                 spriteNode.getComponent('cc.Sprite').spriteFrame = spriteFrame
             }).catch((err) => {
                 console.log(err);

assets/scripts/quest/QuestPopup.js

@@ -64,21 +64,19 @@ cc.Class({
         this.actGift.zIndex = 15
         this.actGift.active = false
 
-        this._initTab()
-
-        // setTimeout(() => {
-        //     this.showActGift('coin')
-        // }, 2000);
+        setTimeout(() => {
+            this._initTab()
+        }, 300);
     },
 
     start () {
         
-        let space = 50;
-        let upAction = cc.moveTo(0.25, cc.v2(0, space));
-        let downAction = cc.moveBy(0.1, cc.v2(0, -space));
-        let bouncesActionArray = [upAction, downAction];
+        // let space = 50;
+        // let upAction = cc.moveTo(0.25, cc.v2(0, space));
+        // let downAction = cc.moveBy(0.1, cc.v2(0, -space));
+        // let bouncesActionArray = [upAction, downAction];
         
-        this.node.runAction(cc.sequence(bouncesActionArray));
+        // this.node.runAction(cc.sequence(bouncesActionArray));
     },
 
     /**

assets/scripts/rank/RankPage.js

@@ -94,19 +94,19 @@ cc.Class({
     },
 
     show() {
-        this.content.y = -cc.view.getVisibleSize().height;
-        let s = cc.sequence(cc.moveTo(0.2, 0, this.contentY + 20).easing(cc.easeCubicActionOut()), cc.moveBy(0.05, 0, -20));
-        this.content.runAction(s);
+        // this.content.y = -cc.view.getVisibleSize().height;
+        // let s = cc.sequence(cc.moveTo(0.2, 0, this.contentY + 20).easing(cc.easeCubicActionOut()), cc.moveBy(0.05, 0, -20));
+        // this.content.runAction(s);
     },
 
     close() {
         this.loading = false;
         if (this.node && this.node.parent) {
             let self = this;
-            let finish = cc.callFunc(() => {
-                self.node.destroy();
-            }, this)
-            this.content.runAction(cc.sequence(cc.moveTo(0.2, 0, -cc.view.getVisibleSize().height).easing(cc.easeCubicActionIn()), finish));
+            self.node.destroy();
+            // let finish = cc.callFunc(() => {
+            // }, this)
+            // this.content.runAction(cc.sequence(cc.moveTo(0.2, 0, -cc.view.getVisibleSize().height).easing(cc.easeCubicActionIn()), finish));
         }
     },
 

assets/scripts/talent/TalentInviteMissionItem.js

@@ -129,7 +129,11 @@ cc.Class({
             }
         }
 
-        this.awardRichText.string = `签约奖励\n<color=#AF7434 >（艺人：${invitedCount}/${model.count}名）</c>`;
+        if (invitedCount >= model.count) {
+            this.awardRichText.string = `签约奖励\n<color=#AF7434 >（艺人：${model.count}/${model.count}名）</c>`;
+        } else {
+            this.awardRichText.string = `签约奖励\n<color=#AF7434 >（艺人：${invitedCount}/${model.count}名）</c>`;
+        }
     },
 
     gainAward() {

assets/scripts/utils/DWTool.js

@@ -46,6 +46,21 @@ class DWTool {
         }
     };
 
+    static coinParseNoFixed(coin) {
+        if (coin < 99999) { // 1 ~ 99999 按实际显示
+            return coin.toString();
+        } else if (coin >= 100000 && coin < 99999999) {
+            let parseCoin = (coin / 10000).toFixed(0);
+            return parseCoin.toString() + "万";
+        } else if (coin >= 100000000 && coin < 9999999999999) {
+            let parseCoin = (coin / 100000000).toFixed(0);
+            return parseCoin.toString() + "亿";
+        } else if (coin >= 1000000000000 && coin < 9999999999999999) {
+            let parseCoin = (coin / 1000000000000).toFixed(0);
+            return parseCoin.toString() + "兆";
+        }
+    };
+
     static setGenderIcon(gender) {
         return this.getGenderIconPath(gender).then((filePath) => {
             return this.loadResSpriteFrame(filePath);

assets/scripts/utils/Global.js

@@ -1,13 +1,15 @@
 const BuildingManager = require("../utils/BuildingManager");
 const ShareAction = require('./ShareAction');
 const Notikey = require('../utils/GameEnum').GameNotificationKey;
+const DWTool = require('./utils/DWTool');
 
-window.Global = {
+var Global = Global || {}
+Global = {
 
     // 建筑管理
     BuildingManager: BuildingManager.instance,
 
-    debug: true,
+    debug: false,
 
     /**
      * 点击别人分享的链接需要进行的操作 加好友
@@ -40,25 +42,35 @@ window.Global = {
     friendList: []
 };
 
+// 开发模式下快速切换 正式 or 测试 环境
+if(CC_DEV && DWTool.getUrlParam('debug') != null) {
+    Global.debug = !!~~DWTool.getUrlParam('debug');
+}
+
+Global.socketUrl = Global.debug ? 
+'wss://test-message-allstar.duowan.com/connect' : 'wss://message-allstar.duowan.com/connect';
+
+window.Global = Global;
+
 if (cc.sys.platform === cc.sys.WECHAT_GAME) {
     wx.onShow(({ query, shareTicket }) => {
-        if (typeof wx.getUpdateManager === 'function') {
-            const updateManager = wx.getUpdateManager()
-
-            updateManager.onCheckForUpdate(function (res) {
-                // 请求完新版本信息的回调
-                console.log('hasUpdate: ' + JSON.stringify(res.hasUpdate));
-            })
-
-            updateManager.onUpdateReady(function () {
-                // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-                updateManager.applyUpdate()
-            })
-
-            updateManager.onUpdateFailed(function () {
-                // 新的版本下载失败
-            })
-        }
+        // if (typeof wx.getUpdateManager === 'function') {
+        //     const updateManager = wx.getUpdateManager()
+
+        //     updateManager.onCheckForUpdate(function (res) {
+        //         // 请求完新版本信息的回调
+        //         console.log('hasUpdate: ' + JSON.stringify(res.hasUpdate));
+        //     })
+
+        //     updateManager.onUpdateReady(function () {
+        //         // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+        //         updateManager.applyUpdate()
+        //     })
+
+        //     updateManager.onUpdateFailed(function () {
+        //         // 新的版本下载失败
+        //     })
+        // }
 
         console.log('Global onShow' + JSON.stringify(query) + '======================================');
         if (query != undefined && query != null) {

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": {}
+    }
+  }
+}