Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 优化地图map

# Conflicts:
#	egret/src/something/chapters/Chapter29.ts

egret/libs/tw/manager/NetManager.ts

@@ -479,7 +479,7 @@ export class NetManager extends ABNetManager {
             deviceSessionId: window['_device_session_id'],
             score: score
         };
-        console.log("通关提交",data);
+        // console.log("通关提交",data);
         if (relatedTaskType) {
             data['relatedTaskType'] = relatedTaskType;
         }

egret/src/mainScene/MainScene.ts

@@ -512,7 +512,7 @@ export default class MainScene extends Scene {
         this.addChildAt(this.festivalContainer,1);
 
         //道具使用时蒙层 无需加入场景，带入propBtnCo的位置数据
-        console.log('偏移',this.propBtnCon.y,this.propBtnCon.boomBtn.y);
+        // console.log('偏移',this.propBtnCon.y,this.propBtnCon.boomBtn.y);
 
         this.propGuide = new PropGuide(this.propBtnCon.y,this.islongScreen);
         this.propGuide.touchEnabled = true;
@@ -1687,7 +1687,7 @@ export default class MainScene extends Scene {
             this.lattices[festivalIndex] &&   //格子必须有
             (Tool.judgeSetFesEle(this.lattices[festivalIndex]) || !this.lattices[festivalIndex].element)  //没有元素也行
         ) {
-            console.log("节日元素loading");
+            // console.log("节日元素loading");
             this['redrainbg'].visible = true;
             await this.startPlayLoadingAni();
             this['redrainbg'].visible = false;
@@ -4369,7 +4369,7 @@ export default class MainScene extends Scene {
                                 ele.playCandyDieAni();
                                 //这里面会去算个数
                                 this.recoverEle(index);
-                                this.playAni(RecoverName.STEP_ANI, [50, 100]);
+                                this.playAni(RecoverName.STEP_ANI, [120, 125]);
                                 setTimeout(() => {
                                     this.steps += 5;
                                 }, 333)
@@ -5403,7 +5403,7 @@ export default class MainScene extends Scene {
      * @param tlidx 拍框猩猩的左上
      */
     pongoPaiKuang(tlidx:number){
-        console.log("猩猩拍框");
+        // console.log("猩猩拍框");
         //随机发框
         var kuangarr:Array<number> = new Array();
         var canusearr:Array<number> = new Array();//可以作为左上角的
@@ -6225,7 +6225,7 @@ export default class MainScene extends Scene {
     //新增糖果转特效元素处理
     setCandyToEffect(ele){
         if(ele&&ele.candy&&ele.candy.step){
-            this.playAni(RecoverName.STEP_ANI, [50, 100]);
+            this.playAni(RecoverName.STEP_ANI, [120, 125]);
             setTimeout(() => {
                 this.steps += 5;
             }, 333)

egret/src/mapScene/MapScene.ts

@@ -152,7 +152,7 @@ export default class MapScene extends Scene {
         }else{
             this.islongScreen = true;
         }
-        console.log("手机长短屏幕适配",whl,this.islongScreen);
+        // console.log("手机长短屏幕适配",whl,this.islongScreen);
         if(this.islongScreen){
             this['adapttop'].y = 50;
             this['settingsx'].bottom = 50;
@@ -1061,7 +1061,7 @@ export default class MapScene extends Scene {
     }
 
     destroy() {
-        console.log("map------------destroy");
+        // console.log("map------------destroy");
         super.destroy();
 
         // this.removeIcon();
@@ -1573,7 +1573,7 @@ export default class MapScene extends Scene {
     }
 
     protected removeEvents(){
-        console.log("map-----------removeEvents");
+        // console.log("map-----------removeEvents");
         this['goldBtn'].removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_goldBtn, this);
         this['guide'].removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_guide, this);
         // this['act2Btn'].removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_act2btn, this);

egret/src/statics/snpmAdStatic.ts

@@ -6,7 +6,7 @@ export class snpmAdStatic{
      */
     static snpmAdReport(type:string,from:string,adata:object){
         var params = {};
-        console.log("准备上报",type,from,JSON.stringify(adata));
+        // console.log("准备上报",type,from,JSON.stringify(adata));
         switch(from){
             case 'icon':
                 params['eleid']='bingoIndexAd';
@@ -59,7 +59,7 @@ export class snpmAdStatic{
      */
     static showAdReport(params){
         try{
-            console.log("曝光上报",JSON.stringify(params));
+            // console.log("曝光上报",JSON.stringify(params));
             let elem = document.createElement('div')
             params.saData.eleid = params.eleid;
             elem.setAttribute('sa-data', JSON.stringify(params.saData))
@@ -73,15 +73,6 @@ export class snpmAdStatic{
                 //expoManual
                 //exposure
                 window['SAUP'].sendLogData("expoManual", elem);
-                // window['SAUP'].sendLogData("expoManual", {
-                //     tag:elem,
-                //     sapmodid:params.sapmodid,
-                //     event_name:'exposure',
-                //     targeturl:params.targeturl,
-                //     pageid:params.saData.pageid,
-                //     modid:params.saData.modid,
-                //     eleid:params.saData.eleid,
-                // });
             }
         }catch(e){
 
@@ -93,7 +84,7 @@ export class snpmAdStatic{
      */
     static clickAdReport(params){
         try{
-            console.log('点击上报',JSON.stringify(params));
+            // console.log('点击上报',JSON.stringify(params));
             if(params.targeturl&&params.targeturl.length){
                 window['$'].ajax({
                     type:'get',
@@ -116,7 +107,7 @@ export class snpmAdStatic{
                 img.src = params.targeturl;
             }
             if (window['SAUP'] && window['SAUP'].sendLogData) {
-                console.log("广告点击上报",params.saData.pageid);
+                // console.log("广告点击上报",params.saData.pageid);
                 //click
                 //comclick
                 window['SAUP'].sendLogData('click',{