Skip to content

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

1

parent ea324e20
Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 42 deletions
egret/index.html
View file @ a099ae07
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<body> <body>
<div style="margin: auto;width: 100%;height: 100%;" class="egret-player" data-entry-class="Main" <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-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"> data-show-fps-style="x:0,y:0,size:12,textColor:0xffffff,bgAlpha:0.9">
</div> </div>
......
egret/libs/new_wx/MainBase.ts
View file @ a099ae07
...@@ -189,6 +189,8 @@ export default class MainBase extends eui.UILayer { ...@@ -189,6 +189,8 @@ export default class MainBase extends eui.UILayer {
RES.getResAsync(`nums_fnt`); RES.getResAsync(`nums_fnt`);
RES.getResAsync(`nums2_png`); RES.getResAsync(`nums2_png`);
RES.getResAsync(`nums2_fnt`); RES.getResAsync(`nums2_fnt`);
RES.getResAsync(`nums3_png`);
RES.getResAsync(`nums3_fnt`);
if (!window['development']) { if (!window['development']) {
RES.getResAsync(`common_json`); RES.getResAsync(`common_json`);
RES.getResAsync(`share3_json`); RES.getResAsync(`share3_json`);
......
egret/resource/assets/common/nums3.fnt 0 → 100644
View file @ a099ae07
{"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/default.res.json
View file @ a099ae07
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
"name": "buy3" "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,有星星2_png,有星星3_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" "name": "map"
}, },
{ {
...@@ -175,6 +175,10 @@ ...@@ -175,6 +175,10 @@
{ {
"keys": "turnprize_icon1_png,turnprize_icon2_png,turnprize_icon3_png,turprizebg_png,turprize继续闯关按钮_png", "keys": "turnprize_icon1_png,turnprize_icon2_png,turnprize_icon3_png,turprizebg_png,turprize继续闯关按钮_png",
"name": "turntableprize" "name": "turntableprize"
},
{
"keys": "nums3_png,nums3_fnt,icongray_png",
"name": "preload"
} }
], ],
"resources": [ "resources": [
...@@ -2952,6 +2956,21 @@ ...@@ -2952,6 +2956,21 @@
"url": "assets/map/有星星3.png", "url": "assets/map/有星星3.png",
"type": "image", "type": "image",
"name": "有星星3_png" "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/MapRepeatSkin.exml
View file @ a099ae07
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<e:Skin class="MapRepeatPartSkin" width="750" height="1477" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="MapRepeatPartSkin" width="750" height="1477" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image source="map2_jpg"/> <e:Image source="map2_jpg"/>
<e:Group x="351" y="26" id="icon0"> <e:Group x="351" y="26" id="icon0">
<e:Image source="icon_png" x="0" y="0"/> <e:Image id="nums" source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt0" width="76" x="12" y="18.69" text="1" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt0" width="76" x="12" y="18.69" text="1" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="196" y="158" id="icon1"> <e:Group x="196" y="158" id="icon1">
......
egret/src/mapScene/MapBottomPart.ts
View file @ a099ae07
...@@ -16,7 +16,6 @@ export default class MapBottomPart extends ComponentBase { ...@@ -16,7 +16,6 @@ export default class MapBottomPart extends ComponentBase {
for (let i = 0; i < MapBottomPart.LEVEL_NUMS; i++) { for (let i = 0; i < MapBottomPart.LEVEL_NUMS; i++) {
const levelOrder = MapTopPart.LEVEL_NUMS + MapRpeatPart.LEVEL_NUMS * repeatCount + i +1; const levelOrder = MapTopPart.LEVEL_NUMS + MapRpeatPart.LEVEL_NUMS * repeatCount + i +1;
this.getTxt(i).text = levelOrder + ''; this.getTxt(i).text = levelOrder + '';
this.getTxt(i).cacheAsBitmap=true;
} }
for (let i = 0; i < MapBottomPart.LEVEL_NUMS; i++) { for (let i = 0; i < MapBottomPart.LEVEL_NUMS; i++) {
...@@ -29,17 +28,16 @@ export default class MapBottomPart extends ComponentBase { ...@@ -29,17 +28,16 @@ export default class MapBottomPart extends ComponentBase {
} }
// console.log(levelOrder)
const icon = MapScene.iconHash[levelOrder] = this.getIcon(i); const icon = MapScene.iconHash[levelOrder] = this.getIcon(i);
this.removeChild(icon);
const label:eui.BitmapLabel=icon.getChildAt(1) as eui.BitmapLabel; icon.show = ()=>{this.addChild(icon)};
label.cacheAsBitmap=true; icon['nums'] = icon.getChildAt(0);
icon['bmptxt']=icon.getChildAt(1);
const star = new MapStarComp(); const star = new MapStarComp();
star.loadSkin(); star.start(); star.loadSkin(); star.start();
MapScene.starHash[levelOrder] = star; MapScene.starHash[levelOrder] = star;
icon.addChild(star); icon.addChild(star);
icon.cacheAsBitmap=true;
} }
} }
......
egret/src/mapScene/MapRpeatPart.ts
View file @ a099ae07
...@@ -16,13 +16,17 @@ export default class MapRpeatPart extends ComponentBase { ...@@ -16,13 +16,17 @@ export default class MapRpeatPart extends ComponentBase {
for (let i = 0; i < MapRpeatPart.LEVEL_NUMS; i++) { for (let i = 0; i < MapRpeatPart.LEVEL_NUMS; i++) {
const levelOrder = MapTopPart.LEVEL_NUMS + this._index * MapRpeatPart.LEVEL_NUMS + i + 1; const levelOrder = MapTopPart.LEVEL_NUMS + this._index * MapRpeatPart.LEVEL_NUMS + i + 1;
this.getTxt(i).text = levelOrder + ''; this.getTxt(i).text = levelOrder + '';
this.getTxt(i).cacheAsBitmap=true;
const icon = MapScene.iconHash[levelOrder] = this.getIcon(i); 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);
const star = new MapStarComp(); const star = new MapStarComp();
star.loadSkin(); star.start(); star.loadSkin(); star.start();
MapScene.starHash[levelOrder] = star; MapScene.starHash[levelOrder] = star;
icon.addChild(star); icon.addChild(star);
icon.cacheAsBitmap=true;
} }
this['animal1'].visible = this._index % 2; this['animal1'].visible = this._index % 2;
......
egret/src/mapScene/MapScene.ts
View file @ a099ae07
...@@ -826,10 +826,6 @@ export default class MapScene extends Scene { ...@@ -826,10 +826,6 @@ export default class MapScene extends Scene {
this['settingGroup'].visible = !this['settingGroup'].visible; this['settingGroup'].visible = !this['settingGroup'].visible;
} }
// onTap_goldBtn() {
// PanelCtrl.instance.show('GoldPanel')
// }
onTap_bloodBtn() { onTap_bloodBtn() {
NetManager.ins.clickLog(getlogItem(2)); NetManager.ins.clickLog(getlogItem(2));
if(getHomeData().remainEnargy > 0) if(getHomeData().remainEnargy > 0)
...@@ -839,16 +835,9 @@ export default class MapScene extends Scene { ...@@ -839,16 +835,9 @@ export default class MapScene extends Scene {
} }
setGray(order: number) { setGray(order: number) {
const d = MapScene.iconHash[order]; const icon = MapScene.iconHash[order];
const colorMatrix = [ (icon['nums'] as eui.Image).source ='icongray_png';
0.3, 0.6, 0, 0, 0, (icon['bmptxt'] as eui.BitmapLabel).font ='nums3_fnt';
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];
d.cacheAsBitmap=true;
} }
get skinKey() { get skinKey() {
......
egret/src/mapScene/MapStarComp.ts
View file @ a099ae07
...@@ -25,7 +25,6 @@ export default class MapStarComp extends ComponentBase { ...@@ -25,7 +25,6 @@ export default class MapStarComp extends ComponentBase {
}else if(num ==3) { }else if(num ==3) {
this['star3'].visible=true; this['star3'].visible=true;
} }
this.cacheAsBitmap=true;
} }
get skinKey(): string { return 'Star' } get skinKey(): string { return 'Star' }
} }
\ No newline at end of file
egret/src/mapScene/MapTopPart.ts
View file @ a099ae07
...@@ -9,19 +9,21 @@ export default class MapTopPart extends ComponentBase { ...@@ -9,19 +9,21 @@ export default class MapTopPart extends ComponentBase {
for (let i = 0; i < MapTopPart.LEVEL_NUMS; i++) { for (let i = 0; i < MapTopPart.LEVEL_NUMS; i++) {
const levelOrder = i + 1; const levelOrder = i + 1;
const icon = MapScene.iconHash[levelOrder] = this.getIcon(i); const icon = MapScene.iconHash[levelOrder] = this.getIcon(i);
const label:eui.BitmapLabel=icon.getChildAt(1) as eui.BitmapLabel; // const label:eui.BitmapLabel=icon.getChildAt(1) as eui.BitmapLabel;
label.cacheAsBitmap=true;
const star = new MapStarComp(); const star = new MapStarComp();
star.loadSkin(); star.start(); star.loadSkin(); star.start();
MapScene.starHash[levelOrder] = star; MapScene.starHash[levelOrder] = star;
icon.addChild(star); icon.addChild(star);
icon.cacheAsBitmap=true;
}
icon['nums'] = icon.getChildAt(0);
icon['bmptxt']=icon.getChildAt(1);
this.removeChild(icon);
icon.show = ()=>{this.addChild(icon)};
}
} }
getIcon(i):egret.DisplayObjectContainer { return this[`icon${i}`]; } getIcon(i) { return this[`icon${i}`]; }
......
mock/happyclear/homemax.json
View file @ a099ae07
...@@ -986,16 +986,6 @@ ...@@ -986,16 +986,6 @@
"levelNum": 196, "levelNum": 196,
"maxScore": 47440, "maxScore": 47440,
"stars": 1 "stars": 1
},
{
"levelNum": 197,
"maxScore": 47440,
"stars": 0
},
{
"levelNum": 198,
"maxScore": 47440,
"stars": 3
} }
], ],
"remainProp": [ "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