Merge branch '冰下动物' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 优化地图map

# Conflicts:
#	egret/index.html
#	egret/resource/skins/Main2Skin.exml
#	mock/happyclear/home.json
合并冰下动物

egret/index.html

@@ -136,8 +136,8 @@
         // localStorage.clear();
         window['imgver'] = '11112';
         //top 8 ，repeat 22 , bottom 3
-        window['total_level'] = 8 + 3 + 22 * 33;
-        window['last_level'] = 737;
+        window['total_level'] = 8 + 3 + 22 * 35;
+        window['last_level'] = 775;
 
         var sharePic = document.getElementById('pic');
         sharePic.onclick = function () {

egret/libs/new_wx/MainBase.ts

@@ -106,6 +106,7 @@ export default class MainBase extends eui.UILayer {
                 // baseApi.enableTitleShow(false);
                 // }, false);
                 document.addEventListener("deviceready", () => {
+                    console.log("苏宁baseapi准备完毕1111");
                     window['baseApi'].enableTitleShow(false);
                 }, false);
             }
@@ -317,6 +318,10 @@ export default class MainBase extends eui.UILayer {
             RES.getResAsync("kuang_png");
             RES.getResAsync("wormhole_png");
             RES.getResAsync("ele41_png");
+            RES.getResAsync("ele42_png");
+            RES.getResAsync("ele43_png");
+            RES.getResAsync("ele44_png");
+            RES.getResAsync("ele45_png");
 
             for (var i = 1; i <= 27; i++) {
                 RES.getResAsync("bonusFra" + i + "_png")
@@ -582,11 +587,13 @@ export default class MainBase extends eui.UILayer {
     }
 
     protected async createGameScene() {
+        
+
         window['getaward'] = () => { getRedBombAward((param) => { console.log(param) }) };
         localStorage.setItem('taskCenter' + window['CFG'].consumerId, 'true');    // 任务中心强提示，每次进入游戏只强提示一次
         await this.hcHome();
         await Promise.all([
-            this.getAd(),
+            // this.getAd(),
             this.ajaxElement(),
             this.hc_userInfo(),
             this.getBackReward(),
@@ -595,6 +602,32 @@ export default class MainBase extends eui.UILayer {
             this.getInviteInfo(),
             this.hbRainBaseInfo(),
         ]);
+
+        if(GFun.isIOS){
+
+        }else{
+            console.log("苏宁安卓开始准备");
+            if(!window['baseApi']){
+                await new Promise((resolve,reject)=>{
+                    // let t1 = setTimeout(() => {
+                    //     console.log("苏宁准备失败");
+                    //     resolve();
+                    // }, 6000);
+                    document.addEventListener("deviceready", function() {
+                        console.log("苏宁baseapi准备完毕222");
+                        // clearTimeout(t1);
+                        resolve();
+                    }.bind(this), false);
+                    
+                })
+                console.log("游戏继续");
+            }else{
+                console.log("已经获得baseapi,游戏继续");
+            }
+        }
+        await this.getAd();
+
+
         //获取分享加体力的shareCode，不影响初始化场景，不进await
         NetManager.ins.getUserShareCode(() => { })
 

egret/libs/tw/manager/NetManager.ts

@@ -12,6 +12,7 @@ import onNotSuccess from '../../new_wx/onNotSuccess';
 import { showToast } from '../../new_wx/ctrls/toastCtrl';
 import SAUP_sendLogData from '../../../src/SAUP_sendLogData';
 import SAMap from '../../../src/SAMap';
+import { GFun } from '../../tc/util/GFun';
 
 // import { IExposureData } from '..';
 
@@ -1461,18 +1462,49 @@ export class NetManager extends ABNetManager {
     }
 
     public hc_advert(callback: Function): void {
+        var deviceId:string = '';
         const net: INetData = {
             name: 'hc_advert',
             uri: window['duiba'] + '/customActivity/happyclear/advert',
             type: 'get',
             dataType: 'json',
             param: {
-                activityId: DataManager.ins.customCfgData.actId
+                activityId: DataManager.ins.customCfgData.actId,
+                deviceId:deviceId
             },
             hideMsg: true,
             callback: callback
         };
-        this.send(net);
+        try{
+            // console.log("苏宁原生测试",window['baseApi']);
+            if(window['baseApi']){
+                console.log("苏宁原生测试",GFun.isIOS);
+                window['baseApi'].getClientInfo(function(res){
+                    console.log("啦啦啦baseApi----info",res);
+                    if(res){
+                        var resdata;
+                        if(typeof res =="string"){
+                            resdata  = JSON.parse(res);
+                        }else{
+                            resdata = res;
+                        }
+                        if(GFun.isIOS){
+                            deviceId = resdata.identifier||'';
+                        }else{
+                            deviceId = resdata.imei||'';
+                        }
+                    }
+                    console.log('新增deviceId',deviceId);
+                    net.param.deviceId = deviceId;
+                    this.send(net);
+                }.bind(this));
+            }else{
+                this.send(net);
+            }
+        }catch(e){
+            console.log('一般获取');
+            this.send(net);
+        }
     }
 
     public doSign(callback: Function, signActivityId: number): void {

egret/resource/default.res.json

@@ -5423,39 +5423,59 @@
 			"name": "ele41_png"
 		},
 		{
-			"name": "hbchuanguan2_png",
+			"url": "assets/redbombalert/hbchuanguan2.png",
 			"type": "image",
-			"url": "assets/redbombalert/hbchuanguan2.png"
+			"name": "hbchuanguan2_png"
 		},
 		{
-			"name": "redAlert_btn1_png",
+			"url": "assets/redbombalert/redAlert_btn1.png",
 			"type": "image",
-			"url": "assets/redbombalert/redAlert_btn1.png"
+			"name": "redAlert_btn1_png"
 		},
 		{
-			"name": "loadingbgfes_png",
+			"url": "assets/startScene/loadingbgfes.png",
 			"type": "image",
-			"url": "assets/startScene/loadingbgfes.png"
+			"name": "loadingbgfes_png"
 		},
 		{
-			"name": "titimg1_png",
+			"url": "assets/redbombalert/titimg1.png",
 			"type": "image",
-			"url": "assets/redbombalert/titimg1.png"
+			"name": "titimg1_png"
 		},
 		{
-			"name": "titimg2_png",
+			"url": "assets/redbombalert/titimg2.png",
 			"type": "image",
-			"url": "assets/redbombalert/titimg2.png"
+			"name": "titimg2_png"
 		},
 		{
-			"name": "titimg3_png",
+			"url": "assets/redbombalert/titimg3.png",
 			"type": "image",
-			"url": "assets/redbombalert/titimg3.png"
+			"name": "titimg3_png"
 		},
 		{
-			"name": "titimg4_png",
+			"url": "assets/redbombalert/titimg4.png",
 			"type": "image",
-			"url": "assets/redbombalert/titimg4.png"
+			"name": "titimg4_png"
+		},
+		{
+			"url": "assets/mainScene/ele42.png",
+			"type": "image",
+			"name": "ele42_png"
+		},
+		{
+			"url": "assets/mainScene/ele43.png",
+			"type": "image",
+			"name": "ele43_png"
+		},
+		{
+			"url": "assets/mainScene/ele44.png",
+			"type": "image",
+			"name": "ele44_png"
+		},
+		{
+			"url": "assets/mainScene/ele45.png",
+			"type": "image",
+			"name": "ele45_png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/Main2Skin.exml

@@ -5,32 +5,42 @@
 	</w:Declarations>
 	<e:Image x="0" y="0" source="playSceneBg_jpg"/>
 	<e:Image source="lef_png" y="-2" x="0"/>
-	<e:Image y="199.5" source="targetBoard_png" x="174"/>
-	<e:Image y="-47.5" source="progressDown_png" horizontalCenter="0"/>
-	<e:Image id="starProgress" x="138" y="159.35" source="starProgress_png"/>
-	<e:Group id="chaptergro" width="750" height="200"/>
-	<e:Image x="69" y="-64.5" source="stepsBoard_png"/>
-	<e:Image x="171.5" y="166.35" source="dangqianfenshu_png"/>
+	<e:Group id="adapttop" width="750" height="1624" horizontalCenter="0" y="0" touchEnabled="false" touchThrough="true">
+		<e:Image y="199.5" source="targetBoard_png" x="174" scaleX="1" scaleY="1"/>
+		<e:Image y="-47.5" source="progressDown_png" horizontalCenter="0" x="11" scaleX="1" scaleY="1"/>
+		<e:Image id="starProgress" x="138" y="159.35" source="starProgress_png" scaleX="1" scaleY="1"/>
+		<e:Group id="chaptergro" width="750" height="200" x="0" y="0" scaleX="1" scaleY="1"/>
+		<e:Image x="69" y="-64.5" source="stepsBoard_png" scaleX="1" scaleY="1"/>
+		<e:Image x="171.5" y="166.35" source="dangqianfenshu_png" scaleX="1" scaleY="1"/>
+		<e:Label id="targetScoreTxt" touchEnabled="false" size="26" width="292.85" anchorOffsetY="0" height="36" textAlign="center" anchorOffsetX="0" verticalAlign="middle" fontFamily="Microsoft YaHei" text="目标分数" y="234.85" textColor="0x9d4a06" bold="true" horizontalCenter="0.5" x="229" scaleX="1" scaleY="1"/>
+		<e:Group id="settingAll" width="89" height="203" x="641" y="5.5" anchorOffsetY="0" scaleX="1" scaleY="1">
+			<e:Group id="settingGroup" width="72" height="282" x="8" y="29" anchorOffsetX="0" visible="false">
+			<e:Image y="-13.03" source="mainSettingBg_png" horizontalCenter="0"/>
+			<e:Image id="questionBtn" y="53" source="mainQuestionBtn_png" horizontalCenter="1"/>
+			<e:Image id="soundBtn" y="105" source="mainSoundBtnOn_png" horizontalCenter="1"/>
+			<e:Image id="musicBtn" y="155" source="mainMusicBtnOn_png" horizontalCenter="1"/>
+			<e:Image id="quitBtn" y="205.99" source="mainQuitBtn_png" horizontalCenter="1"/>
+			</e:Group>
+			<e:Image id="settingBtn" y="1" source="setting_png" horizontalCenter="0"/>
+		</e:Group>
+	</e:Group>
+
+
+
+
+
+
+
+
 
 
 
 
-	<e:Label id="targetScoreTxt" touchEnabled="false" size="26" width="292.85" anchorOffsetY="0" height="36" textAlign="center" anchorOffsetX="0" verticalAlign="middle" fontFamily="Microsoft YaHei" text="目标分数" y="234.85" textColor="0x9d4a06" bold="true" horizontalCenter="0.5"/>
 
 
 
 
 
-	<e:Group id="settingAll" width="89" height="203" x="641" y="5.5" anchorOffsetY="0">
-		<e:Group id="settingGroup" width="72" height="282" x="8" y="29" anchorOffsetX="0" visible="false">
-		<e:Image y="-13.03" source="mainSettingBg_png" horizontalCenter="0"/>
-		<e:Image id="questionBtn" y="53" source="mainQuestionBtn_png" horizontalCenter="1"/>
-		<e:Image id="soundBtn" y="105" source="mainSoundBtnOn_png" horizontalCenter="1"/>
-		<e:Image id="musicBtn" y="155" source="mainMusicBtnOn_png" horizontalCenter="1"/>
-		<e:Image id="quitBtn" y="205.99" source="mainQuitBtn_png" horizontalCenter="1"/>
-		</e:Group>
-		<e:Image id="settingBtn" y="1" source="setting_png" horizontalCenter="0"/>
-	</e:Group>
 	<e:Group id="redrainbg" width="750" height="1624" visible="false">
 		<e:Image source="redrainbg_jpg"/>
 		<e:Label id="tips" text="正在加载中，请稍后" y="826.33" textColor="0x244B00" horizontalCenter="0" size="24" visible="false"/>

egret/resource/skins/TargetItemSkin.exml

@@ -20,5 +20,9 @@
 	<e:Image id="icon34" width="70" height="70" source="startpanel_ele34_png"/>
 	<e:Image id="icon36" width="70" height="70" source="startpanel_ele36_png"/>
 	<e:Image id="icon41" width="70" height="70" source="ele41_png"/>
+	<e:Image id="icon42" width="70" height="70" source="ele42_png"/>
+	<e:Image id="icon43" width="70" height="70" source="ele43_png"/>
+	<e:Image id="icon44" width="70" height="70" source="ele44_png"/>
+	<e:Image id="icon45" width="70" height="70" source="ele45_png"/>
 	<e:BitmapLabel id="txt" text="0" font="nums4_fnt" verticalCenter="20.5" x="73.2" scaleX="0.85" scaleY="0.85"/>
 </e:Skin>
\ No newline at end of file

egret/src/mainScene/doSandAI.ts

@@ -23,7 +23,7 @@ export default async (thisObj: MainScene) => {
     // const sands = [];
     for (let i = 0; i < sandLattices.length; i++) {
         const sandLattice = sandLattices[i];
-        const indexEnd = judgeActionIndex(sandLattice.index, thisObj.lattices,thisObj.chapterData.map.WORMHOLE)
+        const indexEnd = judgeActionIndex(sandLattice.index, thisObj.lattices,thisObj.chapterData.map.WORMHOLE,thisObj)
         if (indexEnd) {//判断是否有地方可以
             //先修改数据，再进行动画播放
             const sand = sandLattice.sand;
@@ -51,7 +51,7 @@ export default async (thisObj: MainScene) => {
 }
 
 //找到毛球移动的目标位置
-const judgeActionIndex = (index: number, lattices: Lattice[],worms:number[][]): number => {
+const judgeActionIndex = (index: number, lattices: Lattice[],worms:number[][],thisObj:MainScene): number => {
     //四个方向尽量随机
     var arr = [index - Tool.colNum, index + Tool.colNum];
     var rc = Tool.indexToRc(index);
@@ -75,6 +75,7 @@ const judgeActionIndex = (index: number, lattices: Lattice[],worms:number[][]):
             )||
             (lattices[i]&&lattices[i].element&&lattices[i].element.inPongoPart))//猩猩支持流沙
             &&!lattices[i].grass
+            &&!thisObj.judgeNoFood(i)
         ) {
             return i
         }

egret/src/mapScene/AdSmallComp.ts

@@ -40,7 +40,7 @@ export default class AdSmallComp extends ComponentBase {
 
             snpmAdStatic.snpmAdReport("click","bottom",result);
             wait(50).then(() => {
-                if (result.url != 0) window.location.href = result.url;
+                if (result.url != 0) window.location.href = decodeURI(result.url);
             });
         }, this);
     }

egret/src/mapScene/MapScene.ts

@@ -144,6 +144,23 @@ export default class MapScene extends Scene {
         }
     }
     initMapScene(){
+        var stagew = this.stage.stageWidth;
+        var stageh = this.stage.stageHeight;
+        var whl = stagew/stageh;
+        if(whl>0.5){
+            this.islongScreen = false;
+        }else{
+            this.islongScreen = true;
+        }
+        console.log("手机长短屏幕适配",whl,this.islongScreen);
+        if(this.islongScreen){
+            this['adapttop'].y = 50;
+            this['settingsx'].bottom = 50;
+        }else{
+            this['adapttop'].y = 0;
+            this['settingsx'].bottom = 25;
+        }
+
         // console.log('initMapScene--------------');
         // 添加Icon
         this.addIcon();
@@ -389,7 +406,7 @@ export default class MapScene extends Scene {
         }, 20 * 1000);
         loadFireworks();
     }
-
+    islongScreen:boolean = false;
     constructor(data?){
         super();
         this._data = data;
@@ -1037,7 +1054,7 @@ export default class MapScene extends Scene {
                 NetManager.ins.clickLog1(getlogItem(32));
                 snpmAdStatic.snpmAdReport("click","icon",result);
                 if(result.url!=0){
-                    window.location.href = result.url;
+                    window.location.href = decodeURI(result.url);
                 }
             }, this);
         }

egret/src/panels/ADPanel.ts

@@ -30,7 +30,7 @@ export default class ADPanel extends Panel {
             snpmAdStatic.snpmAdReport("click","dialog",result);
             NetManager.ins.clickLog1(getlogItem(25));
             wait(100).then(()=>{
-                window.location.href = result.url;
+                window.location.href = decodeURI(result.url);
             });
         }, this);
     }

egret/src/something/anis/FlyTargetAni.ts

@@ -21,7 +21,26 @@ export function FlyTargetAni(
     }
     eleC.x = fromP[0];
     eleC.y = fromP[1];
-    egret.Tween.get(eleC)
+    //食物的是专门的
+    if(type==ElementType.food1||type==ElementType.food2
+        ||type==ElementType.food3||type==ElementType.food4){
+            eleC.anchorOffsetX = texture.textureWidth/2;
+            eleC.anchorOffsetY = texture.textureHeight/2;
+
+        egret.Tween.get(eleC)
+        .to({ x: targetP[0], y: targetP[1], width:63,height:63 }, 500 + (Math.random() * 100) >> 0)
+        .call(()=>{
+            if(eleC.parent){
+                eleC.parent.removeChild(eleC);
+                Pool.recover(RecoverName.BITMAPRECYCLE,eleC);
+            }
+            callback&&callback();
+        })
+    }else{
+        eleC.anchorOffsetX = 0;
+        eleC.anchorOffsetY = 0;
+
+        egret.Tween.get(eleC)
         .to({ x: targetP[0], y: targetP[1], scaleX: 0.3, scaleY: 0.3 }, 500 + (Math.random() * 100) >> 0)
         .call(() => {
             //回收
@@ -30,9 +49,9 @@ export function FlyTargetAni(
                 Pool.recover(RecoverName.BITMAPRECYCLE, eleC);
             }
             //回调
-            callback();
+            callback&&callback();
             // con["elementTargets"].targets[type].count--;
-        })
-
+        })   
+    }
     return eleC
 }
