Skip to content

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

1

parent f18b78c4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 1013 deletions
egret/.wing/exml.json
View file @ d9fc7a68
......@@ -118,7 +118,7 @@
},
{
"key": "data.url",
"value": "turnprize_icon1_png"
"value": "common_prop3_png"
}
]
},
......
egret/libs/new_wx/components/PrizePanel.ts
View file @ d9fc7a68
......@@ -2,7 +2,6 @@ import getShowOffPic from "../../../src/getShowOffPic";
import { iswx } from "../../../src/iswx";
import { getlogItem } from "../../../src/Main";
import { addRankFriendList } from "../../../src/mapScene/RankFriendList";
import setGray from "../../../src/setGray";
import { showShare } from "../../../src/shareCtrl";
import { changeMapScene } from "../../../src/startScene/StartScene";
import wait from "../../new_tc/wait";
......@@ -42,9 +41,6 @@ export default class PrizePanel extends Panel {
start(data) {
super.start();
setGray(this['pica']);
setGray(this['picb']);
setGray(this['picc']);
this._level = parseInt(data.level + '');
this.updateOption(data.option);
......@@ -70,7 +66,7 @@ export default class PrizePanel extends Panel {
this.setStar(hc_submitData.stars);
addRankFriendList(84,859,this);
addRankFriendList(84,869.74,this);
}
showlog() {
......@@ -100,7 +96,7 @@ export default class PrizePanel extends Panel {
await this.playAni3();
}
if (nums >= 1) {
this['light'].visible = true;
this['light'].visible = false;
egret.Tween.get(this['light']).set({ scaleX: 0, scaleY: 0, alpha: 0, }).to({ scaleX: 1, scaleY: 1, alpha: 1 }, 300).call(() => {
egret.Tween.get(this['light'], { loop: true }).to({ rotation: 360 }, 3000);
});
......@@ -110,7 +106,7 @@ export default class PrizePanel extends Panel {
async playAni1() {
return new Promise(r => {
egret.Tween.get(this['pic1']).set({ scaleX: 0, scaleY: 0 }).to({ scaleX: 1, scaleY: 1 }, 400, egret.Ease.getBackOut(1)).call(r)
egret.Tween.get(this['pic1']).set({ scaleX: 0, scaleY: 0 }).to({ scaleX: -1, scaleY: 1 }, 400, egret.Ease.getBackOut(1)).call(r)
})
}
async playAni2() {
......@@ -120,7 +116,7 @@ export default class PrizePanel extends Panel {
}
async playAni3() {
return new Promise(r => {
egret.Tween.get(this['pic3']).set({ scaleX: 0, scaleY: 0 }).to({ scaleX: -1, scaleY: 1 }, 400, egret.Ease.getBackOut(1)).call(r)
egret.Tween.get(this['pic3']).set({ scaleX: 0, scaleY: 0 }).to({ scaleX: 1, scaleY: 1 }, 400, egret.Ease.getBackOut(1)).call(r)
})
}
......@@ -132,11 +128,6 @@ export default class PrizePanel extends Panel {
onTouchTap_closeBtn(): any {
super.onTouchTap_closeBtn();
changeMapScene();
// if (this._level +1 <= 70)
// SceneCtrl.instance.change(ModuleTypes.START_SCENE, { level: this._level + 1 });
// else
// SceneCtrl.instance.change(ModuleTypes.START_SCENE);
// SceneCtrl.instance.change(ModuleTypes.MAP_SCENE, createData());
}
get picBigWidth() { return 510 };
......
egret/resource/assets/prize/点亮.png
View replaced file @ f18b78c4 View file @ d9fc7a68
egret/resource/assets/prize/点亮.png

27.9 KB | W: | H:

egret/resource/assets/prize/点亮.png

13.6 KB | W: | H:

egret/resource/assets/prize/点亮.png
egret/resource/assets/prize/点亮.png
egret/resource/assets/prize/点亮.png
egret/resource/assets/prize/点亮.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/default.res.json
View file @ d9fc7a68
......@@ -29,7 +29,7 @@
"name": "noprize"
},
{
"keys": "PrizePanelX_png,prizePanelUseBtn_png,点亮_png,点亮 副本 2_png",
"keys": "PrizePanelX_png,prizePanelUseBtn_png,点亮gray_png,点亮_png,点亮 副本 2gray_png,点亮 副本 2_png",
"name": "prize"
},
{
......@@ -81,7 +81,7 @@
"name": "signprize"
},
{
"keys": "toast_png,share_btn2_png,share_btn1_png,prizePanelbg_png,nums2_png,nums2_fnt,nums_png,nums_fnt,lightani_png,common_yuanbao_png,common_prizelight_png,common_adbg_png,commmon_okbtn1_png,closeCommonBtn_png,btn_png,alertbg_png,朋友圈中间分享蒙层1_jpg,按钮 副本 4_png,按钮 副本 3_png,exchangebtn_png,turnnoprize再来一次2_png,FZY4JW_TTF,FZY3JW_1_TTF,hbGameCutTimeFont_fnt,hbGameScoreFont_fnt,hbCutTimeFont_fnt",
"keys": "turnnoprize再来一次2_png,toast_png,sharenums_png,sharenums_fnt,share_btn2_png,share_btn1_png,prizePanelbg_png,nums3_png,nums3_fnt,nums2_png,nums2_fnt,nums_png,nums_fnt,lightani_png,exchangebtn_png,cutTimeFont_png,cutTimeFont_fnt,common_yuanbao_png,common_prop3_png,common_prop2_png,common_prop1_png,common_prizelight_png,common_money_png,common_blood_png,common_adbg_png,commmon_okbtn1_png,closeCommonBtn_png,btn_png,alertbg_png,朋友圈中间分享蒙层1_jpg,按钮 副本 4_png,按钮 副本 3_png",
"name": "common"
},
{
......@@ -3543,6 +3543,41 @@
"url": "assets/map/map2+bg2.png",
"type": "image",
"name": "map2+bg2_png"
},
{
"url": "assets/prize/点亮 副本 2gray.png",
"type": "image",
"name": "点亮 副本 2gray_png"
},
{
"url": "assets/prize/点亮gray.png",
"type": "image",
"name": "点亮gray_png"
},
{
"url": "assets/common/common_blood.png",
"type": "image",
"name": "common_blood_png"
},
{
"url": "assets/common/common_money.png",
"type": "image",
"name": "common_money_png"
},
{
"url": "assets/common/common_prop2.png",
"type": "image",
"name": "common_prop2_png"
},
{
"url": "assets/common/common_prop1.png",
"type": "image",
"name": "common_prop1_png"
},
{
"url": "assets/common/common_prop3.png",
"type": "image",
"name": "common_prop3_png"
}
]
}
\ No newline at end of file
egret/resource/skins/PrizeSkin.exml
View file @ d9fc7a68
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="PrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="169005181d0"/>
<e:Component y="859.74" skinName="ADSmallSkin" x="84" visible="false"/>
<e:Image id="light" source="common_prizelight_png" x="374.19" y="253.76" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
<e:Image source="prizePanelbg_png" y="61.15" horizontalCenter="0.5"/>
<e:Image id="img" width="508" height="225" source="{data.url}" horizontalCenter="0" y="411.76" visible="false"/>
<e:Image id="money" source="signprize元宝_png" y="402.2" horizontalCenter="0" scaleX="0.8" scaleY="0.8" visible="false"/>
<e:Image id="blood" source="singprize体力_png" y="364.8" horizontalCenter="0" visible="false"/>
<e:Group id="numsgroup" x="396.38" y="410.4" visible="false">
<e:Component y="869.74" skinName="ADSmallSkin" x="84" visible="false"/>
<e:Image id="light" source="common_prizelight_png" x="374.19" y="253.76" anchorOffsetX="375.76" anchorOffsetY="327.27" visible="false"/>
<e:Image source="prizePanelbg_png" y="61.15" scale9Grid="87,543,522,23" height="839" x="28"/>
<e:Image id="img" width="508" height="225" source="{data.url}" horizontalCenter="0" y="515.76"/>
<e:Image id="money" y="516.2" scaleX="0.6" scaleY="0.6" source="common_money_png" x="150" visible="false"/>
<e:Image id="blood" y="522.8" horizontalCenter="1" source="common_blood_png" scaleX="0.6" scaleY="0.6" visible="false"/>
<e:Group id="numsgroup" x="396.38" y="518.4" visible="false">
<e:Image id="numsbg" source="signprize_numsbg_png" x="0" y="0"/>
<e:Label id="propnums" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center"/>
</e:Group>
<e:Button id="closeBtn" label="" x="618" y="235.25">
<e:Label id="propnums2" text="30" textColor="0x885037" bold="true" y="649.08" width="75" textAlign="right" x="287.16" visible="false"/>
<e:Button id="closeBtn" label="" x="608" y="287.25">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
......@@ -19,7 +20,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="shareBtn" label="" y="714.28" horizontalCenter="-145.5">
<e:Button id="shareBtn" label="" y="766" horizontalCenter="-145">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮 副本 3_png" source.down="按钮 副本 3_png" source.disabled="按钮 副本 3_png"/>
......@@ -27,7 +28,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="goBtn" label="" y="714.28" horizontalCenter="144">
<e:Button id="goBtn" label="" y="766.28" horizontalCenter="144.5">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮 副本 4_png" source.down="按钮 副本 4_png" source.disabled="按钮 副本 4_png"/>
......@@ -35,10 +36,11 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Image id="picb" source="点亮 副本 2_png" x="142" y="118.28"/>
<e:Image id="pica" source="点亮 副本 2_png" x="608" y="118.28" scaleX="-1"/>
<e:Image id="picc" source="点亮_png" y="69.28" x="280"/>
<e:Image id="pic1" source="点亮 副本 2_png" x="223.82" y="178.89" anchorOffsetX="81.82" anchorOffsetY="60.61"/>
<e:Image id="pic3" source="点亮 副本 2_png" x="532.24" y="178.89" scaleX="-1" anchorOffsetX="75.76" anchorOffsetY="60.61"/>
<e:Image id="pic2" source="点亮_png" y="142.01" x="373.94" anchorOffsetX="93.94" anchorOffsetY="72.73"/>
<e:Image id="picb" x="286" y="339.28" source="点亮 副本 2gray_png" scaleX="-1"/>
<e:Image id="pica" x="465.48" y="332.28" source="点亮 副本 2gray_png"/>
<e:Image id="picc" y="315.28" source="点亮gray_png" x="310"/>
<e:Image id="pic1" source="点亮 副本 2_png" x="214.18" y="391.39" anchorOffsetX="81.82" anchorOffsetY="60.61" scaleX="-1"/>
<e:Image id="pic3" source="点亮 副本 2_png" x="528.24" y="394.89" scaleX="1" anchorOffsetX="71.76" anchorOffsetY="66.61"/>
<e:Image id="pic2" source="点亮_png" y="388.01" anchorOffsetX="73.94" anchorOffsetY="74.73" x="375.94"/>
<e:Label id="lvTxt" text="关卡1" y="276" textColor="0xff841b" horizontalCenter="0.5"/>
</e:Skin>
\ No newline at end of file
egret/src/mapScene/MapScene.ts
View file @ d9fc7a68
......@@ -90,6 +90,11 @@ export default class MapScene extends Scene {
async start(data?) {
super.start();
NetManager.ins.hc_submit(()=>{
const submitData = DataManager.ins.getData('hc_submit').data;
PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL,{ level:1, option: submitData.option })
},1,1,'','')
this['actIconsGroup'].x = -999;
this.addIcon(); // 添加Icon
......
mock/happyclear/home.json
View file @ d9fc7a68
This diff is collapsed.
mock/happyclear/submit.json
View file @ d9fc7a68
......@@ -28,6 +28,6 @@
"errorMsg":null,
"success":true
},
"stars":1
"stars":3
}
}
\ No newline at end of file
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