界面效果调整

assets/resources/module/turnable/turnable.prefab

@@ -314,8 +314,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 53,
-      "height": 49
+      "width": 88,
+      "height": 88
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2012,7 +2012,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "5842DuYrxPr6sP4i61F2qV",
+    "fileId": "19SbS9OXFJhYv9RHMGVIuA",
     "sync": false
   },
   {
@@ -2144,7 +2144,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "f43OPjgtFGzIDThuBNUqDz",
+    "fileId": "f1kK+NbW9Ar7k08ThAapN6",
     "sync": false
   },
   {
@@ -2276,7 +2276,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "7eeZac7yxKt4Rx5P2Zl9Ll",
+    "fileId": "8fXbJbkx5DnpE0hVkTN8ZJ",
     "sync": false
   },
   {
@@ -2489,7 +2489,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "3d+JpJ5f1NLKiF9y9hN2st",
+    "fileId": "c8uKfKMOFPvohBehzJrJQ5",
     "sync": false
   },
   {
@@ -3567,8 +3567,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        2.5,
+        2.5,
         1
       ]
     },

assets/script/game/module/blessingBag/BlessingBag.ts

@@ -121,7 +121,8 @@ export default class BlessingBag extends cc.Component {
 
         if (gData.blessingBag.isPlayAniUpdate) {
             if (this.lastNum < data.cumulativeAmount) {
-                mk.fly.PlayCoinAnim(1, 10, this.btnAd.getPosition(), this.btnCash.getPosition(), () => {
+                let world_pos = this.btnCash.parent.convertToWorldSpaceAR(this.btnCash.getPosition());
+                mk.fly.PlayCoinAnim(1, 10, this.btnAd.getPosition(), world_pos, () => {
                     this.aniBigAdBtn.setCurrentTime(0);
                     this.aniBigAdBtn.play();
                 });

assets/script/game/module/redeem/RedeemNode.ts

@@ -57,6 +57,10 @@ export default class RedeemNode extends cc.Component {
 
     InitData() {
         let data = gData.redeem.redeemData.redemption;
+        if (!data.content) {
+            mk.ui.closePanel('module/redeem/RedeemNode');
+            return
+        }
         this.txtGiftName.string = data.title;
         this.rewardData = data.content;
         for (let n of this.rds) {

assets/script/mk/system/FlySystem.ts

@@ -14,7 +14,7 @@ export default class FlySystem extends cc.Component {
      * @param type 类型 道具id  10001，10002
      * @param num 特效数量
      * @param pos 起始位置
-     * @param endpos 飞行的目标坐标 或目标对象路径
+     * @param endpos 飞行目标的世界坐标 或目标对象路径
      * @param cb 动画结束回调
     */
     public async PlayCoinAnim(type: number = 0, num: number, pos: cc.Vec2, endpos: cc.Vec2 | string, cb: Function = null) {
@@ -59,7 +59,7 @@ export default class FlySystem extends cc.Component {
             end_pos = this.node.convertToNodeSpaceAR(world_pos);
         }
         else {
-            end_pos = end as cc.Vec2;
+            end_pos = this.node.convertToNodeSpaceAR(end);
         }
 
         cc.tween(target)