Skip to content

X
xiaoxiaole
Commit 374f827e authored by wildfirecode's avatar wildfirecode
Browse files
Options

Merge branch 'candyEle' into dev

parents d29b88fb 4a13b22c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1334 additions and 153 deletions
.vscode/launch.json 0 → 100644
View file @ 374f827e
{
// 使用 IntelliSense 了解相关属性。
// 悬停以查看现有属性的描述。
// 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:8080/egret",
"webRoot": "${workspaceFolder}"
}
]
}
\ No newline at end of file
egret/index.html
View file @ 374f827e
......@@ -135,8 +135,8 @@
];
// localStorage.clear();
window['imgver'] = '11112';
window['total_level'] = 10 + 10 * 27; /// TODO 14 不能变 总数必须大于总的关卡数
window['last_level'] = 275;//必须大于等于total_level ///TODO 标记最后一关，等于最后一关即可
window['total_level'] = 10 + 10 * 29; /// TODO 14 不能变 总数必须大于总的关卡数
window['last_level'] = 300;//必须大于等于total_level ///TODO 标记最后一关，等于最后一关即可
var sharePic = document.getElementById('pic');
......
egret/libs/new_wx/MainBase.ts
View file @ 374f827e
......@@ -243,6 +243,14 @@ export default class MainBase extends eui.UILayer {
RES.getResAsync(`nums2_fnt`);
RES.getResAsync(`nums3_png`);
RES.getResAsync(`nums3_fnt`);
RES.getResAsync(`candynums_fnt`);
RES.getResAsync('candydie0_json');
RES.getResAsync('candydie1_json');
RES.getResAsync('candydie2_json');
RES.getResAsync('candydie3_json');
RES.getResAsync('candydie4_json');
RES.getResAsync('candysub_json');
RES.getResAsync('candydiebg_json');
if (!window['development']) {
RES.getResAsync(`common_json`);
RES.getResAsync(`share3_json`);
......@@ -261,6 +269,7 @@ export default class MainBase extends eui.UILayer {
RES.getResAsync('maplight2_png');
RES.getResAsync('main_mapbottom_png');
RES.getResAsync('lightani_png');
for (var i = 1; i < 19; i++) {
RES.getResAsync("boom" + i + "_png")
......@@ -270,6 +279,9 @@ export default class MainBase extends eui.UILayer {
RES.getResAsync("ele" + i + "Line" + "_png")
RES.getResAsync("ele" + i + "Exp" + "_png")
}
for (var i = 0; i < 20; i++) {
RES.getResAsync("ele" + i + "_png")
}
for (var i = 1; i <= 27; i++) {
RES.getResAsync("bonusFra" + i + "_png")
}
......@@ -503,10 +515,10 @@ 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.ajaxElement(),
this.hcHome(),
this.hc_userInfo(),
// this.getBackReward(),
this.hcRedBoobBaseInfo(),
......
egret/resource/assets/common/candynums.fnt 0 → 100644
View file @ 374f827e
{"file":"candynums.png","frames":{
"9":{"x":48,"y":0,"w":21,"h":27,"offX":0,"offY":0,"sourceW":21,"sourceH":27},
"8":{"x":69,"y":29,"w":21,"h":27,"offX":0,"offY":0,"sourceW":21,"sourceH":27},
"7":{"x":23,"y":29,"w":21,"h":27,"offX":0,"offY":0,"sourceW":21,"sourceH":27},
"6":{"x":0,"y":29,"w":21,"h":27,"offX":0,"offY":0,"sourceW":21,"sourceH":27},
"5":{"x":71,"y":0,"w":21,"h":27,"offX":0,"offY":0,"sourceW":21,"sourceH":27},
"4":{"x":24,"y":0,"w":22,"h":27,"offX":0,"offY":0,"sourceW":22,"sourceH":27},
"3":{"x":46,"y":29,"w":21,"h":27,"offX":0,"offY":0,"sourceW":21,"sourceH":27},
"2":{"x":94,"y":0,"w":21,"h":27,"offX":0,"offY":0,"sourceW":21,"sourceH":27},
"1":{"x":92,"y":29,"w":14,"h":27,"offX":0,"offY":0,"sourceW":14,"sourceH":27},
"0":{"x":0,"y":0,"w":22,"h":27,"offX":0,"offY":0,"sourceW":22,"sourceH":27}}}
\ No newline at end of file
egret/resource/assets/mc/candydie0.json 0 → 100644
View file @ 374f827e
{"file":"candydie0.png","frames":{
"破碎兔_00012":{"x":663,"y":447,"w":184,"h":50,"offX":113,"offY":330,"sourceW":402,"sourceH":380},
"破碎兔_00011":{"x":240,"y":241,"w":219,"h":156,"offX":81,"offY":224,"sourceW":402,"sourceH":380},
"破碎兔_00010":{"x":469,"y":0,"w":235,"h":224,"offX":70,"offY":156,"sourceW":402,"sourceH":380},
"破碎兔_00009":{"x":0,"y":0,"w":238,"h":241,"offX":67,"offY":111,"sourceW":402,"sourceH":380},
"破碎兔_00008":{"x":240,"y":0,"w":227,"h":239,"offX":74,"offY":81,"sourceW":402,"sourceH":380},
"破碎兔_00007":{"x":706,"y":0,"w":207,"h":234,"offX":88,"offY":63,"sourceW":402,"sourceH":380},
"破碎兔_00006":{"x":469,"y":226,"w":192,"h":220,"offX":95,"offY":52,"sourceW":402,"sourceH":380},
"破碎兔_00005":{"x":663,"y":236,"w":177,"h":209,"offX":103,"offY":46,"sourceW":402,"sourceH":380},
"破碎兔_00004":{"x":842,"y":236,"w":175,"h":191,"offX":102,"offY":40,"sourceW":402,"sourceH":380},
"破碎兔_00003":{"x":0,"y":243,"w":166,"h":178,"offX":107,"offY":31,"sourceW":402,"sourceH":380},
"破碎兔_00002":{"x":168,"y":399,"w":147,"h":164,"offX":119,"offY":24,"sourceW":402,"sourceH":380},
"破碎兔_00001":{"x":0,"y":423,"w":135,"h":158,"offX":126,"offY":22,"sourceW":402,"sourceH":380},
"破碎兔_00000":{"x":317,"y":399,"w":134,"h":166,"offX":130,"offY":19,"sourceW":402,"sourceH":380}}}
\ No newline at end of file
egret/resource/assets/mc/candydie1.json 0 → 100644
View file @ 374f827e
{"file":"candydie1.png","frames":{
"破碎鸟_00012":{"x":557,"y":387,"w":52,"h":47,"offX":241,"offY":333,"sourceW":402,"sourceH":380},
"破碎鸟_00011":{"x":420,"y":222,"w":205,"h":163,"offX":91,"offY":217,"sourceW":402,"sourceH":380},
"破碎鸟_00010":{"x":441,"y":0,"w":204,"h":220,"offX":92,"offY":153,"sourceW":402,"sourceH":380},
"破碎鸟_00009":{"x":215,"y":0,"w":224,"h":201,"offX":77,"offY":110,"sourceW":402,"sourceH":380},
"破碎鸟_00008":{"x":647,"y":0,"w":220,"h":202,"offX":80,"offY":83,"sourceW":402,"sourceH":380},
"破碎鸟_00007":{"x":0,"y":0,"w":213,"h":217,"offX":85,"offY":63,"sourceW":402,"sourceH":380},
"破碎鸟_00006":{"x":215,"y":203,"w":203,"h":207,"offX":92,"offY":53,"sourceW":402,"sourceH":380},
"破碎鸟_00005":{"x":647,"y":204,"w":211,"h":186,"offX":80,"offY":50,"sourceW":402,"sourceH":380},
"破碎鸟_00004":{"x":0,"y":219,"w":187,"h":187,"offX":95,"offY":35,"sourceW":402,"sourceH":380},
"破碎鸟_00003":{"x":869,"y":0,"w":143,"h":194,"offX":122,"offY":30,"sourceW":402,"sourceH":380},
"破碎鸟_00002":{"x":869,"y":196,"w":142,"h":172,"offX":122,"offY":29,"sourceW":402,"sourceH":380},
"破碎鸟_00001":{"x":420,"y":387,"w":135,"h":155,"offX":127,"offY":20,"sourceW":402,"sourceH":380},
"破碎鸟_00000":{"x":860,"y":370,"w":126,"h":167,"offX":131,"offY":17,"sourceW":402,"sourceH":380}}}
\ No newline at end of file
egret/resource/assets/mc/candydie2.json 0 → 100644
View file @ 374f827e
{"file":"candydie2.png","frames":{
"破碎牛_00012":{"x":332,"y":402,"w":52,"h":47,"offX":240,"offY":333,"sourceW":402,"sourceH":380},
"破碎牛_00011":{"x":192,"y":238,"w":202,"h":162,"offX":93,"offY":218,"sourceW":402,"sourceH":380},
"破碎牛_00010":{"x":659,"y":0,"w":201,"h":226,"offX":94,"offY":154,"sourceW":402,"sourceH":380},
"破碎牛_00009":{"x":0,"y":0,"w":222,"h":232,"offX":79,"offY":112,"sourceW":402,"sourceH":380},
"破碎牛_00008":{"x":224,"y":0,"w":218,"h":236,"offX":81,"offY":84,"sourceW":402,"sourceH":380},
"破碎牛_00007":{"x":444,"y":0,"w":213,"h":231,"offX":86,"offY":64,"sourceW":402,"sourceH":380},
"破碎牛_00006":{"x":444,"y":233,"w":204,"h":221,"offX":92,"offY":53,"sourceW":402,"sourceH":380},
"破碎牛_00005":{"x":659,"y":228,"w":213,"h":213,"offX":80,"offY":50,"sourceW":402,"sourceH":380},
"破碎牛_00004":{"x":0,"y":234,"w":190,"h":200,"offX":93,"offY":34,"sourceW":402,"sourceH":380},
"破碎牛_00003":{"x":862,"y":0,"w":154,"h":194,"offX":120,"offY":29,"sourceW":402,"sourceH":380},
"破碎牛_00002":{"x":874,"y":196,"w":146,"h":173,"offX":120,"offY":28,"sourceW":402,"sourceH":380},
"破碎牛_00001":{"x":192,"y":402,"w":138,"h":158,"offX":125,"offY":18,"sourceW":402,"sourceH":380},
"破碎牛_00000":{"x":874,"y":371,"w":135,"h":170,"offX":129,"offY":16,"sourceW":402,"sourceH":380}}}
\ No newline at end of file
egret/resource/assets/mc/candydie3.json 0 → 100644
View file @ 374f827e
{"file":"candydie3.png","frames":{
"破碎狮子_00012":{"x":663,"y":443,"w":184,"h":51,"offX":111,"offY":329,"sourceW":402,"sourceH":380},
"破碎狮子_00011":{"x":239,"y":239,"w":219,"h":156,"offX":79,"offY":224,"sourceW":402,"sourceH":380},
"破碎狮子_00010":{"x":469,"y":0,"w":235,"h":223,"offX":68,"offY":157,"sourceW":402,"sourceH":380},
"破碎狮子_00009":{"x":0,"y":0,"w":237,"h":238,"offX":66,"offY":113,"sourceW":402,"sourceH":380},
"破碎狮子_00008":{"x":239,"y":0,"w":228,"h":237,"offX":73,"offY":83,"sourceW":402,"sourceH":380},
"破碎狮子_00007":{"x":706,"y":0,"w":208,"h":231,"offX":88,"offY":66,"sourceW":402,"sourceH":380},
"破碎狮子_00006":{"x":469,"y":225,"w":192,"h":220,"offX":96,"offY":54,"sourceW":402,"sourceH":380},
"破碎狮子_00005":{"x":663,"y":233,"w":177,"h":208,"offX":105,"offY":48,"sourceW":402,"sourceH":380},
"破碎狮子_00004":{"x":842,"y":233,"w":175,"h":191,"offX":104,"offY":40,"sourceW":402,"sourceH":380},
"破碎狮子_00003":{"x":0,"y":240,"w":166,"h":178,"offX":109,"offY":31,"sourceW":402,"sourceH":380},
"破碎狮子_00002":{"x":168,"y":397,"w":147,"h":165,"offX":121,"offY":23,"sourceW":402,"sourceH":380},
"破碎狮子_00001":{"x":0,"y":420,"w":135,"h":159,"offX":127,"offY":19,"sourceW":402,"sourceH":380},
"破碎狮子_00000":{"x":317,"y":397,"w":135,"h":167,"offX":130,"offY":16,"sourceW":402,"sourceH":380}}}
\ No newline at end of file
egret/resource/assets/mc/candydie4.json 0 → 100644
View file @ 374f827e
{"file":"candydie4.png","frames":{
"破碎猪_00012":{"x":664,"y":444,"w":184,"h":51,"offX":110,"offY":329,"sourceW":402,"sourceH":380},
"破碎猪_00011":{"x":240,"y":239,"w":220,"h":156,"offX":78,"offY":224,"sourceW":402,"sourceH":380},
"破碎猪_00010":{"x":469,"y":0,"w":234,"h":223,"offX":68,"offY":157,"sourceW":402,"sourceH":380},
"破碎猪_00009":{"x":0,"y":0,"w":238,"h":239,"offX":65,"offY":113,"sourceW":402,"sourceH":380},
"破碎猪_00008":{"x":240,"y":0,"w":227,"h":237,"offX":73,"offY":83,"sourceW":402,"sourceH":380},
"破碎猪_00007":{"x":705,"y":0,"w":208,"h":232,"offX":88,"offY":66,"sourceW":402,"sourceH":380},
"破碎猪_00006":{"x":469,"y":225,"w":193,"h":220,"offX":96,"offY":54,"sourceW":402,"sourceH":380},
"破碎猪_00005":{"x":664,"y":234,"w":177,"h":208,"offX":105,"offY":48,"sourceW":402,"sourceH":380},
"破碎猪_00004":{"x":843,"y":234,"w":176,"h":191,"offX":104,"offY":40,"sourceW":402,"sourceH":380},
"破碎猪_00003":{"x":0,"y":241,"w":165,"h":178,"offX":110,"offY":31,"sourceW":402,"sourceH":380},
"破碎猪_00002":{"x":167,"y":397,"w":147,"h":165,"offX":121,"offY":23,"sourceW":402,"sourceH":380},
"破碎猪_00001":{"x":0,"y":421,"w":134,"h":158,"offX":128,"offY":19,"sourceW":402,"sourceH":380},
"破碎猪_00000":{"x":316,"y":397,"w":135,"h":167,"offX":130,"offY":16,"sourceW":402,"sourceH":380}}}
\ No newline at end of file
egret/resource/assets/mc/candydiebg.json 0 → 100644
View file @ 374f827e
{"file":"candydiebg.png","frames":{
"糖果消失光_00013":{"x":486,"y":0,"w":5,"h":5,"offX":0,"offY":0,"sourceW":220,"sourceH":220},
"糖果消失光_00012":{"x":95,"y":422,"w":88,"h":105,"offX":64,"offY":46,"sourceW":220,"sourceH":220},
"糖果消失光_00011":{"x":188,"y":342,"w":91,"h":106,"offX":63,"offY":45,"sourceW":220,"sourceH":220},
"糖果消失光_00010":{"x":0,"y":310,"w":93,"h":112,"offX":62,"offY":42,"sourceW":220,"sourceH":220},
"糖果消失光_00009":{"x":95,"y":310,"w":91,"h":110,"offX":62,"offY":42,"sourceW":220,"sourceH":220},
"糖果消失光_00008":{"x":355,"y":327,"w":91,"h":109,"offX":62,"offY":44,"sourceW":220,"sourceH":220},
"糖果消失光_00007":{"x":0,"y":191,"w":113,"h":117,"offX":54,"offY":44,"sourceW":220,"sourceH":220},
"糖果消失光_00006":{"x":355,"y":176,"w":150,"h":149,"offX":36,"offY":31,"sourceW":220,"sourceH":220},
"糖果消失光_00005":{"x":190,"y":0,"w":175,"h":174,"offX":24,"offY":19,"sourceW":220,"sourceH":220},
"糖果消失光_00004":{"x":367,"y":0,"w":117,"h":114,"offX":49,"offY":50,"sourceW":220,"sourceH":220},
"糖果消失光_00003":{"x":190,"y":176,"w":163,"h":164,"offX":24,"offY":25,"sourceW":220,"sourceH":220},
"糖果消失光_00002":{"x":0,"y":0,"w":188,"h":189,"offX":12,"offY":12,"sourceW":220,"sourceH":220},
"糖果消失光_00001":{"x":367,"y":116,"w":32,"h":33,"offX":93,"offY":87,"sourceW":220,"sourceH":220},
"糖果消失光_00000":{"x":401,"y":116,"w":28,"h":30,"offX":95,"offY":88,"sourceW":220,"sourceH":220}}}
\ No newline at end of file
egret/resource/assets/mc/candydis0.json 0 → 100644
View file @ 374f827e
{"file":"candydis0.png","frames":{
"兔子糖果_00011":{"x":145,"y":202,"w":80,"h":31,"offX":35,"offY":114,"sourceW":150,"sourceH":150},
"兔子糖果_00010":{"x":63,"y":176,"w":80,"h":31,"offX":35,"offY":114,"sourceW":150,"sourceH":150},
"兔子糖果_00009":{"x":148,"y":169,"w":80,"h":31,"offX":35,"offY":114,"sourceW":150,"sourceH":150},
"兔子糖果_00008":{"x":63,"y":142,"w":83,"h":32,"offX":34,"offY":114,"sourceW":150,"sourceH":150},
"兔子糖果_00007":{"x":154,"y":134,"w":86,"h":33,"offX":32,"offY":114,"sourceW":150,"sourceH":150},
"兔子糖果_00006":{"x":0,"y":74,"w":87,"h":48,"offX":32,"offY":99,"sourceW":150,"sourceH":150},
"兔子糖果_00005":{"x":0,"y":0,"w":85,"h":67,"offX":33,"offY":79,"sourceW":150,"sourceH":150},
"兔子糖果_00004":{"x":87,"y":0,"w":69,"h":72,"offX":37,"offY":66,"sourceW":150,"sourceH":150},
"兔子糖果_00003":{"x":0,"y":124,"w":61,"h":67,"offX":39,"offY":58,"sourceW":150,"sourceH":150},
"兔子糖果_00002":{"x":89,"y":74,"w":63,"h":66,"offX":41,"offY":53,"sourceW":150,"sourceH":150},
"兔子糖果_00001":{"x":158,"y":0,"w":65,"h":66,"offX":42,"offY":50,"sourceW":150,"sourceH":150},
"兔子糖果_00000":{"x":158,"y":68,"w":66,"h":64,"offX":43,"offY":50,"sourceW":150,"sourceH":150}}}
\ No newline at end of file
egret/resource/assets/mc/candydis1.json 0 → 100644
View file @ 374f827e
{"file":"candydis1.png","frames":{
"鸟糖果_00011":{"x":0,"y":208,"w":80,"h":31,"offX":35,"offY":114,"sourceW":150,"sourceH":150},
"鸟糖果_00010":{"x":167,"y":184,"w":80,"h":31,"offX":35,"offY":114,"sourceW":150,"sourceH":150},
"鸟糖果_00009":{"x":85,"y":184,"w":80,"h":31,"offX":35,"offY":114,"sourceW":150,"sourceH":150},
"鸟糖果_00008":{"x":0,"y":174,"w":83,"h":32,"offX":34,"offY":114,"sourceW":150,"sourceH":150},
"鸟糖果_00007":{"x":0,"y":139,"w":86,"h":33,"offX":32,"offY":114,"sourceW":150,"sourceH":150},
"鸟糖果_00006":{"x":159,"y":0,"w":87,"h":49,"offX":32,"offY":98,"sourceW":150,"sourceH":150},
"鸟糖果_00005":{"x":0,"y":0,"w":85,"h":68,"offX":33,"offY":78,"sourceW":150,"sourceH":150},
"鸟糖果_00004":{"x":87,"y":0,"w":70,"h":72,"offX":36,"offY":66,"sourceW":150,"sourceH":150},
"鸟糖果_00003":{"x":0,"y":70,"w":61,"h":66,"offX":39,"offY":59,"sourceW":150,"sourceH":150},
"鸟糖果_00002":{"x":128,"y":118,"w":61,"h":64,"offX":42,"offY":55,"sourceW":150,"sourceH":150},
"鸟糖果_00001":{"x":159,"y":51,"w":63,"h":65,"offX":43,"offY":52,"sourceW":150,"sourceH":150},
"鸟糖果_00000":{"x":63,"y":74,"w":63,"h":63,"offX":44,"offY":51,"sourceW":150,"sourceH":150}}}
\ No newline at end of file
egret/resource/assets/mc/candydis2.json 0 → 100644
View file @ 374f827e
{"file":"candydis2.png","frames":{
"牛糖果_00011":{"x":82,"y":223,"w":80,"h":30,"offX":35,"offY":114,"sourceW":150,"sourceH":150},
"牛糖果_00010":{"x":0,"y":210,"w":80,"h":31,"offX":35,"offY":114,"sourceW":150,"sourceH":150},
"牛糖果_00009":{"x":172,"y":190,"w":80,"h":31,"offX":35,"offY":114,"sourceW":150,"sourceH":150},
"牛糖果_00008":{"x":89,"y":190,"w":81,"h":31,"offX":35,"offY":114,"sourceW":150,"sourceH":150},
"牛糖果_00007":{"x":89,"y":155,"w":86,"h":33,"offX":32,"offY":114,"sourceW":150,"sourceH":150},
"牛糖果_00006":{"x":0,"y":154,"w":87,"h":54,"offX":32,"offY":93,"sourceW":150,"sourceH":150},
"牛糖果_00005":{"x":0,"y":0,"w":81,"h":71,"offX":35,"offY":74,"sourceW":150,"sourceH":150},
"牛糖果_00004":{"x":158,"y":0,"w":72,"h":77,"offX":36,"offY":62,"sourceW":150,"sourceH":150},
"牛糖果_00003":{"x":83,"y":0,"w":73,"h":76,"offX":36,"offY":56,"sourceW":150,"sourceH":150},
"牛糖果_00002":{"x":75,"y":78,"w":70,"h":74,"offX":39,"offY":52,"sourceW":150,"sourceH":150},
"牛糖果_00001":{"x":147,"y":79,"w":69,"h":74,"offX":41,"offY":48,"sourceW":150,"sourceH":150},
"牛糖果_00000":{"x":0,"y":73,"w":73,"h":73,"offX":39,"offY":46,"sourceW":150,"sourceH":150}}}
\ No newline at end of file
egret/resource/assets/mc/candydis3.json 0 → 100644
View file @ 374f827e
{"file":"candydis3.png","frames":{
"狮子糖果_00011":{"x":0,"y":218,"w":80,"h":30,"offX":35,"offY":114,"sourceW":150,"sourceH":150},
"狮子糖果_00010":{"x":165,"y":202,"w":80,"h":31,"offX":35,"offY":114,"sourceW":150,"sourceH":150},
"狮子糖果_00009":{"x":83,"y":202,"w":80,"h":31,"offX":35,"offY":114,"sourceW":150,"sourceH":150},
"狮子糖果_00008":{"x":0,"y":185,"w":81,"h":31,"offX":35,"offY":114,"sourceW":150,"sourceH":150},
"狮子糖果_00007":{"x":0,"y":150,"w":86,"h":33,"offX":32,"offY":114,"sourceW":150,"sourceH":150},
"狮子糖果_00006":{"x":135,"y":149,"w":87,"h":51,"offX":32,"offY":96,"sourceW":150,"sourceH":150},
"狮子糖果_00005":{"x":0,"y":0,"w":81,"h":69,"offX":35,"offY":76,"sourceW":150,"sourceH":150},
"狮子糖果_00004":{"x":83,"y":0,"w":70,"h":74,"offX":38,"offY":65,"sourceW":150,"sourceH":150},
"狮子糖果_00003":{"x":71,"y":76,"w":62,"h":72,"offX":41,"offY":60,"sourceW":150,"sourceH":150},
"狮子糖果_00002":{"x":155,"y":75,"w":64,"h":72,"offX":42,"offY":54,"sourceW":150,"sourceH":150},
"狮子糖果_00001":{"x":155,"y":0,"w":68,"h":73,"offX":41,"offY":49,"sourceW":150,"sourceH":150},
"狮子糖果_00000":{"x":0,"y":71,"w":69,"h":71,"offX":41,"offY":48,"sourceW":150,"sourceH":150}}}
\ No newline at end of file
egret/resource/assets/mc/candydis4.json 0 → 100644
View file @ 374f827e
{"file":"candydis4.png","frames":{
"猪糖果_00011":{"x":0,"y":220,"w":80,"h":31,"offX":35,"offY":114,"sourceW":150,"sourceH":150},
"猪糖果_00010":{"x":167,"y":207,"w":80,"h":31,"offX":35,"offY":114,"sourceW":150,"sourceH":150},
"猪糖果_00009":{"x":85,"y":207,"w":80,"h":31,"offX":35,"offY":114,"sourceW":150,"sourceH":150},
"猪糖果_00008":{"x":0,"y":186,"w":83,"h":32,"offX":34,"offY":114,"sourceW":150,"sourceH":150},
"猪糖果_00007":{"x":0,"y":151,"w":86,"h":33,"offX":32,"offY":114,"sourceW":150,"sourceH":150},
"猪糖果_00006":{"x":159,"y":0,"w":87,"h":55,"offX":32,"offY":92,"sourceW":150,"sourceH":150},
"猪糖果_00005":{"x":0,"y":0,"w":85,"h":74,"offX":33,"offY":72,"sourceW":150,"sourceH":150},
"猪糖果_00004":{"x":87,"y":0,"w":70,"h":78,"offX":36,"offY":60,"sourceW":150,"sourceH":150},
"猪糖果_00003":{"x":124,"y":133,"w":57,"h":72,"offX":37,"offY":53,"sourceW":150,"sourceH":150},
"猪糖果_00002":{"x":62,"y":80,"w":60,"h":69,"offX":38,"offY":50,"sourceW":150,"sourceH":150},
"猪糖果_00001":{"x":0,"y":76,"w":60,"h":73,"offX":40,"offY":46,"sourceW":150,"sourceH":150},
"猪糖果_00000":{"x":159,"y":57,"w":62,"h":74,"offX":40,"offY":45,"sourceW":150,"sourceH":150}}}
\ No newline at end of file
egret/resource/assets/mc/candysub.json 0 → 100644
View file @ 374f827e
{"file":"candysub.png","frames":{
"数字减少星星_00015":{"x":186,"y":69,"w":5,"h":5,"offX":0,"offY":0,"sourceW":120,"sourceH":120},
"数字减少星星_00014":{"x":193,"y":69,"w":3,"h":4,"offX":56,"offY":58,"sourceW":120,"sourceH":120},
"数字减少星星_00013":{"x":97,"y":131,"w":20,"h":47,"offX":51,"offY":38,"sourceW":120,"sourceH":120},
"数字减少星星_00012":{"x":221,"y":125,"w":30,"h":51,"offX":50,"offY":37,"sourceW":120,"sourceH":120},
"数字减少星星_00011":{"x":178,"y":125,"w":41,"h":55,"offX":41,"offY":36,"sourceW":120,"sourceH":120},
"数字减少星星_00010":{"x":200,"y":66,"w":47,"h":57,"offX":37,"offY":35,"sourceW":120,"sourceH":120},
"数字减少星星_00009":{"x":200,"y":0,"w":54,"h":64,"offX":33,"offY":32,"sourceW":120,"sourceH":120},
"数字减少星星_00008":{"x":0,"y":68,"w":60,"h":67,"offX":28,"offY":29,"sourceW":120,"sourceH":120},
"数字减少星星_00007":{"x":136,"y":0,"w":62,"h":67,"offX":25,"offY":28,"sourceW":120,"sourceH":120},
"数字减少星星_00006":{"x":70,"y":0,"w":64,"h":66,"offX":24,"offY":28,"sourceW":120,"sourceH":120},
"数字减少星星_00005":{"x":0,"y":0,"w":68,"h":66,"offX":21,"offY":26,"sourceW":120,"sourceH":120},
"数字减少星星_00004":{"x":62,"y":68,"w":63,"h":61,"offX":22,"offY":27,"sourceW":120,"sourceH":120},
"数字减少星星_00003":{"x":127,"y":69,"w":57,"h":53,"offX":25,"offY":31,"sourceW":120,"sourceH":120},
"数字减少星星_00002":{"x":127,"y":124,"w":49,"h":47,"offX":30,"offY":34,"sourceW":120,"sourceH":120},
"数字减少星星_00001":{"x":62,"y":131,"w":33,"h":41,"offX":37,"offY":38,"sourceW":120,"sourceH":120},
"数字减少星星_00000":{"x":249,"y":66,"w":5,"h":5,"offX":0,"offY":0,"sourceW":120,"sourceH":120}}}
\ No newline at end of file
egret/resource/default.res.json
View file @ 374f827e
This diff is collapsed.
egret/scripts/MyExmlPlugin.ts
View file @ 374f827e
......@@ -8,6 +8,22 @@ import { ExmlPlugin2 } from "./ExmlPlugin2";
export class MyExmlPlugin extends ExmlPlugin2 implements plugins.Command {
async onFile(file: plugins.File) {
const excludes = [
'candydiebg.png',
'candysub.png',
'candydis0.png',
'candydis1.png',
'candydis2.png',
'candydis3.png',
'candydis4.png',
'candydie0.png',
'candydie1.png',
'candydie2.png',
'candydie3.png',
'candydie4.png',
'candynums.png',
'top1.png',
'top2.png',
'top3.png',
......
egret/src/mainScene/MainScene.ts
View file @ 374f827e
This diff is collapsed.
egret/src/something/Tool.ts
View file @ 374f827e
import { Element } from "./class/Element";
import { Lattice } from "./class/Lattice";
import { ElementType, FiveBaseElementTypes } from "./enum/ElementType";
import { RectMask } from "./class/RectMask";
import { EffectType } from "./enum/EffectType";
import { Pool } from "./Pool";
import { ElementType, FiveBaseElementTypes } from "./enum/ElementType";
import { RecoverName } from "./enum/RecoverName";
import { RectMask } from "./class/RectMask";
import { StateType } from "./enum/StateType";
import { FallType } from "./interface/FallAniData";
import { GenerateLatData } from "./interface/GenerateLatData";
import { StateType } from "./enum/StateType";
import { Pool } from "./Pool";
//两种，0无棒棒糖，1有
const offsetYTwo: number[] = [];
const gameAreaHeightTwo: number[] = [];
//初始化适配位置，就因为棒棒糖的45偏移
function initClientScale() {
function initClientScale() {
var stageHeight = document.body.clientHeight / document.body.clientWidth * 750;
var middleHeight = 80 * 9;
var smallestHeight = 230 + middleHeight + 180;
......@@ -94,7 +94,7 @@ export class Tool {
*/
public static init(isTwo: boolean = false, hasLollipop: boolean = false) {
//初始化屏幕尺寸
if(!offsetYTwo.length)initClientScale();
if (!offsetYTwo.length) initClientScale();
//x的偏移
var ooox: number = isTwo ? 55 : 15;// 49 : 8.25
var oooy: number = hasLollipop ? offsetYTwo[1] : offsetYTwo[0];
......@@ -295,7 +295,7 @@ export class Tool {
if (this.judgeFall(lat) &&
!lat.element.hasState(StateType.HAIRBALLBLACK) &&
!lat.element.hasState(StateType.HAIRBALLGREY) &&
!lat.element.hasState(StateType.HAIRBALLBROWN)&&
!lat.element.hasState(StateType.HAIRBALLBROWN) &&
!lat.element.hasState(StateType.BLOCK_LOCK) &&
lat.element.type != ElementType.FESTIVALELE_SMALL
) {
......@@ -311,7 +311,8 @@ export class Tool {
* @param lat
*/
public static judgeMatch(lat: Lattice) {
if (Tool.judgeBaseEle(lat) && //是基础元素
if (
(Tool.judgeBaseEle(lat)) && //是基础元素 or 糖果
lat.element.effectType != EffectType.MAGICLION && //特效不为魔力鸟
!lat.element.hasState(StateType.HAIRBALLGREY) && //不带毛球， 下同
!lat.element.hasState(StateType.HAIRBALLBLACK) &&
......@@ -364,7 +365,7 @@ export class Tool {
public static judgeUpsetMove(lat: Lattice) {
if (Tool.judgeBaseEle(lat) && //基础元素
!lat.element.hasState(StateType.LOCK) && //不带锁
!lat.element.hasState(StateType.BLOCK_LOCK) &&
!lat.element.hasState(StateType.BLOCK_LOCK) &&
!lat.element.hasState(StateType.HAIRBALLGREY) && //不带毛球，下同
!lat.element.hasState(StateType.HAIRBALLBLACK) &&
!lat.element.hasState(StateType.HAIRBALLBROWN)
......@@ -383,7 +384,7 @@ export class Tool {
*/
public static judgeSetFesEle(lat: Lattice) {
if (Tool.judgeBaseEle(lat) && //基础元素
!lat.block &&
!lat.block &&
!lat.element.hasState(StateType.HAIRBALLGREY) && //不带毛球，下同
!lat.element.hasState(StateType.HAIRBALLBLACK) &&
!lat.element.hasState(StateType.HAIRBALLBROWN)
......@@ -797,7 +798,8 @@ export class Tool {
var latC = lattices[cur];
if (Tool.judgeMatch(latP) &&
Tool.judgeMatch(latC) &&
latP.element.type == latC.element.type) {
(latP.element.type == latC.element.type)
) {
result[i].push(cur)
} else {
result[++i] = [cur];
......
egret/src/something/anis/candy/createCandyDie0Ani.ts 0 → 100644
View file @ 374f827e
import { getEffectFramesStr } from "../../../effect/createEffect1";
import MovieClip from "../../../movieclip/MovieClip";
export const createCandyDie0Ani = (x,y,p) => {
const spritesheet = RES.getRes('candydie0_json');
if(!spritesheet)return;
const list = getEffectFramesStr('破碎兔_000', 0, 12);
const movieclip = new MovieClip({
spritesheet: spritesheet,
frameInterval: 2,
frames: list,
position: [x, y],
scale:0.4,
anchor: [.5, 0.25],
loop: false
});
p.addChild(movieclip);
movieclip.once(egret.Event.COMPLETE,()=>{
p.removeChild(movieclip);
},this);
}
\ No newline at end of file
egret/src/something/anis/candy/createCandyDie1Ani.ts 0 → 100644
View file @ 374f827e
import { getEffectFramesStr } from "../../../effect/createEffect1";
import MovieClip from "../../../movieclip/MovieClip";
export const createCandyDie1Ani = (x,y,p) => {
const spritesheet = RES.getRes('candydie1_json');
if(!spritesheet)return;
const list = getEffectFramesStr('破碎鸟_000', 0, 12);
const movieclip = new MovieClip({
spritesheet: spritesheet,
frameInterval: 2,
frames: list,
position: [x, y],
scale:0.4,
anchor: [.5, 0.25],
loop: false
});
p.addChild(movieclip);
movieclip.once(egret.Event.COMPLETE,()=>{
p.removeChild(movieclip);
},this);
}
\ No newline at end of file
egret/src/something/anis/candy/createCandyDie2Ani.ts 0 → 100644
View file @ 374f827e
import { getEffectFramesStr } from "../../../effect/createEffect1";
import MovieClip from "../../../movieclip/MovieClip";
export const createCandyDie2Ani = (x,y,p) => {
const spritesheet = RES.getRes('candydie2_json');
if(!spritesheet)return;
const list = getEffectFramesStr('破碎牛_000', 0, 12);
const movieclip = new MovieClip({
spritesheet: spritesheet,
frameInterval: 2,
frames: list,
position: [x, y],
scale:0.4,
anchor: [.5, 0.25],
loop: false
});
p.addChild(movieclip);
movieclip.once(egret.Event.COMPLETE,()=>{
p.removeChild(movieclip);
},this);
}
\ No newline at end of file
egret/src/something/anis/candy/createCandyDie3Ani.ts 0 → 100644
View file @ 374f827e
import { getEffectFramesStr } from "../../../effect/createEffect1";
import MovieClip from "../../../movieclip/MovieClip";
export const createCandyDie3Ani = (x,y,p) => {
const spritesheet = RES.getRes('candydie3_json');
if(!spritesheet)return;
const list = getEffectFramesStr('破碎狮子_000', 0, 12);
const movieclip = new MovieClip({
spritesheet: spritesheet,
frameInterval: 2,
frames: list,
position: [x, y],
scale:0.4,
anchor: [.5, 0.25],
loop: false
});
p.addChild(movieclip);
movieclip.once(egret.Event.COMPLETE,()=>{
p.removeChild(movieclip);
},this);
}
\ No newline at end of file
egret/src/something/anis/candy/createCandyDie4Ani.ts 0 → 100644
View file @ 374f827e
import { getEffectFramesStr } from "../../../effect/createEffect1";
import MovieClip from "../../../movieclip/MovieClip";
export const createCandyDie4Ani = (x,y,p) => {
const spritesheet = RES.getRes('candydie4_json');
if(!spritesheet)return;
const list = getEffectFramesStr('破碎猪_000', 0, 12);
const movieclip = new MovieClip({
spritesheet: spritesheet,
frameInterval: 2,
frames: list,
position: [x, y],
scale:0.4,
anchor: [.5, 0.25],
loop: false
});
p.addChild(movieclip);
movieclip.once(egret.Event.COMPLETE,()=>{
p.removeChild(movieclip);
},this);
}
\ No newline at end of file
egret/src/something/anis/candy/createCandyDieBgAni.ts 0 → 100644
View file @ 374f827e
import { getEffectFramesStr } from "../../../effect/createEffect1";
import MovieClip from "../../../movieclip/MovieClip";
export const createCandyDieBgAni = (x,y,p) => {
const spritesheet = RES.getRes('candydiebg_json');
if(!spritesheet)return;
const list = getEffectFramesStr('糖果消失光_000', 0, 13);
const movieclip = new MovieClip({
spritesheet: spritesheet,
frameInterval: 3,
frames: list,
position: [x, y],
scale:1,
anchor: [.5, 0.5],
loop: false
});
p.addChild(movieclip);
movieclip.once(egret.Event.COMPLETE,()=>{
p.removeChild(movieclip);
},this);
}
\ No newline at end of file
egret/src/something/anis/candy/createCandyDis0Ani.ts 0 → 100644
View file @ 374f827e
import { getEffectFramesStr } from "../../../effect/createEffect1";
import MovieClip from "../../../movieclip/MovieClip";
export const createCandyDis0Ani = (x,y,p) => {
const spritesheet = RES.getRes('candydis0_json');
if(!spritesheet)return;
const list = getEffectFramesStr('兔子糖果_000', 0, 12);
const movieclip = new MovieClip({
spritesheet: spritesheet,
frameInterval: 2,
frames: list,
position: [x, y],
scale:0.4,
anchor: [.5, 0.25],
loop: false
});
p.addChild(movieclip);
movieclip.once(egret.Event.COMPLETE,()=>{
p.removeChild(movieclip);
},this);
}
\ No newline at end of file
egret/src/something/anis/candy/createCandyDis1Ani.ts 0 → 100644
View file @ 374f827e
import { getEffectFramesStr } from "../../../effect/createEffect1";
import MovieClip from "../../../movieclip/MovieClip";
export const createCandyDis1Ani = (x,y,p) => {
const spritesheet = RES.getRes('candydis1_json');
if(!spritesheet)return;
const list = getEffectFramesStr('兔子糖果_000', 0, 12);
const movieclip = new MovieClip({
spritesheet: spritesheet,
frameInterval: 2,
frames: list,
position: [x, y],
scale:0.4,
anchor: [.5, 0.25],
loop: false
});
p.addChild(movieclip);
movieclip.once(egret.Event.COMPLETE,()=>{
p.removeChild(movieclip);
},this);
}
\ No newline at end of file
egret/src/something/anis/candy/createCandyDis2Ani.ts 0 → 100644
View file @ 374f827e
import { getEffectFramesStr } from "../../../effect/createEffect1";
import MovieClip from "../../../movieclip/MovieClip";
export const createCandyDis2Ani = (x,y,p) => {
const spritesheet = RES.getRes('candydis2_json');
if(!spritesheet)return;
const list = getEffectFramesStr('兔子糖果_000', 0, 12);
const movieclip = new MovieClip({
spritesheet: spritesheet,
frameInterval: 2,
frames: list,
position: [x, y],
scale:0.4,
anchor: [.5, 0.25],
loop: false
});
p.addChild(movieclip);
movieclip.once(egret.Event.COMPLETE,()=>{
p.removeChild(movieclip);
},this);
}
\ No newline at end of file
egret/src/something/anis/candy/createCandyDis3Ani.ts 0 → 100644
View file @ 374f827e
import { getEffectFramesStr } from "../../../effect/createEffect1";
import MovieClip from "../../../movieclip/MovieClip";
export const createCandyDis3Ani = (x,y,p) => {
const spritesheet = RES.getRes('candydis3_json');
if(!spritesheet)return;
const list = getEffectFramesStr('兔子糖果_000', 0, 12);
const movieclip = new MovieClip({
spritesheet: spritesheet,
frameInterval: 2,
frames: list,
position: [x, y],
scale:0.4,
anchor: [.5, 0.25],
loop: false
});
p.addChild(movieclip);
movieclip.once(egret.Event.COMPLETE,()=>{
p.removeChild(movieclip);
},this);
}
\ No newline at end of file
egret/src/something/anis/candy/createCandyDis4Ani.ts 0 → 100644
View file @ 374f827e
import { getEffectFramesStr } from "../../../effect/createEffect1";
import MovieClip from "../../../movieclip/MovieClip";
export const createCandyDis4Ani = (x,y,p) => {
const spritesheet = RES.getRes('candydis4_json');
if(!spritesheet)return;
const list = getEffectFramesStr('兔子糖果_000', 0, 11);
const movieclip = new MovieClip({
spritesheet: spritesheet,
frameInterval: 2,
frames: list,
position: [x, y],
scale:0.4,
anchor: [.5, 0.25],
loop: false
});
p.addChild(movieclip);
movieclip.once(egret.Event.COMPLETE,()=>{
p.removeChild(movieclip);
},this);
}
\ No newline at end of file
egret/src/something/anis/candy/createCandySubAni.ts 0 → 100644
View file @ 374f827e
import { getEffectFramesStr } from "../../../effect/createEffect1";
import MovieClip from "../../../movieclip/MovieClip";
export const createCandySubAni = (x,y,p) => {
const spritesheet = RES.getRes('candysub_json');
if(!spritesheet)return;
const list = getEffectFramesStr('数字减少星星_000', 0, 15);
const movieclip = new MovieClip({
spritesheet: spritesheet,
frameInterval: 3,
frames: list,
position: [x, y],
scale: 1,
anchor: [.5, .5],
loop: false
});
p.addChild(movieclip);
movieclip.once(egret.Event.COMPLETE,()=>{
p.removeChild(movieclip);
},this);
}
\ No newline at end of file
egret/src/something/chapters/Chapter13.ts
View file @ 374f827e
This diff is collapsed.
egret/src/something/chapters/getChapter.ts
View file @ 374f827e
......@@ -32,6 +32,18 @@ const chapters: ChapterData[] = [].concat(
Chapters12,
Chapters13,
)
// console.log(chapters)
chapters.forEach((chapter,index) => {
if (chapter && !chapter.baseElementTypes.every(item => item < 5 )) {
console.log('错误chapter====>\n',chapter);
throw new Error(
`chapter.baseElementTypes只能是01234
错误chapter id= ${index}
${JSON.stringify(chapter)}
`
)
}
});
/**
* 获取关卡数据，返回关卡数据
* 以后每添加20关，添加一个文件，上面concat一个文件
......
egret/src/something/class/Candy.ts 0 → 100644
View file @ 374f827e
import { CandyBaseElementType } from "../enum/ElementType";
import { Element } from "./Element";
export class Candy extends egret.Sprite {
ele: Element;
nextState(): any {
return new Promise(async (r) => {
this._step--;
if (this._step < 0) {
this._step = 0;
}else {
if(this.ele) this.ele.playCandySubAni();
}
const result: any = {
element: this.ele
};
if (this._step <= 0) {
result.type = 'eliminate';
}
this.changeText();
r(result);
});
}
private MAX_STEP = 15;
/**
* 剩余部署
*/
private _step: number;
baseElement: CandyBaseElementType;
get step() {
return this._step
}
changeText() {
this._nums.text = `${this._step}`;
this._nums.anchorOffsetX = this._nums.textWidth / 2;
this._nums.anchorOffsetY = this._nums.textHeight / 2;
this._nums.once(egret.Event.RENDER, () => {
this._nums.anchorOffsetX = this._nums.textWidth / 2;
this._nums.anchorOffsetY = this._nums.textHeight / 2;
}, this);
}
_nums: eui.BitmapLabel;
constructor() {
super();
this.touchEnabled = this.touchChildren = false;
this._step = this.MAX_STEP;
this._nums = new eui.BitmapLabel();
this._nums.y=2;
this._nums.font = 'candynums_fnt';
this.changeText();
this.addChild(this._nums);
this._nums.once(egret.Event.ADDED_TO_STAGE, () => {
this._nums.anchorOffsetX = this._nums.textWidth / 2;
this._nums.anchorOffsetY = this._nums.textHeight / 2;
}, this);
}
reset() {
}
}
\ No newline at end of file
egret/src/something/class/Element.ts
View file @ 374f827e
This diff is collapsed.
egret/src/something/enum/ElementConfigType.ts
View file @ 374f827e
import { ElementType } from "./ElementType";
/**
* 元素格子配置，需要和地图格子做区分
*/
......@@ -5,51 +7,101 @@ export enum ElementConfigType {
/**
* 空元素格
*/
EMPTY=0,
EMPTY = 0,
/**
* 基础元素
*/
BASE=1,
BASE = 1,
/**
* 石头
*/
ROCK=2,
ROCK = 2,
/**
* 棒棒糖
*/
LOLLIPOP=3,
LOLLIPOP = 3,
/**
* 枷锁
*/
LOCK=4,
LOCK = 4,
/**
* JELLY
*/
JELLY=5,
JELLY = 5,
/**
* CHICKEN_EGG
*/
CHICKEN_EGG=6,
CHICKEN_EGG = 6,
/**
* 气泡
*/
BUBBLE=7,
BUBBLE = 7,
/**
* 灰色毛球
*/
HAIRBALLGREY=8,
HAIRBALLGREY = 8,
/**
* 褐色毛球
*/
HAIRBALLBROWN=9,
HAIRBALLBROWN = 9,
/**
* 黑色毛球,废弃
*/
HAIRBALLBLACK = 10,
/**
* 黑色毛球
* 糖果
*/
HAIRBALLBLACK=10,
CANDY = 11,
}
// export const isCandy = (t: ElementConfigType) => {
// return t == ElementConfigType.CANDY_RANDOM ||
// t == ElementConfigType.CANDY_1 ||
// t == ElementConfigType.CANDY_2 ||
// t == ElementConfigType.CANDY_3 ||
// t == ElementConfigType.CANDY_4 ||
// t == ElementConfigType.CANDY_5
// }
// export const createCandy = (t: ElementConfigType) => {
// let type: ElementType;
// if (t == ElementConfigType.CANDY_RANDOM) {
// const order = Math.ceil(Math.random() * 5);
// switch (order) {
// case 1:
// type = ElementType.CANDY_RABBIT
// break;
// case 2:
// type = ElementType.CANDY_CHICKEN
// break;
// case 3:
// type = ElementType.CANDY_CATTLE
// break;
// case 4:
// type = ElementType.CANDY_LION
// break;
// case 5:
// type = ElementType.CANDY_PIG
// break;
// /**
// * 石门。石门正面的时候，无法消除。不是锁，锁可以被打破。
// */
// BLOCK_LOCK=11,
}
\ No newline at end of file
// default:
// break;
// }
// }
// else if (t == ElementConfigType.CANDY_1) {
// type = ElementType.CANDY_RABBIT;
// }
// else if (t == ElementConfigType.CANDY_2) {
// type = ElementType.CANDY_CHICKEN;
// }
// else if (t == ElementConfigType.CANDY_3) {
// type = ElementType.CANDY_CATTLE;
// }
// else if (t == ElementConfigType.CANDY_4) {
// type = ElementType.CANDY_LION;
// }
// else if (t == ElementConfigType.CANDY_5) {
// type = ElementType.CANDY_PIG;
// };
// return type;
// }
\ No newline at end of file
egret/src/something/enum/ElementType.ts
View file @ 374f827e
......@@ -29,7 +29,118 @@ export enum ElementType {
//特殊元素 ,节日元素
FESTIVALELE_BIG, //节日元素大中间一个13
FESTIVALELE_SMALL, //节日元素飞溅的小元素14
CANDY_RABBIT,//兔子
CANDY_CHICKEN,//鸟
CANDY_CATTLE,//牛
CANDY_LION,//狮子
CANDY_PIG,//猪
}
export enum CandyBaseElementType {
RANDOM = 0,//随机
RABBIT = 106,//兔子
CHICKEN = 107,//鸟
CATTLE = 108,//牛
LION = 109,//狮子
PIG = 110,//猪
}
export const convertCandyBaseElementType = (t:CandyBaseElementType) => {
if(t==CandyBaseElementType.RABBIT)
return ElementType.RABBIT;
if(t==CandyBaseElementType.CHICKEN)
return ElementType.CHICKEN;
if(t==CandyBaseElementType.CATTLE)
return ElementType.CATTLE;
if(t==CandyBaseElementType.LION)
return ElementType.LION;
if(t==CandyBaseElementType.PIG)
return ElementType.PIG;
return null;
}
export const convertBaseElementType = (t:ElementType) => {
if(t==ElementType.RABBIT)
return CandyBaseElementType.RABBIT;
if(t==ElementType.CHICKEN)
return CandyBaseElementType.CHICKEN;
if(t==ElementType.CATTLE)
return CandyBaseElementType.CATTLE;
if(t==ElementType.LION)
return CandyBaseElementType.LION;
if(t==ElementType.PIG)
return CandyBaseElementType.PIG;
return null;
}
export const randonCandyBaseElement = () => {
const order = Math.ceil(Math.random() * 5);
if (order == 1)
return CandyBaseElementType.RABBIT;
if (order == 2)
return CandyBaseElementType.CHICKEN;
if (order == 3)
return CandyBaseElementType.CATTLE;
if (order == 4)
return CandyBaseElementType.LION;
if (order == 5)
return CandyBaseElementType.PIG;
return null;
}
export const transElementRes = (t: CandyBaseElementType) => {
switch (t) {
case CandyBaseElementType.RABBIT:
return ElementType.CANDY_RABBIT
case CandyBaseElementType.CHICKEN:
return ElementType.CANDY_CHICKEN
case CandyBaseElementType.CATTLE:
return ElementType.CANDY_CATTLE
case CandyBaseElementType.LION:
return ElementType.CANDY_LION
case CandyBaseElementType.PIG:
return ElementType.CANDY_PIG
// case CandyBaseElementType.RANDOM:
// const order = Math.ceil(Math.random() * 5);
// if (order == 1)
// return ElementType.CANDY_RABBIT;
// if (order == 2)
// return ElementType.CANDY_CHICKEN;
// if (order == 3)
// return ElementType.CANDY_CATTLE;
// if (order == 4)
// return ElementType.CANDY_LION;
// if (order == 5)
// return ElementType.CANDY_PIG;
default:
break;
}
return null;
}
// export const isCandyElement=(t:ElementType)=>{
// return t == ElementType.CANDY_RABBIT ||
// t == ElementType.CANDY_CHICKEN ||
// t == ElementType.CANDY_CATTLE ||
// t == ElementType.CANDY_LION ||
// t == ElementType.CANDY_PIG
// };
// export const matchCandy=(a:ElementType,b:ElementType,)=>{
// return (a==ElementType.CANDY_RABBIT && b== ElementType.RABBIT) ||
// (a==ElementType.CANDY_CHICKEN && b== ElementType.CHICKEN) ||
// (a==ElementType.CANDY_CATTLE && b== ElementType.CATTLE) ||
// (a==ElementType.CANDY_LION && b== ElementType.LION) ||
// (a==ElementType.CANDY_PIG && b== ElementType.PIG)
// };
/**
* 5种基本元素的数组，每项是ElementType的枚举值
......
egret/src/startScene/StartScene.ts
View file @ 374f827e
......@@ -117,6 +117,8 @@ export const createData = () => {
if (_startSceneData) return _startSceneData;
const startSceneData: any = {};
_startSceneData = startSceneData;
if(_startSceneData.level === null || _startSceneData.level === undefined)
delete _startSceneData.level
const repeatCount = getRepeatCount();
const list = [];
......
mock/happyclear/home.json
View file @ 374f827e
......@@ -1386,6 +1386,132 @@
"levelNum": 275,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 276,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 277,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 278,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 279,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 280,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 281,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 282,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 283,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 284,
"maxScore": 47440,
"stars": 1
}
,
{
"levelNum": 285,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 286,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 287,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 288,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 289,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 290,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 291,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 292,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 293,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 294,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 295,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 296,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 297,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 298,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 299,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 300,
"maxScore": 47440,
"stars": 1
}
],
"remainProp": [
......
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