Skip to content

X
xiaoxiaole
Commit a48e1eff authored by wjf's avatar wjf
Browse files
Options

l

parent 550d5136
Hide whitespace changes
Inline Side-by-side
Showing with 386 additions and 3 deletions
egret/libs/new_wx/MainBase.ts
View file @ a48e1eff
......@@ -246,6 +246,9 @@ export default class MainBase extends eui.UILayer {
RES.getResAsync(`nums3_fnt`);
RES.getResAsync(`candynums_fnt`);
//新加的5种基础消除特效
RES.loadGroup("eleDisNew")
if (!window['development']) {
RES.getResAsync(`common_json`);
RES.getResAsync(`share3_json`);
......
egret/resource/default.res.json
View file @ a48e1eff
......@@ -235,6 +235,10 @@
{
"keys": "lijiqianwang_png,copyCodeBg_png,shareWxpyqIcon_png,shareWxIcon_png,shareQqIcon_png,shareWeiboIcon_png,zhantiegeihaoyou_png",
"name": "sharecodepanel"
},
{
"keys": "eleDisNew4_9_png,eleDisNew4_8_png,eleDisNew4_7_png,eleDisNew4_6_png,eleDisNew4_5_png,eleDisNew4_4_png,eleDisNew4_3_png,eleDisNew4_2_png,eleDisNew4_14_png,eleDisNew4_13_png,eleDisNew4_12_png,eleDisNew4_11_png,eleDisNew4_10_png,eleDisNew4_1_png,eleDisNew4_0_png,eleDisNew3_9_png,eleDisNew3_8_png,eleDisNew3_7_png,eleDisNew3_6_png,eleDisNew3_5_png,eleDisNew3_4_png,eleDisNew3_3_png,eleDisNew3_2_png,eleDisNew3_14_png,eleDisNew3_13_png,eleDisNew3_12_png,eleDisNew3_11_png,eleDisNew3_10_png,eleDisNew3_1_png,eleDisNew3_0_png,eleDisNew2_9_png,eleDisNew2_8_png,eleDisNew2_7_png,eleDisNew2_6_png,eleDisNew2_5_png,eleDisNew2_4_png,eleDisNew2_3_png,eleDisNew2_2_png,eleDisNew2_14_png,eleDisNew2_13_png,eleDisNew2_12_png,eleDisNew2_11_png,eleDisNew2_10_png,eleDisNew2_1_png,eleDisNew2_0_png,eleDisNew1_9_png,eleDisNew1_8_png,eleDisNew1_7_png,eleDisNew1_6_png,eleDisNew1_5_png,eleDisNew1_4_png,eleDisNew1_3_png,eleDisNew1_2_png,eleDisNew1_14_png,eleDisNew1_13_png,eleDisNew1_12_png,eleDisNew1_11_png,eleDisNew1_10_png,eleDisNew1_1_png,eleDisNew1_0_png,eleDisNew0_9_png,eleDisNew0_8_png,eleDisNew0_7_png,eleDisNew0_6_png,eleDisNew0_5_png,eleDisNew0_4_png,eleDisNew0_3_png,eleDisNew0_2_png,eleDisNew0_14_png,eleDisNew0_13_png,eleDisNew0_12_png,eleDisNew0_11_png,eleDisNew0_10_png,eleDisNew0_1_png,eleDisNew0_0_png",
"name": "eleDisNew"
}
],
"resources": [
......@@ -4558,6 +4562,381 @@
"url": "assets/startpanel2/startpanel_ele36.png",
"type": "image",
"name": "startpanel_ele36_png"
},
{
"url": "assets/eleDisNew/eleDisNew2_14.png",
"type": "image",
"name": "eleDisNew2_14_png"
},
{
"url": "assets/eleDisNew/eleDisNew2_0.png",
"type": "image",
"name": "eleDisNew2_0_png"
},
{
"url": "assets/eleDisNew/eleDisNew2_1.png",
"type": "image",
"name": "eleDisNew2_1_png"
},
{
"url": "assets/eleDisNew/eleDisNew2_2.png",
"type": "image",
"name": "eleDisNew2_2_png"
},
{
"url": "assets/eleDisNew/eleDisNew2_3.png",
"type": "image",
"name": "eleDisNew2_3_png"
},
{
"url": "assets/eleDisNew/eleDisNew2_4.png",
"type": "image",
"name": "eleDisNew2_4_png"
},
{
"url": "assets/eleDisNew/eleDisNew2_5.png",
"type": "image",
"name": "eleDisNew2_5_png"
},
{
"url": "assets/eleDisNew/eleDisNew2_6.png",
"type": "image",
"name": "eleDisNew2_6_png"
},
{
"url": "assets/eleDisNew/eleDisNew2_7.png",
"type": "image",
"name": "eleDisNew2_7_png"
},
{
"url": "assets/eleDisNew/eleDisNew2_8.png",
"type": "image",
"name": "eleDisNew2_8_png"
},
{
"url": "assets/eleDisNew/eleDisNew2_9.png",
"type": "image",
"name": "eleDisNew2_9_png"
},
{
"url": "assets/eleDisNew/eleDisNew2_10.png",
"type": "image",
"name": "eleDisNew2_10_png"
},
{
"url": "assets/eleDisNew/eleDisNew2_11.png",
"type": "image",
"name": "eleDisNew2_11_png"
},
{
"url": "assets/eleDisNew/eleDisNew2_12.png",
"type": "image",
"name": "eleDisNew2_12_png"
},
{
"url": "assets/eleDisNew/eleDisNew2_13.png",
"type": "image",
"name": "eleDisNew2_13_png"
},
{
"url": "assets/eleDisNew/eleDisNew1_0.png",
"type": "image",
"name": "eleDisNew1_0_png"
},
{
"url": "assets/eleDisNew/eleDisNew1_1.png",
"type": "image",
"name": "eleDisNew1_1_png"
},
{
"url": "assets/eleDisNew/eleDisNew1_2.png",
"type": "image",
"name": "eleDisNew1_2_png"
},
{
"url": "assets/eleDisNew/eleDisNew1_3.png",
"type": "image",
"name": "eleDisNew1_3_png"
},
{
"url": "assets/eleDisNew/eleDisNew1_4.png",
"type": "image",
"name": "eleDisNew1_4_png"
},
{
"url": "assets/eleDisNew/eleDisNew1_5.png",
"type": "image",
"name": "eleDisNew1_5_png"
},
{
"url": "assets/eleDisNew/eleDisNew1_6.png",
"type": "image",
"name": "eleDisNew1_6_png"
},
{
"url": "assets/eleDisNew/eleDisNew1_7.png",
"type": "image",
"name": "eleDisNew1_7_png"
},
{
"url": "assets/eleDisNew/eleDisNew1_8.png",
"type": "image",
"name": "eleDisNew1_8_png"
},
{
"url": "assets/eleDisNew/eleDisNew1_9.png",
"type": "image",
"name": "eleDisNew1_9_png"
},
{
"url": "assets/eleDisNew/eleDisNew1_10.png",
"type": "image",
"name": "eleDisNew1_10_png"
},
{
"url": "assets/eleDisNew/eleDisNew1_11.png",
"type": "image",
"name": "eleDisNew1_11_png"
},
{
"url": "assets/eleDisNew/eleDisNew1_12.png",
"type": "image",
"name": "eleDisNew1_12_png"
},
{
"url": "assets/eleDisNew/eleDisNew1_13.png",
"type": "image",
"name": "eleDisNew1_13_png"
},
{
"url": "assets/eleDisNew/eleDisNew1_14.png",
"type": "image",
"name": "eleDisNew1_14_png"
},
{
"url": "assets/eleDisNew/eleDisNew3_0.png",
"type": "image",
"name": "eleDisNew3_0_png"
},
{
"url": "assets/eleDisNew/eleDisNew3_1.png",
"type": "image",
"name": "eleDisNew3_1_png"
},
{
"url": "assets/eleDisNew/eleDisNew3_2.png",
"type": "image",
"name": "eleDisNew3_2_png"
},
{
"url": "assets/eleDisNew/eleDisNew3_3.png",
"type": "image",
"name": "eleDisNew3_3_png"
},
{
"url": "assets/eleDisNew/eleDisNew3_4.png",
"type": "image",
"name": "eleDisNew3_4_png"
},
{
"url": "assets/eleDisNew/eleDisNew3_5.png",
"type": "image",
"name": "eleDisNew3_5_png"
},
{
"url": "assets/eleDisNew/eleDisNew3_6.png",
"type": "image",
"name": "eleDisNew3_6_png"
},
{
"url": "assets/eleDisNew/eleDisNew3_7.png",
"type": "image",
"name": "eleDisNew3_7_png"
},
{
"url": "assets/eleDisNew/eleDisNew3_8.png",
"type": "image",
"name": "eleDisNew3_8_png"
},
{
"url": "assets/eleDisNew/eleDisNew3_9.png",
"type": "image",
"name": "eleDisNew3_9_png"
},
{
"url": "assets/eleDisNew/eleDisNew3_10.png",
"type": "image",
"name": "eleDisNew3_10_png"
},
{
"url": "assets/eleDisNew/eleDisNew3_11.png",
"type": "image",
"name": "eleDisNew3_11_png"
},
{
"url": "assets/eleDisNew/eleDisNew3_12.png",
"type": "image",
"name": "eleDisNew3_12_png"
},
{
"url": "assets/eleDisNew/eleDisNew3_13.png",
"type": "image",
"name": "eleDisNew3_13_png"
},
{
"url": "assets/eleDisNew/eleDisNew3_14.png",
"type": "image",
"name": "eleDisNew3_14_png"
},
{
"url": "assets/eleDisNew/eleDisNew0_0.png",
"type": "image",
"name": "eleDisNew0_0_png"
},
{
"url": "assets/eleDisNew/eleDisNew0_1.png",
"type": "image",
"name": "eleDisNew0_1_png"
},
{
"url": "assets/eleDisNew/eleDisNew0_2.png",
"type": "image",
"name": "eleDisNew0_2_png"
},
{
"url": "assets/eleDisNew/eleDisNew0_3.png",
"type": "image",
"name": "eleDisNew0_3_png"
},
{
"url": "assets/eleDisNew/eleDisNew0_4.png",
"type": "image",
"name": "eleDisNew0_4_png"
},
{
"url": "assets/eleDisNew/eleDisNew0_5.png",
"type": "image",
"name": "eleDisNew0_5_png"
},
{
"url": "assets/eleDisNew/eleDisNew0_6.png",
"type": "image",
"name": "eleDisNew0_6_png"
},
{
"url": "assets/eleDisNew/eleDisNew0_7.png",
"type": "image",
"name": "eleDisNew0_7_png"
},
{
"url": "assets/eleDisNew/eleDisNew0_8.png",
"type": "image",
"name": "eleDisNew0_8_png"
},
{
"url": "assets/eleDisNew/eleDisNew0_9.png",
"type": "image",
"name": "eleDisNew0_9_png"
},
{
"url": "assets/eleDisNew/eleDisNew0_10.png",
"type": "image",
"name": "eleDisNew0_10_png"
},
{
"url": "assets/eleDisNew/eleDisNew0_11.png",
"type": "image",
"name": "eleDisNew0_11_png"
},
{
"url": "assets/eleDisNew/eleDisNew0_12.png",
"type": "image",
"name": "eleDisNew0_12_png"
},
{
"url": "assets/eleDisNew/eleDisNew0_13.png",
"type": "image",
"name": "eleDisNew0_13_png"
},
{
"url": "assets/eleDisNew/eleDisNew0_14.png",
"type": "image",
"name": "eleDisNew0_14_png"
},
{
"url": "assets/eleDisNew/eleDisNew4_0.png",
"type": "image",
"name": "eleDisNew4_0_png"
},
{
"url": "assets/eleDisNew/eleDisNew4_1.png",
"type": "image",
"name": "eleDisNew4_1_png"
},
{
"url": "assets/eleDisNew/eleDisNew4_2.png",
"type": "image",
"name": "eleDisNew4_2_png"
},
{
"url": "assets/eleDisNew/eleDisNew4_3.png",
"type": "image",
"name": "eleDisNew4_3_png"
},
{
"url": "assets/eleDisNew/eleDisNew4_4.png",
"type": "image",
"name": "eleDisNew4_4_png"
},
{
"url": "assets/eleDisNew/eleDisNew4_5.png",
"type": "image",
"name": "eleDisNew4_5_png"
},
{
"url": "assets/eleDisNew/eleDisNew4_6.png",
"type": "image",
"name": "eleDisNew4_6_png"
},
{
"url": "assets/eleDisNew/eleDisNew4_7.png",
"type": "image",
"name": "eleDisNew4_7_png"
},
{
"url": "assets/eleDisNew/eleDisNew4_8.png",
"type": "image",
"name": "eleDisNew4_8_png"
},
{
"url": "assets/eleDisNew/eleDisNew4_9.png",
"type": "image",
"name": "eleDisNew4_9_png"
},
{
"url": "assets/eleDisNew/eleDisNew4_10.png",
"type": "image",
"name": "eleDisNew4_10_png"
},
{
"url": "assets/eleDisNew/eleDisNew4_11.png",
"type": "image",
"name": "eleDisNew4_11_png"
},
{
"url": "assets/eleDisNew/eleDisNew4_12.png",
"type": "image",
"name": "eleDisNew4_12_png"
},
{
"url": "assets/eleDisNew/eleDisNew4_13.png",
"type": "image",
"name": "eleDisNew4_13_png"
},
{
"url": "assets/eleDisNew/eleDisNew4_14.png",
"type": "image",
"name": "eleDisNew4_14_png"
}
]
}
\ No newline at end of file
egret/src/mainScene/MainScene.ts
View file @ a48e1eff
......@@ -36,7 +36,7 @@ import { BonusShootAni, stepPosition } from '../something/anis/BonusShootAni';
import { BoomAni } from '../something/anis/BoomAni';
import { CrossAni } from '../something/anis/CrossAni';
import { EggBrokenAni } from '../something/anis/EggBrokenAni';
import { EleDisAni } from '../something/anis/EleDisAni';
import { EleDisAni, playEleDisAniNew } from '../something/anis/EleDisAni';
import { EleDownAni } from '../something/anis/EleDownAni';
import { EleMaskAni } from '../something/anis/EleMaskAni';
import { FlyTargetAni } from '../something/anis/FlyTargetAni';
......@@ -2520,7 +2520,8 @@ export default class MainScene extends Scene {
this.recoverEle(index);
}
} else {
this.playAni(RecoverName.ELEDIS_ANI, p)
// this.playAni(RecoverName.ELEDIS_ANI, p)
this.addChild(playEleDisAniNew(ele.type, p))//0303版本呢修改，每种基础元素区分动效
//这里面会去算个数
this.recoverEle(index);
// if(ele.hasState(StateType.HONEY)) {
......
egret/src/something/anis/EleDisAni.ts
View file @ a48e1eff
......@@ -50,7 +50,7 @@ class EleDisAniNew extends egret.DisplayObjectContainer {
super()
for (var i = 0; i < 5; i++) {
var arr = []
for (var j = 1; j <= 19; j++) arr.push("eleDisNew" + i + "_" + j + "_png");//改图片
for (var j = 0; j <= 14; j++) arr.push("eleDisNew" + i + "_" + j + "_png");//改图片
this["showImage" + i] = new ImageAni(arr);
this["showImage" + i].visible = false;
this.addChild(this["showImage" + i])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment