Skip to content

X
xiaoxiaoleTuia
Commit e27fc729 authored by zhangjinzhou's avatar zhangjinzhou
Browse files
Options

消消乐0513版本暂存

parent e0f8f5e4
Hide whitespace changes
Inline Side-by-side
Showing with 574 additions and 129 deletions
egret/libs/new_wx/MainBase.ts
View file @ e27fc729
......@@ -53,6 +53,8 @@ import { GFun } from "../tc/util/GFun";
import { GDispatcher } from "../tc/util/GDispatcher";
import DailyIconPrizePanel from "../../src/panels/DailyIconPrizePanel";
import VideoBuyPanel from "../../src/panels/VideoBuyPanel";
import AddBloodV from "../../src/panels/AddBloodV";
import AddToolV from "../../src/panels/AddToolV";
export default class MainBase extends eui.UILayer {
constructor() {
......@@ -74,6 +76,8 @@ export default class MainBase extends eui.UILayer {
['bagquit', { cls: BagQuitPanel }],
['bloodPanel', { cls: BloodPanel }],
['blood2Panel', { cls: BloodPanel2 }],
['addBloodV',{cls:AddBloodV}],
['addToolV',{cls:AddToolV}],
['GoldPanel', { cls: GoldPanel }],
['Shop', { cls: ShopPanel }],
['StartPanel', { cls: StartPanel }],
......
egret/resource/assets/map/topban.png
View replaced file @ e0f8f5e4 View file @ e27fc729
egret/resource/assets/map/topban.png

43.9 KB | W: | H:

egret/resource/assets/map/topban.png

41.6 KB | W: | H:

egret/resource/assets/map/topban.png
egret/resource/assets/map/topban.png
egret/resource/assets/map/topban.png
egret/resource/assets/map/topban.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/default.res.json
View file @ e27fc729
......@@ -114,7 +114,7 @@
},
{
"name": "preload",
"keys": "albhtxxl_fnt,albhtxxl_png,starbox1_png,starbox2_png,starbox3_png,exchangebtn2_png,rankbtn_png,starboxrect_png,stopsoundbtn_png,topban_png,turnpbtn_png,lightstar3_png,opensoundbtn_png,turnpbtnicon_png,ballonimg_png,starbox1light_png,starbox2light_png,starbox3light_png,starbox1close_png,starbox1open_png,starbox2close_png,starbox2open_png,starbox3close_png,starbox3open_png,pingfangxxl_png,pingfangxxl_fnt,sucprizepanelbg_png,sucprizenextbtn_png,sucprizespimg_png,sucstar1_png,sucstar2_png,sucstar3_png,sucopenboxbtn_png,sucprizebox_png,sucprizeboxinfo_png,sucprizeboxshadow_png,sucprizeboxtxt_png,nextlevelprizetxt_png,sucnoprizetit_png,sucnoprizecont_png,failtit_png,failcontxt_png,failvideostep_png,failpanelbg_png,failrestartbtn_png,failrestartbtn1_png,failstepshadow_png"
"keys": "albhtxxl_fnt,albhtxxl_png,starbox1_png,starbox2_png,starbox3_png,exchangebtn2_png,rankbtn_png,starboxrect_png,stopsoundbtn_png,topban_png,turnpbtn_png,lightstar3_png,opensoundbtn_png,turnpbtnicon_png,ballonimg_png,starbox1light_png,starbox2light_png,starbox3light_png,starbox1close_png,starbox1open_png,starbox2close_png,starbox2open_png,starbox3close_png,starbox3open_png,pingfangxxl_png,pingfangxxl_fnt,sucprizepanelbg_png,sucprizenextbtn_png,sucprizespimg_png,sucstar1_png,sucstar2_png,sucstar3_png,sucopenboxbtn_png,sucprizebox_png,sucprizeboxinfo_png,sucprizeboxshadow_png,sucprizeboxtxt_png,nextlevelprizetxt_png,sucnoprizetit_png,sucnoprizecont_png,failtit_png,failcontxt_png,failvideostep_png,failrestartbtn_png,failrestartbtn1_png,failstepshadow_png,spkuang_png,countkuang_png,nicknamekuang_png,avatarmask_png,failpanelbghv_png,failpanelbgnv_png,sucpirzebg1_png,nclosebtn_png,videoaddbloodbtn_png,bloodicon1_png,diacommenbg_png,addbloodtit_png,getstep_png,gethammer_png,videoaddtool_png,getboom_png"
}
],
"resources": [
......@@ -3155,11 +3155,6 @@
"type": "image",
"url": "assets/meituanfail/failvideostep.png"
},
{
"name": "failpanelbg_png",
"type": "image",
"url": "assets/meituanfail/failpanelbg.png"
},
{
"name": "failrestartbtn_png",
"type": "image",
......@@ -3174,6 +3169,86 @@
"name": "failstepshadow_png",
"type": "image",
"url": "assets/meituanfail/failstepshadow.png"
},
{
"name": "spkuang_png",
"type": "image",
"url": "assets/map/spkuang.png"
},
{
"name": "countkuang_png",
"type": "image",
"url": "assets/map/countkuang.png"
},
{
"name": "nicknamekuang_png",
"type": "image",
"url": "assets/map/nicknamekuang.png"
},
{
"name": "avatarmask_png",
"type": "image",
"url": "assets/map/avatarmask.png"
},
{
"name": "failpanelbghv_png",
"type": "image",
"url": "assets/meituanfail/failpanelbghv.png"
},
{
"name": "failpanelbgnv_png",
"type": "image",
"url": "assets/meituanfail/failpanelbgnv.png"
},
{
"name": "sucpirzebg1_png",
"type": "image",
"url": "assets/meituansuc/sucpirzebg1.png"
},
{
"name": "nclosebtn_png",
"type": "image",
"url": "assets/addbloodv/nclosebtn.png"
},
{
"name": "videoaddbloodbtn_png",
"type": "image",
"url": "assets/addbloodv/videoaddbloodbtn.png"
},
{
"name": "bloodicon1_png",
"type": "image",
"url": "assets/addbloodv/bloodicon1.png"
},
{
"name": "diacommenbg_png",
"type": "image",
"url": "assets/addbloodv/diacommenbg.png"
},
{
"name": "addbloodtit_png",
"type": "image",
"url": "assets/addbloodv/addbloodtit.png"
},
{
"name": "getstep_png",
"type": "image",
"url": "assets/videoaddtool/getstep.png"
},
{
"name": "gethammer_png",
"type": "image",
"url": "assets/videoaddtool/gethammer.png"
},
{
"name": "videoaddtool_png",
"type": "image",
"url": "assets/videoaddtool/videoaddtool.png"
},
{
"name": "getboom_png",
"type": "image",
"url": "assets/videoaddtool/getboom.png"
}
]
}
\ No newline at end of file
egret/resource/default.thm.json
View file @ e27fc729
......@@ -2,6 +2,8 @@
"skins": {},
"autoGenerateExmlsList": true,
"exmls": [
"resource/skins/AddBloodVSkin.exml",
"resource/skins/AddToolVSkin.exml",
"resource/skins/ADSkin.exml",
"resource/skins/ADSmallSkin.exml",
"resource/skins/AlertSkin.exml",
......
egret/resource/skins/AddBloodVSkin.exml 0 → 100644
View file @ e27fc729
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="AddBloodV" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image source="diacommenbg_png" horizontalCenter="0" verticalCenter="0"/>
<e:Image source="addbloodtit_png" horizontalCenter="0" y="200"/>
<e:Image source="bloodicon1_png" y="430.37" horizontalCenter="0.5"/>
<e:Group id="stepcountgro" width="44" height="45" x="403" y="531"/>
<e:Group id="infotxt" width="750" height="100" y="608.7">
<e:Label text="再玩一关就可以拿" y="0.29999999999984084" width="750" textAlign="center" x="0" scaleX="1" scaleY="1" textColor="0x664a2f"/>
<e:Label id="bloodprize" text="88个外卖碎片" y="46.29999999999984" width="750" textAlign="center" x="0" scaleX="1" scaleY="1" textColor="0xff1e2f"/>
</e:Group>
<e:Image id="closeBtn" source="nclosebtn_png" x="618.45" y="212.49"/>
<e:Image id="videoBtn" source="videoaddbloodbtn_png" y="733.4" horizontalCenter="0.5"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/AddToolVSkin.exml 0 → 100644
View file @ e27fc729
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="AddToolVSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image source="diacommenbg_png" horizontalCenter="0" verticalCenter="0"/>
<e:Image id="prop2tit" y="200" source="getboom_png" horizontalCenter="0" visible="false"/>
<e:Image id="prop3tit" y="200" source="gethammer_png" horizontalCenter="0" visible="false"/>
<e:Image id="prop4tit" y="200" source="getstep_png" horizontalCenter="0" visible="false"/>
<e:Group id="toolgro" width="750" height="149" y="430"/>
<e:Group id="infotxt" width="750" height="100" y="608.7">
<e:Label id="toolprizetxt" text="88个外卖碎片" y="34.3" width="750" textAlign="center" x="0" scaleX="1" scaleY="1" textColor="0xff1e2f" bold="true"/>
</e:Group>
<e:Image id="closeBtn" source="nclosebtn_png" x="618.45" y="212.49"/>
<e:Image id="videoBtn" y="733.4" horizontalCenter="0.5" source="videoaddtool_png"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/FailSkin.exml
View file @ e27fc729
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="FailSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image y="218" source="failpanelbg_png" horizontalCenter="-5.5"/>
<e:Group id="havevideo" width="750" height="1206">
<e:Image scaleX="1" scaleY="1" source="failpanelbghv_png" y="-64" x="5"/>
<e:Button id="videoBtn" label="" y="812" horizontalCenter="0" x="137" scaleX="1" scaleY="1">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -10,18 +10,19 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Image id="againBtn1" source="failrestartbtn_png" y="967" scaleX="1" scaleY="1" horizontalCenter="0"/>
<e:Image source="failtit_png" y="456" horizontalCenter="0.5"/>
<e:Image source="failcontxt_png" y="540" horizontalCenter="0"/>
<e:Group id="steptool" width="110" height="117" y="633" x="320">
<e:Image id="againBtn1" source="failrestartbtn_png" y="967" scaleX="1" scaleY="1" horizontalCenter="0" visible="false"/>
<e:Image source="failtit_png" y="489.33" horizontalCenter="0.5"/>
<e:Image source="failcontxt_png" y="573.33" horizontalCenter="0"/>
<e:Group id="steptool" width="110" height="117" y="657.24" x="320">
<e:Image source="failstepshadow_png" y="81" horizontalCenter="0.5"/>
<e:Image source="stepBtn_png" scaleX="1" scaleY="1"/>
<e:Image source="propNumBg_png" x="70" y="70" scaleX="1" scaleY="1"/>
<e:Group width="44" height="45" x="70" y="70">
<e:Group id="stepcountgro" width="44" height="45" x="70" y="70">
</e:Group>
</e:Group>
</e:Group>
<e:Group id="novideo" width="750" height="1206">
<e:Group id="novideo" width="750" height="1206" visible="false">
<e:Image scaleX="1" scaleY="1" source="failpanelbgnv_png" y="-64" x="5"/>
<e:Button id="againBtn" label="" y="812" horizontalCenter="0.5" x="137" scaleX="1" scaleY="1">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -30,7 +31,5 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Image source="failtit_png" y="504" horizontalCenter="0.5"/>
<e:Image source="failcontxt_png" y="588" horizontalCenter="0"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/resource/skins/MapSkin.exml
View file @ e27fc729
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="MapSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Rect id="rectbg" width="750" height="1206"/>
<e:Scroller id="scroll" width="750" height="1624" x="0" y="0" scrollPolicyH="off" scrollPolicyV="on">
<e:Scroller id="scroll" width="750" height="1624" x="0" y="0" scrollPolicyH="off" scrollPolicyV="on" locked="true">
<e:Group id="scrollGroup">
</e:Group>
</e:Scroller>
......@@ -9,15 +9,18 @@
<e:Group id="topcont" width="750" height="150" x="0" top="0">
<e:Image source="topban_png" horizontalCenter="0" y="0"/>
<e:BitmapLabel id="bloodTxt" width="164" height="48" x="120" y="32" text="次 5" font="albhtxxl_fnt"/>
<e:BitmapLabel id="goldTxt" width="81" height="48" x="376" y="32" text="231" font="albhtxxl_fnt"/>
<e:Image id="exchangebtn" source="exchangebtn2_png" x="462" y="17"/>
<e:Group id="soundbtn" width="80" height="80" y="7" x="632">
<e:Image id="stopsoundimg" source="stopsoundbtn_png" scaleX="1" scaleY="1" x="10" y="9"/>
<e:Image id="opensoundimg" source="opensoundbtn_png" scaleX="1" scaleY="1" x="10" y="9"/>
</e:Group>
<e:Image x="40" y="8" scaleX="1" scaleY="1" source="avatar_png"/>
<e:Image source="countkuang_png" x="184" y="16"/>
<e:Image source="spkuang_png" x="444" y="14"/>
<e:Image id="avatar" source="testavatar_png" x="45" y="18.92" width="110" height="110"/>
<e:Image id="avatarMask" source="avatarmask_png" x="52.52" y="16.96"/>
<e:Image source="nicknamekuang_png" x="9" y="95"/>
<e:Label id="nameTxt" text="" x="42.27" y="103.12" width="118" textAlign="center" verticalAlign="middle" height="30" size="24"/>
<e:BitmapLabel id="bloodTxt" width="164" height="48" x="256.38" y="30.48" text="次 5" font="albhtxxl_fnt"/>
<e:BitmapLabel id="goldTxt" width="81" height="48" x="524.48" y="32" text="231" font="albhtxxl_fnt"/>
<e:Image id="exchangebtn" source="exchangebtn2_png" x="604.43" y="17"/>
</e:Group>
<e:Group id="signGroup" x="26" y="172">
<e:Group id="signGroup" x="26" y="172" locked="true">
<e:Button id="signBtn" label="" x="0" y="0">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -31,15 +34,67 @@
<e:Image id="sign_s2" source="map明日可领_png" x="0" y="0" visible="false"/>
</e:Group>
</e:Group>
<e:Group id="rankGroup" width="115" height="121" y="172" x="609">
<e:Group id="rankGroup" width="115" height="121" y="172" x="609" locked="true">
<e:Image source="rankbtn_png" scaleX="1" scaleY="1"/>
</e:Group>
<e:Group id="turnGroup" width="115" height="121" x="609" y="322">
<e:Group id="turnGroup" width="115" height="121" x="609" y="322" locked="true">
<e:Image source="turnpbtn_png"/>
<e:Image source="turnpbtnicon_png" x="-35" y="9"/>
</e:Group>
<e:Group id="settingsx" x="30" scaleX="1.4" scaleY="1.4" bottom="23" touchEnabled="false">
<e:Group id="settingGroup" x="2" y="6.08" visible="false">
<e:Image id="settingbg" source="设置bg_png" y="0" x="0" scale9Grid="9,84,54,76" height="231"/>
<e:Button id="soundBtn" label="" y="59.65" horizontalCenter="0.5">
<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="questionBtn" label="" y="109.41" horizontalCenter="0.5">
<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="musicBtn" label="" y="14.36" horizontalCenter="0.5">
<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="musicOffBtn" label="" y="13.69" horizontalCenter="0.5">
<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="soundOffBtn" label="" y="60.32" horizontalCenter="0.5">
<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:Group>
<e:Button id="settingBtn" label="" y="162.34" horizontalCenter="0">
<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:Group>
......
egret/resource/skins/NoPrizeSkin.exml
View file @ e27fc729
......@@ -3,10 +3,10 @@
<w:Config id="1690063a75e"/>
<e:Image scale9Grid="87,543,522,23" source="sucprizepanelbg_png" horizontalCenter="-19.5" y="266"/>
<e:Image id="pic1" y="284" anchorOffsetX="56.82" anchorOffsetY="50.61" source="sucstar1_png" horizontalCenter="-125"/>
<e:Image id="pic3" y="294" anchorOffsetX="52" anchorOffsetY="46" source="sucstar2_png" horizontalCenter="125" x="10"/>
<e:Image id="pic2" y="254" anchorOffsetX="54" anchorOffsetY="49.73" source="sucstar3_png" x="375"/>
<e:Image scale9Grid="87,543,522,23" horizontalCenter="-9.5" y="266" source="sucpirzebg1_png"/>
<e:Image id="pic1" y="272" anchorOffsetX="56.82" anchorOffsetY="50.61" source="sucstar1_png" x="265.04"/>
<e:Image id="pic3" y="272" anchorOffsetX="52" anchorOffsetY="46" source="sucstar2_png" x="489.04"/>
<e:Image id="pic2" y="254" anchorOffsetX="54" anchorOffsetY="49.73" source="sucstar3_png" x="376.04"/>
<e:BitmapLabel id="scoretxt" height="80" font="pingfangxxl_fnt" text="19999分" y="483" horizontalCenter="0"/>
<e:Image source="sucnoprizetit_png" y="562" horizontalCenter="0"/>
<e:Image source="sucnoprizecont_png" y="644" horizontalCenter="0"/>
......
egret/resource/skins/PrizeSkin.exml
View file @ e27fc729
......@@ -2,16 +2,15 @@
<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:Image scale9Grid="87,543,522,23" source="sucprizepanelbg_png" horizontalCenter="-19.5" y="266"/>
<e:Image scale9Grid="87,543,522,23" source="sucprizepanelbg_png" horizontalCenter="-13.5" y="266"/>
<e:Image id="picb" x="286" y="339.28" source="点亮 副本 2gray_png" scaleX="-1" visible="false"/>
<e:Image id="pica" x="465.48" y="332.28" source="点亮 副本 2gray_png" visible="false"/>
<e:Image id="picc" y="315.28" source="点亮gray_png" x="310" visible="false"/>
<e:Image id="pic1" y="284" anchorOffsetX="56.82" anchorOffsetY="50.61" source="sucstar1_png" horizontalCenter="-125"/>
<e:Image id="pic3" y="284" anchorOffsetX="52" anchorOffsetY="46" source="sucstar2_png" horizontalCenter="125"/>
<e:Image id="pic2" y="254" anchorOffsetX="54" anchorOffsetY="49.73" source="sucstar3_png" x="375"/>
<e:BitmapLabel id="scoretxt" height="80" font="pingfangxxl_fnt" text="19999分" y="483" horizontalCenter="0"/>
<e:Image source="sucprizeboxshadow_png" y="770" horizontalCenter="0"/>
<e:Image id="pic1" y="272" anchorOffsetX="56.82" anchorOffsetY="50.61" source="sucstar1_png" x="265.04"/>
<e:Image id="pic3" y="272" anchorOffsetX="52" anchorOffsetY="46" source="sucstar2_png" x="489.04"/>
<e:Image id="pic2" y="254" anchorOffsetX="54" anchorOffsetY="49.73" source="sucstar3_png" x="376.04"/>
<e:BitmapLabel id="scoretxt" height="80" font="pingfangxxl_fnt" text="19999分" y="481" horizontalCenter="0"/>
<e:Group id="nextgro" width="750" height="818" y="184">
<e:Button id="goBtn" label="" y="663" x="137" scaleX="1" scaleY="1">
<e:skinName>
......
egret/resource/skins/StarSkin.exml
View file @ e27fc729
......@@ -5,8 +5,12 @@
<e:Image id="star1" source="有星星_png" x="0" y="0" scaleX="1" scaleY="1" visible="false"/>
<e:Image id="star2" source="有星星2_png" x="0" y="0" scaleX="1" scaleY="1" visible="false"/>
<e:Image id="star3" source="有星星3_png" x="0" y="0" scaleX="1" scaleY="1"/>
<e:Image id="starlbox1" source="starbox1light_png" x="-16" y="-60" scaleX="1" scaleY="1" visible="false"/>
<e:Image id="starlbox2" source="starbox2light_png" x="-16" y="-64" scaleX="1" scaleY="1" visible="false"/>
<e:Image id="starlbox3" source="starbox3light_png" x="-16" y="-70.5" scaleX="1" scaleY="1" visible="false"/>
<e:Image id="starlbox1" source="starbox1light_png" x="-16" y="-60" scaleX="1" scaleY="1"/>
<e:Image id="starlbox2" source="starbox2light_png" x="-16" y="-64" scaleX="1" scaleY="1"/>
<e:Image id="starlbox3" source="starbox3light_png" x="-16" y="-70.5" scaleX="1" scaleY="1"/>
<e:Group id="boxinfogro" width="135" height="40" x="-30" y="0">
<e:Image source="starboxrect_png" y="0" scaleX="1" scaleY="1"/>
<e:Label id="boxinfotxt" text="可领取" verticalAlign="middle" textAlign="center" width="135" height="40"/>
</e:Group>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/src/Utils.ts
View file @ e27fc729
......@@ -173,6 +173,7 @@ export default class Utils {
let options:ShowVideoOptions = {
afterClose,
};
//true,false，发奖成功失败
afterClose&&afterClose(true);
}
//美团碎片弹窗
......
egret/src/mainScene/MainScene.ts
View file @ e27fc729
......@@ -981,7 +981,7 @@ export default class MainScene extends Scene {
onTap_boomBtn() {
if (this.propBtnCon.boomBtn.propNumShow.count <= 0) {
//购买弹框
PanelCtrl.instance.show("VideoBuyPanel", {
PanelCtrl.instance.show("addToolV", {
propType: PropType.BOOM,
showVideo: !this.recordOnce.boom,
complete: (isVideo) => {
......@@ -996,7 +996,7 @@ export default class MainScene extends Scene {
onTap_hammerBtn() {
if (this.propBtnCon.hammerBtn.propNumShow.count <= 0) {
//购买弹框
PanelCtrl.instance.show("VideoBuyPanel", {
PanelCtrl.instance.show("addToolV", {
propType: PropType.HAMMER,
showVideo: !this.recordOnce.hammer,
complete: (isVideo) => {
......@@ -1011,7 +1011,7 @@ export default class MainScene extends Scene {
onTap_stepBtn() {
if (this.propBtnCon.stepBtn.propNumShow.count <= 0) {
//购买弹框
PanelCtrl.instance.show("VideoBuyPanel", {
PanelCtrl.instance.show("addToolV", {
propType: PropType.CHANCE_NUM,
showVideo: !this.recordOnce.step,
complete: (isVideo) => {
......@@ -1995,11 +1995,14 @@ export default class MainScene extends Scene {
if (this.steps == 0) {
//失败弹框
// playSound(SoundType.fail);
var failVideoAddStep = 5;
var panelsDatas = this.returnPanels("failed", {
level: this.chapter,
score:this.score,
showVideo: !this.recordOnce.failStep,//是否显示观看视频加步数
videoAdd:failVideoAddStep,
complete: () => {//观看完成回调，其实只要继续执行下面的逻辑就行
console.error("广告成功回掉");
let count = 0;
let countAll = 2;
AiControl.ins.jellyMotion(this, () => {
......@@ -2012,7 +2015,7 @@ export default class MainScene extends Scene {
this.recordOnce.failStep = true;
//加步数
this.playAni(RecoverName.STEP_ANI, [50, 100]);
setTimeout(() => { this.steps += 5; }, 333)
setTimeout(() => {console.error("广告成功回掉233"); this.steps += failVideoAddStep; }, 333)
}
})
this.solveDiaPush("fail",panelsDatas);
......@@ -2747,7 +2750,7 @@ export default class MainScene extends Scene {
panelsDatas = this.returnPanels(ModuleTypes.NO_PRIZE_PANEL, { level: this.chapter,score:this.score, })
// PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL, { level: this.chapter });
}
panelsDatas = this.returnPanels(ModuleTypes.NO_PRIZE_PANEL, { level: this.chapter,score:this.score, })
//弹出所有的
this.solveDiaPush("success",panelsDatas);
// PanelCtrl.instance.showPanels(panelsDatas[0], panelsDatas[1], () => { })
......
egret/src/mapScene/MapScene.ts
View file @ e27fc729
......@@ -13,7 +13,7 @@ import { loadSvga } from "../loadSvga";
import { getlogItem } from "../Main";
import setGlow from "../setGlow";
import setGray from "../setGray";
import {getSoundOn, playBg, toggleBg, toggleSound } from "../soundCtrl";
import { getBgOn, getSoundOn, playBg, toggleBg, toggleSound } from "../soundCtrl";
import Utils from "../Utils";
import AvatarComp from "./AvatarComp";
import CountDown from "./CountDown";
......@@ -26,6 +26,7 @@ import RedBagAni, { createRedBagIcon } from "./RedBagAni";
import { createEffect2MovieClip } from "../effect/createEffect2";
import { NetName } from "../../libs/tw/enum/NetName";
import { getUrl } from "../myVideo/getDefaultConfig";
import { stopGamebg } from "../soundCtrl2";
let doHelpFlag = false;
// let doScratchHelpFlag = false;
......@@ -45,7 +46,7 @@ export default class MapScene extends Scene {
private inviteTimer: egret.Timer;
private cutTime: number;
pic:egret.Bitmap;
pic: egret.Bitmap;
async start(data?) {
super.start();
......@@ -71,7 +72,13 @@ export default class MapScene extends Scene {
// this.updateAdData();
GDispatcher.dispatchEvent("getInviteInfo"); // 查询邀请信息，控制邀请有礼角标
// this['avatar'].mask = this['avatarMask'];
this['avatar'].mask = this['avatarMask'];
if (getBgOn() && MapScene['firstPlayBgTag'] == true) {
playBg();
}
stopGamebg();
NetManager.ins.getSignInfo(() => {
const panels = [];
const date = new Date();
......@@ -204,7 +211,7 @@ export default class MapScene extends Scene {
this.stage.once(egret.TouchEvent.TOUCH_TAP, () => {
if (!MapScene['firstPlayBgTag']) {
if (getSoundOn()) {
if (getBgOn()) {
playBg();
}
MapScene['firstPlayBgTag'] = true;
......@@ -215,7 +222,7 @@ export default class MapScene extends Scene {
if (homeData.levels.length >= window['total_level'])
lastOrder = window['total_level'];
this.scroll.viewport.scrollV = this.getScrollV(lastOrder, this.stage.stageHeight);
// console.warn(this.getScrollV(lastOrder, this.stage.stageHeight))
......@@ -264,14 +271,13 @@ export default class MapScene extends Scene {
}
updateMyInfo() {
return;
this['avatar'].visible = true;
this['nameTxt'].text = '';
var avatar = getUrl("avatar");
this['avatar'].source = avatar ? decodeURIComponent(avatar) : "http://yun.duiba.com.cn/db_games/default_avatar.png";
//注意dcustom里大小写
var nickName = getUrl("nickname");
var nickName = getUrl("nickname") || "美团用户";
if (nickName) this['nameTxt'].text = getNick(nickName);
}
......@@ -428,7 +434,9 @@ export default class MapScene extends Scene {
if (level) {
star.setStar(level.stars);
star.setBox(level.stars);
let havebx = [1, 2, 3];
let openbx = [1];
star.setBox(havebx,openbx);
this.enableIcon(level.levelNum);
} else {
this.disableIcon(level.levelNum);
......@@ -437,8 +445,11 @@ export default class MapScene extends Scene {
if (homeData.levels.length == 0) {
const star = MapScene.starHash[1];
star.setStar(0);
star.setBox(0);
let havebx = [];
let openbx = [];
star.setBox(havebx,openbx);
this.enableIcon(1);
} else if (homeData.levels.length == window['last_level']) {
......@@ -635,15 +646,15 @@ export default class MapScene extends Scene {
// this['adBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_adBtn, this)
this['signGroup'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_signBtn, this)
// this['bloodBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_bloodBtn, this)
// this['settingBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.toggleSettings, this)
this['settingBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.toggleSettings, this)
// this['shopBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_shopBtn, this)
// this['questionBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_questionBtn, this);
this['questionBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_questionBtn, this);
// this['box'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_boxLayer, this);
// this['boxani'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_box, this);
this['soundbtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_sound, this);
// this['stopsoundimg'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_sound, this);
// this['musicOffBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_music, this);
// this['musicBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_music, this);
this['soundBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_sound, this);
this['soundOffBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_sound, this);
this['musicOffBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_music, this);
this['musicBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_music, this);
// this['recordBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
// PanelCtrl.instance.show('bag');
// }, this);
......@@ -651,19 +662,22 @@ export default class MapScene extends Scene {
// 消消乐查询信息
// GDispatcher.addEvent('getInviteInfo', this.getInviteInfo, this);
this["rankGroup"].addEventListener(egret.TouchEvent.TOUCH_TAP,this.onTap_friendBtn,this);
this["turnGroup"].addEventListener(egret.TouchEvent.TOUCH_TAP,this.onTap_turnGroup,this);
this["exchangebtn"].addEventListener(egret.TouchEvent.TOUCH_TAP,this.onTap_exchangeBtn,this);
this["rankGroup"].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_friendBtn, this);
this["turnGroup"].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_turnGroup, this);
this["exchangebtn"].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_exchangeBtn, this);
}
initSound() {
this['opensoundimg'].visible = getSoundOn();
this['stopsoundimg'].visible = !getSoundOn();
this['soundBtn'].visible = getSoundOn();
this['soundOffBtn'].visible = !getSoundOn();
this['musicBtn'].visible = getBgOn();
this['musicOffBtn'].visible = !getBgOn();
}
onTap_sound() {
this['opensoundimg'].visible = !this['opensoundimg'].visible;
this['stopsoundimg'].visible = !this['stopsoundimg'].visible;
console.error("声音点击===》", this['soundBtn'].visible, this['soundOffBtn'].visible);
this['soundBtn'].visible = !this['soundBtn'].visible;
this['soundOffBtn'].visible = !this['soundOffBtn'].visible;
toggleSound();
}
......@@ -784,7 +798,7 @@ export default class MapScene extends Scene {
if (getHomeData().remainEnargy > 0)
PanelCtrl.instance.show('bloodPanel')
else
PanelCtrl.instance.show('blood2Panel')
PanelCtrl.instance.show('addBloodV')
}
setGray(order: number) {
......@@ -857,11 +871,11 @@ export default class MapScene extends Scene {
}
//打开转盘
onTap_turnGroup(){
onTap_turnGroup() {
console.log("打开转盘");
}
//兑换
onTap_exchangeBtn(){
onTap_exchangeBtn() {
console.log("打开兑换");
}
}
......
egret/src/mapScene/MapStarComp.ts
View file @ e27fc729
......@@ -7,7 +7,7 @@ export default class MapStarComp extends ComponentBase {
this.y=-24;
this.setStar(0);
this.setBox(1);
this.setBox([1,2,3],[1,2]);
}
setStar(num:number)
......@@ -27,12 +27,22 @@ export default class MapStarComp extends ComponentBase {
this['star3'].visible=true;
}
}
setBox(idx:number){
//拥有的宝箱，[1,2,3],打开的宝箱：[1,2,3]
setBox(havebx,openbx){
let idx = -1;
for(let ih of havebx){
if(openbx.indexOf(ih)==-1){
idx = ih;
break;
}
}
this['starlbox1'].visible = false;
this['starlbox2'].visible = false;
this['starlbox3'].visible = false;
this["boxinfogro"].visible = true;
if(idx ==0) {
this["boxinfogro"].visible = false;
}else if(idx ==1) {
this['starlbox1'].visible=true;
}
......
egret/src/panels/AddBloodV.ts 0 → 100644
View file @ e27fc729
import Panel from "../../libs/new_wx/components/Panel";
import SceneCtrl from "../../libs/new_wx/ctrls/sceneCtrl";
import { showToast } from "../../libs/new_wx/ctrls/toastCtrl";
import { NetManager } from "../../libs/tw/manager/NetManager";
import getHomeData, { BLOOD_NUMS_MAX } from "../getHomeData";
import { PropNumber } from "../something/uis/PropNumber";
import Utils from "../Utils";
export default class AddBloodV extends Panel {
start(data) {
super.start();
let propNumShow = new PropNumber();
this["stepcountgro"].addChild(propNumShow);
propNumShow.num = 5;
propNumShow.x = 22.5;
propNumShow.y = 7;
propNumShow.scaleX = 1.5;
propNumShow.scaleY = 1.5;
}
initEvents() {
super.initEvents();
this['videoBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapBuy, this)
}
onTapBuy() {
this['videoBtn'].enabled = false;
Utils.showVideo((suc) => {
this['videoBtn'].enabled = true;
if (suc) {
NetManager.ins.hc_home(() => {
SceneCtrl.instance.updateScene();
}, window['collectRuleId']);
this.hidePanel();
} else {
showToast("广告未成功观看，无法获得体力");
}
})
// NetManager.ins.hc_exchange((success, res) => {
// this['videoBtn'].enabled = true;
// if (success) {
// showToast('兑换成功');
// NetManager.ins.hc_home(() => {
// SceneCtrl.instance.updateScene();
// }, window['collectRuleId']);
// }
// else if (res) {
// showToast(res.desc || "网络异常")
// } else {
// showToast("网络异常，请重试")
// }
// }, 1);
}
protected get closeBtns(): eui.Button[] { return [this['closeBtn']] }
get skinKey() { return 'AddBloodV' }
}
\ No newline at end of file
egret/src/panels/AddToolV.ts 0 → 100644
View file @ e27fc729
import Panel from "../../libs/new_wx/components/Panel";
import { NetManager } from "../../libs/tw/manager/NetManager";
import PropType from "../PropType";
import SceneCtrl from "../../libs/new_wx/ctrls/sceneCtrl";
import { getlogItem } from "../Main";
import { showToast } from "../../libs/new_wx/ctrls/toastCtrl";
import setGlow from "../setGlow";
import getHomeData from "../getHomeData";
import { showToast2 } from "../../libs/new_wx/ctrls/toastCtrl2";
import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl";
import MainScene from "../mainScene/MainScene";
import Loading from "../../libs/new_wx/components/Loading";
import { handleVideo } from "../myVideo/videoCtrl";
import Utils from "../Utils";
import { CusButton } from "../something/uis/PropBtnCon";
export default class AddToolV extends Panel {
buyBtn: eui.Button
hasYuanbao: eui.Group
start(data: { propType: PropType, showVideo: boolean, complete: Function }) {
super.start();
//显示图片
this["prop" + data.propType+"tit"].visible = true;
let tooltxt = {
2:"选择任意一个元素，它的横竖各一排消除",
3:"选择任意一个元素消除",
4:"为本局增加5次额外步数",
}
this["toolprizetxt"].text = tooltxt[data.propType];
let tooltex = ["","","boomBtn_png","hammerBtn_png","stepBtn_png"][data.propType];
let toolsp = new CusButton(tooltex);
toolsp.x = 375;
toolsp.y = 100;
this["toolgro"].addChild(toolsp);
toolsp.propNumShow.count = 2;
// //购买
// this['buyBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
// Loading.instace.show();
// NetManager.ins.hc_exchange((success) => {
// Loading.instace.hide();
// if (success) {
// this.hidePanel();
// showToast('兑换成功');
// //消耗掉
// NetManager.ins.hc_useProp(() => { }, data.propType)
// //回调
// data.complete(false)
// } else {
// showToast('元宝不足哦~\n快去玩游戏赢元宝吧');
// }
// }, data.propType);//兑换道具
// }, this);
// switch (data.propType) {
// case PropType.BOOM:
// this['priceTxt'].text = '-' + window['price2'];
// break;
// case PropType.HAMMER:
// this['priceTxt'].text = '-' + window['price3'];
// break;
// case PropType.CHANCE_NUM:
// this['priceTxt'].text = '-' + window['price4'];
// break;
// }
// this['moneyTxt'].text = getHomeData().wealth;
// setGlow(this['priceTxt'], 0x0083e8, 1);
//曝光
NetManager.ins.showLog(getlogItem(9))
//看视频
// if (data.showVideo) {
// this["videoBtn"].visible = true;
this["videoBtn"].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
NetManager.ins.clickLog(getlogItem(10));
Utils.showVideo((suc)=>{
if(suc){
this.hidePanel();
//回调
data.complete(true);
showToast("领取成功")
}else{
showToast("广告未成功观看，道具领取失败")
}
})
// NetManager.ins.getTuiaAd(
// () => {
// this.hidePanel();
// //回调
// data.complete(true);
// showToast("领取成功")
// },
// () => { showToast("广告未成功观看，道具领取失败") },
// window["slotIdsTuia"][3]
// )
}, this);
// } else {
// this["videoBtn"].visible = false;
// this["hasYuanbao"].horizontalCenter = 0;
// this.buyBtn.horizontalCenter = 0;
// this["priceTxt"].x = 250;
// }
}
get skinKey() { return 'AddToolV' }
}
\ No newline at end of file
egret/src/panels/FailedPanel.ts
View file @ e27fc729
......@@ -4,20 +4,32 @@ import { addRankFriendList } from "../mapScene/RankFriendList";
import { changeMapScene } from "../startScene/StartScene";
import { showToast } from "../../libs/new_wx/ctrls/toastCtrl";
import { getlogItem } from "../Main";
import { PropNumber } from "../something/uis/PropNumber";
import Utils from "../Utils";
export default class FailedPanel extends Panel {
_level;
//场景展示
changeSceneShow(havevideo){
changeSceneShow(havevideo) {
this["havevideo"].visible = havevideo;
this["novideo"].visible = !havevideo;
}
start(data) {
super.start();
console.error("过关失败===》",data);
const {showVideo} = data;
this.data = data;
const { showVideo,videoAdd } = data;
this.changeSceneShow(showVideo);
if (showVideo) {
let propNumShow = new PropNumber();
this["stepcountgro"].addChild(propNumShow);
propNumShow.num = videoAdd;
propNumShow.x = 22.5;
propNumShow.y = 7;
}
if (data)
this._level = parseInt(data.level + '');
NetManager.ins.hc_home(() => { }, window['collectRuleId']);
......@@ -36,22 +48,36 @@ export default class FailedPanel extends Panel {
NetManager.ins.showLog(getlogItem(3))
//新增视频
if (data.showVideo) {
this["videoBtn"].visible = true;
this["videoBtn"].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
NetManager.ins.clickLog(getlogItem(4))
NetManager.ins.getTuiaAd(
() => {
this.hidePanel();
data.complete();
},
() => { showToast("广告未成功观看，无法复活"); },
window["slotIdsTuia"][4]
)
}, this);
}
}
// if (data.showVideo) {
// this["videoBtn"].visible = true;
// this["videoBtn"].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
// NetManager.ins.clickLog(getlogItem(4))
// NetManager.ins.getTuiaAd(
// () => {
// this.hidePanel();
// data.complete();
// },
// () => { showToast("广告未成功观看，无法复活"); },
// window["slotIdsTuia"][4]
// )
// }, this);
// }
this["videoBtn"].addEventListener(egret.TouchEvent.TOUCH_TAP, this.openFailVideo, this);
}
openFailVideo = () => {
this['videoBtn'].enabled = false;
Utils.showVideo((suc) => {
this['videoBtn'].enabled = true;
if (suc) {
this.hidePanel();
this.data.complete && this.data.complete();
} else {
showToast("广告未成功观看，无法复活");
this.changeSceneShow(false);
}
})
}
onTouchTap_closeBtn() {
super.onTouchTap_closeBtn();
changeMapScene();
......
egret/src/panels/SignPanel.ts
View file @ e27fc729
......@@ -40,6 +40,7 @@ export default class SignPanel extends Panel {
}
item['btn1'].enabled=false;
NetManager.ins.doSign((s)=>{
console.error("签到点击===》");
item['btn1'].enabled=true;
wait(300).then(()=>{
NetManager.ins.getSignInfo(() => {
......
egret/src/panels/SignPrizePanel.ts
View file @ e27fc729
......@@ -7,6 +7,7 @@ import Loading from "../../libs/new_wx/components/Loading";
import { showToast } from "../../libs/new_wx/ctrls/toastCtrl";
import { updateMainTimer } from "../../libs/new_wx/MainBase";
import SceneCtrl from "../../libs/new_wx/ctrls/sceneCtrl";
import Utils from "../Utils";
export default class SignPrizePanel extends Panel {
doubleBtn: eui.Button
......@@ -49,9 +50,9 @@ export default class SignPrizePanel extends Panel {
//新增看视频双倍
this['close2Btn'].visible = false;
this["doubleBtn"].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
NetManager.ins.clickLog(getlogItem(8))
NetManager.ins.getTuiaAd(
() => {
NetManager.ins.clickLog(getlogItem(8));
Utils.showVideo((suc)=>{
if(suc){
Loading.instace.show();
NetManager.ins.getIncentiveAward(
(s) => {
......@@ -71,10 +72,35 @@ export default class SignPrizePanel extends Panel {
},
21
)
},
() => { showToast("广告未成功观看，无法加倍领取") },
window["slotIdsTuia"][1]
)
}else{
showToast("广告未成功观看，无法加倍领取")
}
})
// NetManager.ins.getTuiaAd(
// () => {
// Loading.instace.show();
// NetManager.ins.getIncentiveAward(
// (s) => {
// Loading.instace.hide();
// this['close2Btn'].visible = true;
// this['doubleBtn'].visible = false;
// if (s) {
// showToast("翻倍成功");
// NetManager.ins.hc_home(() => {
// updateMainTimer();
// SceneCtrl.instance.updateScene();
// }, window['collectRuleId']);
// } else {
// showToast("加倍失败");
// this.hidePanel();
// }
// },
// 21
// )
// },
// () => { showToast("广告未成功观看，无法加倍领取") },
// window["slotIdsTuia"][1]
// )
}, this)
}
......
egret/src/panels/StartPanel.ts
View file @ e27fc729
......@@ -18,6 +18,7 @@ import { addRankFriendList } from "../mapScene/RankFriendList";
import { addAdComp } from "./BoxPanel";
import { getChapterData } from "../something/chapters/getChapter";
import { getlogItem } from "../Main";
import Utils from "../Utils";
export default class StartPanel extends Panel {
static currlevel;
......@@ -103,7 +104,7 @@ export default class StartPanel extends Panel {
const homeData = getHomeData();
if (homeData.remainEnargy <= 0) {
// if (homeData.askForEnergy) {
PanelCtrl.instance.show('blood2Panel');
PanelCtrl.instance.show('addBloodV');
// } else {
// if (iswx()) {
// getShareUrl(this.stage);
......@@ -196,47 +197,77 @@ export default class StartPanel extends Panel {
//锤子
onTap_video1btn() {
//看视频按钮点击
NetManager.ins.clickLog(getlogItem(2))
NetManager.ins.getTuiaAd(
() => {
NetManager.ins.clickLog(getlogItem(2));
Utils.showVideo((suc)=>{
if(suc){
this['video1btn'].visible = false;
this.videoProp[1] = 1;
this['nums1Txt'].text = (this.hammer + this.videoProp[1]) + "";
showToast("增加一个锤子道具")
},
() => { showToast("广告未成功观看，道具领取失败") },
window["slotIdsTuia"][2]
)
}else{
showToast("广告未成功观看，道具领取失败")
}
});
// NetManager.ins.getTuiaAd(
// () => {
// this['video1btn'].visible = false;
// this.videoProp[1] = 1;
// this['nums1Txt'].text = (this.hammer + this.videoProp[1]) + "";
// showToast("增加一个锤子道具")
// },
// () => { showToast("广告未成功观看，道具领取失败") },
// window["slotIdsTuia"][2]
// )
}
//炸弹
onTap_video2btn() {
//看视频按钮点击
NetManager.ins.clickLog(getlogItem(2))
NetManager.ins.getTuiaAd(
() => {
NetManager.ins.clickLog(getlogItem(2));
Utils.showVideo((suc)=>{
if(suc){
this['video2btn'].visible = false;
this.videoProp[0] = 1;
this['nums2Txt'].text = (this.boom + this.videoProp[0]) + "";
showToast("增加一个炸弹道具")
},
() => { showToast("广告未成功观看，道具领取失败") },
window["slotIdsTuia"][2]
)
}else{
showToast("广告未成功观看，道具领取失败")
}
});
// NetManager.ins.getTuiaAd(
// () => {
// this['video2btn'].visible = false;
// this.videoProp[0] = 1;
// this['nums2Txt'].text = (this.boom + this.videoProp[0]) + "";
// showToast("增加一个炸弹道具")
// },
// () => { showToast("广告未成功观看，道具领取失败") },
// window["slotIdsTuia"][2]
// )
}
//步数
onTap_video3btn() {
//看视频按钮点击
NetManager.ins.clickLog(getlogItem(2))
NetManager.ins.getTuiaAd(
() => {
NetManager.ins.clickLog(getlogItem(2));
Utils.showVideo((suc)=>{
if(suc){
this['video3btn'].visible = false;
this.videoProp[2] = 1;
this['nums3Txt'].text = (this.boom + this.videoProp[2]) + "";
showToast("增加一个增加步数道具")
},
() => { showToast("广告未成功观看，道具领取失败") },
window["slotIdsTuia"][2]
)
}else{
showToast("广告未成功观看，道具领取失败")
}
})
// NetManager.ins.getTuiaAd(
// () => {
// this['video3btn'].visible = false;
// this.videoProp[2] = 1;
// this['nums3Txt'].text = (this.boom + this.videoProp[2]) + "";
// showToast("增加一个增加步数道具")
// },
// () => { showToast("广告未成功观看，道具领取失败") },
// window["slotIdsTuia"][2]
// )
}
get skinKey() { return 'StartPanel' }
......
egret/src/something/uis/PropBtnCon.ts
View file @ e27fc729
......@@ -24,7 +24,7 @@ export class PropBtnCon extends eui.Component {
/**
* 自定义按钮
*/
class CusButton extends eui.Component {
export class CusButton extends eui.Component {
propNumShow: PropNumShow
constructor(source: string) {
super();
......
egret/src/soundCtrl.ts
View file @ e27fc729
......@@ -19,9 +19,9 @@ let loading = false;
export const getSoundOn = () => {
return soundOn
}
// export const getBgOn = () => {
// return bgOn
// }
export const getBgOn = () => {
return bgOn
}
export const toggleSound = () => {
soundOn = !soundOn;
......
mock/happyclear/home.json
View file @ e27fc729
......@@ -1011,18 +1011,18 @@
"remainProp": [
{
"type": 2,
"num": 1
"num": 0
},
{
"type": 3,
"num": 2
"num": 0
},
{
"type": 4,
"num": 3
"num": 0
}
],
"remainEnargy": 99,
"remainEnargy": 2,
"askForEnergy": false,
"canReceiveTreasureBoxNum": 10,
"nextRangeStarsNum": 150
......
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