\ No newline at end of file

egret/src/something/chapters/Chapter30.ts

+import { ChapterData } from "../interface/ChapterData";
+
+//751-775
+export const Chapters30: ChapterData[] = [
+    { 
+        baseElementTypes: [ 0, 1, 2, 3 ], bubbleProbability: 0, stepCount: 24, 
+        passTarget: { type: 1, 
+            elements: [ 
+                { type: 42, count: 1 },
+                { type: 43, count: 1 },
+                { type: 44, count: 1 },
+                { type: 45, count: 1}
+             ] }, 
+        starScores: [ 15000, 20000, 25000 ], 
+        map: { 
+            lattices: [ 
+                7, 3, 3, 3, 3, 3, 3, 3, 3,
+                7, 3, 3, 3, 3, 3, 3, 3, 3,
+                7, 3, 3, 3, 3, 3, 3, 3, 3,
+                7, 7, 7, 7, 7, 7, 7, 7, 7,
+                7, 7, 7, 7, 7, 7, 7, 7, 7,
+                2, 2, 2, 2, 2, 2, 2, 2, 2,
+                2, 2, 2, 2, 2, 2, 2, 2, 2,
+                7, 7, 7, 7, 7, 7, 7, 7, 7,
+                7, 7, 7, 7, 7, 7, 7, 7, 7,
+            ], connectedLats: [], conveyor: [], conveyorConnectedLats: [], 
+            WORMHOLE: [], 
+            foodsdata:[
+                {
+                    type:42,
+                    luidx:1,
+                    dir:"up"
+                },
+                {
+                    type:43,
+                    luidx:6,
+                    dir:"up"
+                },
+                {
+                    type:44,
+                    luidx:45,
+                    dir:"up"
+                },
+                {
+                    type:45,
+                    luidx:51,
+                    dir:"up"
+                },
+            ],
+            elements: [ 
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 
+                1, 1, 1, 1, 1, 1, 1, 1, 1 
+            ], 
+            baseElements: [ 
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0 
+            ], recycles: [], 
+            generateLats: [ 
+                { index: 0, type: null }, { index: 1, type: null }, 
+                { index: 2, type: null }, { index: 3, type: null }, 
+                { index: 4, type: null }, { index: 5, type: null }, 
+                { index: 6, type: null }, { index: 7, type: null }, 
+                { index: 8, type: null } ] } 
+        }
+]

