发布后上传版本

README.md

@@ -29,7 +29,7 @@ npm run buildExml
 ```
 之后只需要更新皮肤中的`default.thm.js`文件的版本号
 ```js
-<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/activity/demo/1537172754/resource/default.thm.js"></script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/activity/demo/1537172754/r"></script>
 ```
 
 ## demo

egret/egretProperties.json

 {
-  "engineVersion": "5.2.10",
-  "compilerVersion": "5.2.10",
+  "engineVersion": "5.2.7",
+  "compilerVersion": "5.2.7",
   "template": {},
   "target": {
     "current": "web"

egret/libs/tw/manager/NetManager.ts

@@ -943,16 +943,24 @@ export class NetManager extends ABNetManager {
      * @param {number} signActivityId 签到活动ID
      * @param {number} activityId 插件活动ID，用于加抽奖次数，不传则使用签到身上配置的插件活动ID，否则不加抽奖次数
      */
-    public doSign(callback: Function, signActivityId: number, activityId: number): void {
+    public doSign(callback: Function, signActivityId: number, activityId?:number): void {
+        var data:any;
+        if(activityId){
+            data = {
+                id: signActivityId,
+                activityId: activityId
+            };
+        }else {
+            data = {
+                id: signActivityId
+            };
+        }
         const net: INetData = {
             name: NetName.SIGN_DO_SIGN,
             uri: '/signactivity/doSign',
             type: 'post',
             dataType: 'json',
-            param: {
-                id: signActivityId,
-                activityId: activityId
-            },
+            param: data,
             callback: callback
         };
         this.send(net);

egret/project.json

 {
     "type": "activity",
-    "name": "demo"
+    "name": "fishing"
 }
\ No newline at end of file

egret/resource/TextureMerger/adopte_panel.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"adopte_panel","version":5,"files":["../assets/adopte_panel/开始旅程按钮.png","../assets/adopte_panel/领养界面bg.png","../assets/adopte_panel/你觉得我叫什么好？.png"]}
\ No newline at end of file

egret/resource/TextureMerger/album_panel.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"album_panel","version":5,"files":["../assets/album_panel/album_bg.png","../assets/album_panel/album_close.png","../assets/album_panel/相片详情关闭.png","../assets/album_panel/单个相片背景框.png","../assets/album_panel/相片背景.png","../assets/album_panel/相片别针.png","../assets/album_panel/相片印章.png"]}
\ No newline at end of file

egret/resource/TextureMerger/alert.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"alert","version":5,"files":["../assets/alert/Bitmap-4.png","../assets/alert/Bitmap-2.png","../assets/alert/Bitmap-1.png"]}
\ No newline at end of file

egret/resource/TextureMerger/alert_3.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"alert_3","version":5,"files":["../assets/alert/Bitmap-4.png","../assets/alert/Bitmap-2.png","../assets/alert/Bitmap-1.png"]}
\ No newline at end of file

egret/resource/TextureMerger/earnGold_panel.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"earnGold_panel","version":5,"files":["../assets/earnGold_panel/赚金币_分享.png","../assets/earnGold_panel/赚金币_签到.png","../assets/earnGold_panel/赚金币_下单返金币.png","../assets/earnGold_panel/赚金币_bg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/guide_panel.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"guide_panel","version":5,"files":["../assets/guide_panel/guideHand.png","../assets/guide_panel/出游提示.png","../assets/guide_panel/签到提示.png","../assets/guide_panel/使用道具提示.png","../assets/guide_panel/收取食物提示.png","../assets/guide_panel/引导提示小海豚.png","../assets/guide_panel/赚金币提示.png"]}
\ No newline at end of file

egret/resource/TextureMerger/loading_2.tmproject → egret/resource/TextureMerger/loading.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"loading_2","version":5,"files":["../assets/loading/bg.png","../assets/loading/progress.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"loading","version":5,"files":["../assets/loading/bg.png","../assets/loading/progress.png"]}
\ No newline at end of file

egret/resource/TextureMerger/main_scene.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"main_scene","version":5,"files":["../assets/main_scene/喂食1.png","../assets/main_scene/小海豚png.png","../assets/main_scene/道具.png","../assets/main_scene/赚金币.png","../assets/main_scene/出游.png","../assets/main_scene/小宠信息.png","../assets/main_scene/签到.png","../assets/main_scene/秘籍.png","../assets/main_scene/我的金币.png","../assets/main_scene/喂食.png","../assets/main_scene/lvBg.png","../assets/main_scene/泡泡.png","../assets/main_scene/mscrollBg.png","../assets/main_scene/mscrollBar.png","../assets/main_scene/fengche.png","../assets/main_scene/shuipao.png","../assets/main_scene/boat.png","../assets/main_scene/circle.png","../assets/adopte_panel/你觉得我叫什么好？.png","../assets/adopte_panel/开始旅程按钮.png","../assets/adopte_panel/领养界面bg.png","../assets/album_panel/album_bg.png","../assets/album_panel/album_close.png","../assets/album_panel/相片详情关闭.png","../assets/main_scene/timeTickBarBg.png","../assets/main_scene/petState.png","../assets/mc/sDolphin1.png","../assets/main_scene/timeBarTemp.png","../assets/signIn_scene/awardState.png","../assets/signIn_scene/coinImg.png","../assets/signIn_scene/dayBg1.png","../assets/signIn_scene/dayBg2.png","../assets/signIn_scene/getAwardBtn.png","../assets/signIn_scene/getedBtn.png","../assets/signIn_scene/signInBg.png","../assets/signIn_scene/sinCloseBtn.png","../assets/myGoldCoin_panel/金币icon.png","../assets/prop_panel/closeBtn_prop.png","../assets/prop_panel/bugBtn_prop.png","../assets/prop_panel/BuyPanelBg.png","../assets/prop_panel/bugBtn_prop0.png","../assets/prop_panel/itemBg_prop.png","../assets/prop_panel/jiasuka.png","../assets/prop_panel/txt_prop.png","../assets/prop_panel/propPanelBg.png","../assets/prop_panel/buyPanelBg.png","../assets/prop_panel/downImg.png","../assets/prop_panel/upImg.png","../assets/prop_panel/uppng.png","../assets/main_scene/txt0.png","../assets/main_scene/txt1.png","../assets/main_scene/txt2.png","../assets/main_scene/txt3.png","../assets/prop_panel/skipBtn.png","../assets/rule/closerule.png","../assets/main_scene/toastBg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/myGoldCoin_panel.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"myGoldCoin_panel","version":5,"files":["../assets/myGoldCoin_panel/我的金币_背景蒙层.png","../assets/myGoldCoin_panel/我的金币_关闭按钮.png","../assets/myGoldCoin_panel/我的金币_线.png","../assets/myGoldCoin_panel/我的金币_bg.png","../assets/earnGold_panel/赚金币_bg.png","../assets/myGoldCoin_panel/金币icon.png"]}
\ No newline at end of file

egret/resource/TextureMerger/playScene_1.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"playScene_1","version":5,"files":["../assets/playScene/wheelBg2.png","../assets/playScene/wating.png","../assets/playScene/startBtnBg.png","../assets/playScene/sideLightL.png","../assets/playScene/sideLightD.png","../assets/playScene/ruleBtn.png","../assets/playScene/redPacket.png","../assets/playScene/outShell.png","../assets/playScene/myCreditsBg.png","../assets/playScene/multiple3.png","../assets/playScene/multiple.png","../assets/playScene/heartB.png","../assets/playScene/go.png","../assets/playScene/gift.png","../assets/playScene/finger.png","../assets/playScene/earnPanel.png","../assets/playScene/coinIcon.png","../assets/playScene/coinf8.png","../assets/playScene/coinf7.png","../assets/playScene/coinf6.png","../assets/playScene/coinf5.png","../assets/playScene/coinf4.png","../assets/playScene/coinf3.png","../assets/playScene/coinf2.png","../assets/playScene/coinf1.png","../assets/playScene/circleLight2.png","../assets/playScene/circleLight1.png","../assets/playScene/+.png","../assets/playScene/-_.png"]}
\ No newline at end of file

egret/resource/TextureMerger/prop_panel.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prop_panel","version":5,"files":["../assets/prop_panel/closeBtn_prop.png","../assets/prop_panel/bugBtn_prop.png","../assets/prop_panel/BuyPanelBg.png","../assets/prop_panel/bugBtn_prop0.png","../assets/prop_panel/itemBg_prop.png","../assets/prop_panel/jiasuka.png","../assets/prop_panel/txt_prop.png","../assets/prop_panel/propPanelBg.png","../assets/prop_panel/buyPanelBg.png","../assets/prop_panel/downImg.png","../assets/prop_panel/upImg.png","../assets/prop_panel/uppng.png"]}
\ No newline at end of file

egret/resource/TextureMerger/reward_panel.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"reward_panel","version":5,"files":["../assets/reward_panel/奖励背景图.png","../assets/reward_panel/明信片.png","../assets/reward_panel/去查看按钮.png"]}
\ No newline at end of file

egret/resource/TextureMerger/rule_4.tmproject → egret/resource/TextureMerger/rule_panel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"rule_4","version":5,"files":["../assets/rule/ruleBg.png","../assets/rule/X.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"rule_panel","version":5,"files":["../assets/rule/closerule.png"]}
\ No newline at end of file

egret/resource/TextureMerger/msg_0.tmproject → egret/resource/TextureMerger/share_panel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"msg_0","version":5,"files":["../assets/msg/msgBg.png","../assets/msg/x.png","../assets/msg/sureBtn.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"share_panel","version":5,"files":["../assets/share_panel/分享引导.png"]}
\ No newline at end of file

egret/resource/TextureMerger/signIn_panel.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"signIn_panel","version":5,"files":["../assets/signIn_scene/awardState.png","../assets/signIn_scene/coinImg.png","../assets/signIn_scene/dayBg1.png","../assets/signIn_scene/dayBg2.png","../assets/signIn_scene/getAwardBtn.png","../assets/signIn_scene/getedBtn.png","../assets/signIn_scene/signInBg.png","../assets/signIn_scene/sinCloseBtn.png"]}
\ No newline at end of file

egret/resource/TextureMerger/tour_panel.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"tour_panel","version":5,"files":["../assets/tour_panel/tab_未选中.png","../assets/tour_panel/tab_选中.png","../assets/tour_panel/tourBg1.png","../assets/tour_panel/tourBg2.png","../assets/tour_panel/tourBg3.png","../assets/tour_panel/出游按钮.png","../assets/tour_panel/出游Bg.png","../assets/tour_panel/地图背景.png","../assets/tour_panel/立牌.png","../assets/tour_panel/欧洲地图未解锁.png","../assets/tour_panel/地点锁.png","../assets/tour_panel/地图锁.png","../assets/tour_panel/相册按钮.png","../assets/tour_panel/亚洲地图未解锁.png","../assets/tour_panel/出游确认按钮.png","../assets/tour_panel/出游确认框Bg.png"]}
\ No newline at end of file

egret/resource/default.thm.json

 {
-    "skins": {},
-    "autoGenerateExmlsList": true,
-    "exmls": [
-        "resource/skins/AdopteSkin.exml",
-        "resource/skins/AlbumInfoSkin.exml",
-        "resource/skins/AlbumItemSkin.exml",
-        "resource/skins/AlbumSkin.exml",
-        "resource/skins/AlertSkin.exml",
-        "resource/skins/component/FoodComponent.exml",
-        "resource/skins/EarnGoldCoinSkin.exml",
-        "resource/skins/GuideSkin.exml",
-        "resource/skins/LoadingSkin.exml",
-        "resource/skins/ui/ProgressBarSkin.exml",
-        "resource/skins/ui/TimeProgressBarSkin.exml",
-        "resource/skins/MainSceneSkin.exml",
-        "resource/skins/MsgSkin.exml",
-        "resource/skins/MyCoinLogItemSkin.exml",
-        "resource/skins/MyGoldCoinSkin.exml",
-        "resource/skins/PropPanelSkin.exml",
-        "resource/skins/RewardSkin.exml",
-        "resource/skins/RuleSkin.exml",
-        "resource/skins/ShareSkin.exml",
-        "resource/skins/SignInSceneSkin.exml",
-        "resource/skins/TourSkin.exml"
-    ],
-    "path": "resource/default.thm.json"
+	"skins": {},
+	"autoGenerateExmlsList": true,
+	"exmls": [
+		"resource/skins/AdopteSkin.exml",
+		"resource/skins/AlbumInfoSkin.exml",
+		"resource/skins/AlbumItemSkin.exml",
+		"resource/skins/AlbumSkin.exml",
+		"resource/skins/AlertSkin.exml",
+		"resource/skins/EarnGoldCoinSkin.exml",
+		"resource/skins/GuideSkin.exml",
+		"resource/skins/LoadingSkin.exml",
+		"resource/skins/MainSceneSkin.exml",
+		"resource/skins/MsgSkin.exml",
+		"resource/skins/MyCoinLogItemSkin.exml",
+		"resource/skins/MyGoldCoinSkin.exml",
+		"resource/skins/PropPanelSkin.exml",
+		"resource/skins/RewardSkin.exml",
+		"resource/skins/RuleSkin.exml",
+		"resource/skins/ShareSkin.exml",
+		"resource/skins/SignInSceneSkin.exml",
+		"resource/skins/TourSkin.exml",
+		"resource/skins/component/FoodComponent.exml",
+		"resource/skins/ui/ProgressBarSkin.exml",
+		"resource/skins/ui/TimeProgressBarSkin.exml"
+	],
+	"path": "resource/default.thm.json"
 }
\ No newline at end of file

egret/scripts/myplugin.ts

-/**
- * 示例自定义插件，您可以查阅 http://developer.egret.com/cn/github/egret-docs/Engine2D/projectConfig/cmdExtensionPlugin/index.html
- * 了解如何开发一个自定义插件
- */
-export class CustomPlugin implements plugins.Command {
-
-    constructor() {
-    }
-
-    async onFile(file: plugins.File) {
-        // console.log(file.relative)
-        return file;
-    }
-
-    async onFinish(commandContext: plugins.CommandContext) {
-        // console.log(commandContext.projectRoot)
-        // const path = require('path');
-        // commandContext.createFile('test.txt', new Buffer('123'));
-    }
-}
\ No newline at end of file

egret/src/ctrls/panelCtrl.ts

@@ -22,7 +22,7 @@ export default class PanelCtrl {
         this._current = panel;
         // panel.setSkinName();
         // panel.setMask();
-        panel.setShowAct();
+        // panel.setShowAct();
         // panel.start(data);
         
         

egret/src/loading/Loading.ts

@@ -3,6 +3,7 @@ import ComponentBase from "../components/ComponentBase";
 export default class Loading extends ComponentBase {
     private static _parent: eui.UILayer;
     private static _instance: Loading;
+    public waitImg:eui.Image;
     static get instace(): Loading {
         return Loading._instance || (Loading._instance = new Loading());
     }
@@ -45,7 +46,7 @@ export default class Loading extends ComponentBase {
     }
 
     onEnterFrame() {
-        this.data.speed += 5;
+        this.waitImg.rotation += 5;
     }
 
     public get skinKey() { return 'Loading' }

egret/src/signInPanel/SignInSceneSkin.ts

@@ -54,7 +54,7 @@ export class SignInScene extends Panel{
             // DataManager.ins.signInfoData.signInfoVO.todaySigned = true;
 
             DataManager.ins.signInfoData.signInfoVO.rewardMap //奖品列表
-        }.bind(this), 555555, 66666);
+        }.bind(this), window['signActivityId']);
         //点击埋点，确认签到
         const dpm = Buried.connectDpm(110, 4, 1);
         const dcm = Buried.connectDcm(230, window['skinID'], 0);

egret/src/views/Panel.ts

@@ -7,11 +7,6 @@ export default class Panel extends ComponentBase {
     constructor(data?, hasMask:boolean = true) {
         super(data);
         this.hasMask = hasMask;
-
-        this.setMask();
-        if(!this.hasMask){
-            this.pMask.alpha = 0;
-        }
     }
 
     /**
@@ -26,15 +21,17 @@ export default class Panel extends ComponentBase {
             this.pMask.graphics.drawRect(0, 0, 750, 750 * rate);
             this.pMask.graphics.endFill();
             this.addChildAt(this.pMask, 0); 
+
+            this.pMask.touchEnabled = false;
         }
 
     }
 
     setShowAct():void{
         this.alpha = 0;
-        this.y = document.body.clientHeight;
-        this.scaleY = 0;
-        egret.Tween.get(this).to({alpha:1, y:0, scaleY:1},300);
+        // this.y = document.body.clientHeight;
+        // this.scaleY = 0;
+        egret.Tween.get(this).to({alpha:1},300);
     }
 
     initEvents() {
@@ -77,6 +74,14 @@ export default class Panel extends ComponentBase {
     protected onSkinComplete() {
         super.onSkinComplete();
         Loading.instace.hide();
+
+
+        this.setMask();
+        if(!this.hasMask){
+            this.pMask.alpha = 0;
+        }
+
+        this.setShowAct();
     }
 
     protected get closeBtns(): eui.Button[] { return [this['closeBtn']] }