Skip to content

X
xiaoxiaole
Commit 968d1d19 authored by 邱旭's avatar 邱旭
Browse files
Options

Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev

parents f5ae3805 4a44ece8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 342 additions and 153 deletions
egret/index.html
View file @ 968d1d19
......@@ -41,7 +41,7 @@
<body>
<div style="margin: auto;width: 100%;height: 100%;" class="egret-player" data-entry-class="Main"
data-orientation="auto" data-scale-mode="showAll" data-frame-rate="60" data-content-width="750"
data-content-height="1624" data-multi-fingered="2" data-show-fps="false" data-show-log="false"
data-content-height="1624" data-multi-fingered="2" data-show-fps="true" data-show-log="true"
data-show-fps-style="x:0,y:0,size:12,textColor:0xffffff,bgAlpha:0.9">
</div>
......@@ -121,13 +121,13 @@
</script>
<script>
window['signconfigs'] = [
{nums: '0.15元', type: 'quan15'},
{nums: '0.08元', type: 'quan8'},
{nums: '*1', type: 'hammer'},
{nums: '0.38元', type: 'quan38'},
{nums: '0.12元', type: 'quan12'},
{nums: '*1', type: 'boom'},
{nums: '0.58元', type: 'quan58'},
{nums: '0.16元', type: 'quan16'},
{nums: '*1', type: 'steps'},
{nums: '随机奖励', type: 'random'}
{nums: '0.28元', type: 'quan28'}
];
// localStorage.clear();
window['imgver'] = '1022'
......
egret/libs/new_wx/MainBase.ts
View file @ 968d1d19
......@@ -197,6 +197,8 @@ export default class MainBase extends eui.UILayer {
RES.getResAsync(`nums_fnt`);
RES.getResAsync(`nums2_png`);
RES.getResAsync(`nums2_fnt`);
RES.getResAsync(`nums3_png`);
RES.getResAsync(`nums3_fnt`);
if (!window['development']) {
RES.getResAsync(`common_json`);
RES.getResAsync(`share3_json`);
......
egret/libs/new_wx/components/Toast2.ts
View file @ 968d1d19
import ComponentBase from "./ComponentBase";
import { HtmlTextParser } from "../HtmlTextParser";
import { gotoNextLevel } from "../../../src/panels/gotoNextLevel";
import SceneCtrl from "../ctrls/sceneCtrl";
import MainScene from "../../../src/mainScene/MainScene";
export default class Toast2 extends ComponentBase {
......@@ -9,10 +11,15 @@ export default class Toast2 extends ComponentBase {
get skinKey(): string { return 'Toast2' }
toastLabel:eui.Label;
start() {
this.touchEnabled=false;
this.touchChildren=false;
this.toastLabel.textFlow = (new HtmlTextParser).parser('<u>继续闯关赢好礼</u>');
this.toastLabel.addEventListener(egret.TouchEvent.TOUCH_TAP,()=>{
gotoNextLevel();
if(SceneCtrl.instance.currentScene instanceof MainScene){
}else {
gotoNextLevel();
}
egret.Tween.removeTweens(this);
this.alpha=0;
},this);
......
egret/resource/TextureMerger/map.tmproject
View file @ 968d1d19
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/taskicon.png","../assets/map/recordbtn.png","../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/namebg.png","../assets/map/msgTri.png","../assets/map/map_signicon.png","../assets/map/lionMsgBg.png","../assets/map/invite_txtbg.png","../assets/map/invite_icon.png","../assets/map/iconbg.png","../assets/map/icon.png","../assets/map/guideOver.png","../assets/map/guideMoney.png","../assets/map/guideLove.png","../assets/map/guideLevel.png","../assets/map/guideBox.png","../assets/map/friend_avatar.png","../assets/map/avatar.png","../assets/map/animal1.png","../assets/map/ad_icon.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐关闭.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音关闭.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/光 副本 4.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/宝箱.png","../assets/map/map明日可领.png","../assets/map/map今日可领.png","../assets/map/map刮现金红包.png","../assets/map/map大转盘.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/taskicon.png","../assets/map/recordbtn.png","../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/namebg.png","../assets/map/msgTri.png","../assets/map/map_signicon.png","../assets/map/lionMsgBg.png","../assets/map/invite_txtbg.png","../assets/map/invite_icon.png","../assets/map/iconbg.png","../assets/map/icon.png","../assets/map/guideOver.png","../assets/map/guideMoney.png","../assets/map/guideLove.png","../assets/map/guideLevel.png","../assets/map/guideBox.png","../assets/map/friend_avatar.png","../assets/map/avatar.png","../assets/map/animal1.png","../assets/map/ad_icon.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐关闭.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音关闭.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/光 副本 4.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/宝箱.png","../assets/map/map明日可领.png","../assets/map/map今日可领.png","../assets/map/map刮现金红包.png","../assets/map/map大转盘.png","../assets/map/有星星2.png","../assets/map/有星星3.png"]}
\ No newline at end of file
egret/resource/TextureMerger/sign.tmproject
View file @ 968d1d19
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sign","version":5,"files":["../assets/sign/signitem.png","../assets/sign/signicon5.png","../assets/sign/signicon4.png","../assets/sign/signicon3.png","../assets/sign/signicon2.png","../assets/sign/signbtn4.png","../assets/sign/signbtn3.png","../assets/sign/signbtn2.png","../assets/sign/signbtn1.png","../assets/sign/signbg.png","../assets/sign/sign_line2.png","../assets/sign/sign_line.png","../assets/sign/sign_light.png","../assets/sign/sign_icon1.png","../assets/sign/signicon6.png","../assets/sign/signicon_blood.png","../assets/sign/sign_quan88.png","../assets/sign/sign_quan58.png","../assets/sign/sign_quan38.png","../assets/sign/sign_quan15.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sign","version":5,"files":["../assets/sign/signitem.png","../assets/sign/signicon6.png","../assets/sign/signicon5.png","../assets/sign/signicon4.png","../assets/sign/signicon3.png","../assets/sign/signicon2.png","../assets/sign/signicon_blood.png","../assets/sign/signbtn4.png","../assets/sign/signbtn3.png","../assets/sign/signbtn2.png","../assets/sign/signbtn1.png","../assets/sign/signbg.png","../assets/sign/sign_quan88.png","../assets/sign/sign_quan8.png","../assets/sign/sign_quan58.png","../assets/sign/sign_quan38.png","../assets/sign/sign_quan28.png","../assets/sign/sign_quan16.png","../assets/sign/sign_quan15.png","../assets/sign/sign_quan12.png","../assets/sign/sign_line2.png","../assets/sign/sign_line.png","../assets/sign/sign_light.png","../assets/sign/sign_icon1.png"]}
\ No newline at end of file
egret/resource/assets/common/nums3.fnt 0 → 100644
View file @ 968d1d19
{"file":"nums3.png","frames":{
"9":{"x":74,"y":27,"w":22,"h":25,"offX":0,"offY":0,"sourceW":22,"sourceH":25},
"8":{"x":76,"y":0,"w":23,"h":25,"offX":0,"offY":0,"sourceW":23,"sourceH":25},
"7":{"x":0,"y":27,"w":23,"h":24,"offX":0,"offY":0,"sourceW":23,"sourceH":24},
"6":{"x":26,"y":0,"w":23,"h":25,"offX":0,"offY":0,"sourceW":23,"sourceH":25},
"5":{"x":25,"y":27,"w":23,"h":24,"offX":0,"offY":0,"sourceW":23,"sourceH":24},
"4":{"x":0,"y":0,"w":24,"h":25,"offX":0,"offY":0,"sourceW":24,"sourceH":25},
"3":{"x":101,"y":0,"w":23,"h":25,"offX":0,"offY":0,"sourceW":23,"sourceH":25},
"2":{"x":51,"y":0,"w":23,"h":25,"offX":0,"offY":0,"sourceW":23,"sourceH":25},
"1":{"x":98,"y":27,"w":16,"h":25,"offX":0,"offY":0,"sourceW":16,"sourceH":25},
"0":{"x":50,"y":27,"w":22,"h":25,"offX":0,"offY":0,"sourceW":22,"sourceH":25}}}
\ No newline at end of file
egret/resource/assets/map/有星星.png
View replaced file @ f5ae3805 View file @ 968d1d19
egret/resource/assets/map/有星星.png

2.41 KB | W: | H:

egret/resource/assets/map/有星星.png

2.15 KB | W: | H:

egret/resource/assets/map/有星星.png
egret/resource/assets/map/有星星.png
egret/resource/assets/map/有星星.png
egret/resource/assets/map/有星星.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/default.res.json
View file @ 968d1d19
......@@ -21,7 +21,7 @@
"name": "buy3"
},
{
"keys": "taskicon_png,recordbtn_png,progress2_png,progress1_png,namebg_png,msgTri_png,map3_jpg,map2_jpg,map1_jpg,map_signicon_png,lionMsgBg_png,invite_txtbg_png,invite_icon_png,iconbg_png,icon_png,guideOver_png,guideMoney_png,guideLove_png,guideLevel_png,guideBox_png,friend_avatar_png,avatar_png,animal1_png,ad_icon_png,元宝bg_png,有星星_png,音乐关闭_png,音乐_png,星星bg_png,星星_png,无星星_png,问题_png,退出_png,狮子_png,声音关闭_png,声音_png,设置bg_png,设置_png,光 副本 4_png,关闭 拷贝_png,道具_png,宝箱btn_png,宝箱bg_png,宝箱3_png,宝箱2_png,宝箱1_png,宝箱_png,map明日可领_png,map今日可领_png,map刮现金红包_png,map大转盘_png",
"keys": "taskicon_png,recordbtn_png,progress2_png,progress1_png,namebg_png,msgTri_png,map3_jpg,map2_jpg,map1_jpg,map_signicon_png,lionMsgBg_png,invite_txtbg_png,invite_icon_png,iconbg_png,icon_png,guideOver_png,guideMoney_png,guideLove_png,guideLevel_png,guideBox_png,friend_avatar_png,avatar_png,animal1_png,ad_icon_png,元宝bg_png,有星星_png,音乐关闭_png,音乐_png,星星bg_png,星星_png,无星星_png,问题_png,退出_png,狮子_png,声音关闭_png,声音_png,设置bg_png,设置_png,光 副本 4_png,关闭 拷贝_png,道具_png,宝箱btn_png,宝箱bg_png,宝箱3_png,宝箱2_png,宝箱1_png,宝箱_png,map明日可领_png,map今日可领_png,map刮现金红包_png,map大转盘_png,有星星2_png,有星星3_png,icongray_png",
"name": "map"
},
{
......@@ -73,7 +73,7 @@
"name": "exchange"
},
{
"keys": "signitem_png,signicon5_png,signicon4_png,signicon3_png,signicon2_png,signbtn4_png,signbtn3_png,signbtn2_png,signbtn1_png,signbg_png,sign_line2_png,sign_line_png,sign_light_png,sign_icon1_png,signicon6_png,signicon_blood_png,sign_quan88_png,sign_quan58_png,sign_quan38_png,sign_quan15_png",
"keys": "signitem_png,signicon6_png,signicon5_png,signicon4_png,signicon3_png,signicon2_png,signicon_blood_png,signbtn4_png,signbtn3_png,signbtn2_png,signbtn1_png,signbg_png,sign_quan88_png,sign_quan8_png,sign_quan58_png,sign_quan38_png,sign_quan28_png,sign_quan16_png,sign_quan15_png,sign_quan12_png,sign_line2_png,sign_line_png,sign_light_png,sign_icon1_png",
"name": "sign"
},
{
......@@ -3197,6 +3197,51 @@
"url": "assets/hbGame/hbGame_rabbit.png",
"type": "image",
"name": "hbGame_rabbit_png"
},
{
"url": "assets/sign/sign_quan28.png",
"type": "image",
"name": "sign_quan28_png"
},
{
"url": "assets/sign/sign_quan16.png",
"type": "image",
"name": "sign_quan16_png"
},
{
"url": "assets/sign/sign_quan12.png",
"type": "image",
"name": "sign_quan12_png"
},
{
"url": "assets/sign/sign_quan8.png",
"type": "image",
"name": "sign_quan8_png"
},
{
"url": "assets/map/有星星2.png",
"type": "image",
"name": "有星星2_png"
},
{
"url": "assets/map/有星星3.png",
"type": "image",
"name": "有星星3_png"
},
{
"url": "assets/common/nums3.png",
"type": "image",
"name": "nums3_png"
},
{
"url": "assets/common/nums3.fnt",
"type": "font",
"name": "nums3_fnt"
},
{
"url": "assets/map/icongray.png",
"type": "image",
"name": "icongray_png"
}
]
}
\ No newline at end of file
egret/resource/skins/SignItemSkin.exml
View file @ 968d1d19
......@@ -16,6 +16,11 @@
<e:Image id="quan15" x="95.42" y="56.76" anchorOffsetX="0" anchorOffsetY="0" height="79.34" source="sign_quan15_png" visible="false"/>
<e:Image id="quan38" x="95.42" y="56.76" anchorOffsetX="0" anchorOffsetY="0" source="sign_quan38_png" visible="false"/>
<e:Image id="quan58" x="99.42" y="56.76" anchorOffsetX="0" anchorOffsetY="0" source="sign_quan58_png" visible="false"/>
<e:Image id="quan12" source="sign_quan12_png" x="95" y="56" visible="false"/>
<e:Image id="quan16" x="95" y="56" source="sign_quan16_png" visible="false"/>
<e:Image id="quan28" x="95" y="56" source="sign_quan28_png" visible="false"/>
<e:Image id="quan8" x="95" y="56" source="sign_quan8_png" visible="false"/>
<e:Image id="quan88" x="95" y="56" source="sign_quan88_png" visible="false"/>
<e:Button id="btn1" label="" x="364" y="65">
<e:skinName>
<e:Skin states="up,down,disabled">
......
egret/resource/skins/StarSkin.exml
View file @ 968d1d19
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="StarSkin" width="67" height="25" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image source="无星星_png" />
<e:Rect id="rectmask" width="67" height="25" />
<e:Image id="star" source="有星星_png" />
<e:Image id="star1" source="有星星_png" visible="false"/>
<e:Image id="star2" source="有星星2_png" visible="false"/>
<e:Image id="star3" source="有星星3_png" visible="false"/>
</e:Skin>
\ No newline at end of file
egret/src/mapScene/GuideCon.ts
View file @ 968d1d19
......@@ -40,7 +40,7 @@ let arrow: egret.DisplayObjectContainer;
* \n
*/
export class GuideCon extends egret.DisplayObjectContainer {
private steps: number = 5;
private steps: number = 4;
private curStep: number = 1;
groups: any[];
couldOver: boolean = false;
......
egret/src/mapScene/MapBottomPart.ts
View file @ 968d1d19
......@@ -16,7 +16,6 @@ export default class MapBottomPart extends ComponentBase {
for (let i = 0; i < MapBottomPart.LEVEL_NUMS; i++) {
const levelOrder = MapTopPart.LEVEL_NUMS + MapRpeatPart.LEVEL_NUMS * repeatCount + i +1;
this.getTxt(i).text = levelOrder + '';
this.getTxt(i).cacheAsBitmap=true;
}
for (let i = 0; i < MapBottomPart.LEVEL_NUMS; i++) {
......@@ -29,11 +28,12 @@ export default class MapBottomPart extends ComponentBase {
}
// console.log(levelOrder)
const icon = MapScene.iconHash[levelOrder] = this.getIcon(i);
const label:eui.BitmapLabel=icon.getChildAt(1) as eui.BitmapLabel;
label.cacheAsBitmap=true;
this.removeChild(icon);
icon.show = ()=>{this.addChild(icon)};
icon['nums'] = icon.getChildAt(0);
icon['bmptxt']=icon.getChildAt(1);
icon['mappart']=this;
const star = new MapStarComp();
star.loadSkin(); star.start();
......
egret/src/mapScene/MapRpeatPart.ts
View file @ 968d1d19
......@@ -2,13 +2,17 @@ import ComponentBase from "../../libs/new_wx/components/ComponentBase";
import MapTopPart from "./MapTopPart";
import MapScene from "./MapScene";
import MapStarComp from "./MapStarComp";
import { createData } from "../startScene/StartScene";
export default class MapRpeatPart extends ComponentBase {
static LEVEL_NUMS = 13;
private _index;
constructor(i) {
private _topHeight;
constructor(i,topHeight) {
super();
this._index = i;
this._topHeight=topHeight;
createData()
}
start() {
......@@ -16,13 +20,19 @@ export default class MapRpeatPart extends ComponentBase {
for (let i = 0; i < MapRpeatPart.LEVEL_NUMS; i++) {
const levelOrder = MapTopPart.LEVEL_NUMS + this._index * MapRpeatPart.LEVEL_NUMS + i + 1;
this.getTxt(i).text = levelOrder + '';
this.getTxt(i).cacheAsBitmap=true;
const icon = MapScene.iconHash[levelOrder] = this.getIcon(i);
this.removeChild(icon);
icon.show = ()=>{this.addChild(icon)};
icon['nums'] = icon.getChildAt(0);
icon['bmptxt']=icon.getChildAt(1);
icon['mappart']=this;
const star = new MapStarComp();
star.loadSkin(); star.start();
MapScene.starHash[levelOrder] = star;
icon.addChild(star);
icon['visibleY'] = this._topHeight + this
}
this['animal1'].visible = this._index % 2;
......
egret/src/mapScene/MapScene.ts
View file @ 968d1d19
......@@ -26,7 +26,7 @@ import ScratchIcon from "./icon/ScratchIcon";
import TurntableIcon from "./icon/TurntableIcon";
let doHelpFlag = false;
let doScratchHelpFlag = false;
// let doScratchHelpFlag = false;
// let adTag = false;
export default class MapScene extends Scene {
static adData;
......@@ -63,7 +63,7 @@ export default class MapScene extends Scene {
NetManager.ins.showLog(getlogItem(36));
}, code, dojoin.data);
} else { // 刮刮卡
let _code = code.slice(8);
const _code = code.slice(8);
NetManager.ins.scratchDoHelp((success, res) => {
doHelpFlag = true;
switch(true) {
......@@ -166,7 +166,7 @@ export default class MapScene extends Scene {
this['rect'].scaleX = 0.5
//进度条文本发光
setGlow(this['totalStarTxt'], 0x0083e8, 1);
this.topPart = data.top;
this.repeatsPart = data.list;
this.bottomPart = data.bottom;
......@@ -214,7 +214,7 @@ export default class MapScene extends Scene {
const pic = new egret.Bitmap(light);//76 61
pic.x = targetIcon.x + 50 - 2;
pic.y = targetIcon.y + 37 + 10;
targetIcon.parent.addChildAt(pic, 1);
targetIcon.mappart.addChildAt(pic, 1);
// targetIcon.parent.addChildAt(pic, 0);
pic.anchorOffsetX = 76;
pic.anchorOffsetY = 61;
......@@ -409,7 +409,7 @@ export default class MapScene extends Scene {
addAvatar(level, ele?) {
const item = MapScene.iconHash[level];
const parent = item.parent;
const parent = item['mappart'];
const avatar = new AvatarComp();
avatar.loadSkin();
avatar.start(ele);
......@@ -827,10 +827,6 @@ export default class MapScene extends Scene {
this['settingGroup'].visible = !this['settingGroup'].visible;
}
// onTap_goldBtn() {
// PanelCtrl.instance.show('GoldPanel')
// }
onTap_bloodBtn() {
NetManager.ins.clickLog(getlogItem(2));
if(getHomeData().remainEnargy > 0)
......@@ -840,15 +836,9 @@ export default class MapScene extends Scene {
}
setGray(order: number) {
const d = MapScene.iconHash[order];
const colorMatrix = [
0.3, 0.6, 0, 0, 0,
0.3, 0.6, 0, 0, 0,
0.3, 0.6, 0, 0, 0,
0, 0, 0, 1, 0
];
const colorFlilter = new egret.ColorMatrixFilter(colorMatrix);
d.filters = [colorFlilter];
const icon = MapScene.iconHash[order];
(icon['nums'] as eui.Image).source ='icongray_png';
(icon['bmptxt'] as eui.BitmapLabel).font ='nums3_fnt';
}
get skinKey() {
......
egret/src/mapScene/MapStarComp.ts
View file @ 968d1d19
......@@ -5,23 +5,26 @@ export default class MapStarComp extends ComponentBase {
super.start();
this.x = 15;
this.y=-24;
this['star'].mask = this['rectmask']
this.setStar(0);
}
setStar(num:number)
{
this['star1'].visible=false;
this['star2'].visible=false;
this['star3'].visible=false;
if(num ==0) {
this['rectmask'].width=0;
}else if(num ==1) {
this['rectmask'].width=23;
this['star1'].visible=true;
}
else if(num ==2) {
this['rectmask'].width=46;
this['star2'].visible=true;
}else if(num ==3) {
this['rectmask'].width=67;
this['star3'].visible=true;
}
this.cacheAsBitmap=true;
}
get skinKey(): string { return 'Star' }
}
\ No newline at end of file
egret/src/mapScene/MapTopPart.ts
View file @ 968d1d19
......@@ -9,20 +9,23 @@ export default class MapTopPart extends ComponentBase {
for (let i = 0; i < MapTopPart.LEVEL_NUMS; i++) {
const levelOrder = i + 1;
const icon = MapScene.iconHash[levelOrder] = this.getIcon(i);
const label:eui.BitmapLabel=icon.getChildAt(1) as eui.BitmapLabel;
label.cacheAsBitmap=true;
// const label:eui.BitmapLabel=icon.getChildAt(1) as eui.BitmapLabel;
const star = new MapStarComp();
star.loadSkin(); star.start();
MapScene.starHash[levelOrder] = star;
icon.addChild(star);
icon['nums'] = icon.getChildAt(0);
icon['bmptxt']=icon.getChildAt(1);
this.removeChild(icon);
icon['mappart']=this;
icon.show = ()=>{this.addChild(icon)};
icon['visibleY'] = icon.y;
}
}
getIcon(i):egret.DisplayObjectContainer { return this[`icon${i}`]; }
getIcon(i) { return this[`icon${i}`]; }
get skinKey(): string { return 'MapTop' }
}
\ No newline at end of file
egret/src/panels/Buy1Panel.ts
View file @ 968d1d19
......@@ -44,7 +44,7 @@ export default class Buy1Panel extends Panel {
SceneCtrl.instance.updateScene();
}, window['collectRuleId']);
}else {
showToast('哎呀，购买失败！\n元宝返回咯~')
showToast('元宝不足哦~\n快去玩游戏赢元宝吧');
}
}, PropType.HAMMER);//兑换道具
}
......
egret/src/panels/Buy2Panel.ts
View file @ 968d1d19
......@@ -39,7 +39,7 @@ export default class Buy2Panel extends Panel {
SceneCtrl.instance.updateScene();
}, window['collectRuleId']);
}else{
showToast('哎呀，购买失败！\n元宝返回咯~')
showToast('元宝不足哦~\n快去玩游戏赢元宝吧');
}
}, PropType.BOOM);//兑换道具
}
......
egret/src/panels/Buy3Panel.ts
View file @ 968d1d19
......@@ -40,7 +40,7 @@ export default class Buy3Panel extends Panel {
SceneCtrl.instance.updateScene();
}, window['collectRuleId']);
}else{
showToast('哎呀，购买失败！\n元宝返回咯~')
showToast('元宝不足哦~\n快去玩游戏赢元宝吧');
}
}, PropType.CHANCE_NUM);//兑换道具
}
......
egret/src/panels/ExchangePanel.ts
View file @ 968d1d19
......@@ -40,7 +40,7 @@ export default class ExchangePanel extends Panel {
SceneCtrl.instance.updateScene();
}, window['collectRuleId']);
}else{
showToast('哎呀，购买失败！\n元宝返回咯~')
showToast('元宝不足哦~\n快去玩游戏赢元宝吧');
}
}, PropType.CASH_NUM);//兑换道具
}
......
egret/src/something/chapters/Chapter1.ts
View file @ 968d1d19
......@@ -22,7 +22,7 @@ export const Chapters1: ChapterData[] = [
},
],
},
starScores: [100, 500, 950],
starScores: [1000, 5000, 10000],
map: {
lattices: [
0, 0, 0, 0, 0, 0, 0, 0, 0,
......@@ -79,7 +79,7 @@ export const Chapters1: ChapterData[] = [
},
],
},
starScores: [4000, 8000, 12000],
starScores: [100, 500, 950],
map: {
lattices: [
0, 0, 0, 0, 0, 0, 0, 0, 0,
......@@ -198,9 +198,9 @@ export const Chapters1: ChapterData[] = [
map: {
lattices: [
0, 1, 1, 1, 1, 1, 1, 1, 0,
0, 3, 3, 1, 1, 1, 3, 3, 0,
0, 3, 3, 1, 1, 1, 3, 3, 0,
0, 3, 3, 1, 1, 1, 3, 3, 0,
0, 2, 2, 1, 1, 1, 2, 2, 0,
0, 2, 2, 1, 1, 1, 2, 2, 0,
0, 2, 2, 1, 1, 1, 2, 2, 0,
0, 1, 1, 1, 1, 1, 1, 1, 0,
0, 1, 1, 1, 1, 1, 1, 1, 0,
0, 2, 2, 1, 1, 1, 2, 2, 0,
......
egret/src/something/chapters/Chapter5.ts
View file @ 968d1d19
......@@ -190,7 +190,7 @@ export const Chapters5: ChapterData[] = [
{
"baseElementTypes": [0, 1, 2, 3, 4],
"bubbleProbability": 0,
"stepCount": 25,
"stepCount": 25+10,
"passTarget": { "type": 1, "elements": [{ "type": 9, "count": 36 }] },
"starScores": [5000, 12000, 19000],
"map": {
......@@ -248,7 +248,7 @@ export const Chapters5: ChapterData[] = [
{
baseElementTypes: [1, 0, 2, 3, 4],
bubbleProbability: 0.1,
stepCount: 30,
stepCount: 30+10,
passTarget: { type: 1, elements: [{ type: 9, count: 49 }] },
starScores: [5000, 12000, 21000],
map: {
......@@ -256,7 +256,7 @@ export const Chapters5: ChapterData[] = [
0, 1, 0, 1, 1, 1, 0, 1, 0,
0, 2, 1, 1, 1, 1, 1, 2, 0,
0, 3, 3, 1, 1, 1, 3, 3, 0,
0, 0, 3, 1, 1, 3, 3, 0, 0,
0, 0, 3, 3, 1, 3, 3, 0, 0,
0, 3, 0, 3, 3, 3, 0, 3, 0,
3, 3, 3, 0, 3, 0, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3,
......@@ -436,10 +436,24 @@ export const Chapters5: ChapterData[] = [
},
//98
{
baseElementTypes: [1, 0, 2, 3, 4],
bubbleProbability: 0.1,
stepCount: 40,
passTarget: { type: 1, elements: [{ type: 9, count: 27 }] }, starScores: [5000, 13000, 21000], map: { lattices: [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 2, 0, 2, 0, 2, 0, 2, 0, 3, 1, 1, 1, 3, 1, 1, 1, 3, 3, 1, 1, 1, 3, 1, 1, 1, 3, 3, 1, 1, 1, 3, 1, 1, 1, 3, 3, 1, 1, 1, 3, 1, 1, 1, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0], connectedLats: [], elements: [7, 1, 1, 1, 7, 1, 1, 1, 7, 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, 4, 1, 1, 1, 4, 1, 1, 1, 4, 4, 1, 1, 1, 4, 1, 1, 1, 4, 4, 1, 1, 1, 4, 1, 1, 1, 4, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 2, 2, 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: 4, type: null }, { index: 8, type: null }] }
baseElementTypes: [1, 0, 2, 3, 4],
bubbleProbability: 0.1,
stepCount: 40,
passTarget: { type: 1, elements: [{ type: 9, count: 27 }] },
starScores: [5000, 13000, 21000],
map: {
lattices: [
1, 0, 0, 0, 1, 0, 0, 0, 1,
0, 1, 0, 1, 0, 1, 0, 1, 0,
1, 0, 1, 0, 1, 0, 1, 0, 1,
0, 2, 0, 2, 0, 2, 0, 2, 0,
3, 1, 1, 1, 3, 1, 1, 1, 3,
3, 1, 1, 1, 3, 1, 1, 1, 3,
3, 1, 1, 1, 3, 1, 1, 1, 3,
3, 3, 3, 1, 3, 1, 3, 3, 3,
0, 3, 3, 3, 3, 3, 3, 3, 0
], connectedLats: [], elements: [7, 1, 1, 1, 7, 1, 1, 1, 7, 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, 4, 1, 1, 1, 4, 1, 1, 1, 4, 4, 1, 1, 1, 4, 1, 1, 1, 4, 4, 1, 1, 1, 4, 1, 1, 1, 4, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 2, 2, 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: 4, type: null }, { index: 8, type: null }]
}
},
//99
{ baseElementTypes: [1, 0, 4, 3], bubbleProbability: 0, stepCount: 24, passTarget: { type: 1, elements: [{ type: 9, count: 66 }] }, starScores: [5000, 13000, 21000], map: { lattices: [3, 0, 3, 3, 3, 3, 3, 0, 3, 3, 0, 3, 3, 3, 3, 3, 0, 3, 3, 0, 3, 3, 3, 3, 3, 0, 3, 3, 0, 3, 3, 3, 3, 3, 0, 3, 3, 0, 3, 3, 3, 3, 3, 0, 3, 3, 0, 3, 3, 3, 3, 3, 0, 3, 3, 0, 3, 3, 0, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3], connectedLats: [], elements: [1, 1, 1, 1, 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 1, 2, 4, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 1, 2, 4, 2, 1, 1, 2, 2, 2, 1, 1, 1, 1, 1, 2, 2, 1, 2, 1, 2, 2, 2, 1, 2, 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, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], recycles: [], generateLats: [{ index: 0, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 8, type: null }] } },
......
egret/src/something/chapters/Chapter6.ts
View file @ 968d1d19
......@@ -375,7 +375,7 @@ export const Chapters6: ChapterData[] = [
3, 3, 3, 3, 3, 0, 0, 0, 0,
3, 3, 3, 3, 3, 0, 0, 0, 0
],
connectedLats: [[72, 0], [73, 1], [74, 2], [75, 3], [76, 4]],
// connectedLats: [[72, 0], [73, 1], [74, 2], [75, 3], [76, 4]],
elements: [
2, 7, 2, 7, 2, 1, 1, 1, 1,
1, 2, 1, 2, 1, 1, 1, 1, 1,
......@@ -408,7 +408,13 @@ export const Chapters6: ChapterData[] = [
{ index: 28, type: null },
{ index: 29, type: null },
{ index: 30, type: null },
{ index: 31, type: null }
{ index: 31, type: null },
{ index: 0, type: null },
{ index: 1, type: null },
{ index: 2, type: null },
{ index: 3, type: null },
{ index: 4, type: null },
]
}
},
......
egret/src/something/chapters/Chapter7.ts
View file @ 968d1d19
This diff is collapsed.
egret/src/something/chapters/Chapter8.ts
View file @ 968d1d19
......@@ -67,7 +67,37 @@ export const Chapters8: ChapterData[] = [
//142
{
baseElementTypes: [0, 1, 2, 3, 4],
bubbleProbability: 0.1, stepCount: 27, passTarget: { type: 1, elements: [{ type: 6, count: 2 }] }, starScores: [5000, 12000, 21000], map: { lattices: [0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 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, 0, 1, 0, 1, 1, 1], connectedLats: [[72, 15], [73, 16], [74, 17]], elements: [1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 5, 2, 1, 1, 1, 1, 1, 2, 2, 5, 2, 2, 1, 1, 1, 2, 2, 2, 5, 2, 2, 2, 1, 2, 2, 2, 1, 5, 1, 2, 2, 2], 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: [76], generateLats: [{ index: 4, type: null }, { index: 9, type: null }, { index: 10, type: null }, { index: 11, type: null }, { index: 15, type: null }, { index: 16, type: null }, { index: 17, type: null }, { index: 48, type: null }, { index: 50, type: null }] }
bubbleProbability: 0.1,
stepCount: 27,
passTarget: { type: 1, elements: [{ type: 6, count: 2 }] },
starScores: [5000, 12000, 21000],
map: {
lattices: [
0, 0, 0, 0, 1, 0, 0, 0, 0,
1, 1, 1, 0, 1, 0, 1, 1, 1,
1, 1, 1, 0, 1, 0, 1, 1, 1,
1, 1, 1, 0, 1, 0, 1, 1, 1,
1, 1, 1, 0, 1, 0, 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, 0, 1, 0, 1, 1, 1
],
connectedLats: [[72, 15], [73, 16], [74, 17]],
elements: [
1, 1, 1, 1, 3, 1, 1, 1, 1,
1, 1, 1, 1, 2, 1, 1, 1, 1,
1, 1, 1, 1, 2, 1, 1, 1, 1,
1, 1, 1, 1, 2, 1, 1, 1, 1,
1, 1, 1, 1, 2, 1, 1, 1, 1,
1, 1, 1, 2, 5, 2, 1, 1, 1,
1, 1, 2, 2, 5, 2, 2, 1, 1,
1, 2, 2, 2, 5, 2, 2, 2, 1,
2, 2, 2, 1, 5, 1, 2, 2, 2
],
recycles: [76, 72, 73, 74, 78, 79, 80],
generateLats: [{ index: 4, type: null }, { index: 9, type: null }, { index: 10, type: null }, { index: 11, type: null }, { index: 15, type: null }, { index: 16, type: null }, { index: 17, type: null }, { index: 48, type: null }, { index: 50, type: null }]
}
},
//143
{
......@@ -390,7 +420,22 @@ export const Chapters8: ChapterData[] = [
baseElementTypes: [0, 1, 2, 3],
bubbleProbability: 0.1,
stepCount: 25,
passTarget: { type: 1, elements: [{ type: 9, count: 26 }] }, starScores: [5000, 12000, 21000], map: { lattices: [0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0], connectedLats: [[30, 48], [31, 49], [32, 50]], elements: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 7, 1, 2, 1, 1, 1, 2, 1, 7, 7, 1, 1, 2, 2, 2, 1, 1, 7, 7, 1, 2, 1, 1, 1, 2, 1, 7, 7, 1, 1, 2, 2, 2, 1, 1, 7, 7, 1, 1, 1, 1, 1, 1, 1, 7, 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: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 10, type: null }, { index: 16, type: null }, { index: 18, type: null }, { index: 26, type: null }] }
passTarget: { type: 1, elements: [{ type: 9, count: 26 }] },
starScores: [5000, 12000, 21000],
map: {
lattices: [
0, 0, 1, 1, 1, 1, 1, 0, 0,
0, 1, 1, 3, 3, 3, 3, 1, 0,
3, 3, 3, 3, 3, 3, 3, 3, 3,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 0, 0, 0, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
3, 3, 3, 3, 3, 3, 3, 3, 3,
0, 1, 3, 3, 3, 3, 1, 1, 0,
0, 0, 1, 1, 1, 1, 1, 0, 0
],
connectedLats: [[30, 48], [31, 49], [32, 50]], elements: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 7, 1, 2, 1, 1, 1, 2, 1, 7, 7, 1, 1, 2, 2, 2, 1, 1, 7, 7, 1, 2, 1, 1, 1, 2, 1, 7, 7, 1, 1, 2, 2, 2, 1, 1, 7, 7, 1, 1, 1, 1, 1, 1, 1, 7, 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: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 10, type: null }, { index: 16, type: null }, { index: 18, type: null }, { index: 26, type: null }]
}
},
//155
{
......
egret/src/something/chapters/Chapter9.ts
View file @ 968d1d19
This diff is collapsed.
egret/src/something/chapters/getChapter.ts
View file @ 968d1d19
......@@ -37,13 +37,13 @@ export function getChapterData(index: number): ChapterData {
}
var a = {
"levelNum": 102,
"levelTarget": [
{ "targetType": 5, "targetNum": 40 }
"level": 102,
"tar": [
{ "tarType": 5, "tarNum": 40 }
],
"oneStarScore": 6000,
"twoStarScore": 15000,
"threeStarScore": 32000
"ones": 6000,
"twos": 15000,
"threes": 32000
};
//取数据格式用，一般情况注释
// (function exportFile(chapters: ChapterData[]) {
......@@ -52,20 +52,20 @@ var a = {
// var chapter: ChapterData = chapters[i]
// var target: PassTargetData = chapter.passTarget
// var a: any = {};
// a["levelNum"] = i;
// a["levelTarget"] = [];
// a["level"] = i;
// a["tar"] = [];
// if (target.type == PassType.SCORE_TARGET) {
// a["levelTarget"].push({ "targetType": 1, "targetNum": target.score })
// a["tar"].push({ "tarType": 1, "tarNum": target.score })
// } else {
// for (var j = 0; j < target.elements.length; j++) {
// var element = target.elements[j];
// a["levelTarget"].push({ "targetType": submitTran[element.type], "targetNum": element.count })
// a["tar"].push({ "tarType": submitTran[element.type], "tarNum": element.count })
// }
// }
// a["oneStarScore"] = chapter.starScores[0];
// a["twoStarScore"] = chapter.starScores[1];
// a["threeStarScore"] = chapter.starScores[2];
// a["ones"] = chapter.starScores[0];
// a["twos"] = chapter.starScores[1];
// a["threes"] = chapter.starScores[2];
// obj.push(a)
// }
......
egret/src/startScene/StartScene.ts
View file @ 968d1d19
......@@ -120,7 +120,7 @@ export const createData = () => {
const repeatCount =getRepeatCount();
for (let i = 0; i < repeatCount; i++) {
const repeat = new MapRpeatPart(i);
const repeat = new MapRpeatPart(i,startSceneData.top.height);
repeat.loadSkin(); repeat.start();
list.push(repeat);
}
......
mock/happyclear/getBackReward.json
View file @ 968d1d19
......@@ -2,6 +2,6 @@
"code":"0000000000",
"data":null,
"desc":"OK",
"success":1,
"success":0,
"timestamp":1572079274940
}
\ No newline at end of file
mock/happyclear/homemax.json
View file @ 968d1d19
......@@ -980,32 +980,12 @@
{
"levelNum": 195,
"maxScore": 47440,
"stars": 3
"stars": 2
},
{
"levelNum": 196,
"maxScore": 47440,
"stars": 3
},
{
"levelNum": 197,
"maxScore": 47440,
"stars": 3
},
{
"levelNum": 198,
"maxScore": 47440,
"stars": 3
},
{
"levelNum": 199,
"maxScore": 47440,
"stars": 3
},
{
"levelNum": 200,
"maxScore": 47440,
"stars": 3
"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