l

egret/libs/new_wx/MainBase.ts

@@ -160,7 +160,6 @@ export default class MainBase extends eui.UILayer {
                 "ele5",
                 "ele6",
                 "ele7",
-                "iceEle",
                 "leftArrow",
                 "chooseRect",
                 "lightedStar",

egret/resource/default.res.json

@@ -57,12 +57,8 @@
 			"name": "startpanel"
 		},
 		{
-			"keys": "yezi1_png,unlightedStar_png,targetBoard_png,stepsBoard_png,stepNumber9_png,stepNumber8_png,stepNumber7_png,stepNumber6_png,stepNumber5_png,stepNumber4_png,stepNumber3_png,stepNumber2_png,stepNumber1_png,stepNumber0_png,stepBtn_png,starProgress_png,setting_png,scoreNumber9_png,scoreNumber8_png,scoreNumber7_png,scoreNumber6_png,scoreNumber5_png,scoreNumber4_png,scoreNumber3_png,scoreNumber2_png,scoreNumber1_png,scoreNumber0_png,rock6_png,rock5_png,rock4_png,rock3_png,rock2_png,rock1_png,rightMark_png,rightArrow_png,rectLat_png,progressDown_png,playSceneBg_png,magicLionBg_png,magicLion_png,lockUp_png,lockDown_png,lineLight_png,lightedStar_png,leftArrow_png,iceEle_png,ice6_png,ice5_png,ice4_png,ice3_png,ice2_png,ice1_png,hammerBtn_png,eleDis9_png,eleDis8_png,eleDis7_png,eleDis6_png,eleDis5_png,eleDis4_png,eleDis3_png,eleDis2_png,eleDis12_png,eleDis11_png,eleDis10_png,eleDis1_png,ele5_png,ele42_png,ele41_png,ele40_png,ele4_png,ele32_png,ele31_png,ele30_png,ele3_png,ele22_png,ele21_png,ele20_png,ele2_png,ele12_png,ele11_png,ele10_png,ele1_png,ele02_png,ele01_png,ele00_png,ele0_png,dangqianfenshu_png,chooseRect_png,boomBtn_png,boom9_png,boom8_png,boom7_png,boom6_png,boom5_png,boom4_png,boom3_png,boom2_png,boom18_png,boom17_png,boom16_png,boom15_png,boom14_png,boom13_png,boom12_png,boom11_png,boom10_png,boom1_png,mainSoundBtnOn_png,mainSettingBg_png,mainQuestionBtn_png,mainMusicBtnOn_png,mainQuitBtn_png,mainSoundBtnOff_png,mainMusicBtnOff_png,targetNumber9_png,targetNumber8_png,targetNumber7_png,targetNumber6_png,targetNumber5_png,targetNumber4_png,targetNumber3_png,targetNumber2_png,targetNumber1_png,targetNumber0_png",
+			"keys": "yezi1_png,unlightedStar_png,targetBoard_png,stepsBoard_png,stepNumber9_png,stepNumber8_png,stepNumber7_png,stepNumber6_png,stepNumber5_png,stepNumber4_png,stepNumber3_png,stepNumber2_png,stepNumber1_png,stepNumber0_png,stepBtn_png,starProgress_png,setting_png,scoreNumber9_png,scoreNumber8_png,scoreNumber7_png,scoreNumber6_png,scoreNumber5_png,scoreNumber4_png,scoreNumber3_png,scoreNumber2_png,scoreNumber1_png,scoreNumber0_png,rock6_png,rock5_png,rock4_png,rock3_png,rock2_png,rock1_png,rightMark_png,rightArrow_png,rectLat_png,progressDown_png,playSceneBg_png,magicLionBg_png,magicLion_png,lockUp_png,lockDown_png,lineLight_png,lightedStar_png,leftArrow_png,ice6_png,ice5_png,ice4_png,ice3_png,ice2_png,ice1_png,hammerBtn_png,eleDis9_png,eleDis8_png,eleDis7_png,eleDis6_png,eleDis5_png,eleDis4_png,eleDis3_png,eleDis2_png,eleDis12_png,eleDis11_png,eleDis10_png,eleDis1_png,ele5_png,ele42_png,ele41_png,ele40_png,ele4_png,ele32_png,ele31_png,ele30_png,ele3_png,ele22_png,ele21_png,ele20_png,ele2_png,ele12_png,ele11_png,ele10_png,ele1_png,ele02_png,ele01_png,ele00_png,ele0_png,dangqianfenshu_png,chooseRect_png,boomBtn_png,boom9_png,boom8_png,boom7_png,boom6_png,boom5_png,boom4_png,boom3_png,boom2_png,boom18_png,boom17_png,boom16_png,boom15_png,boom14_png,boom13_png,boom12_png,boom11_png,boom10_png,boom1_png,mainSoundBtnOn_png,mainSettingBg_png,mainQuestionBtn_png,mainMusicBtnOn_png,mainQuitBtn_png,mainSoundBtnOff_png,mainMusicBtnOff_png,targetNumber9_png,targetNumber8_png,targetNumber7_png,targetNumber6_png,targetNumber5_png,targetNumber4_png,targetNumber3_png,targetNumber2_png,targetNumber1_png,targetNumber0_png,ele7_png,ele6_png",
 			"name": "mainScene"
-		},
-		{
-			"name": "preload",
-			"keys": "ele7_png"
 		}
 	],
 	"resources": [
@@ -801,11 +797,6 @@
 			"type": "image",
 			"name": "ice6_png"
 		},
