Commit af1d70b3 authored by Edwise's avatar Edwise 🍷

123

parent 3005d10c
module.exports = {
opn: 0,
opn: 1,
devPort: 8080,
proxy: {
'/ngapi/*': 'http://localhost:3000',
......
......@@ -875,8 +875,8 @@ export class NetManager extends ABNetManager {
}
/**
* 收集能量
* energy 能量
* 收集星能
* energy 星能
*/
public collectEnergy(callback: Function, energy: string): void {
const net: INetData = {
......
......@@ -20,7 +20,7 @@
</e:Group>
<e:Group id="guideStep5" top="0" left="0" bottom="0" verticalCenter="0" right="0" horizontalCenter="0" visible="false">
<e:Image id="guideStepBg5" width="525" height="753" source="guideStep5_jpg" verticalCenter="39.5" horizontalCenter="0.5"/>
<e:Label text="累计能量:0" textColor="0xaa281b" size="24" width="300" anchorOffsetY="0" height="82.66" textAlign="center" verticalAlign="middle" verticalCenter="271.5" horizontalCenter="3"/>
<e:Label text="累计星能:0" textColor="0xaa281b" size="24" width="300" anchorOffsetY="0" height="82.66" textAlign="center" verticalAlign="middle" verticalCenter="271.5" horizontalCenter="3"/>
<e:Image id="handStep5" width="114" height="119" source="hand_png" name="handStep5" scaleX="1" scaleY="1" verticalCenter="-150.5" horizontalCenter="182"/>
</e:Group>
</e:Skin>
\ No newline at end of file
......@@ -12,8 +12,8 @@
</e:Button>
<e:Label id="titleLab" text="离线收益" x="0" y="44" size="42" width="634" textAlign="center" visible="false"/>
<e:Label id="energyLabel" text="0能量" y="337" horizontalCenter="0" x="279.00000000000006" scaleX="1" scaleY="1" width="634" textAlign="center" lineSpacing="10" size="30"/>
<e:Label id="energyLabel0" text="已存入“累计能量”哦" y="375" horizontalCenter="0" x="289.00000000000006" scaleX="1" scaleY="1" width="634" textAlign="center" lineSpacing="10" size="24"/>
<e:Label id="energyLabel" text="0星能" y="337" horizontalCenter="0" x="279.00000000000006" scaleX="1" scaleY="1" width="634" textAlign="center" lineSpacing="10" size="30"/>
<e:Label id="energyLabel0" text="已存入“累计星能”哦" y="375" horizontalCenter="0" x="289.00000000000006" scaleX="1" scaleY="1" width="634" textAlign="center" lineSpacing="10" size="24"/>
<e:Button id="unlineBtn" label="" y="412.0000000000001" horizontalCenter="0" x="101" scaleX="1" scaleY="1">
<e:skinName>
<e:Skin states="up,down,disabled">
......
......@@ -22,7 +22,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="levelHintLab" text="产效提升至14能量/1小时" y="509" width="580" size="24" textAlign="center" height="30" verticalAlign="middle" x="28"/>
<e:Label id="levelHintLab" text="产效提升至14星能/1小时" y="509" width="580" size="24" textAlign="center" height="30" verticalAlign="middle" x="28"/>
<e:Image id="oldLevel" width="240" height="92" y="368" source="0_png" x="237"/>
<e:Image id="newLevel" width="240" height="92" y="368" source="1_png" x="237"/>
<e:Image id="arrow" width="86" height="45" x="271" y="386" source="arrow_png"/>
......
......@@ -27,7 +27,7 @@
</e:Group>
<e:Group id="offLineGroup" width="634" height="641" x="55" y="286" touchEnabled="false" visible="false">
<e:Image id="offLintIcon" width="140" height="165" y="157" source="offLintIcon_png" x="247"/>
<e:Label id="offNumLab" text="20能量" x="22" y="348" size="24" width="600" textAlign="center"/>
<e:Label id="offNumLab" text="20星能" x="22" y="348" size="24" width="600" textAlign="center"/>
<e:Button id="getBtn" label="" y="408" x="101">
<e:skinName>
<e:Skin states="up,down,disabled">
......
......@@ -11,7 +11,7 @@
</e:skinName>
</e:Button>
<e:Image id="propTitle" width="131" height="47" y="26" source="propTitle_png" x="249"/>
<e:Label id="propHint" text="加速器可通过星购买以及邀请好友助力获取\n使用后可以瞬间将产效提升2倍,持续1小时" y="170" size="24" width="536" textAlign="center" lineSpacing="10" touchEnabled="false" verticalAlign="justify" anchorOffsetX="0" horizontalCenter="0"/>
<e:Label id="propHint" text="加速器可通过星购买以及邀请好友助力获取\n使用后可以瞬间将产效提升2倍,持续1小时" y="170" size="24" width="536" textAlign="center" lineSpacing="10" touchEnabled="false" verticalAlign="justify" anchorOffsetX="0" horizontalCenter="0"/>
<e:Image id="propBigIcon" width="146" height="183" y="261" source="propBigIcon_png" x="239"/>
<e:Label id="havePropCount" text="当前拥有加速器:0" y="448" size="24" horizontalCenter="0"/>
<e:Button id="getPropBtn" label="" x="29" y="493">
......@@ -30,7 +30,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="priceLab" text="800星/个" x="119" y="603" textColor="0x360d79" size="24"/>
<e:Label id="priceLab" text="800星/个" x="119" y="603" textColor="0x360d79" size="24"/>
<e:Label id="friendHint" text="成功邀请3个好友助力可获得1个邀请加速器" x="0" y="691" width="634" textAlign="center" size="26"/>
<e:Group id="friendGroup1" width="90" height="110" x="42" y="745" anchorOffsetX="0" anchorOffsetY="0" touchChildren="false">
<e:Label id="friendLabel1" text="邀请" y="87" size="22" horizontalCenter="0"/>
......@@ -80,9 +80,9 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="buyTitle" text="确定兑换星加速器吗?" x="59" y="393" size="42" width="634" textAlign="center"/>
<e:Label id="buyTitle" text="确定兑换星加速器吗?" x="59" y="393" size="42" width="634" textAlign="center"/>
<e:Label text="消耗:" x="296" y="533"/>
<e:Label id="needCount" text="800星" x="373" y="533"/>
<e:Label id="needCount" text="800星" x="373" y="533"/>
<e:Button id="cancelBtn" label="" x="92" y="635">
<e:skinName>
<e:Skin states="up,down,disabled">
......
......@@ -2,9 +2,9 @@
<e:Skin class="ResultPanelSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Group width="634" height="531" x="58" y="286">
<e:Image id="buyPropBg" width="634" height="531" x="0" y="0" source="buyPropBg_png"/>
<e:Label id="titleLab" text="当前星不足哟~" x="0" y="62" size="42" width="634" textAlign="center"/>
<e:Label id="titleLab" text="当前星不足哟~" x="0" y="62" size="42" width="634" textAlign="center"/>
<e:Group id="androidGroup" width="634" height="531" x="0" y="0">
<e:Label id="contentLab" text="点击获取星" x="0" y="203" size="30" width="634" textAlign="center" scaleX="1" scaleY="1"/>
<e:Label id="contentLab" text="点击获取星" x="0" y="203" size="30" width="634" textAlign="center" scaleX="1" scaleY="1"/>
<e:Button id="cancelBtn" label="" x="34" y="308">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -23,7 +23,7 @@
</e:Button>
</e:Group>
<e:Group id="iosGroup" width="634" height="531" x="0" y="0" visible="false">
<e:Label id="iosLabel" text="了解星获取攻略" x="0" y="203" size="30" width="634" textAlign="center" scaleX="1" scaleY="1"/>
<e:Label id="iosLabel" text="了解星获取攻略" x="0" y="203" size="30" width="634" textAlign="center" scaleX="1" scaleY="1"/>
<e:Button id="iosBtn" label="" y="308" x="101">
<e:skinName>
<e:Skin states="up,down,disabled">
......
......@@ -12,35 +12,35 @@
<e:Group id="pp0" x="47" y="47" scaleX="1" scaleY="1" anchorOffsetX="47" anchorOffsetY="47">
<e:Image source="energyPpBg_png" scaleX="1" scaleY="1"/>
<e:Label id="ppLb01" text="+1" y="22.52" size="21" width="81" textAlign="center" horizontalCenter="0" touchEnabled="false"/>
<e:Label id="ppLb02" text="能量" y="45.27" size="21" width="81" textAlign="center" horizontalCenter="0" touchEnabled="false"/>
<e:Label id="ppLb02" text="星能" y="45.27" size="21" width="81" textAlign="center" horizontalCenter="0" touchEnabled="false"/>
</e:Group>
</e:Group>
<e:Group id="ppc2" width="94" height="94" x="208" y="89" anchorOffsetX="47" anchorOffsetY="47">
<e:Group id="pp2" x="47" y="47" scaleX="1" scaleY="1" anchorOffsetX="47" anchorOffsetY="47">
<e:Image source="energyPpBg_png" scaleX="1" scaleY="1"/>
<e:Label id="ppLb21" text="+1" y="22.52" size="21" width="81" textAlign="center" horizontalCenter="0" touchEnabled="false"/>
<e:Label id="ppLb22" text="能量" y="45.27" size="21" width="81" textAlign="center" horizontalCenter="0" touchEnabled="false"/>
<e:Label id="ppLb22" text="星能" y="45.27" size="21" width="81" textAlign="center" horizontalCenter="0" touchEnabled="false"/>
</e:Group>
</e:Group>
<e:Group id="ppc3" width="94" height="94" x="360" y="53" anchorOffsetX="47" anchorOffsetY="47">
<e:Group id="pp3" x="47" y="47" scaleX="1" scaleY="1" anchorOffsetX="47" anchorOffsetY="47">
<e:Image source="energyPpBg_png" scaleX="1" scaleY="1"/>
<e:Label id="ppLb31" text="+1" y="22.52" size="21" width="81" textAlign="center" horizontalCenter="0" touchEnabled="false"/>
<e:Label id="ppLb32" text="能量" y="45.27" size="21" width="81" textAlign="center" horizontalCenter="0" touchEnabled="false"/>
<e:Label id="ppLb32" text="星能" y="45.27" size="21" width="81" textAlign="center" horizontalCenter="0" touchEnabled="false"/>
</e:Group>
</e:Group>
<e:Group id="ppc1" width="94" height="94" x="66" y="182" anchorOffsetX="47" anchorOffsetY="47">
<e:Group id="pp1" x="47" y="47" scaleX="1" scaleY="1" anchorOffsetX="47" anchorOffsetY="47">
<e:Image source="energyPpBg_png" scaleX="1" scaleY="1"/>
<e:Label id="ppLb11" text="+1" y="22.52" size="21" width="81" textAlign="center" horizontalCenter="0" touchEnabled="false"/>
<e:Label id="ppLb12" text="能量" y="45.27" size="21" width="81" textAlign="center" horizontalCenter="0" touchEnabled="false"/>
<e:Label id="ppLb12" text="星能" y="45.27" size="21" width="81" textAlign="center" horizontalCenter="0" touchEnabled="false"/>
</e:Group>
</e:Group>
<e:Group id="ppc4" width="94" height="94" x="333" y="169" anchorOffsetX="47" anchorOffsetY="47">
<e:Group x="47" y="47" scaleX="1" scaleY="1" id="pp4" anchorOffsetX="47" anchorOffsetY="47">
<e:Image source="energyPpBg_png" scaleX="1" scaleY="1"/>
<e:Label id="ppLb41" text="+1" y="22.52" size="21" width="81" textAlign="center" horizontalCenter="0" touchEnabled="false"/>
<e:Label id="ppLb42" text="能量" y="45.27" size="21" width="81" textAlign="center" horizontalCenter="0" touchEnabled="false"/>
<e:Label id="ppLb42" text="星能" y="45.27" size="21" width="81" textAlign="center" horizontalCenter="0" touchEnabled="false"/>
</e:Group>
</e:Group>
</e:Group>
......@@ -131,8 +131,8 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="energyLb" text="累计能量:1320" x="374.81" y="28.69" size="23" textColor="0xaa281b" scaleX="1" scaleY="1" anchorOffsetX="75.2" anchorOffsetY="12"/>
<e:Label id="energySpeedLb" text="效率:10能量/1小时(上限6)" x="214.96" y="51.88999999999987" size="21" textColor="0xb06629" scaleX="1" scaleY="1" width="313" textAlign="center"/>
<e:Label id="energyLb" text="累计星能:1320" x="374.81" y="28.69" size="23" textColor="0xaa281b" scaleX="1" scaleY="1" anchorOffsetX="75.2" anchorOffsetY="12"/>
<e:Label id="energySpeedLb" text="效率:10星能/1小时(上限6)" x="214.96" y="51.88999999999987" size="21" textColor="0xb06629" scaleX="1" scaleY="1" width="313" textAlign="center"/>
<e:Group id="anliGroup" x="502" y="114" width="177" height="183" scaleX="1" scaleY="1">
<e:Image id="anliBtnBarBg0" source="anliBtnBg_png" y="-6" x="-4" visible="false"/>
<e:Image id="anliBtnBar0" y="-4" x="-2" source="anliBtnBar_png" visible="false"/>
......
......@@ -6,7 +6,7 @@
<e:Label id="titleLab" text="离线收益" x="0" y="44" size="42" width="634" textAlign="center"/>
<e:Group id="unlineGroup" width="634" height="641">
<e:Label id="energyLabel" text="0能量" y="363" horizontalCenter="0" x="279.00000000000006" scaleX="1" scaleY="1"/>
<e:Label id="energyLabel" text="0星能" y="363" horizontalCenter="0" x="279.00000000000006" scaleX="1" scaleY="1"/>
<e:Label id="energyLabel0" text="离线时段产能减半哦~" y="555" horizontalCenter="0" x="289.00000000000006" scaleX="1" scaleY="1" size="24" textColor="0x711768"/>
<e:Button id="unlineBtn" label="" y="412.0000000000001" horizontalCenter="0" x="101" scaleX="1" scaleY="1">
<e:skinName>
......
......@@ -59,7 +59,7 @@ export default class JiaSuPanel extends Panel {
private onLoad() {
console.log('加速弹窗',this._mData);
this.energyLabel.text = `加速额外获得${this._mData.energy}能量`;
this.energyLabel.text = `加速额外获得${this._mData.energy}星能`;
let startDpmOut = Buried.connectDpm(110, 45, 1); // 点击埋点
let startDcmOut = Buried.connectDcm(202, 0, 0); // 曝光埋点
......
......@@ -81,7 +81,7 @@ export default class LevelPanel extends Panel {
window['_hmt'].push(['_trackEvent', '升级弹窗确认按钮', 'showLog', '曝光']);
}
this.levelHintLab.text = this.data.speed ? `产效提升至${this.data.speed}能量/1小时` : '产效提升至10能量/1小时';
this.levelHintLab.text = this.data.speed ? `产效提升至${this.data.speed}星能/1小时` : '产效提升至10星能/1小时';
}
private handleTitle() {
......
......@@ -74,6 +74,8 @@ export default class PopupPanel extends Panel {
}
private onLoad() {
this.numLab.text = '+0';
this.offNumLab.text = '0';
this.commonGroup.visible = false;
this.offLineGroup.visible = false;
if(this.mData && this.mData.type) {
......@@ -112,14 +114,18 @@ export default class PopupPanel extends Panel {
private handleCommon() {
this.commonGroup.visible = true;
if(this.mData && this.mData.count >= 0) {
this.numLab.text = '+' + this.mData.count;
this.numLab.text = '+' + (this.mData.count || 0);
}else{
this.numLab.text = '+0';
}
}
private handleOffLine() {
this.offLineGroup.visible = true;
if(this.mData && this.mData.count >= 0) {
this.offNumLab.text = this.mData.count;
this.offNumLab.text = (this.mData.count || 0);
}else{
this.offNumLab.text = '0';
}
}
......
......@@ -139,8 +139,8 @@ export default class PropPanel extends Panel {
this.havePropCount.text = `当前拥有加速器:${count}`;
this.priceLab.text = (window['priceCount'] ? window['priceCount'] : 800) + '星/个';
this.needCount.text = (window['needCount'] ? window['needCount'] : 800) + '星';
this.priceLab.text = (window['priceCount'] ? window['priceCount'] : 800) + '星/个';
this.needCount.text = (window['needCount'] ? window['needCount'] : 800) + '星';
[1, 2, 3].forEach((v) => {
this[`friendAvatar${v}`].mask = this[`friendMask${v}`];
......@@ -184,10 +184,10 @@ export default class PropPanel extends Panel {
PanelCtrl.instance.btnDelay(e.target);
this.buyPropGroup.visible = true;
NetManager.ins.showLog(getlogItem(40));
window['_hmt'].push(['_trackEvent', '兑换星加速器-再想想', 'showLog', '曝光']);
window['_hmt'].push(['_trackEvent', '兑换星加速器-再想想', 'showLog', '曝光']);
NetManager.ins.showLog(getlogItem(41));
window['_hmt'].push(['_trackEvent', '兑换星加速器-立即兑换', 'showLog', '曝光']);
window['_hmt'].push(['_trackEvent', '兑换星加速器-立即兑换', 'showLog', '曝光']);
}
//使用加速器
......@@ -210,7 +210,7 @@ export default class PropPanel extends Panel {
console.log('加速失败');
return;
}
showToast('开始加速,结束后加速能量将存入累计能量中哦~');
showToast('开始加速,结束后加速星能将存入累计星能中哦~');
GDispatcher.dispatchEvent('refreshMainUI');// 刷新主页接口,刷新弹窗,加速器数量等
this.hidePanel();
})
......@@ -227,7 +227,7 @@ export default class PropPanel extends Panel {
private onTap_cancel(e: egret.TouchEvent) {
NetManager.ins.clickLog(getlogItem(40));
window['_hmt'].push(['_trackEvent', '兑换星加速器-再想想', 'clickLog', '点击']);
window['_hmt'].push(['_trackEvent', '兑换星加速器-再想想', 'clickLog', '点击']);
PanelCtrl.instance.btnDelay(e.target);
this.buyPropGroup.visible = false;
......@@ -235,7 +235,7 @@ export default class PropPanel extends Panel {
private onTap_buyBtn(e: egret.TouchEvent) {
NetManager.ins.clickLog(getlogItem(41));
window['_hmt'].push(['_trackEvent', '兑换星加速器-立即兑换', 'clickLog', '点击']);
window['_hmt'].push(['_trackEvent', '兑换星加速器-立即兑换', 'clickLog', '点击']);
this.buyPropGroup.visible = false;
PanelCtrl.instance.btnDelay(e.target);
......
......@@ -75,18 +75,18 @@ export default class ResultPanel extends Panel {
//源码
// this.androidGroup.visible = !(this.iosGroup.visible = GFun.isIOS);
// this.data.task ? this.iosLabel.text = '回复"1"获取' : 0;
// this.data.task ? this.titleLab.text = "了解星获取攻略" : 0;
// this.data.task ? this.titleLab.text = "了解星获取攻略" : 0;
if(GFun.isIOS){
NetManager.ins.showLog(getlogItem(39));
window['_hmt'].push(['_trackEvent', '(ios)星币不足-购买星币按钮', 'showLog', '曝光']);
window['_hmt'].push(['_trackEvent', '(ios)星钻不足-购买星钻按钮', 'showLog', '曝光']);
}else{
NetManager.ins.showLog(getlogItem(38));
window['_hmt'].push(['_trackEvent', '(安卓)星币不足-购买星币按钮', 'showLog', '曝光']);
window['_hmt'].push(['_trackEvent', '(安卓)星钻不足-购买星钻按钮', 'showLog', '曝光']);
}
NetManager.ins.showLog(getlogItem(37));
window['_hmt'].push(['_trackEvent', '星不足-放弃兑换按钮', 'showLog', '曝光']);
window['_hmt'].push(['_trackEvent', '星不足-放弃兑换按钮', 'showLog', '曝光']);
}
private onTap_clickClose(e: egret.TouchEvent) {
......@@ -97,10 +97,10 @@ export default class ResultPanel extends Panel {
private onTap_cancelBtn(e: egret.TouchEvent) {
if(GFun.isIOS){
NetManager.ins.clickLog(getlogItem(39));
window['_hmt'].push(['_trackEvent', '(ios)星不足-放弃兑换按钮', 'clickLog', '点击']);
window['_hmt'].push(['_trackEvent', '(ios)星不足-放弃兑换按钮', 'clickLog', '点击']);
}else{
NetManager.ins.clickLog(getlogItem(38));
window['_hmt'].push(['_trackEvent', '(安卓)星不足-放弃兑换按钮', 'clickLog', '曝光']);
window['_hmt'].push(['_trackEvent', '(安卓)星不足-放弃兑换按钮', 'clickLog', '曝光']);
}
PanelCtrl.instance.btnDelay(e.target);
this.hidePanel();
......@@ -132,10 +132,10 @@ export default class ResultPanel extends Panel {
private onTap_androidBuy(e: egret.TouchEvent) {
if(GFun.isIOS){
NetManager.ins.clickLog(getlogItem(39));
window['_hmt'].push(['_trackEvent', '(ios)星币不足-购买星币按钮', 'clickLog', '点击']);
window['_hmt'].push(['_trackEvent', '(ios)星钻不足-购买星钻按钮', 'clickLog', '点击']);
}else{
NetManager.ins.clickLog(getlogItem(38));
window['_hmt'].push(['_trackEvent', '(安卓)星币不足-购买星币按钮', 'clickLog', '点击']);
window['_hmt'].push(['_trackEvent', '(安卓)星钻不足-购买星钻按钮', 'clickLog', '点击']);
}
PanelCtrl.instance.btnDelay(e.target);
......
......@@ -2,8 +2,11 @@ import Panel from "../views/Panel";
import { NetManager } from "../../libs/tw/manager/NetManager";
import { getlogItem } from "../getlogItem";
let G_ShareBase64 = '//yun.duiba.com.cn/db_games/qx/lantvshareImg1.png';
let G_DefaultImg = '//yun.duiba.com.cn/db_games/qx/lantvshareImg1.png';
// let G_ShareBase64 = '//yun.duiba.com.cn/db_games/qx/lantvshareImg1.png';
// let G_DefaultImg = '//yun.duiba.com.cn/db_games/qx/lantvshareImg1.png';
let G_ShareBase64 = '//yun.duiba.com.cn/aurora/assets/7e0ee257a64fa2742777323e585d25a0f32f1b51.png';
let G_DefaultImg = '//yun.duiba.com.cn/aurora/assets/7e0ee257a64fa2742777323e585d25a0f32f1b51.png';
export function G_SetShareBase64(base64) {
G_ShareBase64 = base64;
......@@ -56,7 +59,8 @@ export default class SharePanel extends Panel {
console.log(this.data);
sharePic.src = getShareImg(this.data);
// sharePic.src = getShareImg(this.data);
// RES.getResByUrl("//yun.duiba.com.cn/aurora/assets/7e0ee257a64fa2742777323e585d25a0f32f1b51.png",(data)=>{console.log('分享图片资源'+data);sharePic.src = data;},RES.ResourceItem.TYPE_IMAGE)
}
......
......@@ -1486,7 +1486,7 @@ export default class StartScene1 extends Scene {
}
//气泡的百度埋点
private baiduBuriedPp(idx:number,buriedType,buriedString){
window['_hmt'].push(['_trackEvent', `能量气泡${idx}`, buriedType, buriedString]);
window['_hmt'].push(['_trackEvent', `星能气泡${idx}`, buriedType, buriedString]);
}
/**
* 气泡的tween动画
......@@ -1573,15 +1573,15 @@ export default class StartScene1 extends Scene {
scaleX: 1,
scaleY: 1
}, 100).call(() => {
//收取能量接口
//收取星能接口
NetManager.ins.collectEnergy((success) => {
this.isCanGetEnergy = false;
if(success) {//刷新能量
if(success) {//刷新星能
let data = DataManager.ins.getData(NetName.COLLECT_ENERGY).data;
if(data) {
this.energyTime = data.nextSettleDiffTime;
this.energyLb.text = '累计能量:' + data.totalEnergy;
this.energyLb.text = '累计星能:' + data.totalEnergy;
}
if(this.hasTimeDownPp()) {
......@@ -1657,7 +1657,7 @@ export default class StartScene1 extends Scene {
//设置进度条
this.onProgress(Math.floor(100 * this.mainInfo.intimate / (qimizhiStr + this.mainInfo.intimate)));
this.energyLb.text = '累计能量:' + this.mainInfo.totalEnergy;
this.energyLb.text = '累计星能:' + this.mainInfo.totalEnergy;
//let timeDesc = this.mainInfo.oneEnergyNeedTime <= 60 ? (`${this.mainInfo.oneEnergyNeedTime}秒(上限6)`) : (`${Math.ceil(this.mainInfo.oneEnergyNeedTime/60) >6 ? 6: Math.ceil(this.mainInfo.oneEnergyNeedTime/60)}分钟(上限6)`)
let timeDesc ;
......@@ -1667,7 +1667,7 @@ export default class StartScene1 extends Scene {
let timeNum = Math.ceil(this.mainInfo.oneEnergyNeedTime/60);
timeDesc = `${timeNum}分钟(上限6)`;
}
this.energySpeedLb.text = '效率:' + '1能量/' + timeDesc;
this.energySpeedLb.text = '效率:' + '1星能/' + timeDesc;
this.daqiBtn['numLb'].text = this.mainInfo.cheeryUpLimit;
this.jiejiBtn['numLb'].text = this.mainInfo.pickUpLimit;
this.anliBtn['numLb'].text = this.mainInfo.propagandaLimit;
......@@ -1690,7 +1690,7 @@ export default class StartScene1 extends Scene {
}
}
private jiasuPp_Tap(){
TopLayerCtrl.instance.show(ModuleTypes.TOAST_PANEL, {msg: '加速中,计时结束后加速能量将自动存入累计能量~'});
TopLayerCtrl.instance.show(ModuleTypes.TOAST_PANEL, {msg: '加速中,计时结束后加速星能将自动存入累计星能~'});
//加速气泡的点击埋点暂时取消
return;
PanelCtrl.instance.btnDelay(this.jiasuPp);
......@@ -1721,7 +1721,7 @@ export default class StartScene1 extends Scene {
hasTimeDown = true;
} else {
this['ppLb' + i + '1'].text = '+' + energyArr[i];
this['ppLb' + i + '2'].text = "能量";
this['ppLb' + i + '2'].text = "星能";
}
if(this.energyArr[i] == -1 && this['ppc' + i].alpha == 0) {
......@@ -1793,7 +1793,7 @@ export default class StartScene1 extends Scene {
}
}
//能量倒计时
//星能倒计时
private energyItvIdx: number;
private setEnergyTimeDown(lb: eui.Label): void {
......
......@@ -177,8 +177,9 @@ export default class TaskItem extends MItem {
// url: '/pages/start/start?page=2'
// });
//直接跳转
window['wx'].miniProgram.navigateTo({
url: '/pages/start/start?page=2'
url: '/pages/start/start?page=2'
});
console.log('去充值');
}.bind(this)();
......
......@@ -57,7 +57,7 @@ export default class UnlinePanel extends Panel {
private onLoad() {
console.log(this.data);
this.energyLabel.text = `${this.data.energy}能量`;
this.energyLabel.text = `${this.data.energy}星能`;
NetManager.ins.showLog(getlogItem(36));
window['_hmt'].push(['_trackEvent', '离线收益弹窗按钮', 'showLog', '曝光']);
}
......
This diff is collapsed.
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