-a

client/app.js

@@ -15,7 +15,7 @@ App({
         console.info('App onLaunch');
         const { activityId } = options.query || {};
         console.log(activityId)
-        this.activityId = activityId || '5efc00f585a749991406f677';
+        this.activityId = activityId || '5efc14a98e6a08930b59105d';
         // this.activityId = activityId || '5ef880873075d9927e7f10b4';
         // this.activityId = activityId || '5ef1b4f72ad1116ce639e23e';
     },

client/pages/index/output.js

@@ -4025,10 +4025,10 @@ exports.ResJson = {
                     "y": 312,
                     "w": 35,
                     "h": 35,
-                    "ox": 0,
-                    "oy": 0,
-                    "sw": 35,
-                    "sh": 35,
+                    "ox": 9,
+                    "oy": 8,
+                    "sw": 53,
+                    "sh": 51,
                     "ro": false
                 },
                 "receivedBtn.png": {
@@ -4456,7 +4456,7 @@ exports.ResJson = {
             }
         }
     ],
-    "path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593601594/resource/"
+    "path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593605327/resource/"
 };
 
 
@@ -10350,32 +10350,27 @@ var RulePanel = (function (_super) {
         var text = Tools_1.Tool.getText(arr, 24, '#091631', FYGE.TEXT_ALIGN.LEFT, 540);
         text.lineType = FYGE.TEXT_lINETYPE.MULTI;
         text.y = 0;
-        var scrollPage = new FYGE.ScrollPage(540, 280, text.textHeight);
+        var scrollPage = new FYGE.ScrollPage(540, 450, text.textHeight);
         scrollPage.x = 50;
-        scrollPage.y = 200;
+        scrollPage.y = 150;
         scrollPage.children[1].addChild(text);
         ruleBg.addChild(scrollPage);
         this.addChild(ruleBg);
         this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png"));
         this.closeBtn.position.set(625, 360);
         this.addChild(this.closeBtn);
-        this.knowBtn = new FYGE.Button(RES_1.RES.getRes("knowBtn.png"));
-        this.knowBtn.position.set((ruleBg.width - this.knowBtn.width) / 2, 500);
-        ruleBg.addChild(this.knowBtn);
     };
     RulePanel.prototype.start = function (data) {
         _super.prototype.start.call(this);
     };
     RulePanel.prototype.initEvents = function () {
         this.closeBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onClick_closeBtn, this);
-        this.knowBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onClick_closeBtn, this);
     };
     RulePanel.prototype.onClick_closeBtn = function () {
         this.hidePanel();
     };
     RulePanel.prototype.removeEvents = function () {
         this.closeBtn.removeEventListener(FYGE.MouseEvent.CLICK, this.onClick_closeBtn, this);
-        this.knowBtn.removeEventListener(FYGE.MouseEvent.CLICK, this.onClick_closeBtn, this);
     };
     return RulePanel;
 }(Panel_1.Panel));
@@ -10630,6 +10625,8 @@ var AssistScene = (function (_super) {
                     case 1:
                         _a.sent();
                         console.log('跳转活动界面');
+                        FYGE.Tween.removeTweens(goPlayBtn);
+                        FYGE.Tween.removeTweens(assistBtn);
                         ctrls_1.changeScene(StartScene_1.StartScene);
                         return [2];
                 }
@@ -10637,6 +10634,7 @@ var AssistScene = (function (_super) {
         }); }, this);
         this.creatTween(goPlayBtn);
         this.addChild(goPlayBtn);
+        this.assistFailShow();
     };
     AssistScene.prototype.creatTween = function (node) {
         FYGE.Tween.get(node, { loop: true })
@@ -10979,7 +10977,7 @@ var RecordScene = (function (_super) {
                         this.addChild(timeText);
                         backBtn = new FYGE.Sprite(RES_1.RES.getRes('prizePanelBack.png'));
                         backBtn.x = 10;
-                        backBtn.y = 10;
+                        backBtn.y = 30;
                         this.addChild(backBtn);
                         backBtn.addEventListener(FYGE.MouseEvent.CLICK, function () {
                             ctrls_1.changeScene(StartScene_1.StartScene);