future 1 year ago
parent
commit
1eb1750d35

+ 0 - 9
assets/run/style.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "d7cf7351-7702-4504-8d99-2e10c0db657d",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}

+ 0 - 9
assets/run/style/red.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "1603ff02-e10b-4f52-b900-7688ee8d5d37",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}

BIN
assets/run/style/red/red_btn_tip.png


+ 0 - 134
assets/run/style/red/red_btn_tip.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "e6a82762-c8d6-4206-a826-8cecff8d3ac1",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "e6a82762-c8d6-4206-a826-8cecff8d3ac1@6c48a",
-      "displayName": "red_btn_tip",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "e6a82762-c8d6-4206-a826-8cecff8d3ac1",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "e6a82762-c8d6-4206-a826-8cecff8d3ac1@f9941",
-      "displayName": "red_btn_tip",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": -1,
-        "offsetY": -0.5,
-        "trimX": 0,
-        "trimY": 21,
-        "width": 208,
-        "height": 88,
-        "rawWidth": 210,
-        "rawHeight": 129,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -104,
-            -44,
-            0,
-            104,
-            -44,
-            0,
-            -104,
-            44,
-            0,
-            104,
-            44,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            108,
-            208,
-            108,
-            0,
-            20,
-            208,
-            20
-          ],
-          "nuv": [
-            0,
-            0.15503875968992248,
-            0.9904761904761905,
-            0.15503875968992248,
-            0,
-            0.8372093023255814,
-            0.9904761904761905,
-            0.8372093023255814
-          ],
-          "minPos": [
-            -104,
-            -44,
-            0
-          ],
-          "maxPos": [
-            104,
-            44,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "e6a82762-c8d6-4206-a826-8cecff8d3ac1@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "e6a82762-c8d6-4206-a826-8cecff8d3ac1@f9941"
-  }
-}

BIN
assets/run/style/red/red_img_back.png


+ 0 - 134
assets/run/style/red/red_img_back.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "5f72fce7-0f64-4f7b-b5af-6fc7086481da",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "5f72fce7-0f64-4f7b-b5af-6fc7086481da@6c48a",
-      "displayName": "red_img_back",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "5f72fce7-0f64-4f7b-b5af-6fc7086481da",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "5f72fce7-0f64-4f7b-b5af-6fc7086481da@f9941",
-      "displayName": "red_img_back",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 131,
-        "height": 181,
-        "rawWidth": 131,
-        "rawHeight": 181,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -65.5,
-            -90.5,
-            0,
-            65.5,
-            -90.5,
-            0,
-            -65.5,
-            90.5,
-            0,
-            65.5,
-            90.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            181,
-            131,
-            181,
-            0,
-            0,
-            131,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -65.5,
-            -90.5,
-            0
-          ],
-          "maxPos": [
-            65.5,
-            90.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "5f72fce7-0f64-4f7b-b5af-6fc7086481da@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "5f72fce7-0f64-4f7b-b5af-6fc7086481da@f9941"
-  }
-}

BIN
assets/run/style/red/red_img_title_bg.png


+ 0 - 134
assets/run/style/red/red_img_title_bg.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "9975ffe2-3f51-419c-833c-a6345a34d10b",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "9975ffe2-3f51-419c-833c-a6345a34d10b@6c48a",
-      "displayName": "red_img_title_bg",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "9975ffe2-3f51-419c-833c-a6345a34d10b",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "9975ffe2-3f51-419c-833c-a6345a34d10b@f9941",
-      "displayName": "red_img_title_bg",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0.5,
-        "offsetY": 0,
-        "trimX": 20,
-        "trimY": 0,
-        "width": 555,
-        "height": 120,
-        "rawWidth": 594,
-        "rawHeight": 120,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -277.5,
-            -60,
-            0,
-            277.5,
-            -60,
-            0,
-            -277.5,
-            60,
-            0,
-            277.5,
-            60,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            20,
-            120,
-            575,
-            120,
-            20,
-            0,
-            575,
-            0
-          ],
-          "nuv": [
-            0.03367003367003367,
-            0,
-            0.968013468013468,
-            0,
-            0.03367003367003367,
-            1,
-            0.968013468013468,
-            1
-          ],
-          "minPos": [
-            -277.5,
-            -60,
-            0
-          ],
-          "maxPos": [
-            277.5,
-            60,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "9975ffe2-3f51-419c-833c-a6345a34d10b@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "9975ffe2-3f51-419c-833c-a6345a34d10b@f9941"
-  }
-}

