Skip to content

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

1

parent 1961c8b4
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 35 deletions
egret/libs/new_wx/components/RulePanel2.ts
View file @ 6bbf295c
import { DataManager } from "../../tw/manager/DataManager";
import { HtmlTextParser } from "../HtmlTextParser";
import Panel from "./Panel";
......@@ -15,7 +14,7 @@ export default class RulePanel2 extends Panel {
private addRule() {
const text =
`<br>1、新用户点击“为TA助力”按钮后，进入游戏参与闯关即可为好友助力成功。<br>2、新用户仅包含未参与过狮狮连萌活动的用户。<br>3、用户不可为自己助力，或重复为好友助力。<br>`;
`<br>1、新用户点击“帮TA助力”按钮后，进入游戏参与闯关即可为好友助力成功。<br>2、新用户仅包含未参与过狮狮连萌活动的用户。<br>3、用户不可为自己助力，或重复为好友助力。<br>`;
this.labContent.textFlow = (new HtmlTextParser).parser(text);
}
......
egret/resource/default.res.json
View file @ 6bbf295c
......@@ -69,7 +69,7 @@
"name": "blood2"
},
{
"keys": "exchangebtn_png,exchange_png",
"keys": "exchange_png",
"name": "exchange"
},
{
......@@ -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",
"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",
"name": "common"
},
{
......@@ -700,11 +700,6 @@
"type": "image",
"name": "signitem_png"
},
{
"url": "assets/exchange/exchangebtn.png",
"type": "image",
"name": "exchangebtn_png"
},
{
"url": "assets/exchange/exchange.png",
"type": "image",
......@@ -2264,6 +2259,11 @@
"url": "assets/invite/invitebg2.png",
"type": "image",
"name": "invitebg2_png"
},
{
"url": "assets/common/exchangebtn.png",
"type": "image",
"name": "exchangebtn_png"
}
]
}
\ No newline at end of file
egret/resource/skins/Buy1Skin.exml
View file @ 6bbf295c
......@@ -5,12 +5,12 @@
<e:Button id="buyBtn" label="" y="589" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="btn_png" source.down="btn_png" source.disabled="btn_png"/>
<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>
</e:Button>
<e:Button id="closeBtn" label="" x="614" y="187">
<e:Button id="closeBtn" label="" x="606" y="211">
<e:skinName>
<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
......@@ -18,10 +18,10 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="priceTxt" text="X2" x="350.08" y="617.56" bold="true" size="44" touchEnabled="false"/>
<e:Group y="706" horizontalCenter="0">
<e:Label text="已拥有：" x="0" y="0" textColor="0x885037" size="24"/>
<e:Label id="moneyTxt" text="0" x="138.24" y="0" textColor="0x885037" size="24"/>
<e:Image source="common_yuanbao_png" x="93.68" y="1.04"/>
<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"/>
<e:Image source="common_yuanbao_png" x="2.93" y="1.04"/>
</e:Group>
<e:Label id="priceTxt" text="-3" x="257.08" y="613" bold="true" size="47" touchEnabled="false" width="131" textAlign="right"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/Buy2Skin.exml
View file @ 6bbf295c
......@@ -3,13 +3,13 @@
<e:Image y="50" horizontalCenter="0" source="购买炸弹_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>
</e:Button>
<e:Button id="closeBtn" label="" x="614" y="187">
<e:Button id="closeBtn" label="" x="608" y="209">
<e:skinName>
<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
......@@ -17,10 +17,10 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="priceTxt" text="X100" x="350.08" y="617" bold="true" size="44" touchEnabled="false"/>
<e:Group y="706" horizontalCenter="0">
<e:Label text="已拥有：" x="0" y="0" textColor="0x885037" size="24"/>
<e:Label id="moneyTxt" text="0" x="138.24" y="0" textColor="0x885037" size="24"/>
<e:Image source="common_yuanbao_png" x="93.68" y="1.04"/>
<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"/>
<e:Image source="common_yuanbao_png" x="2.93" y="1.04"/>
</e:Group>
<e:Label id="priceTxt" text="-2" x="243.08" y="611" bold="true" size="50" touchEnabled="false" width="144" textAlign="right"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/Buy3Skin.exml
View file @ 6bbf295c
......@@ -4,13 +4,13 @@
<e:Image y="50" horizontalCenter="0" source="购买步数增加_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>
</e:Button>
<e:Button id="closeBtn" label="" x="614" y="187">
<e:Button id="closeBtn" label="" x="616" y="207">
<e:skinName>
<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
......@@ -18,10 +18,10 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="priceTxt" text="X100" x="350.08" y="617" bold="true" size="44" touchEnabled="false"/>
<e:Group y="706" horizontalCenter="0">
<e:Label text="已拥有：" x="0" y="0" textColor="0x885037" size="24"/>
<e:Label id="moneyTxt" text="0" x="138.24" y="0" textColor="0x885037" size="24"/>
<e:Image source="common_yuanbao_png" x="93.68" y="1.04"/>
<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"/>
<e:Image source="common_yuanbao_png" x="2.93" y="1.04"/>
</e:Group>
<e:Label id="priceTxt" text="-5" x="250.08" y="613" bold="true" size="48" touchEnabled="false" width="140" textAlign="right"/>
</e:Skin>
\ No newline at end of file
egret/src/panels/Buy1Panel.ts
View file @ 6bbf295c
......@@ -14,7 +14,7 @@ export default class Buy1Panel extends Panel {
this['buyBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.ontap, this);
this.showlog();
this['priceTxt'].text = 'X'+window['price3'];
this['priceTxt'].text = '-'+window['price3'];
this['moneyTxt'].text = getHomeData().wealth;
setGlow(this['priceTxt'], 0x0083e8, 1);
......
egret/src/panels/Buy2Panel.ts
View file @ 6bbf295c
......@@ -13,7 +13,7 @@ export default class Buy2Panel extends Panel {
this['buyBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.ontap, this);
this.showlog();
this['priceTxt'].text = 'X'+window['price2'];
this['priceTxt'].text = '-'+window['price2'];
setGlow(this['priceTxt'], 0x0083e8, 1);
this['moneyTxt'].text = getHomeData().wealth;
}
......
egret/src/panels/Buy3Panel.ts
View file @ 6bbf295c
......@@ -13,7 +13,7 @@ export default class Buy3Panel extends Panel {
this['buyBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.ontap, this);
this.showlog();
this['priceTxt'].text = 'X'+window['price4'];
this['priceTxt'].text = '-'+window['price4'];
setGlow(this['priceTxt'], 0x0083e8, 1);
this['moneyTxt'].text = getHomeData().wealth;
}
......
mock/happyclear/getInviteInfo.json
View file @ 6bbf295c
......@@ -19,7 +19,7 @@
"avatar": null
}
],
"completeFlag": 5,
"completeFlag": 1,
"openPrizeMsg": "图片",
"prizeType": "nickname",
"prizeName": "nickname",
......
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