egret/src/something/chapters/getChapter.ts

@@ -30,6 +30,8 @@ import { Chapters25 } from "./Chapter25";
 import { Chapters26 } from "./Chapter26";
 import { Chapters27 } from "./Chapter27";
 import { Chapters28 } from "./Chapter28";
+import { Chapters29 } from "./Chapter29";
+import { Chapters30 } from "./Chapter30";
 //所有的关卡
 const chapters: ChapterData[] = [].concat(
     Chapters1,
@@ -59,7 +61,10 @@ const chapters: ChapterData[] = [].concat(
     Chapters25,
     Chapters26,
     Chapters27,
-    Chapters28
+    Chapters28,
+    Chapters29,
+    Chapters30,
+
 )
 // console.log(chapters)
 chapters.forEach((chapter,index) => {
@@ -80,7 +85,7 @@ chapters.forEach((chapter,index) => {
  */
 export function getChapterData(index: number): ChapterData {
     //没有数据就返回第一关数据
-    // return chapters[701];
+    return chapters[751];
     return chapters[index] || chapters[1];
 }
 

egret/src/something/class/Element.ts

@@ -1000,7 +1000,7 @@ export class Element extends eui.Component {
     }
 
     /**
-     * 会重置掉所有特效类型，枷锁，鸡蛋等
+ * 会重置掉所有特效类型，枷锁，鸡蛋等
      * @param type  只应该是基础元素和特殊元素
      */
     reset(type: ElementType) {

egret/src/something/class/Food.ts

+import { ElementType } from "../enum/ElementType";
+import { Tool } from "../Tool";
+
+export default class Food extends eui.Component{
+    showImage:eui.Image;
+    /**
+     * 42   3*3
+     * 43   2*2
+     * 44   3*2
+     * 45   1*2
+     */
+    type:ElementType;
+    userow:number;
+    usecol:number;
+    lockidxs:Array<number> = [];
+    freeidxs:Array<number> = [];
+    constructor(){
+        super();
+        
+        this.showImage = new eui.Image();
+        this.addChild(this.showImage);
+    }
+    resetFood(type:ElementType,dir:string,luidx:number){
+        this.type = type;
+        this.userow = [3,2,3,1][this.type-ElementType.food1];
+        this.usecol = [3,2,2,2][this.type-ElementType.food1];
+        var texture:egret.Texture = RES.getRes('ele'+type+'_png');
+        this.showImage.texture = texture;
+        this.showImage.anchorOffsetX = texture.textureWidth/2;
+        this.showImage.anchorOffsetY = texture.textureHeight/2;
+        
+
+        var roa:number;
+        var inidx:number = 0; 
+        if(dir=='left'){
+            roa = -90;
+            inidx = 1
+        }else if(dir=='up'){
+            roa = 0;
+            inidx = 0;
+        }else if(dir=='right'){
+            roa = 90;
+            inidx = 1;
+        }else if(dir=='down'){
+            roa = 180;
+            inidx = 0;
+        }
+        var irow:number = [this.userow,this.usecol][inidx];
+        var icol:number = [this.usecol,this.userow][inidx];
+
+        //row和col反了
+        console.log(this.type+'食物占位'+inidx+'row:'+irow+';col:'+icol);
+        this.lockidxs = new Array();
+        this.freeidxs = new Array();
+        for(var i=0;i<icol;i++){
+            var startridx = luidx + i*Tool.colNum;
+            for(var j=0;j<irow;j++){
+                var latidx = startridx+j;
+                this.lockidxs.push(latidx);
+            }
+        }
+        console.log('解锁idxs',this.lockidxs);
+
+        
+        this.showImage.rotation = roa;
+        var onelength = 78;
+        var posx = Tool.getPositionByIndex(luidx)[0]+irow*onelength/2-onelength/2;
+        var posy = Tool.getPositionByIndex(luidx)[1]+icol*onelength/2-onelength/2;
+        return [posx,posy];
+    }
+}
\ No newline at end of file

egret/src/something/enum/ElementType.ts

@@ -63,7 +63,10 @@ export enum ElementType {
     Pongo,//40
 
     Grass,//41
-    
+    food1,//42  蛋糕
+    food2,//43  饼干
+    food3,//44  寿司
+    food4,//45  雪糕
 }
 
 export const isMonsterEle = (t: ElementType) => {
@@ -257,6 +260,11 @@ export const submitTran = {
     34: 16,
     36: 17,
     41: 18,
+    42: 19,
+    43: 20,
+    44: 21,
+    45: 22,
+    
 }
 
 // SCORE(1, "分数"),

egret/src/something/enum/RecoverName.ts

@@ -93,5 +93,6 @@ export enum RecoverName {
 
     GRASS = 'GRASS',
     GRASS_BLOCK = 'GRASS_BLOCK',
+    FOOD = 'FOOD',
     
 }
\ No newline at end of file

egret/src/something/interface/MapData.ts

@@ -74,4 +74,12 @@ export interface MapData {
      * 黑洞
      */
     WORMHOLE?:number[][];
+    /**
+     * 冰下食物
+     */
+    foodsdata?:Array<{
+        type:number,//类型
+        luidx:number,//左上位置
+        dir:string,//朝向
+    }>;
 }
\ No newline at end of file

egret/src/something/uis/ElementTarget.ts

@@ -40,6 +40,8 @@ export class ElementTarget extends egret.DisplayObjectContainer {
         super()
         var texture: egret.Texture = RES.getRes("ele" + type + "_png");
         var showImage = new egret.Bitmap(texture);
+        showImage.width = 90;
+        showImage.height = 90;
         showImage.scaleX = showImage.scaleY = 0.7;
         showImage.y = 10;
         this.addChild(showImage);

egret/src/something/uis/PropBtnCon.ts

@@ -8,7 +8,7 @@ export class PropBtnCon extends eui.Component {
 
     bg: eui.Image;
 
-    constructor() {
+    constructor(islongScreen:boolean) {
         super();
 
         var textureBg = RES.getRes("propBg_png");
@@ -16,14 +16,21 @@ export class PropBtnCon extends eui.Component {
         this.bg.y = -137;
         this.addChild(this.bg);
 
+        var cuty:number = 0;
+        if(islongScreen){
+            cuty = 40;
+        }
         this.boomBtn = new CusButton("boomBtn_png");
         this.boomBtn.x = 375 - 110 - 50;  //110图片宽度，50按钮间隔
+        this.boomBtn.y = -cuty;
         this.addChild(this.boomBtn);
         this.hammerBtn = new CusButton("hammerBtn_png");
         this.hammerBtn.x = 375;
+        this.hammerBtn.y = -cuty;
         this.addChild(this.hammerBtn);
         this.stepBtn = new CusButton("stepBtn_png");
         this.stepBtn.x = 375 + 110 + 50;
+        this.stepBtn.y = -cuty;
         this.addChild(this.stepBtn);
     }
 }

egret/src/something/uis/PropGuide.ts

@@ -13,21 +13,25 @@ export class PropGuide extends egret.DisplayObjectContainer {
     hammerBtn: egret.Bitmap;
     stepBtn: egret.Bitmap;
     msgTxt: egret.TextField;
-    constructor(offsetY: number) {
+    constructor(offsetY: number,islongScreen:boolean) {
         super()
         this.bg = new egret.Shape();
         this.addChild(this.bg);
         this.boomBtn = new egret.Bitmap(RES.getRes("boomBtn_png"));
         this.boomBtn.x = 375 - 110 - 50 - 55;  //110图片宽度，50按钮间隔，55一半的图片宽度
-        this.boomBtn.y = offsetY - 55;
+        var cuty:number = 0;
+        if(islongScreen){
+            cuty = -100;
+        }
+        this.boomBtn.y = offsetY - 55+cuty;
         this.addChild(this.boomBtn);
         this.hammerBtn = new egret.Bitmap(RES.getRes("hammerBtn_png"));
         this.hammerBtn.x = 375 - 55;
-        this.hammerBtn.y = offsetY - 55;
+        this.hammerBtn.y = offsetY - 55+cuty;
         this.addChild(this.hammerBtn);
         this.stepBtn = new egret.Bitmap(RES.getRes("stepBtn_png"));
         this.stepBtn.x = 375 + 110 + 50 - 55;
-        this.stepBtn.y = offsetY - 55;
+        this.stepBtn.y = offsetY - 55+cuty;
         this.addChild(this.stepBtn);
         //再调
         var text: egret.TextField = new egret.TextField();
@@ -35,7 +39,7 @@ export class PropGuide extends egret.DisplayObjectContainer {
         text.textColor = 0xffffff;
         text.size = 20;
         text.x = (750 - 500) / 2;
-        text.y = offsetY - 80;
+        text.y = offsetY - 80+cuty;
         text.textAlign = egret.HorizontalAlign.CENTER;
         text.width = 500;
         this.addChild(text);
@@ -44,13 +48,17 @@ export class PropGuide extends egret.DisplayObjectContainer {
             if (this.parent) this.parent.removeChild(this)
         }, this)
     }
-    changeOffset(offsetY: number){
-        this.boomBtn.y = offsetY - 55;
-        this.hammerBtn.y = offsetY - 55;
-        this.stepBtn.y = offsetY - 55;
-        this.msgTxt.y = offsetY - 80;
+    changeOffset(offsetY: number,islongScreen:boolean){
+        var cuty:number = 0;
+        if(islongScreen){
+            cuty = -40;
+        }
+        this.boomBtn.y = offsetY - 55+cuty;
+        this.hammerBtn.y = offsetY - 55+cuty;
+        this.stepBtn.y = offsetY - 55+cuty;
+        this.msgTxt.y = offsetY - 80+cuty;
     }
-    init(prop: PropType) {
+    init(prop: PropType,adapttopy:number) {
         if (prop == PropType.BOOM) {
             this.boomBtn.visible = true;
             this.hammerBtn.visible = false;
@@ -78,7 +86,7 @@ export class PropGuide extends egret.DisplayObjectContainer {
             this.bg.graphics.lineTo(750, 1624);
             this.bg.graphics.lineTo(0, 1624);
             this.bg.graphics.lineTo(0, 0);
-            this.bg.graphics.drawArc(178, 85, 80, 0, Math.PI * 2, true)
+            this.bg.graphics.drawArc(178, 85+adapttopy, 80, 0, Math.PI * 2, true)
             this.bg.graphics.endFill();
             this.msgTxt.text = "点击左上方步数，可为闯关时增加额外5次步数";
             // this.msgTxt.x = 320;

mock/happyclear/baseinfo.json

 {
     "code":"0000000000",
     "data":{
-        "remain": 3,
+        "remain": 0,
         "redBombSwitchTime": "77798963487234"
     },
     "desc":"OK",