+ 5 - 13
assets/scene/game.scene

@@ -5646,14 +5646,6 @@
     "img_title": {
       "__id__": 154
     },
-    "red_sf_btn_back": {
-      "__uuid__": "5f72fce7-0f64-4f7b-b5af-6fc7086481da@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "red_sf_img_title_bg": {
-      "__uuid__": "9975ffe2-3f51-419c-833c-a6345a34d10b@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
     "_id": "c31EJW/XdDU6yisYkOpGvb"
   },
   {
@@ -7480,7 +7472,7 @@
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -295,
+      "x": -297.5,
       "y": 0,
       "z": 0
     },
@@ -7519,8 +7511,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 208,
-      "height": 88
+      "width": 213,
+      "height": 89
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -7550,7 +7542,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "e6a82762-c8d6-4206-a826-8cecff8d3ac1@f9941",
+      "__uuid__": "7854c0a8-b427-41ba-92b7-2ea56810f711@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,
@@ -7808,7 +7800,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 399,
+      "width": 404,
       "height": 100
     },
     "_anchorPoint": {

+ 0 - 16
assets/script/run/ui/back_title.ts

@@ -8,14 +8,8 @@ export class back_title extends Component {
     @property(Node) btn_back:Node = null;
     @property(Node) img_title_bg:Node = null;
     @property(Node) img_title:Node = null;
-    @property(SpriteFrame) red_sf_btn_back:SpriteFrame = null;
-    @property(SpriteFrame) red_sf_img_title_bg:SpriteFrame = null;
-    private sf_btn_back:SpriteFrame = null;
-    private sf_img_title_bg:SpriteFrame = null;
     private mCallBack = null;
     protected start(): void {
-        this.sf_btn_back = this.btn_back.getComponent(Sprite).spriteFrame
-        this.sf_img_title_bg = this.img_title_bg.getComponent(Sprite).spriteFrame
         if(SdkUtil.iPhoneIsLingdongdao()&&SdkUtil.KS_GAME==false) {
             let p = this.img_title_bg.getPosition()
             this.img_title_bg.setPosition(p.x,p.y-60,p.z)
@@ -41,16 +35,6 @@ export class back_title extends Component {
         }
         this.img_title.getComponent(Label).string = title;
     }
-
-    public updateStyle(is_change:boolean=false){
-        if(is_change) {
-            this.btn_back.getComponent(Sprite).spriteFrame = this.red_sf_btn_back
-            this.img_title_bg.getComponent(Sprite).spriteFrame = this.red_sf_img_title_bg
-        } else {
-            this.btn_back.getComponent(Sprite).spriteFrame = this.sf_btn_back
-            this.img_title_bg.getComponent(Sprite).spriteFrame = this.sf_img_title_bg
-        }
-    }
 }
 
 

+ 0 - 5
assets/script/run/ui_layer.ts

@@ -279,11 +279,6 @@ export class ui_layer extends Component {
                 this.dai_dao_ju_bag.getComponent(dai_dao_ju_bag).initView(data._guo_ju_qing_dai_dao_ju,this.onClickBossTips.bind(this),this.onAddTime.bind(this))
             break;
         }
-        if(data.type==config.task_type.guo_ju_qing_dai_dao_ju) {
-            this.back_title_node.getComponent(back_title).updateStyle(true)
-        } else {
-            this.back_title_node.getComponent(back_title).updateStyle()
-        }
     }
 
     onClickBossTips(){