Skip to content

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

1

parent 3b536e8c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 121 additions and 52 deletions
egret/libs/tw/manager/NetManager.ts
View file @ d6498bf5
......@@ -1781,6 +1781,8 @@ export class NetManager extends ABNetManager {
*/
protected onResponse(net: INetData, result: any): void {
if(net.name == 'hc_home') {
// if(result.data.refectionCountdown==null)
// result.data.refectionCountdown==0;
if(result.data.refectionCountdown==0)
result.data.refectionCountdown=5;
result.data.refectionCountdown += Math.floor(new Date().getTime()/1000);
......
egret/resource/TextureMerger/exchange.tmproject
View file @ d6498bf5
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"exchange","version":5,"files":["../assets/buy2/购买炸弹.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"exchange","version":5,"files":["../assets/exchange/exchangebtn.png","../assets/exchange/exchange.png"]}
\ No newline at end of file
egret/resource/TextureMerger/preload.tmproject 0 → 100644
View file @ d6498bf5
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["../assets/signprize/signprize_btn.png","../assets/signprize/singprizebg.png"]}
\ No newline at end of file
egret/resource/TextureMerger/shop.tmproject
View file @ d6498bf5
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"shop","version":5,"files":["../assets/shop/道具商城.png","../assets/shop/按钮 副本.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"shop","version":5,"files":["../assets/shop/shopbtn1.png","../assets/shop/道具商城.png","../assets/shop/按钮 副本.png"]}
\ No newline at end of file
egret/resource/default.res.json
View file @ d6498bf5
......@@ -41,7 +41,7 @@
"name": "quit"
},
{
"keys": "道具商城_png,按钮 副本_png",
"keys": "shopbtn1_png,道具商城_png,按钮 副本_png",
"name": "shop"
},
{
......@@ -73,16 +73,16 @@
"name": "startpanel"
},
{
"keys": "blood2按钮 副本1_png,blood2按钮 副本_png",
"keys": "blood2按钮 副本1_png,blood2按钮 副本_png,blood2_png",
"name": "blood2"
},
{
"keys": "购买炸弹_png",
"keys": "exchangebtn_png,exchange_png",
"name": "exchange"
},
{
"keys": "signprize_btn_png,singprizebg_png",
"name": "preload"
"keys": "",
"name": "sign"
}
],
"resources": [
......@@ -1735,6 +1735,76 @@
"url": "assets/mainScene/lockVine.png",
"type": "image",
"name": "lockVine_png"
},
{
"url": "assets/mainScene/lockVine.png",
"type": "image",
"name": "lockVine2_png"
},
{
"url": "assets/sign/signbtn1.png",
"type": "image",
"name": "signbtn1_png"
},
{
"url": "assets/sign/signbtn2.png",
"type": "image",
"name": "signbtn2_png"
},
{
"url": "assets/sign/signbtn3.png",
"type": "image",
"name": "signbtn3_png"
},
{
"url": "assets/sign/signbtn4.png",
"type": "image",
"name": "signbtn4_png"
},
{
"url": "assets/sign/sign_line.png",
"type": "image",
"name": "sign_line_png"
},
{
"url": "assets/sign/sign_icon1.png",
"type": "image",
"name": "sign_icon1_png"
},
{
"url": "assets/sign/signicon2.png",
"type": "image",
"name": "signicon2_png"
},
{
"url": "assets/sign/signicon3.png",
"type": "image",
"name": "signicon3_png"
},
{
"url": "assets/sign/signitem.png",
"type": "image",
"name": "signitem_png"
},
{
"url": "assets/exchange/exchangebtn.png",
"type": "image",
"name": "exchangebtn_png"
},
{
"url": "assets/exchange/exchange.png",
"type": "image",
"name": "exchange_png"
},
{
"url": "assets/shop/shopbtn1.png",
"type": "image",
"name": "shopbtn1_png"
},
{
"url": "assets/blood2/blood2.png",
"type": "image",
"name": "blood2_png"
}
]
}
\ No newline at end of file
egret/resource/skins/Blood2Skin.exml
View file @ d6498bf5
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="Blood2Skin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image y="46" horizontalCenter="0" source="blood体力补济站_png"/>
<e:Image y="36" horizontalCenter="0" source="blood2_png"/>
<e:Button id="closeBtn" label="" x="614" y="241">
<e:skinName>
<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
......@@ -9,26 +9,26 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="buyBtn" label="" x="433" y="522">
<e:Button id="buyBtn" label="" x="436" y="484">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="blood按钮 副本_png" source.down="blood按钮 副本_png" source.disabled="blood按钮 副本_png"/>
<e:Image width="100%" height="100%" source="blood2按钮 副本_png" source.down="blood2按钮 副本_png" source.disabled="blood2按钮 副本_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="inviteBtn" label="" x="433" y="661">
<e:Button id="inviteBtn" label="" x="439.08" y="621.6">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="blood按钮 副本1_png" source.down="blood按钮 副本1_png" source.disabled="blood按钮 副本1_png"/>
<e:Image width="100%" height="100%" source="blood2按钮 副本1_png" source.down="blood2按钮 副本1_png" source.disabled="blood2按钮 副本1_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="bloodTxt" text="你的可用体力值为：5" y="306" horizontalCenter="0" textColor="0xe2701b"/>
<e:Label id="countdownTxt" text="距离下一次体力补给时间:" y="772" textColor="0xE2701B" size="24" width="509" horizontalCenter="0" verticalAlign="middle" textAlign="center"/>
<e:Label text="使用元宝购买" y="524" textColor="0x821818" size="27" x="228"/>
<e:Label text="分享好友获得体力" y="663" textColor="0x821818" size="27" x="225.92"/>
<e:Label id="invitTxt" text="(已领0/1)" y="699" textColor="0x821818" size="27" x="232"/>
<e:Label id="price1Txt" text="20" y="565" textColor="0x821818" x="274" size="27"/>
<e:Label id="bloodTxt" text="你的可用体力值为：5" y="299.92" horizontalCenter="0" textColor="0xf54500" size="33"/>
<e:Label id="countdownTxt" text="距离下一次体力补给时间:" y="753.76" size="22" width="509" horizontalCenter="0.5" verticalAlign="middle" textAlign="center" textColor="0x86533a"/>
<e:Label text="元宝兑换得体力" y="492.08" size="26" x="218.88" textColor="0xc33700"/>
<e:Label text="分享活动得体力" y="634.22" size="26" x="221.39" textColor="0xc33700"/>
<e:Label id="invitTxt" text="(已领0/1)" y="670.12" size="22" x="219.84" textColor="0xc33700"/>
<e:Label id="price1Txt" text="30个元宝=1个体力值" y="529.08" x="218.32" size="22" textColor="0xc33700"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/BloodSkin.exml
View file @ d6498bf5
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="BloodSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image y="46" horizontalCenter="0" source="blood体力补济站_png"/>
<e:Label text="元宝兑换得体力" y="504.08" size="26" x="216.88" textColor="0xC33700"/>
<e:Label text="分享活动得体力" y="646.22" size="26" x="219.39" textColor="0xC33700"/>
<e:Label id="invitTxt" text="(已领0/1)" y="682.12" size="22" x="217.84" textColor="0xC33700"/>
<e:Label id="price1Txt" text="30个元宝=1个体力值" y="541.08" x="216.32" size="22" textColor="0xC33700"/>
<e:Button id="closeBtn" label="" x="614" y="241">
<e:skinName>
<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
......@@ -17,7 +21,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="buyBtn" label="" x="433" y="522">
<e:Button id="buyBtn" label="" x="433" y="496">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="blood按钮 副本_png" source.down="blood按钮 副本_png" source.disabled="blood按钮 副本_png"/>
......@@ -25,7 +29,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="inviteBtn" label="" x="433" y="661">
<e:Button id="inviteBtn" label="" x="433" y="635">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="blood按钮 副本1_png" source.down="blood按钮 副本1_png" source.disabled="blood按钮 副本1_png"/>
......@@ -33,10 +37,6 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="bloodTxt" text="你的可用体力值为：5" y="306" horizontalCenter="0" textColor="0xe2701b"/>
<e:Label id="countdownTxt" text="距离下一次体力补给时间:" y="772" textColor="0xE2701B" size="24" width="509" horizontalCenter="0" verticalAlign="middle" textAlign="center"/>
<e:Label text="使用元宝购买" y="524" textColor="0x821818" size="27" x="228"/>
<e:Label text="分享好友获得体力" y="663" textColor="0x821818" size="27" x="225.92"/>
<e:Label id="invitTxt" text="(已领0/1)" y="699" textColor="0x821818" size="27" x="232"/>
<e:Label id="price1Txt" text="20" y="565" textColor="0x821818" x="274" size="27"/>
<e:Label id="bloodTxt" text="你的可用体力值为：5" y="303.92" horizontalCenter="0" textColor="0xF54500" size="33"/>
<e:Label id="countdownTxt" text="距离下一次体力补给时间:" y="753.76" size="22" width="509" horizontalCenter="0.5" verticalAlign="middle" textAlign="center" textColor="0x86533A"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/ExchangeSkin.exml
View file @ d6498bf5
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="ExchangeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16c984f7919"/>
<e:Image y="50" horizontalCenter="0" source="购买步数增加_png"/>
<e:Image y="50" horizontalCenter="0" source="exchange_png"/>
<e:Button id="buyBtn" label="" y="589" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
<e:Image width="100%" height="100%" source="btn_png" source.down="btn_png" source.disabled="btn_png"/>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="exchangebtn_png" source.down="exchangebtn_png" source.disabled="exchangebtn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
......@@ -18,7 +18,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="priceTxt" text="-1000" x="350.08" y="617" bold="true" size="44" touchEnabled="false"/>
<e:Label id="priceTxt" text="-1000" x="231.08" y="615" bold="true" size="44" touchEnabled="false" width="169" textAlign="right"/>
<e:Group y="706" horizontalCenter="0">
<e:Label text="可使用的元宝：" x="34.88" y="0" textColor="0x885037" size="24"/>
<e:Label id="moneyTxt" text="00000" x="192.97" y="0" textColor="0x885037" size="24"/>
......
egret/resource/skins/MapSkin.exml
View file @ d6498bf5
......@@ -50,14 +50,6 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="signBtn" label="" x="618.08" y="489.01">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="道具_png" source.down="道具_png" source.disabled="道具_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="recordBtn" label="" x="615.08" y="304.41">
<e:skinName>
<e:Skin states="up,down,disabled">
......
egret/resource/skins/ShopSkin.exml
View file @ d6498bf5
......@@ -2,10 +2,10 @@
<e:Skin class="ShopSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16c953f5068" horizontalCenter="0"/>
<e:Image source="道具商城_png" y="42" horizontalCenter="0"/>
<e:Label id="price1Txt" text="20" y="398.52" x="294.52" size="27" textColor="0xc33700"/>
<e:Label id="price1Txt" text="20" y="395.86" x="294.52" size="27" textColor="0xc33700"/>
<e:Label id="price2Txt" text="20" y="541.44" textColor="0xC33700" x="295.4" size="27"/>
<e:Label id="price3Txt" text="20" y="680.64" textColor="0xC33700" x="294.76" size="27"/>
<e:Label id="price4Txt" text="20" y="751.28" textColor="0xC33700" x="297.16" size="27"/>
<e:Label id="price4Txt" text="20" y="819.28" textColor="0xC33700" x="297.16" size="27"/>
<e:Button id="closeBtn" label="" x="614" y="230">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -22,7 +22,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="buyBtn1" label="" x="444" y="498">
<e:Button id="buyBtn1" label="" x="444" y="499.33">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮 副本_png" source.down="按钮 副本_png" source.disabled="按钮 副本_png"/>
......@@ -30,7 +30,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="buyBtn3" label="" x="444" y="634">
<e:Button id="buyBtn3" label="" x="444" y="636.66">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮 副本_png" source.down="按钮 副本_png" source.disabled="按钮 副本_png"/>
......@@ -38,12 +38,13 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="buyBtn4" label="" x="447.52" y="741.16">
<e:Button id="buyBtn4" label="" x="447.52" y="779.76">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮 副本_png" source.down="按钮 副本_png" source.disabled="按钮 副本_png"/>
<e:Image width="100%" height="100%" source="shopbtn1_png" source.down="shopbtn1_png" source.disabled="shopbtn1_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="moneyTxt" text="0000" x="421.24" y="886" textColor="0x885037" size="24"/>
</e:Skin>
\ No newline at end of file
egret/src/panels/BloodPanel.ts
View file @ d6498bf5
......@@ -17,8 +17,8 @@ export default class BloodPanel extends Panel {
super.start();
this.updateData();
this.showlog();
this['price1Txt'].text = window['price1'];
this['price1Txt'].text =`${ window['price1']}个元宝=1个体力值`;
}
......
egret/src/panels/BloodPanel2.ts
View file @ d6498bf5
......@@ -17,7 +17,7 @@ export default class BloodPanel2 extends Panel {
super.start();
this.updateData();
this.showlog();
this['price1Txt'].text = window['price1'];
this['price1Txt'].text =`${ window['price1']}个元宝=1个体力值`;
}
......
egret/src/panels/ShopPanel.ts
View file @ d6498bf5
......@@ -2,6 +2,7 @@ import Panel from "../../libs/new_wx/components/Panel";
import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl";
import { NetManager } from "../../libs/tw/manager/NetManager";
import { getlogItem } from "../Main";
import getHomeData from "../getHomeData";
export default class ShopPanel extends Panel {
buyBtn1: eui.Button;
......@@ -19,6 +20,8 @@ export default class ShopPanel extends Panel {
this['price2Txt'].text = window['price3']
this['price3Txt'].text = window['price4']
this['price4Txt'].text = window['price5']
this['moneyTxt'].text = getHomeData().wealth;
}
showLog() {
......
egret/src/panels/StartPanel.ts
View file @ d6498bf5
......@@ -103,7 +103,7 @@ export default class StartPanel extends Panel {
// Loading.instace.hide();
this.touchChildren = true;
this.touchEnabled = true;
wait(2000).then(()=>{
wait(5000).then(()=>{
updateMainTimerAfterGetData();
});
if (success) {
......
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