Commit 61025213 authored by 邱旭's avatar 邱旭

1

parent f4eb4ae3
No preview for this file type
...@@ -2,15 +2,20 @@ ...@@ -2,15 +2,20 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="6d7f36c9-7613-4f12-9933-91b1cd2225cf" name="Default Changelist" comment=""> <list default="true" id="6d7f36c9-7613-4f12-9933-91b1cd2225cf" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/egret/src/Scene/IndexScene/UserMock.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/egret/index.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/egret/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/libs/tw/util/Buried.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/tw/util/Buried.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/resource/assets/index_scene/bg.png" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/assets/index_scene/bg.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/preload.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/preload.tmproject" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/resource/skins/IndexSceneSkin.exml" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/skins/IndexSceneSkin.exml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/skins/RulePanelSkin.exml" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/skins/RulePanelSkin.exml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/resource/skins/LoadingSceneSkin.exml" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/skins/LoadingSceneSkin.exml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/MVC/ctrls/EffectMgr.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/MVC/ctrls/EffectMgr.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/resource/skins/PrizePanelSkin.exml" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/skins/PrizePanelSkin.exml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Panels/HelpPrizePanel/HelpPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/HelpPrizePanel/HelpPrizePanel.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/src/MVC/ctrls/AudioCtrl.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/MVC/ctrls/AudioCtrl.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Panels/RulePanel/RulePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/RulePanel/RulePanel.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/src/Main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Main.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scene/IndexScene/IndexScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scene/IndexScene/IndexScene.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/src/Scene/IndexScene/IndexScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scene/IndexScene/IndexScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scene/IndexScene/PrizeListItem.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scene/IndexScene/PrizeListItem.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/json/getCollectCards.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/json/getCollectCards.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/json/mixCard.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/json/mixCard.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/json/queryPrizeList.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/json/queryPrizeList.json" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -26,28 +31,6 @@ ...@@ -26,28 +31,6 @@
</list> </list>
</option> </option>
</component> </component>
<component name="FindInProjectRecents">
<findStrings>
<find>rotationForever</find>
<find>setP</find>
<find>success</find>
<find>quer</find>
<find>CARD_M</find>
<find>proje</find>
<find>customCfgData</find>
<find>5.52.5</find>
<find>collectcards</find>
<find>getHelpData</find>
<find>Panel</find>
<find>getcoll</find>
<find>pMask</find>
<find>openBox</find>
<find>help</find>
</findStrings>
<replaceStrings>
<replace />
</replaceStrings>
</component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="RECENT_BRANCH_BY_REPOSITORY"> <option name="RECENT_BRANCH_BY_REPOSITORY">
...@@ -85,6 +68,10 @@ ...@@ -85,6 +68,10 @@
<property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" /> <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/egret/resource/skins" />
<recent name="$PROJECT_DIR$/egret/src/Panels" />
</key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/egret/src/Scene/IndexScene" /> <recent name="$PROJECT_DIR$/egret/src/Scene/IndexScene" />
<recent name="$PROJECT_DIR$/egret/src" /> <recent name="$PROJECT_DIR$/egret/src" />
...@@ -92,10 +79,6 @@ ...@@ -92,10 +79,6 @@
<recent name="$PROJECT_DIR$/egret/src/MVC/views" /> <recent name="$PROJECT_DIR$/egret/src/MVC/views" />
<recent name="$PROJECT_DIR$/egret/src/Scene" /> <recent name="$PROJECT_DIR$/egret/src/Scene" />
</key> </key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/egret/resource/skins" />
<recent name="$PROJECT_DIR$/egret/src/Panels" />
</key>
</component> </component>
<component name="RunDashboard"> <component name="RunDashboard">
<option name="ruleStates"> <option name="ruleStates">
...@@ -179,6 +162,19 @@ ...@@ -179,6 +162,19 @@
<workItem from="1569548645840" duration="115000" /> <workItem from="1569548645840" duration="115000" />
<workItem from="1569548788949" duration="86000" /> <workItem from="1569548788949" duration="86000" />
<workItem from="1569549547848" duration="9716000" /> <workItem from="1569549547848" duration="9716000" />
<workItem from="1569580340808" duration="20000" />
<workItem from="1569636961412" duration="390000" />
<workItem from="1569678327372" duration="15000" />
<workItem from="1569740285190" duration="6309000" />
<workItem from="1569750154108" duration="411000" />
<workItem from="1570527124451" duration="170000" />
<workItem from="1570531181315" duration="68000" />
<workItem from="1570707556433" duration="1215000" />
<workItem from="1570791229992" duration="1605000" />
<workItem from="1570793584317" duration="69000" />
<workItem from="1570794037479" duration="52000" />
<workItem from="1570794683322" duration="1663000" />
<workItem from="1570846078231" duration="397000" />
</task> </task>
<servers /> <servers />
</component> </component>
......
No preview for this file type
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
return request[key] || null; return request[key] || null;
} }
let assistItemId = getRequestByKey("assistItemId") let assistItemId = getRequestByKey("assistItemId")
window.location.href="http://activity.m.duiba.com.cn/projectx/p70c442c7/faec5c090.html" + "?assistItemId=" + assistItemId; // window.location.href="http://activity.m.duiba.com.cn/projectx/p70c442c7/faec5c090.html" + "?assistItemId=" + assistItemId;
// https://activity.m.duiba.com.cn/hdtool/index?id=3711075&appKey=VkGjfX1GCUW4pbwWRwXnDsPBAxx&openBs=openbs // https://activity.m.duiba.com.cn/hdtool/index?id=3711075&appKey=VkGjfX1GCUW4pbwWRwXnDsPBAxx&openBs=openbs
// https://activity.m.duiba.com.cn/hdtool/index?id=3711074&appKey=VkGjfX1GCUW4pbwWRwXnDsPBAxx&openBs=openbs // https://activity.m.duiba.com.cn/hdtool/index?id=3711074&appKey=VkGjfX1GCUW4pbwWRwXnDsPBAxx&openBs=openbs
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
var appId = '65619'; // appId 埋点需要 var appId = '65619'; // appId 埋点需要
var rule = var rule =
"欢迎加入夺宝大作战欢迎加入<br>夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战<br>欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大<br>作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入<br>夺宝大作战欢迎加入夺宝大作战欢迎加<br>入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎<br>加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大<br>作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入<br>夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战<br>欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大<br>作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入<br>夺宝大作战欢迎加入夺宝大作战欢迎加<br>入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎<br>加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大<br>作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入<br>夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战<br>欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大<br>作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入<br>夺宝大作战欢迎加入夺宝大作战欢迎加<br>入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎<br>加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大<br>作战欢迎加入夺宝大作战欢迎加入夺宝大作战欢迎加入夺宝大作战"; "活动时间:10月20日 0:00 - 11月2日 23:59(待定)<br><br>活动规则:<br>1、在活动期间内,每个用户每天有3次免费抽卡机会。<br>2、免费机会用完后,还可以邀请好友助力,高概率获得超稀有emoji卡牌哦。助力规则:每人每天仅可为同一用户助力一次;每人每天仅可为他人助力5次;每人每天获得的助力上限3次;自己不能为自己助力哦。<br>3、用户集齐不同类型的emoji卡卡牌(暴富、好运、锦鲤、快乐、平安、桃花)后可召唤大奖。<br>4、本次活动的抽卡机会、未兑换卡片和奖励均需在本次活动截止时间前予以使用/兑换,否则视为用户自动放弃,并在本次活动结束后全部清零。<br>5、 活动奖品:现金红包(最高66元)、腾讯视频月卡、爱奇艺月卡、优酷会员月卡、咪咕阅读30天VIP、必胜客芝心至尊披萨五折、周黑鸭满88减20元券、必胜客满49送浓情烤翅。<br><br>发奖说明:<br>1.、现金奖励将通过支付宝转账的形式发放至用户所填的支付宝账户,每个支付宝账户仅能一个用户进行领奖;<br>2、优惠券奖励将在用户领取后根据兑奖说明领取即可。<br><br>用户须知:<br>(一) 用户仅能使用个人有效注册账号参与此次活动,不得盗用他人手机、地址或以非法形式或不正当形式注册账号参与活动,否则视为无效参与。<br>(二) 用户承诺:参与活动过程中保证活动的真实性、合法性、有效性、准确性、无害性,杜绝一切违反法律法规、侵犯其他用户合法权益、干扰QQ输入法的行为,否则QQ输入法保留追究用户相关法律责任的权利(包括但不限于收回用户已获得的全部相关奖励/奖品、冻结用户账号,并追究因此给QQ输入法造成的全部损失等)。<br>(三) 用户参与本次活动即代表对本次活动全部规则的接受,并同意接受相关规则的约束。本活动规则可由QQ输入法随时更新,更新后的规则一旦公布即代替原来规则;用户继续参与本次活动将视为接受修改后的规则。<br>(四) 本次活动由QQ输入法与杭州兑吧网络科技有限公司联合运营,活动中的现金奖励由杭州兑吧网络科技有限公司发放。<br>(五)对本次活动规则有任何疑问,请联系客服进行咨询。";
var mapPlugIDList = [1218, 1219]; var mapPlugIDList = [1218, 1219];
var weUrl = 'http://weserver.duibadev.com.cn'; var weUrl = 'http://weserver.duibadev.com.cn';
......
No preview for this file type
No preview for this file type
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="LoadingSceneSkin" width="750" height="2249" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="LoadingSceneSkin" width="750" height="1550" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Scroller id="scroller" height="2249" right="0" left="0" anchorOffsetY="0" top="0"> <e:Scroller id="scroller" height="1550" right="0" left="0" anchorOffsetY="0" top="0">
<e:Group> <e:Group anchorOffsetX="0" width="757">
<e:Image source="bg_png" x="0" y="0" scaleX="1" scaleY="1"/> <e:Image source="bg_png" x="0" y="0" scaleX="1" scaleY="1"/>
<e:Image y="79" scaleX="1" scaleY="1" source="act_title_png" horizontalCenter="0" x="46"/> <e:Image y="79" scaleX="1" scaleY="1" source="act_title_png" horizontalCenter="0" x="46"/>
<e:Group id="title_group" width="659" height="130" x="46" y="79" anchorOffsetX="0" anchorOffsetY="0"> <e:Group id="title_group" width="659" height="130" x="46" y="79" anchorOffsetX="0" anchorOffsetY="0">
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
<e:Label id="timesLabel" text="今日 次数:0次" y="448" textColor="0x000000" size="26" bold="true" left="269" textAlign="left"/> <e:Label id="timesLabel" text="今日 次数:0次" y="448" textColor="0x000000" size="26" bold="true" left="269" textAlign="left"/>
<e:Group id="scrollerGroup" width="544" height="29" x="118" y="25" anchorOffsetX="0" anchorOffsetY="0"> <e:Group id="scrollerGroup" width="544" height="29" x="118" y="25" anchorOffsetX="0" anchorOffsetY="0">
<e:Rect id="scrollerMask" right="0" left="0" fillAlpha="1" top="0" bottom="0"/> <e:Rect id="scrollerMask" right="0" left="0" fillAlpha="1" top="0" bottom="0"/>
<e:Label id="scrollerLable1" text="XXXXX人正在集卡" size="25" anchorOffsetX="0" width="544" y="-30" textColor="0x000000" horizontalCenter="0"/> <e:Label id="scrollerLable1" text="XXXXX人正在集卡" size="25" anchorOffsetX="0" textColor="0x000000" width="544" height="29" y="0" horizontalCenter="0"/>
<e:Label id="scrollerLable2" text="XXXXX人已集齐卡牌" size="25" anchorOffsetX="0" width="544" y="30" scaleX="1" scaleY="1" textColor="0x000000" horizontalCenter="0"/> <e:Label id="scrollerLable2" text="XXXXX人已集齐卡牌" size="25" anchorOffsetX="0" scaleX="1" scaleY="1" textColor="0x000000" horizontalCenter="0" width="544" height="29" y="0"/>
</e:Group> </e:Group>
</e:Group> </e:Group>
<e:Group height="119" anchorOffsetY="0" horizontalCenter="0" y="798" left="0" right="0" x="0" scaleX="1" scaleY="1"> <e:Group height="119" anchorOffsetY="0" horizontalCenter="0" y="798" left="0" right="0" x="0" scaleX="1" scaleY="1">
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<e:Image scaleX="1" scaleY="1" y="47" source="logo_png" horizontalCenter="0"/> <e:Image scaleX="1" scaleY="1" y="47" source="logo_png" horizontalCenter="0"/>
<e:Label id="percentLb" text="78%" width="750" textAlign="center" size="34" alpha="1" anchorOffsetX="0" scaleX="1" scaleY="1" x="7.5" y="585.22" verticalCenter="205.21500000000003" textColor="0x361400" visible="false"/> <e:Label id="percentLb" text="78%" width="750" textAlign="center" size="34" alpha="1" anchorOffsetX="0" scaleX="1" scaleY="1" x="7.5" y="585.22" verticalCenter="205.21500000000003" textColor="0x361400" visible="false"/>
<e:Label text="loading..." width="750" size="50" alpha="1" anchorOffsetX="0" scaleX="1" scaleY="1" verticalAlign="middle" textAlign="center" y="355.5" textColor="0x000000" bold="true" horizontalCenter="0"/> <e:Label text="loading..." width="750" size="50" alpha="1" anchorOffsetX="0" scaleX="1" scaleY="1" verticalAlign="middle" textAlign="center" y="355.5" textColor="0x000000" bold="true" horizontalCenter="0"/>
<e:Label text="66元 正向你奔来" width="750" size="46" alpha="1" anchorOffsetX="0" scaleX="1" scaleY="1" verticalAlign="middle" textAlign="center" y="567" horizontalCenter="0" textColor="0x000000" x="10" bold="true"/> <e:Label text="66元 正向你奔来" width="750" size="46" alpha="1" anchorOffsetX="0" scaleX="1" scaleY="1" verticalAlign="middle" textAlign="center" textColor="0x000000" bold="true" left="0" y="567"/>
<e:Rect id="progressBar_fill" height="44" x="174" y="459.5" anchorOffsetX="0" fillColor="0xffbe30" ellipseHeight="50" ellipseWidth="50" anchorOffsetY="0" strokeColor="0x000000"/> <e:Rect id="progressBar_fill" height="44" x="174" y="459.5" anchorOffsetX="0" fillColor="0xffbe30" ellipseHeight="50" ellipseWidth="50" anchorOffsetY="0" strokeColor="0x000000"/>
<e:Image id="progressBar_bg" scaleX="1" scaleY="1" y="482" anchorOffsetX="0" anchorOffsetY="22.5" horizontalCenter="0" source="progressbar_bg_png"/> <e:Image id="progressBar_bg" scaleX="1" scaleY="1" y="482" anchorOffsetX="0" anchorOffsetY="22.5" horizontalCenter="0" source="progressbar_bg_png"/>
<e:Image id="emoji" x="174" y="482" source="load_emoji_png" anchorOffsetX="38.5" anchorOffsetY="40.5"/> <e:Image id="emoji" x="174" y="482" source="load_emoji_png" anchorOffsetX="38.5" anchorOffsetY="40.5"/>
......
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Image source="prize_bg_png" horizontalCenter="-1.5" x="0" scaleX="1" scaleY="1" verticalCenter="0.5" y="-2.5"/> <e:Image source="prize_bg_png" horizontalCenter="-1.5" x="0" scaleX="1" scaleY="1" verticalCenter="0.5" y="-2.5"/>
<e:Image id="prizeImg" y="140.5" scaleX="1" scaleY="1" horizontalCenter="1.5" x="285"/> <e:Image id="prizeImg" y="130.5" scaleX="1.3" scaleY="1.3" horizontalCenter="0"/>
<e:Label id="prizeName" text="奖品名字" y="446.5" textColor="0x000000" size="25" horizontalCenter="1" x="234" scaleX="1" scaleY="1"/> <e:Label id="prizeName" text="奖品名字" y="471.5" textColor="0x000000" size="25" scaleX="1" scaleY="1" horizontalCenter="0"/>
<e:Button id="ok_btn" label="" y="546" scaleX="1" scaleY="1" anchorOffsetY="55.5" anchorOffsetX="191.8" horizontalCenter="0"> <e:Button id="ok_btn" label="" y="567" scaleX="1" scaleY="1" anchorOffsetY="55.5" anchorOffsetX="191.8" horizontalCenter="0">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" scaleX.down="0.9" scaleY.down="0.9" source="prize_btn_png" source.down="prize_btn_png" source.disabled="prize_btn_png"/> <e:Image width="100%" height="100%" scaleX.down="0.9" scaleY.down="0.9" source="prize_btn_png" source.down="prize_btn_png" source.disabled="prize_btn_png"/>
......
No preview for this file type
No preview for this file type
...@@ -7,20 +7,22 @@ export default class AudioCtrl { ...@@ -7,20 +7,22 @@ export default class AudioCtrl {
// } // }
private static audios = {}; private static audios = {};
private static audioChannels = {};
private static bg: egret.Sound; private static bg: egret.Sound;
private static bgChannel: egret.SoundChannel;
/** /**
* 切换背景音乐 * 切换背景音乐
* @param bg 背景音乐 * @param bg 背景音乐
*/ */
public static changeBgMusic(bg: egret.Sound) { public static changeBgMusic(bg: egret.Sound) {
if(this.bg) { if(this.bgChannel) {
this.bg.close(); this.bgChannel.stop();
} }
setTimeout(() => { setTimeout(() => {
if(bg) { if(bg) {
this.bg = bg; this.bg = bg;
this.bg.play(); this.bgChannel = this.bg.play();
} }
}, 50); }, 50);
} }
...@@ -30,7 +32,7 @@ export default class AudioCtrl { ...@@ -30,7 +32,7 @@ export default class AudioCtrl {
*/ */
public static resumeBgMusic() { public static resumeBgMusic() {
if(this.bg) { if(this.bg) {
this.bg.play(); this.bgChannel = this.bg.play();
} }
} }
...@@ -38,8 +40,8 @@ export default class AudioCtrl { ...@@ -38,8 +40,8 @@ export default class AudioCtrl {
* 停止背景音乐 * 停止背景音乐
*/ */
public static stopBgMusic() { public static stopBgMusic() {
if(this.bg) { if(this.bgChannel) {
this.bg.close(); this.bgChannel.stop();
} }
} }
...@@ -64,8 +66,21 @@ export default class AudioCtrl { ...@@ -64,8 +66,21 @@ export default class AudioCtrl {
if(!this.audios[name]) { if(!this.audios[name]) {
return; return;
} }
this.audios[name].play(startTime, playTimes); this.audioChannels[name] = this.audios[name].play(startTime, playTimes);
}
/**
* 播放音频
* @param name 音频的名字
* @param audio 音频
* @param playTimes 播放次数,默认值是 1,循环播放。 大于 0 为播放次数,如 1 为播放 1 次;小于等于 0,为循环播放。
* @param startTime 应开始播放的初始位置(以秒为单位),默认值是 0
*/
public static addAndPlayAudio(name: string, audio: egret.Sound, playTimes: number = 1, startTime: number = 0) {
if(!this.audios[name]) {
this.audios[name] = audio;
}
this.audioChannels[name] = this.audios[name].play(startTime, playTimes);
} }
/** /**
...@@ -73,8 +88,8 @@ export default class AudioCtrl { ...@@ -73,8 +88,8 @@ export default class AudioCtrl {
* @param name 音频的名字 * @param name 音频的名字
*/ */
public static stopAudio(name: string) { public static stopAudio(name: string) {
if(this.audios[name]) { if(this.audioChannels[name]) {
this.audios[name].close(); this.audioChannels[name].stop();
} }
} }
...@@ -86,6 +101,9 @@ export default class AudioCtrl { ...@@ -86,6 +101,9 @@ export default class AudioCtrl {
if(this.audios[name]) { if(this.audios[name]) {
delete this.audios[name]; delete this.audios[name];
} }
if(this.audioChannels[name]) {
delete this.audioChannels[name];
}
} }
/** /**
...@@ -95,6 +113,11 @@ export default class AudioCtrl { ...@@ -95,6 +113,11 @@ export default class AudioCtrl {
for(let v in this.audios) { for(let v in this.audios) {
delete this.audios[v]; delete this.audios[v];
} }
for(let v in this.audioChannels){
delete this.audioChannels[v];
}
this.audios = {};
this.audioChannels = {};
} }
} }
\ No newline at end of file
...@@ -36,6 +36,7 @@ import { NetName } from "../libs/tw/enum/NetName"; ...@@ -36,6 +36,7 @@ import { NetName } from "../libs/tw/enum/NetName";
////// //////
class Main extends eui.UILayer { class Main extends eui.UILayer {
private bgMusic: egret.Sound;
protected createChildren(): void { protected createChildren(): void {
super.createChildren(); super.createChildren();
// alert(1) // alert(1)
...@@ -167,23 +168,32 @@ class Main extends eui.UILayer { ...@@ -167,23 +168,32 @@ class Main extends eui.UILayer {
}); });
this.stage.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchStage, this); this.stage.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchStage, this);
document.addEventListener("visibilitychange", () => {
if(document.visibilityState == "visible") {
AudioCtrl.resumeBgMusic();
}
if(document.visibilityState == "hidden") {
AudioCtrl.stopBgMusic();
}
})
} }
onTouchStage() { onTouchStage() {
AudioCtrl.changeBgMusic(RES.getRes('bg_sound_mp3')); AudioCtrl.changeBgMusic(this.bgMusic);
this.stage.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchStage, this); this.stage.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchStage, this);
} }
//加载游戏中的资源 //加载游戏中的资源
private async getGameRes() { private async getGameRes() {
await NetManager.ins.getProjectUserInfo((success)=>{ await NetManager.ins.getProjectUserInfo((success) => {
if(!success){ if(!success) {
Buried.init(0); Buried.init(0);
return; return;
} }
Buried.init(DataManager.ins.getData(NetName.GET_PROJECTUSERINFO).data.consumerId); Buried.init(DataManager.ins.getData(NetName.GET_PROJECTUSERINFO).data.consumerId);
}); });
this.bgMusic = await RES.getResAsync('bg_sound_mp3');
SceneCtrl.instance.change(ModuleTypes.LOADING_SCENE); SceneCtrl.instance.change(ModuleTypes.LOADING_SCENE);
await RES.loadGroup('common'); await RES.loadGroup('common');
......
...@@ -15,7 +15,7 @@ import { GTime } from "../../../libs/tc/util/GTime"; ...@@ -15,7 +15,7 @@ import { GTime } from "../../../libs/tc/util/GTime";
import AudioCtrl from "../../MVC/ctrls/AudioCtrl"; import AudioCtrl from "../../MVC/ctrls/AudioCtrl";
import PrizeListItem from "./PrizeListItem"; import PrizeListItem from "./PrizeListItem";
import { getlogItem } from "../../getlogItem"; import { getlogItem } from "../../getlogItem";
import tr = egret.sys.tr; import userMock from "./UserMock";
export default class IndexScene extends Scene { export default class IndexScene extends Scene {
public scroller: eui.Scroller; public scroller: eui.Scroller;
...@@ -131,6 +131,7 @@ export default class IndexScene extends Scene { ...@@ -131,6 +131,7 @@ export default class IndexScene extends Scene {
// 开奖 // 开奖
private openBox() { private openBox() {
// SceneCtrl.instance.change(ModuleTypes.INDEX_SCENE);
if(!this.boxTouch) { if(!this.boxTouch) {
return; return;
} }
...@@ -481,10 +482,10 @@ export default class IndexScene extends Scene { ...@@ -481,10 +482,10 @@ export default class IndexScene extends Scene {
} }
} }
let hongbao_data = { let hongbao_data = {
"icon": link, icon: link,
"name": "现金红包", name: "现金红包",
}; };
_data.push(hongbao_data); _data.unshift(hongbao_data);
this.list.itemRenderer = PrizeListItem; this.list.itemRenderer = PrizeListItem;
const ac = new eui.ArrayCollection(_data); const ac = new eui.ArrayCollection(_data);
this.list.dataProvider = ac; this.list.dataProvider = ac;
...@@ -537,14 +538,17 @@ export default class IndexScene extends Scene { ...@@ -537,14 +538,17 @@ export default class IndexScene extends Scene {
} }
private easyScroller(obj1: any, obj2: any, duration: number) { private easyScroller(obj1: any, obj2: any, duration: number) {
let height = obj1.height;
obj1.y = height + 7;
obj2.y = height + 7;
let name = userMock.nameList[~~(Math.random() * userMock.nameList.length)];
let prize = userMock.prizeList[~~(Math.random() * userMock.prizeList.length)];
obj1.text = `${Math.floor(GTime.getTimestamp() % 1000000000000 / 123456)}人正在集卡`;
obj2.text = `${name}已集齐卡牌,抽中${prize}!`;
egret.Tween.get(obj1).to({y: 2}, duration).wait(1500).call(() => { egret.Tween.get(obj1).to({y: 2}, duration).wait(1500).call(() => {
egret.Tween.get(obj1).to({y: -28}, duration).call(() => { egret.Tween.get(obj1).to({y: -height-3}, duration).call(() => {
obj1.y = 30;
this.scrollerLable1.text = `${Math.floor(GTime.getTimestamp() / 100000)}人正在集卡`;
egret.Tween.get(obj2).to({y: 2}, duration).wait(1500).call(() => { egret.Tween.get(obj2).to({y: 2}, duration).wait(1500).call(() => {
egret.Tween.get(obj2).to({y: -28}, duration).call(() => { egret.Tween.get(obj2).to({y: -height-3}, duration).call(() => {
obj2.y = 30;
this.scrollerLable2.text = `${Math.floor(GTime.getTimestamp() * 2.5 / 10000 / 1000)}人已经集齐卡牌, 抽中支付宝红包`;
this.easyScroller(obj1, obj2, duration); this.easyScroller(obj1, obj2, duration);
}); });
}); });
...@@ -600,10 +604,6 @@ export default class IndexScene extends Scene { ...@@ -600,10 +604,6 @@ export default class IndexScene extends Scene {
// 滚动弹幕 // 滚动弹幕
this.scrollerGroup.mask = this.scrollerMask; this.scrollerGroup.mask = this.scrollerMask;
this.scrollerLable1.y = 30;
this.scrollerLable2.y = 30;
this.scrollerLable1.text = `${Math.floor(GTime.getTimestamp() / 100000)}人正在集卡`;
this.scrollerLable2.text = `${Math.floor(GTime.getTimestamp() * 2.5 / 10000 / 1000)}人已经集齐卡牌`;
this.easyScroller(this.scrollerLable1, this.scrollerLable2, 1000); this.easyScroller(this.scrollerLable1, this.scrollerLable2, 1000);
// 标题扫光 // 标题扫光
......
...@@ -11,6 +11,6 @@ export default class RankPrize extends eui.ItemRenderer { ...@@ -11,6 +11,6 @@ export default class RankPrize extends eui.ItemRenderer {
setTimeout(() => { setTimeout(() => {
this.icon.source = this.data.icon; this.icon.source = this.data.icon;
this.title.text = this.data.name; this.title.text = this.data.name;
}, 50) }, 100)
} }
} }
\ No newline at end of file
This diff is collapsed.
No preview for this file type
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"code":"", "code":"",
"data":{ "data":{
"endFlag":false, "endFlag":false,
"leftTimes":0, "leftTimes":3,
"spMap":{ "spMap":{
"sp_1":1, "sp_1":1,
"sp_2":1, "sp_2":1,
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"message":"", "message":"",
"code":"", "code":"",
"data":{ "data":{
"optionId":"abcd", "optionId":"sss_1",
"prizeId":"sss_2", "prizeId":"sss_2",
"prizeType":2, "prizeType":2,
"userRecordId":344, "userRecordId":344,
......
{ {
"data": [ "data": [
{ {
"icon": "//yun.dui88.com/images/201907/ui83og75fr.png", "icon": "//yun.duiba.com.cn/polaris/必胜客芝心至尊披萨五折 250.635ec3195fbbc064b710cfdfbf37f661410e9661.jpg",
"icon2": "//yun.dui88.com/images/201907/ui83og75fr.png", "id": "o532e55fb",
"id": "o8c947e58", "index": 9,
"index": 1, "name": "芝心披萨五折",
"name": "999元支付宝红包", "prizeId": "sss_8",
"prizeId": "ga58ef339", "prizeType": 2,
"prizeType": 2 "refId": "60629",
}, "refType": "coupon"
{ },
"icon": "//yun.duiba.com.cn/db-m/app/turntable/circle/images/prize/谢谢参与_6311f27.png", {
"icon2": "//yun.duiba.com.cn/db-m/app/turntable/circle/images/prize/谢谢参与_6311f27.png", "icon": "//yun.duiba.com.cn/polaris/4.27f73ce1cbae2a243bf5f4203af3430b5519b9ee.png",
"id": "thanks", "id": "ofd97c6a6",
"index": 5,
"name": "腾讯视频月卡",
"prizeId": "sss_4",
"prizeType": 2,
"refId": "60625",
"refType": "coupon"
},
{
"degree": "66",
"icon": "//yun.duiba.com.cn/polaris/1.9b3b2e99ac4e84c617346afed2486de76665c38a.png",
"id": "o0adb99b6",
"index": 2, "index": 2,
"name": "谢谢参与", "name": "66元支付宝红包",
"prizeId": "thanks", "prizeId": "sss_1",
"prizeType": 0 "prizeType": 2,
"refId": "53",
"refType": "alipay"
}, },
{ {
"icon": "//yun.dui88.com/images/201907/xsit2cvmyl.jpeg", "degree": "6",
"icon2": "//yun.dui88.com/images/201907/xsit2cvmyl.jpeg", "icon": "//yun.duiba.com.cn/polaris/1.9b3b2e99ac4e84c617346afed2486de76665c38a.png",
"id": "ob52caaca", "id": "od05ba3d6",
"index": 3, "index": 3,
"name": "实物1", "name": "6元支付宝红包",
"prizeId": "gb87b2592", "prizeId": "sss_2",
"prizeType": 2 "prizeType": 2,
"refId": "53",
"refType": "alipay"
}, },
{ {
"icon": "//yun.dui88.com/projectxh5/alipay-250-250.png", "degree": "2",
"icon2": "//yun.dui88.com/projectxh5/alipay-250-250.png", "icon": "//yun.duiba.com.cn/polaris/1.9b3b2e99ac4e84c617346afed2486de76665c38a.png",
"id": "ob7dc936f", "id": "o2c4e97e6",
"index": 4, "index": 4,
"name": "支付宝10元", "name": "2元支付宝红包",
"prizeId": "g1f8062fe", "prizeId": "sss_3",
"prizeType": 2 "prizeType": 2,
"refId": "53",
"refType": "alipay"
}, },
{ {
"icon": "//yun.dui88.com/projectxh5/phonebill-250-250.png", "icon": "//yun.duiba.com.cn/polaris/3.8b5a8cfdaa0e3c8765c73f970683d17329abd64e.png",
"icon2": "//yun.dui88.com/projectxh5/phonebill-250-250.png", "id": "o120942e7",
"id": "o56bf97cc", "index": 6,
"index": 5, "name": "爱奇艺月卡",
"name": "话费30元", "prizeId": "sss_5",
"prizeId": "gbeeb3187", "prizeType": 2,
"prizeType": 2 "refId": "60622",
"refType": "coupon"
}, },
{ {
"icon": "//yun.dui88.com/projectxh5/qb-250-250.png", "icon": "//yun.duiba.com.cn/polaris/2.f6a7409aa4fbe976dc82d38644476f45be8f532d.png",
"icon2": "//yun.dui88.com/projectxh5/qb-250-250.png", "id": "o934f06b2",
"id": "o6c455e84", "index": 7,
"index": 6, "name": "优酷会员月卡",
"name": "Q币10个", "prizeId": "sss_6",
"prizeId": "g4c4c3edd", "prizeType": 2,
"prizeType": 2 "refId": "60624",
"refType": "coupon"
},
{
"icon": "//yun.duiba.com.cn/polaris/咪咕阅读30天VIP 250.645cc4e36ecc3b857acff4795562d2e591cd1382.jpg",
"id": "o0c644163",
"index": 8,
"name": "咪咕阅读会员",
"prizeId": "sss_7",
"prizeType": 2,
"refId": "60627",
"refType": "coupon"
},
{
"icon": "//yun.duiba.com.cn/polaris/必胜客芝心至尊披萨五折 250.635ec3195fbbc064b710cfdfbf37f661410e9661.jpg",
"id": "o532e55fb",
"index": 9,
"name": "芝心披萨五折",
"prizeId": "sss_8",
"prizeType": 2,
"refId": "60629",
"refType": "coupon"
},
{
"icon": "//yun.duiba.com.cn/polaris/周黑鸭满88减20元券 250.133d9ee17b38b93b9f9a4b9b9be6ca2e77c3b835.jpg",
"id": "ocf80ae5f",
"index": 10,
"name": "周黑鸭满减券",
"prizeId": "sss_9",
"prizeType": 2,
"refId": "60631",
"refType": "coupon"
},
{
"icon": "//yun.duiba.com.cn/polaris/必胜客满49送浓情烤翅 250.635ec3195fbbc064b710cfdfbf37f661410e9661.jpg",
"id": "obf6078f6",
"index": 11,
"name": "必胜客满送券",
"prizeId": "sss_10",
"prizeType": 2,
"refId": "60632",
"refType": "coupon"
} }
], ],
"success": true "success": true
......
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