wuwangdong 4 年之前
父節點
當前提交
09d7c8b917

+ 26 - 26
assets/resources/module/speedUpUI/productReward2.prefab

@@ -202,8 +202,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 588,
-      "height": 603
+      "width": 610,
+      "height": 777
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -215,7 +215,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        153.583,
+        56.583,
         0,
         0,
         0,
@@ -266,8 +266,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 431,
-      "height": 244
+      "width": 683,
+      "height": 680
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -285,8 +285,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        0.5,
+        0.5,
         1
       ]
     },
@@ -319,7 +319,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "ac027582-1e62-4e8f-828d-2b08b9dc20bb"
+      "__uuid__": "b6ea2776-3ce8-48ab-a74e-f552254f6b9a"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -388,8 +388,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        269.57,
-        265.127,
+        267.716,
+        433.864,
         0,
         0,
         0,
@@ -502,8 +502,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 346,
-      "height": 193
+      "width": 463,
+      "height": 154
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -521,8 +521,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        0.5,
+        0.5,
         1
       ]
     },
@@ -547,7 +547,7 @@
       "__id__": 11
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 13
@@ -662,7 +662,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "a77e227e-90a3-4144-956d-473fbcdabe70"
+      "__uuid__": "61755aab-48ef-4144-81d8-99bf853f0fb6"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -733,7 +733,7 @@
       "ctor": "Float64Array",
       "array": [
         150,
-        -403,
+        -513,
         0,
         0,
         0,
@@ -1386,7 +1386,7 @@
       "ctor": "Float64Array",
       "array": [
         -150,
-        -403,
+        -513,
         0,
         0,
         0,
@@ -1688,9 +1688,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 138,
-      "g": 67,
-      "b": 18,
+      "r": 255,
+      "g": 220,
+      "b": 79,
       "a": 255
     },
     "_contentSize": {
@@ -1708,7 +1708,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -125.752,
+        -277.752,
         0,
         0,
         0,
@@ -1756,7 +1756,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -1784,7 +1784,7 @@
       "__id__": 3
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 48
@@ -1908,7 +1908,7 @@
         "__id__": 67
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 71
@@ -2668,7 +2668,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "5bb7db0c-36f9-42c2-a664-c982a39d1553"
+      "__uuid__": "65280d6a-2bbf-45b8-98f9-eb6f07f3a7d7"
     },
     "_type": 0,
     "_sizeMode": 1,

二進制
assets/resources/module/speedUpUI/texture/bg_hb.png


+ 36 - 0
assets/resources/module/speedUpUI/texture/bg_hb.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "496993af-5178-4e14-a55a-3c64c38919a3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 610,
+  "height": 777,
+  "platformSettings": {},
+  "subMetas": {
+    "bg_hb": {
+      "ver": "1.0.4",
+      "uuid": "65280d6a-2bbf-45b8-98f9-eb6f07f3a7d7",
+      "rawTextureUuid": "496993af-5178-4e14-a55a-3c64c38919a3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 610,
+      "height": 777,
+      "rawWidth": 610,
+      "rawHeight": 777,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

二進制
assets/resources/module/speedUpUI/texture/lucky.png


+ 36 - 0
assets/resources/module/speedUpUI/texture/lucky.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "1636e0f6-c923-47ee-b56b-3811ad9232a3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 463,
+  "height": 154,
+  "platformSettings": {},
+  "subMetas": {
+    "lucky": {
+      "ver": "1.0.4",
+      "uuid": "61755aab-48ef-4144-81d8-99bf853f0fb6",
+      "rawTextureUuid": "1636e0f6-c923-47ee-b56b-3811ad9232a3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 463,
+      "height": 154,
+      "rawWidth": 463,
+      "rawHeight": 154,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

二進制
assets/resources/module/speedUpUI/texture/lucky_2.png


+ 36 - 0
assets/resources/module/speedUpUI/texture/lucky_2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "d4585e7e-d5d9-4c9d-81f4-d06976666c2e",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 750,
+  "height": 772,
+  "platformSettings": {},
+  "subMetas": {
+    "lucky_2": {
+      "ver": "1.0.4",
+      "uuid": "b6ea2776-3ce8-48ab-a74e-f552254f6b9a",
+      "rawTextureUuid": "d4585e7e-d5d9-4c9d-81f4-d06976666c2e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 6.5,
+      "offsetY": -7,
+      "trimX": 40,
+      "trimY": 53,
+      "width": 683,
+      "height": 680,
+      "rawWidth": 750,
+      "rawHeight": 772,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 1 - 1
assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -93,7 +93,7 @@ export default class NewOpenRedBag extends cc.Component {
         const newRedMoney = redMoney > cash_data.redMoney ? cash_data.redMoney : redMoney;
         this.lbl_reward_value.string = cash_data.money / 100 + '元';
         this.lbl_progress.string = newRedMoney + '/' + cash_data.redMoney/100;
-        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / cash_data.redMoney;
+        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / (cash_data.redMoney/100);
         // this.spr_cash_out.fillRange = fillRange;
         cc.tween(this.spr_cash_out).to(fillRange, { fillRange: fillRange }).start();
         if (redMoney >= cash_data.redMoney) {

+ 1 - 1
assets/script/game/module/redBagTask/RedBagTask.ts

@@ -219,7 +219,7 @@ export default class RedBagTask extends cc.Component {
         const newRedMoney = redMoney > cash_data.redMoney ? cash_data.redMoney : redMoney;
         this.lbl_reward_value.string = cash_data.money / 100 + '元';
         this.lbl_progress.string = newRedMoney + '/' + cash_data.redMoney / 100;
-        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / cash_data.redMoney;
+        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / (cash_data.redMoney/100);
         // this.spr_cash_out.fillRange = fillRange;
         cc.tween(this.spr_cash_out).to(fillRange, { fillRange: fillRange }).start();
         if (redMoney >= cash_data.redMoney) {

+ 1 - 1
assets/script/game/module/reward/Reward.ts

@@ -99,7 +99,7 @@ export default class Reward extends cc.Component {
         const newRedMoney = redMoney > cash_data.redMoney ? cash_data.redMoney : redMoney;
         this.lbl_cash.string = cash_data.money / 100 + '元';
         this.lbl_cash_out.string = newRedMoney + '/' + cash_data.redMoney/100;
-        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / cash_data.redMoney;
+        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / (cash_data.redMoney/100);
         // this.spr_cash_out.fillRange = fillRange;
         cc.tween(this.spr_cash_out).to(fillRange, { fillRange: fillRange }).start();
         if (redMoney >= cash_data.redMoney) {

+ 1 - 1
assets/script/game/module/speedUpUI/ProductReward2.ts

@@ -12,7 +12,7 @@ export default class ProductReward2 extends cc.Component {
     private lbl_value: cc.Label[] = [];
 
     start() {
-        this.showChangePart();
+        //this.showChangePart();
     }
 
     // update() {

+ 1 - 1
assets/script/game/module/speedUpUI/SpeedUpUI.ts

@@ -60,7 +60,7 @@ export default class SpeedUpUI extends cc.Component {
         const newRedMoney = redMoney > cash_data.redMoney ? cash_data.redMoney : redMoney;
         this.lbl_reward_value.string = cash_data.money / 100 + '元';
         this.lbl_progress.string = newRedMoney + '/' + cash_data.redMoney/100;
-        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / cash_data.redMoney;
+        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / (cash_data.redMoney/100);
         // this.spr_cash_out.fillRange = fillRange;
         cc.tween(this.spr_cash_out).to(fillRange, { fillRange: fillRange }).start();
         if (redMoney >= cash_data.redMoney) {

+ 1 - 1
assets/script/game/module/turntable/Turnablerule.ts

@@ -50,7 +50,7 @@ export default class Turnablerule extends cc.Component {
         const newRedMoney = redMoney > cash_data.redMoney ? cash_data.redMoney : redMoney;
         this.lbl_reward_value.string = cash_data.money / 100 + '元';
         this.lbl_progress.string = newRedMoney + '/' + cash_data.redMoney/100;
-        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / cash_data.redMoney;
+        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / (cash_data.redMoney/100);
         // this.spr_cash_out.fillRange = fillRange;
         cc.tween(this.spr_cash_out).to(fillRange, { fillRange: fillRange }).start();
         if (redMoney >= cash_data.redMoney) {