55555

egret/publish.js

@@ -24,8 +24,8 @@ class TuiaAutoUpload {
         var _this = this;
         this.client = new OSS({
             region: 'oss-cn-hangzhou',
-            accessKeyId: 'LTAIdGi1IOap7fkF',
-            accessKeySecret: 'SKrOOp6EVtDGEV47yn0t2h97gyNioQ',
+            accessKeyId: 'LTAIqO2wblIxQvwc',
+            accessKeySecret: '4brsaSRbRpjxw3oDIxJi6bNMcndIR6',
             bucket: _this.type === 'prod' ? 'duiba' : 'daily-duiba'
         });
         this.bar = new ProgressBar(chalk.yellow(`  文件上传中 [:bar] :current/${this.files().length} :percent :elapseds`), {

egret/resource/skins/PrizePanelSkin.exml

@@ -18,7 +18,7 @@
 				</e:Skin>
 			</e:skinName>
 		</e:Button>
-		<e:Label id="prizeNameLb" text="奖品文案" y="692.67" size="22" textAlign="center" width="200" textColor="0x0bb17b" x="175" visible="false"/>
+		<e:Label id="prizeNameLb" text="奖品文案" y="692.67" size="22" textAlign="center" width="200" textColor="0x0bb17b" x="175" visible="false" locked="true"/>
 		<e:Image id="prizeImg" y="466.19" anchorOffsetY="0" anchorOffsetX="0" width="245" height="245" source="" horizontalCenter="0.5"/>
 		<e:Label text="恭喜\n赢得100颜值币" y="354.09" textColor="0x9861ba" textAlign="center" size="39" horizontalCenter="0.5" lineSpacing="10"/>
 	</e:Group>

egret/src/msgPanel/MsgPanel.ts

@@ -54,7 +54,7 @@ export default class MsgPanel extends Panel {
         this.msgTxt0.visible = true;
 
         if(this.mData){
-            if(this.mData.type == 0 || this.mData.type == 1){
+            if(this.mData.type == 0 || this.mData.type == 1 || this.mData.type == 21){
                 switch(this.mData.type){
                     case 0:
                         this.msgTxt1.visible = false;
@@ -72,6 +72,15 @@ export default class MsgPanel extends Panel {
                             this.msgTxt1.text = this.mData.text;
                         }
                     break;
+                    
+                    case 21:
+                    this.msgTxt1.visible = false;
+                    this.msgTxt0.visible = true;
+
+                    if(this.mData.text){
+                        this.msgTxt0.text = this.mData.text;
+                    }
+                break;
                 }
 
             }
@@ -83,7 +92,13 @@ export default class MsgPanel extends Panel {
 
     private onTap():void{
         PanelCtrl.instance.btnDelay(this.okBtn);
-        this.getAjax();
+        if(this.mData){
+            if(this.mData.type != 21){
+                this.getAjax();
+            }
+        }else{
+            this.getAjax();
+        }
         this.hidePanel();
     }
 

egret/src/startScene/StartScene.ts

@@ -277,8 +277,10 @@ export default class StartScene extends Scene {
                 }
                 if (DataManager.ins.doJoinData.code == 'E100202007' || DataManager.ins.doJoinData.code == 'E100202008' || DataManager.ins.doJoinData.code == 'E100202009' || DataManager.ins.doJoinData.code == 'E100202010'){  
                     //次数已用完
-                    PanelCtrl.instance.show(ModuleTypes.MSG_PANEL, {type:0, text:'今天挑战次数用完了~\n明天再来吧！'});
-                } if(DataManager.ins.doJoinData.code == 'E100201007'){
+                    PanelCtrl.instance.show(ModuleTypes.MSG_PANEL, {type:21, text:'今天挑战次数用完了~\n明天再来吧！'});
+                }else if(DataManager.ins.doJoinData.code == 'E100201001' || DataManager.ins.doJoinData.code == 'E100201002'){
+                    PanelCtrl.instance.show(ModuleTypes.MSG_PANEL, {type:21, text:'小主，您还未登录\n请登录后再玩吧~'});
+                }else if(DataManager.ins.doJoinData.code == 'E100201007'){
                     PanelCtrl.instance.show(ModuleTypes.MSG_PANEL, {type:1});
                 }else{//未中奖
                     PanelCtrl.instance.isLoseCoin = true;

mock/json/doJoinNew.json

 {
-    "success": true,
-    "code": "0000000000",
+    "success": false,
+    "code": "E100202007",
     "desc": "OK",
     "timestamp": 1548915321930,
     "data": 123456