-		{
-			"url": "assets/mainScene/iceEle.png",
-			"type": "image",
-			"name": "iceEle_png"
-		},
 		{
 			"url": "assets/mainScene/leftArrow.png",
 			"type": "image",
@@ -1167,9 +1158,14 @@
 			"name": "targetNumber8_png"
 		},
 		{
-			"name": "ele7_png",
+			"url": "assets/mainScene/ele7.png",
+			"type": "image",
+			"name": "ele7_png"
+		},
+		{
+			"url": "assets/mainScene/ele6.png",
 			"type": "image",
-			"url": "assets/mainScene/ele7.png"
+			"name": "ele6_png"
 		}
 	]
 }
\ No newline at end of file

egret/src/mainScene/MainScene.ts

@@ -200,7 +200,7 @@ export default class MainScene extends Scene {
                 this.hasEliminatedElements[element.type] = 0;
             }
             this.elementTargets=new ElementTargets(this.passElements);
-            this.elementTargets.x=100;
+            this.elementTargets.x=375;
             this.elementTargets.y=200;
             console.log(this.elementTargets)
             this.addChild(this.elementTargets)

egret/src/something/class/Ice.ts

@@ -18,7 +18,7 @@ export class Ice extends eui.Image {
 
     constructor(n: number = 2) {
         super()
-        this.source = "iceEle_png";
+        this.source = "ele7_png";
         if (n == 2) {
             this.alpha = 1;
         } else {

egret/src/something/logic/aaa.ts

@@ -682,7 +682,7 @@ function fallAni(anis: any[], emptys: number[], callback: Function) {
             .to({ x: position[0], y: position[1] }, 100)
             .call(() => {
                 //查看每个掉落的obj是否有冰淇淋，并且index是底部的索引,如果是，掉落完后，该格置空，加入emptys，并且需要掉落冰淇淋判断
-                if (obj.type == ElementType.ICECREAM && Tool.indexToRc(index)) {
+                if (obj.type == ElementType.LOLLIPOP && Tool.indexToRc(index)) {
                     Tool.insert(index, emptys)
                     //执行冰淇淋动画，加入通关目标
                     //判断通关目标，生成冰淇淋标志

egret/src/something/uis/ElementTargets.ts

@@ -10,6 +10,7 @@ export class ElementTargets extends egret.DisplayObjectContainer {
     targets: ElementTarget[];
     constructor(passElement: number[]) {
         super()
+        this.targets = [];
         for (var i = 0; i < passElement.length; i++) {
             if (passElement[i]) {
                 var eleTar: ElementTarget = new ElementTarget(i);