修改驻场艺人界面

assets/resources/artistOperation/artist_close.png.meta

@@ -0,0 +1,30 @@
+{
+  "ver": "2.0.0",
+  "uuid": "cf836020-8073-4e90-a038-88250b9332b3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "subMetas": {
+    "artist_close": {
+      "ver": "1.0.3",
+      "uuid": "205e39ae-1e78-4d41-9dad-5c702a755f65",
+      "rawTextureUuid": "cf836020-8073-4e90-a038-88250b9332b3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 66,
+      "height": 71,
+      "rawWidth": 66,
+      "rawHeight": 71,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/artistOperation/artist_operation_top_bg.png.meta

@@ -1,14 +1,14 @@
 {
   "ver": "2.0.0",
-  "uuid": "08f24b7d-4acb-48c2-be94-77d9596d79db",
+  "uuid": "66059434-e855-4d0e-a151-47bdbd109e22",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "subMetas": {
     "artist_operation_top_bg": {
       "ver": "1.0.3",
-      "uuid": "b9030c1a-bfd3-45dc-ac22-58bb1691bead",
-      "rawTextureUuid": "08f24b7d-4acb-48c2-be94-77d9596d79db",
+      "uuid": "a02ade3a-e739-4221-8843-e69f5cf7d070",
+      "rawTextureUuid": "66059434-e855-4d0e-a151-47bdbd109e22",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -16,10 +16,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 316,
-      "height": 86,
-      "rawWidth": 316,
-      "rawHeight": 86,
+      "width": 306,
+      "height": 76,
+      "rawWidth": 306,
+      "rawHeight": 76,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/artistOperation/artist_resident_effect.png.meta

@@ -1,14 +1,14 @@
 {
   "ver": "2.0.0",
-  "uuid": "c207d8f0-03f5-490b-a258-6e91daaf9c58",
+  "uuid": "59e550bc-a8e3-437e-87a3-c5af5ddb3fda",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "subMetas": {
     "artist_resident_effect": {
       "ver": "1.0.3",
-      "uuid": "29cda422-3d83-4ee0-8559-689b026c33bf",
-      "rawTextureUuid": "c207d8f0-03f5-490b-a258-6e91daaf9c58",
+      "uuid": "789b7804-f819-428c-b8c8-fd12845d872c",
+      "rawTextureUuid": "59e550bc-a8e3-437e-87a3-c5af5ddb3fda",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -16,14 +16,14 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 450,
+      "width": 56,
       "height": 56,
-      "rawWidth": 450,
+      "rawWidth": 56,
       "rawHeight": 56,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
+      "borderTop": 20,
+      "borderBottom": 20,
+      "borderLeft": 20,
+      "borderRight": 20,
       "subMetas": {}
     }
   }

assets/resources/artistOperation/artist_resident_effect_select.png.meta

@@ -0,0 +1,30 @@
+{
+  "ver": "2.0.0",
+  "uuid": "443e74a2-41e4-4209-8634-0a6783e3960c",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "subMetas": {
+    "artist_resident_effect_select": {
+      "ver": "1.0.3",
+      "uuid": "5d63b2d7-612e-4ea6-9cc0-a81fa684b8b5",
+      "rawTextureUuid": "443e74a2-41e4-4209-8634-0a6783e3960c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 56,
+      "height": 56,
+      "rawWidth": 56,
+      "rawHeight": 56,
+      "borderTop": 20,
+      "borderBottom": 20,
+      "borderLeft": 20,
+      "borderRight": 20,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/prefabs/artist_resident.prefab

@@ -1199,8 +1199,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 316,
-      "height": 86
+      "width": 306,
+      "height": 76
     },
     "_rotationX": 0,
     "_rotationY": 0,
@@ -1253,7 +1253,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 244,
+      "width": 222,
       "height": 50
     },
     "_rotationX": 0,
@@ -1280,9 +1280,9 @@
       "__id__": 37
     },
     "_enabled": true,
-    "_N$string": "<outline color=#e8e9e9 width=2><b><color=#584A47>选择驻场艺人</c></b></outline>",
+    "_N$string": "<outline color=#f1db95 width=3><b><color=##51270f>选择驻场艺人</c></b></outline>",
     "_N$horizontalAlign": 0,
-    "_N$fontSize": 40,
+    "_N$fontSize": 36,
     "_N$font": null,
     "_N$maxWidth": 0,
     "_N$lineHeight": 50,
@@ -1309,7 +1309,7 @@
     },
     "_enabled": true,
     "_spriteFrame": {
-      "__uuid__": "b9030c1a-bfd3-45dc-ac22-58bb1691bead"
+      "__uuid__": "a02ade3a-e739-4221-8843-e69f5cf7d070"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -1339,7 +1339,7 @@
     "_alignFlags": 17,
     "_left": 0,
     "_right": 0,
-    "_top": 24.5,
+    "_top": 29.5,
     "_bottom": 0,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
@@ -1635,8 +1635,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 70,
-      "height": 72
+      "width": 66,
+      "height": 71
     },
     "_rotationX": 0,
     "_rotationY": 0,
@@ -1663,7 +1663,7 @@
     },
     "_enabled": true,
     "_spriteFrame": {
-      "__uuid__": "d81639e6-1728-48fa-854b-da4cdcc7709c"
+      "__uuid__": "205e39ae-1e78-4d41-9dad-5c702a755f65"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -1818,7 +1818,6 @@
     "scrollView": {
       "__id__": 34
     },
-    "noArtistTip": null,
     "talentBtn": {
       "__id__": 12
     },

assets/resources/prefabs/artist_resident_item.prefab

@@ -939,10 +939,10 @@
     },
     "_enabled": true,
     "_spriteFrame": {
-      "__uuid__": "29cda422-3d83-4ee0-8559-689b026c33bf"
+      "__uuid__": "789b7804-f819-428c-b8c8-fd12845d872c"
     },
-    "_type": 0,
-    "_sizeMode": 1,
+    "_type": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -1497,9 +1497,20 @@
         "__uuid__": "88bfebc4-787f-47f0-a757-d97a9adb002a"
       }
     ],
+    "effectSpriteFrames": [
+      {
+        "__uuid__": "789b7804-f819-428c-b8c8-fd12845d872c"
+      },
+      {
+        "__uuid__": "5d63b2d7-612e-4ea6-9cc0-a81fa684b8b5"
+      }
+    ],
     "headSprite": {
       "__id__": 4
     },
+    "effectSprite": {
+      "__id__": 30
+    },
     "nickRichText": {
       "__id__": 12
     },

assets/scripts/artistOperation/ArtistResidentItem.js

@@ -9,9 +9,13 @@ cc.Class({
     properties: {
 
         bgSpriteFrames: [cc.SpriteFrame],
+
+        effectSpriteFrames: [cc.SpriteFrame],
      
         headSprite: cc.Sprite,
 
+        effectSprite: cc.Sprite,
+
         nickRichText: cc.RichText,
 
         jobLevelLabel: cc.Label,
@@ -46,6 +50,7 @@ cc.Class({
             set: function (value) {
                 this._flag = value;
                 this._bgSprite.spriteFrame = this.bgSpriteFrames[value];
+                this.effectSprite.spriteFrame = this.effectSpriteFrames[value];
             }
 
         }