1

build.js

@@ -14,5 +14,14 @@ if (cmd === 'build' && process.argv[3] === 'prod') {
   if (process.argv[4] === 'exml')
     cmd = 'buildProdEXML';
 }
+
+else if (cmd === 'build' && process.argv[3] === 'prod2') {
+  // if (cmd === 'build' && remain[1] === 'prod') {
+  cmd = 'notinypng';
+  if (process.argv[4] === 'ts')
+    cmd = 'buildProdTS';
+  if (process.argv[4] === 'exml')
+    cmd = 'buildProdEXML';
+}
 build[cmd]('egret');
 console.log();
\ No newline at end of file

egret/libs/tw/manager/NetManager.ts

@@ -1332,7 +1332,7 @@ export class NetManager extends ABNetManager {
         const net: INetData = {
             name:'hc_advert',
             uri: window['duiba']+'/customActivity/happyclear/advert',
-            type: 'post',
+            type: 'get',
             dataType: 'json',
             param: {
                 activityId: DataManager.ins.customCfgData.actId

egret/resource/TextureMerger/common.tmproject

-<<<<<<< HEAD
 {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/toast.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/prizePanelbg.png","../assets/common/lightani.png","../assets/common/common_yuanbao.png","../assets/common/common_prizelight.png","../assets/common/common_adbg.png","../assets/common/commmon_okbtn1.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png"]}
\ No newline at end of file
-=======
-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/toast.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/commmon_okbtn1.png","../assets/common/lightani.png","../assets/common/prizePanelbg.png","../assets/common/common_prizelight.png","../assets/common/common_yuanbao.png"]}
->>>>>>> 0930

egret/resource/TextureMerger/map.tmproject

-<<<<<<< HEAD
 {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/taskicon.png","../assets/map/recordbtn.png","../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/namebg.png","../assets/map/msgTri.png","../assets/map/map_signicon.png","../assets/map/lionMsgBg.png","../assets/map/invite_txtbg.png","../assets/map/invite_icon.png","../assets/map/iconbg.png","../assets/map/icon.png","../assets/map/guideOver.png","../assets/map/guideMoney.png","../assets/map/guideLove.png","../assets/map/guideLevel.png","../assets/map/guideBox.png","../assets/map/friend_avatar.png","../assets/map/avatar.png","../assets/map/animal1.png","../assets/map/ad_icon.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐关闭.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音关闭.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/光 副本 4.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/宝箱.png"]}
\ No newline at end of file
-=======
-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/icon.png","../assets/map/animal1.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/iconbg.png","../assets/map/光 副本 4.png","../assets/map/音乐关闭.png","../assets/map/声音关闭.png","../assets/map/recordbtn.png","../assets/map/msgTri.png","../assets/map/guideOver.png","../assets/map/guideLove.png","../assets/map/guideBox.png","../assets/map/guideLevel.png","../assets/map/guideMoney.png","../assets/map/lionMsgBg.png","../assets/map/map_signicon.png"]}
->>>>>>> 0930

egret/resource/TextureMerger/preload.tmproject

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

egret/resource/skins/AvatarSkin.exml

@@ -2,7 +2,7 @@
 <e:Skin class="AvatarSkin" width="79" height="85" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<e:Image source="friend_avatar_png"/>
 	<e:Group x="8.5" y="8.8">
-		<e:Image id="avatar" y="0" source="testavatar_png" width="64" height="64" x="0"/>
+		<e:Image id="avatar" y="0" source="" width="64" height="64" x="0"/>
 		<e:Rect id="avatarMask" width="64" height="64" y="0" ellipseWidth="64" ellipseHeight="64"/>
 	</e:Group>
 </e:Skin>
\ No newline at end of file

egret/resource/skins/MapSkin.exml

@@ -70,7 +70,7 @@
 	<e:Group id="friendBtn" x="5.96" y="22.31" width="171" height="120">
 		<e:Image source="avatar_png" y="0" horizontalCenter="0"/>
 		<e:Group x="38.5" y="10">
-		<e:Image id="avatar" y="0" source="testavatar_png" width="96" height="96" x="0"/>
+		<e:Image id="avatar" y="0" source="" width="96" height="96" x="0"/>
 		<e:Rect id="avatarMask" width="96" height="96" x="0" y="0" ellipseWidth="96" ellipseHeight="96"/>
 		</e:Group>
 		<e:Image source="namebg_png" horizontalCenter="-4" bottom="-4"/>

egret/src/mapScene/AdSmallComp.ts

@@ -10,21 +10,23 @@ export default class AdSmallComp extends ComponentBase {
         super.start(data);
         NetManager.ins.hc_advert(() => {
             const { data } = DataManager.ins.getData('hc_advert');
-            const { noticeAdvert } = data;
+            let { noticeAdvert } = data;
+            if (noticeAdvert == null)
+                noticeAdvert = { enable: false, advertList: [] }
             this.visible = noticeAdvert.enable;
             if (noticeAdvert.enable) {
                 result = noticeAdvert.advertList;
-                if(Array.isArray(noticeAdvert.advertList)) {
+                if (Array.isArray(noticeAdvert.advertList)) {
                     const index = Math.floor(noticeAdvert.advertList.length * Math.random());
-                    result =noticeAdvert.advertList[index];
+                    result = noticeAdvert.advertList[index];
                 }
                 this.data.img = result.img;
             }
         });
 
-        this['img'].addEventListener(egret.TouchEvent.TOUCH_TAP,()=>{
+        this['img'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
             window.location.href = result.url;
-        },this);
+        }, this);
     }
 
     get skinKey(): string { return 'ADSmall' }

egret/src/mapScene/MapScene.ts

@@ -76,7 +76,7 @@ export default class MapScene extends Scene {
 
             const hc_advert = DataManager.ins.getData('hc_advert').data;
             const { popupAdvert } = hc_advert;
-            if (oldTimerStr2 != nowTimerStr2 && popupAdvert.enable) {
+            if (oldTimerStr2 != nowTimerStr2 && popupAdvert &&popupAdvert.enable) {
                 panels.push('ad');
                 localStorage.setItem('nowTimer2Str' + window['CFG'].consumerId, nowTimerStr2);
             }
@@ -229,8 +229,11 @@ export default class MapScene extends Scene {
 
     updateAdData() {
         const hc_advert = DataManager.ins.getData('hc_advert').data;
-        const { mapAdvert } = hc_advert;
+        let { mapAdvert } = hc_advert;
+        if (mapAdvert == null)
+            mapAdvert = { enable: false, advertList: [] }
         this['adBtn'].visible = mapAdvert.enable;
+        if (mapAdvert.enable) {
             let result;
             result = mapAdvert.advertList;
             if (Array.isArray(mapAdvert.advertList)) {
@@ -242,6 +245,7 @@ export default class MapScene extends Scene {
                 window.location.href = result.url;
             }, this);
         }
+    }
 
     destroy() {
         super.destroy();

mock/happyclear/advert copy.json

+{
+    "success":true,
+    "code":null,
+    "desc":null,
+    "timestamp":1566199822308,
+    "data":{
+        "popupAdvert":{
+            "enable":false,
+            "advertList":[
+                {
+                    "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
+                    "url":"Http://www.baidu.com"
+                },
+                {
+                    "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
+                    "url":"Http://www.baidu.com"
+                }
+            ]
+        },
+        "noticeAdvert":{
+            "enable":true,
+            "advertList":[
+                {
+                    "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
+                    "url":"Http://www.baidu.com"
+                },
+                {
+                    "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
+                    "url":"Http://www.baidu.com"
+                }
+            ]
+        },
+        "mapAdvert":{
+            "enable":false,
+            "advertList":[
+                {
+                    "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
+                    "url":"Http://www.baidu.com"
+                },
+                {
+                    "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
+                    "url":"Http://www.baidu.com"
+                }
+            ]
+        }
+    }
+}
\ No newline at end of file

mock/happyclear/advert.json

 {
-    "success":true,
-    "code":null,
-    "desc":null,
-    "timestamp":1566199822308,
-    "data":{
-        "popupAdvert":{
-            "enable":false,
-            "advertList":[
-                {
-                    "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
-                    "url":"Http://www.baidu.com"
-                },
-                {
-                    "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
-                    "url":"Http://www.baidu.com"
-                }
-            ]
-        },
-        "noticeAdvert":{
-            "enable":true,
-            "advertList":[
-                {
-                    "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
-                    "url":"Http://www.baidu.com"
-                },
-                {
-                    "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
-                    "url":"Http://www.baidu.com"
-                }
-            ]
-        },
-        "mapAdvert":{
-            "enable":false,
-            "advertList":[
-                {
-                    "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
-                    "url":"Http://www.baidu.com"
-                },
-                {
-                    "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
-                    "url":"Http://www.baidu.com"
-                }
-            ]
-        }
+    "success": true,
+    "code": "0000000000",
+    "desc": "OK",
+    "timestamp": 1571038218940,
+    "data": {
+        "noticeAdvert": null,
+        "popupAdvert": null,
+        "mapAdvert": null
     }
 }
\ No newline at end of file

mock/happyclear/userInfo.json

 {
-    "success":true,
-    "code":"0000000000",
-    "desc":"OK",
-    "timestamp":1570785133074,
-    "data":{
-        "id":27,
-        "consumerId":1539361,
-        "appId":1,
-        "partnerUserId":"1",
-        "nickname":"奈何本人没文化，一句卧槽行天下",
-        "avatar":"http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
-        "email":null,
-        "sex":null,
-        
-        "gmtCreate":1447904240000,
-        "gmtModified":1564034789000
+    "success": true,
+    "code": "0000000000",
+    "desc": "OK",
+    "timestamp": 1571037021641,
+    "data": {
+        "id": 27,
+        "consumerId": 1539361,
+        "appId": 1,
+        "partnerUserId": "1",
+        "nickname": "奈何本人没文化，一句卧槽行天下",
+        "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+        "email": null,
+        "sex": null,
+        "json": "{\"petName\":\"嘿嘿\",\"phone\":\"15858586969\",\"openId\":\"zyj\"}",
+        "gmtCreate": 1447904240000,
+        "gmtModified": 1564034789000
     }
 }
\ No newline at end of file

package.json

@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "node build.js dev",
     "build": "node build.js build prod",
+    "build2": "node build.js build prod2",
     "buildTS": "node build.js build prod ts",
     "buildExml": "node build.js build prod exml",
     "backup": "node build.js backup",