Commit b628c8d2 authored by 还有醋v's avatar 还有醋v

1

parent a24d5968
No preview for this file type
No preview for this file type
...@@ -9,7 +9,12 @@ ...@@ -9,7 +9,12 @@
}, },
"global": { "global": {
"globalAutoLayerMarkEnable": true, "globalAutoLayerMarkEnable": true,
"globalRulerEnable": true "globalRulerEnable": false,
"globalAdsorbEnable": true,
"gridColor": 8421504,
"gridEnabled": false,
"gridSize": 20,
"globalBindingDataTestObj": []
}, },
"16c22d7b1ce": { "16c22d7b1ce": {
"guideLines": [ "guideLines": [
...@@ -18,5 +23,15 @@ ...@@ -18,5 +23,15 @@
"pos": -151.515 "pos": -151.515
} }
] ]
},
"16e64c53e86": {
"backgroundX": 0,
"backgroundY": 0,
"backgroundWidth": -1,
"backgroundHeight": -1,
"useBgImage": true,
"useBgColor": true,
"backgroundAlpha": 100,
"bindingDataTestObj": []
} }
} }
\ No newline at end of file
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
<script src="libs/modules/promise/promise.js"></script> <script src="libs/modules/promise/promise.js"></script>
<script src="libs/zepto.min.js"></script> <script src="libs/zepto.min.js"></script>
<script src="libs/security.js"></script> <script src="libs/security.js"></script>
<script src="scripts/svga.egret.min2.js"></script>
<script src="libs/physics.min.js"></script> <script src="libs/physics.min.js"></script>
<script src="output.js"></script> <script src="output.js"></script>
<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script> <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
...@@ -126,6 +127,8 @@ ...@@ -126,6 +127,8 @@
return b; return b;
} }
window['hbRainTime'] = 20;
</script> </script>
<script> <script>
egret.runEgret({ egret.runEgret({
......
...@@ -44,6 +44,33 @@ export enum NetName { ...@@ -44,6 +44,33 @@ export enum NetName {
OPEN_COLLECT, OPEN_COLLECT,
WINNERS, WINNERS,
GET_TOKEN, GET_TOKEN,
//宠物养成
PET_ADOPTE,
PET_STATUS,
PET_INFO,
PET_FEED,
PET_TOYS,
PET_TOY_EXCHANGE,
PET_TOY_USE,
PET_COLLECT,
PET_GET_RANK_LIST,
PET_GET_FOOD_PILES,
PET_COLLECT_FOOD,
//外来宠物养成
PETS_GET_HOME_INFO,
PETS_GET_ACT_TOYS,
PETS_GET_USER_TOYS,
PETS_USE_TOYS,
PETS_TOY_EXCHANGE,
PETS_BATCHOLLECT_FOOD,
PETS_VISI_STATISTICS,
PETS_GET_VISIT_INFO,
PETS_VISIT_DETAIL,
PETS_COLLECT_GIFT_RECORD,
//携程养成
PETS_USE_TOYS_XCH,
TOY_EXCHANGES_DATA_XC,
EXCHANGE_RECSULT,
//签到 //签到
SIGN_INFO, SIGN_INFO,
SIGN_DO_SIGN, SIGN_DO_SIGN,
...@@ -86,19 +113,11 @@ export enum NetName { ...@@ -86,19 +113,11 @@ export enum NetName {
// 浦发中秋排行榜 // 浦发中秋排行榜
RANK_NEW_LIST, RANK_NEW_LIST,
DO_JOIN_DATA, DO_JOIN_DATA,
USER_SUBMIT_PHONE,
USER_GET_PHONE,
GAME_SUBMIT_NEW,
GAME_START_STATUS_NEW, GAME_START_STATUS_NEW,
GET_ORDER_STATUS, GET_ORDER_STATUS,
GET_PERIOD_PRIZE_INFO,
// 屈臣氏 RANK_INFO
GET_DOMAIN,
GET_COUNT,
QUERY_PRIZE_LIST,
CREDITS_COST,
QUERY_STATUS,
GET_PRIZE,
QUERY_PRIZE_INFO,
GET_COUPON_INFO,
QUERY_RECORDS,
GET_PROJECTUSERINFO,
} }
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
...@@ -11,8 +11,24 @@ export class Buried { ...@@ -11,8 +11,24 @@ export class Buried {
* 初始化 * 初始化
*/ */
public static init(): void { public static init(): void {
Buried.appId = 49215; if(DataManager.ins.gameCfgData) {
Buried.oaId = 'p50fd29ae'; console.log("gameCfgData");
this.appId = DataManager.ins.gameCfgData.appInfo.appId;
this.oaId = DataManager.ins.gameCfgData.gameInfo.oaId;
} else if(DataManager.ins.customCfgData){
console.log("customCfgData");
this.appId = DataManager.ins.customCfgData.appId;
this.oaId = DataManager.ins.customCfgData.oaId ;
} else if(DataManager.ins.petIndexData && DataManager.ins.petIndexData.appId && DataManager.ins.petIndexData.activityId){
console.log("petIndexData");
this.appId = DataManager.ins.petIndexData.appId;
this.oaId = DataManager.ins.petIndexData.activityId ;
} else if(DataManager.ins.petsIndexData && DataManager.ins.petsIndexData.appId && DataManager.ins.petsIndexData.activityId){
console.log("petsIndexData");
this.appId = DataManager.ins.petsIndexData.appId;
this.oaId = DataManager.ins.petsIndexData.activityId ;
}
console.log(this.appId, this.consumerId, this.oaId);
} }
/** /**
......
No preview for this file type
{"file":"cutTimeFont.png","frames":{
"0":{"x":58,"y":91,"w":56,"h":89,"offX":0,"offY":0,"sourceW":56,"sourceH":89},
"1":{"x":116,"y":0,"w":56,"h":89,"offX":0,"offY":0,"sourceW":56,"sourceH":89},
"2":{"x":174,"y":91,"w":56,"h":89,"offX":0,"offY":0,"sourceW":56,"sourceH":89},
"3":{"x":174,"y":0,"w":56,"h":89,"offX":0,"offY":0,"sourceW":56,"sourceH":89},
"4":{"x":0,"y":91,"w":56,"h":89,"offX":0,"offY":0,"sourceW":56,"sourceH":89},
"5":{"x":0,"y":182,"w":56,"h":89,"offX":0,"offY":0,"sourceW":56,"sourceH":89},
"6":{"x":58,"y":182,"w":56,"h":89,"offX":0,"offY":0,"sourceW":56,"sourceH":89},
"7":{"x":116,"y":91,"w":56,"h":89,"offX":0,"offY":0,"sourceW":56,"sourceH":89},
"8":{"x":58,"y":0,"w":56,"h":89,"offX":0,"offY":0,"sourceW":56,"sourceH":89},
"9":{"x":0,"y":0,"w":56,"h":89,"offX":0,"offY":0,"sourceW":56,"sourceH":89},
"分":{"x":145,"y":182,"w":25,"h":26,"offX":0,"offY":31,"sourceW":25,"sourceH":89},
"秒":{"x":116,"y":182,"w":27,"h":26,"offX":0,"offY":31,"sourceW":27,"sourceH":89},
"时":{"x":172,"y":182,"w":24,"h":25,"offX":0,"offY":32,"sourceW":24,"sourceH":89}}}
\ No newline at end of file
{ {
"groups":[ "groups": [
{ {
"keys":"progress_png", "keys": "progress_png",
"name":"loading" "name": "loading"
}, },
{ {
"keys":"Bitmap-4_png", "keys": "Bitmap-4_png",
"name":"alert" "name": "alert"
}, },
{ {
"keys":"closeBtn_png", "keys": "closeBtn_png",
"name":"common" "name": "common"
}, },
{ {
"keys":"progress_png", "keys": "progress_png",
"name":"loading_scene" "name": "loading_scene"
}, },
{ {
"keys":"creditsTip_bg_png,creditsTip_btn_png", "keys": "index_bg_png,index_again_btn_png,cutTimeFont_fnt,index_hongbao_png,index_myprize_btn_png,index_panel_bg_png,index_rule_btn_png,index_tips_cuting_png,index_tips_raining_png,cutTimeFont_png,index_hongbao_current_png,index_start_btn_png",
"name":"creditsTip_panel" "name": "index_scene"
}, },
{ {
"keys":"noMore_bg_png", "keys": "hbGame_tips_png,hbGame_hongbao_png,hbGame_hongbao_effect_png,hbGame_bg_png,hbGame_3_png,hbGame_2_png,hbGame_1_png",
"name":"noMore_panel" "name": "hbRainGame"
}, },
{ {
"keys":"", "keys": "hbPrize_bg_png,hbPrize_item_bg_png,hbPrize_item_line_png,hbPrize_ok_btn_png,hbPrize_share_btn_png,hbPrize_share_tips_png",
"name":"noPrize_panel" "name": "hbPrize"
}, },
{ {
"keys":"noTimes_bg_png", "keys": "hbNoPrize_share_tips_png,hbNoPrize_share_btn_png,hbNoPrize_ok_btn_png,hbNoPrize_bg_png",
"name":"noTimes_panel" "name": "hbNoPrize"
}
],
"resources": [
{
"url": "assets/alert/Bitmap-4.png",
"type": "image",
"name": "Bitmap-4_png"
}, },
{ {
"keys":"prize_bg_png,prize_btn_png", "url": "assets/loading/bg.png",
"name":"prize_panel" "type": "image",
"name": "bg_png"
}, },
{ {
"keys":"index_bg_png", "url": "assets/loading/progress.png",
"name":"index_scene" "type": "image",
"name": "progress_png"
}, },
{ {
"keys":"turnTable_bg_png,turnTable_prize_bg_png,turnTable_start_btn_png,turnTable_title_png", "url": "assets/common/closeBtn.png",
"name":"turnTable_panel" "type": "image",
"name": "closeBtn_png"
}, },
{ {
"keys":"turnTablePrize_bg_png,turnTablePrize_ok_btn_png", "url": "assets/alert/Bitmap-1.png",
"name":"turnTablePrize_panel" "type": "image",
"name": "Bitmap-1_png"
}, },
{ {
"keys":"TurnTableIDou_bg_png,TurnTableIDou_ok_btn_png", "url": "assets/alert/Bitmap-2.png",
"name":"TurnTableIDou_panel" "type": "image",
"name": "Bitmap-2_png"
}, },
{ {
"keys":"TurnTableNoPrize_bg_png,TurnTableNoPrize_ok_btn_png", "url": "assets/index_scene/index_bg.png",
"name":"TurnTableNoPrize_panel" "type": "image",
} "name": "index_bg_png"
], },
"resources":[ {
"url": "assets/index_scene/index_again_btn.png",
"type": "image",
"name": "index_again_btn_png"
},
{
"url": "assets/index_scene/cutTimeFont.fnt",
"type": "font",
"name": "cutTimeFont_fnt"
},
{
"url": "assets/index_scene/index_hongbao.png",
"type": "image",
"name": "index_hongbao_png"
},
{
"url": "assets/index_scene/index_myprize_btn.png",
"type": "image",
"name": "index_myprize_btn_png"
},
{
"url": "assets/index_scene/index_panel_bg.png",
"type": "image",
"name": "index_panel_bg_png"
},
{ {
"name":"Bitmap-4_png", "url": "assets/index_scene/index_rule_btn.png",
"type":"image", "type": "image",
"url":"assets/alert/Bitmap-4.png" "name": "index_rule_btn_png"
}, },
{ {
"name":"bg_png", "url": "assets/index_scene/index_tips_cuting.png",
"type":"image", "type": "image",
"url":"assets/loading/bg.png" "name": "index_tips_cuting_png"
}, },
{ {
"name":"progress_png", "url": "assets/index_scene/index_tips_raining.png",
"type":"image", "type": "image",
"url":"assets/loading/progress.png" "name": "index_tips_raining_png"
}, },
{ {
"name":"closeBtn_png", "url": "assets/index_scene/cutTimeFont.png",
"type":"image", "type": "image",
"url":"assets/common/closeBtn.png" "name": "cutTimeFont_png"
}, },
{ {
"name":"Bitmap-1_png", "url": "assets/hbGame/hbGame_1.png",
"type":"image", "type": "image",
"url":"assets/alert/Bitmap-1.png" "name": "hbGame_1_png"
}, },
{ {
"name":"Bitmap-2_png", "url": "assets/hbGame/hbGame_2.png",
"type":"image", "type": "image",
"url":"assets/alert/Bitmap-2.png" "name": "hbGame_2_png"
}, },
{ {
"name":"creditsTip_bg_png", "url": "assets/hbGame/hbGame_3.png",
"type":"image", "type": "image",
"url":"assets/creditsTip_panel/creditsTip_bg.png" "name": "hbGame_3_png"
}, },
{ {
"name":"creditsTip_btn_png", "url": "assets/hbGame/hbGame_bg.png",
"type":"image", "type": "image",
"url":"assets/creditsTip_panel/creditsTip_btn.png" "name": "hbGame_bg_png"
}, },
{ {
"name":"noMore_bg_png", "url": "assets/hbGame/hbGame_hongbao.png",
"type":"image", "type": "image",
"url":"assets/noMore_panel/noMore_bg.png" "name": "hbGame_hongbao_png"
}, },
{ {
"name":"noTimes_bg_png", "url": "assets/hbGame/hbGame_hongbao_effect.png",
"type":"image", "type": "image",
"url":"assets/noTimes_panel/noTimes_bg.png" "name": "hbGame_hongbao_effect_png"
}, },
{ {
"name":"prize_bg_png", "url": "assets/hbGame/hbGame_tips.png",
"type":"image", "type": "image",
"url":"assets/prize_panel/prize_bg.png" "name": "hbGame_tips_png"
}, },
{ {
"name":"prize_btn_png", "url": "assets/hbPrize/hbPrize_bg.png",
"type":"image", "type": "image",
"url":"assets/prize_panel/prize_btn.png" "name": "hbPrize_bg_png"
}, },
{ {
"name":"index_bg_png", "url": "assets/hbPrize/hbPrize_item_bg.png",
"type":"image", "type": "image",
"url":"assets/index_scene/index_bg.png" "name": "hbPrize_item_bg_png"
}, },
{ {
"name":"turnTable_bg_png", "url": "assets/hbPrize/hbPrize_item_line.png",
"type":"image", "type": "image",
"url":"assets/turnTanle_panel/turnTable_bg.png" "name": "hbPrize_item_line_png"
}, },
{ {
"name":"turnTable_prize_bg_png", "url": "assets/hbPrize/hbPrize_ok_btn.png",
"type":"image", "type": "image",
"url":"assets/turnTanle_panel/turnTable_prize_bg.png" "name": "hbPrize_ok_btn_png"
}, },
{ {
"name":"turnTable_start_btn_png", "url": "assets/hbPrize/hbPrize_share_btn.png",
"type":"image", "type": "image",
"url":"assets/turnTanle_panel/turnTable_start_btn.png" "name": "hbPrize_share_btn_png"
}, },
{ {
"name":"turnTable_title_png", "url": "assets/hbPrize/hbPrize_share_tips.png",
"type":"image", "type": "image",
"url":"assets/turnTanle_panel/turnTable_title.png" "name": "hbPrize_share_tips_png"
}, },
{ {
"name":"TurnTableIDou_bg_png", "url": "assets/hbNoPrize/hbNoPrize_bg.png",
"type":"image", "type": "image",
"url":"assets/TurnTableIDou_panel/TurnTableIDou_bg.png" "name": "hbNoPrize_bg_png"
}, },
{ {
"name":"TurnTableIDou_ok_btn_png", "url": "assets/hbNoPrize/hbNoPrize_ok_btn.png",
"type":"image", "type": "image",
"url":"assets/TurnTableIDou_panel/TurnTableIDou_ok_btn.png" "name": "hbNoPrize_ok_btn_png"
}, },
{ {
"name":"TurnTableNoPrize_bg_png", "url": "assets/hbNoPrize/hbNoPrize_share_btn.png",
"type":"image", "type": "image",
"url":"assets/TurnTableNoPrize_panel/TurnTableNoPrize_bg.png" "name": "hbNoPrize_share_btn_png"
}, },
{ {
"name":"TurnTableNoPrize_ok_btn_png", "url": "assets/hbNoPrize/hbNoPrize_share_tips.png",
"type":"image", "type": "image",
"url":"assets/TurnTableNoPrize_panel/TurnTableNoPrize_ok_btn.png" "name": "hbNoPrize_share_tips_png"
}, },
{ {
"name":"turnTablePrize_bg_png", "url": "assets/index_scene/index_hongbao_current.png",
"type":"image", "type": "image",
"url":"assets/TurnTanlePrize_panel/turnTablePrize_bg.png" "name": "index_hongbao_current_png"
}, },
{ {
"name":"turnTablePrize_ok_btn_png", "url": "assets/index_scene/index_start_btn.png",
"type":"image", "type": "image",
"url":"assets/TurnTanlePrize_panel/turnTablePrize_ok_btn.png" "name": "index_start_btn_png"
} }
] ]
} }
\ No newline at end of file
...@@ -2,15 +2,13 @@ ...@@ -2,15 +2,13 @@
"skins": {}, "skins": {},
"autoGenerateExmlsList": true, "autoGenerateExmlsList": true,
"exmls": [ "exmls": [
"resource/skins/AlertSkin.exml",
"resource/skins/CreditsTipPanelSkin.exml",
"resource/skins/LoadingSceneSkin.exml", "resource/skins/LoadingSceneSkin.exml",
"resource/skins/LoadingSkin.exml", "resource/skins/LoadingSkin.exml",
"resource/skins/TuanTableNoPrizePanelSkin.exml", "resource/skins/HbGameSkin.exml",
"resource/skins/TuanTablePrizePanelSkin.exml", "resource/skins/HbPrizeSkin.exml",
"resource/skins/RulePanelSkin.exml", "resource/skins/HbNoPrizeSkin.exml",
"resource/skins/IndexSceneSkin.exml", "resource/skins/IndexSceneSkin.exml",
"resource/skins/TurnTablePanelSkin.exml", "resource/skins/HbPrizeItem.exml",
"resource/skins/ToastPanelSkin.exml", "resource/skins/ToastPanelSkin.exml",
"resource/skins/ui/IconButtonSkin.exml", "resource/skins/ui/IconButtonSkin.exml",
"resource/skins/ui/ProgressBarSkin.exml", "resource/skins/ui/ProgressBarSkin.exml",
......
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="AlertSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="1667aecff69"/>
<e:Image source="Bitmap-1_png" y="175" horizontalCenter="0"/>
<e:Button id="confirmBtn" label="{data.btnTxt}" y="361" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="Bitmap-2_png" source.down="Bitmap-2_png" source.disabled="Bitmap-2_png" horizontalCenter.down="0" verticalCenter.down="0"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="closeBtn" label="" x="586.18" y="143">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="Bitmap-4_png" source.down="Bitmap-4_png" source.disabled="Bitmap-4_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Label text="{data.message}" y="239" textColor="0x000000" horizontalCenter="0"/>
</e:Skin>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="CreditsTip" width="750" height="1335" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image x="75" y="435" source="creditsTip_bg_png"/>
<e:Button id="ok_btn" label="" x="368.5" y="766.5" anchorOffsetX="191.5" anchorOffsetY="55.5">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" scaleX.down="0.9" scaleY.down="0.9" source="creditsTip_btn_png" source.down="creditsTip_btn_png" source.disabled="creditsTip_btn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="closeBtn" label="" x="626" y="386">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="closeBtn_png" source.down="closeBtn_png" source.disabled="closeBtn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
</e:Skin>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="HbGame" width="750" height="1624" xmlns:e="http://ns.egret.com/eui"
xmlns:w="http://ns.egret.com/wing">
<e:Image source="hbGame_bg_png" top="0" horizontalCenter="0" touchEnabled="false"/>
<e:Group id="cutTimeGroup" horizontalCenter="0" y="-150" left="0" right="0" touchChildren="false" touchEnabled="false" height="150">
<e:Label text="红包雨倒计时" y="44" size="28" horizontalCenter="0" touchEnabled="false"/>
<e:Label id="cutLabel" text="20:00" y="90" textColor="0xfdf79b" fontFamily="SimHei" size="58" horizontalCenter="0" touchEnabled="false" textAlign="center" verticalAlign="justify"/>
</e:Group>
<e:Group id="rainGroup" left="0" right="0" top="0" bottom="0">
</e:Group>
<e:Group id="readyGroup" horizontalCenter="0" anchorOffsetY="0" height="1624" width="750" y="0" touchEnabled="false" touchChildren="false">
<e:Image id="readyTips" source="hbGame_tips_png" horizontalCenter="17.5" top="19" touchEnabled="false"/>
<e:Image id="readyCutTime" y="462" horizontalCenter="0" source="hbGame_3_png" scaleX="0" scaleY="0" touchEnabled="false"/>
</e:Group>
</e:Skin>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="CreditsTip" width="750" height="1335" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui"
<e:Image y="216" source="TurnTableNoPrize_bg_png" horizontalCenter="0"/> xmlns:w="http://ns.egret.com/wing">
<e:Button id="ok_btn" label="" y="675" anchorOffsetY="0" anchorOffsetX="0" horizontalCenter="0"> <e:Image y="216" horizontalCenter="0" source="hbNoPrize_bg_png"/>
<e:Button id="closeBtn" label="" x="603" y="274">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="TurnTableNoPrize_ok_btn_png" source.down="TurnTableNoPrize_ok_btn_png" source.disabled="TurnTableNoPrize_ok_btn_png"/> <e:Image width="100%" height="100%" source="closeBtn_png" source.down="closeBtn_png" source.disabled="closeBtn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/> <e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Button id="closeBtn" label="" x="603" y="274"> <e:Button id="ok_btn" label="" y="701" x="102">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="closeBtn_png" source.down="closeBtn_png" source.disabled="closeBtn_png"/> <e:Image width="100%" height="100%" source="hbNoPrize_ok_btn_png" source.down="hbNoPrize_ok_btn_png" source.disabled="hbNoPrize_ok_btn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="share_btn" label="" y="683" x="362">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="hbNoPrize_share_btn_png" source.down="hbNoPrize_share_btn_png" source.disabled="hbNoPrize_share_btn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/> <e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Image source="hbNoPrize_share_tips_png" x="394" y="646"/>
</e:Skin> </e:Skin>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="InviteSkin" width="447" height="77.5" xmlns:e="http://ns.egret.com/eui"
xmlns:w="http://ns.egret.com/wing">
<e:Image source="hbPrize_item_line_png" bottom="0" horizontalCenter="0"/>
<e:Label id="prizeLabel" text="Label" textColor="0x4b91eb" size="26" anchorOffsetX="0" horizontalCenter="0" verticalCenter="0" top="0" bottom="0" left="0" right="0" verticalAlign="middle" textAlign="center"/>
</e:Skin>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui"
xmlns:w="http://ns.egret.com/wing">
<e:Image y="40" source="hbPrize_bg_png" horizontalCenter="0"/>
<e:Button id="closeBtn" label="" x="603" y="274">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="closeBtn_png" source.down="closeBtn_png" source.disabled="closeBtn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Group id="sGroup" y="548" horizontalCenter="0">
<e:Image id="sMask" source="hbPrize_item_bg_png" y="0" x="0"/>
<e:Scroller id="scroller" y="0" anchorOffsetX="0" anchorOffsetY="0" height="310" width="447" mask="sMask" x="0">
<e:Group anchorOffsetX="0" anchorOffsetY="0" width="303" height="302"/>
</e:Scroller>
<e:Image id="sBg" source="hbPrize_item_bg_png" y="0" x="0"/>
</e:Group>
<e:Button id="ok_btn" label="" y="933" x="102">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="hbPrize_ok_btn_png" source.down="hbPrize_ok_btn_png" source.disabled="hbPrize_ok_btn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="share_btn" label="" y="915" x="362">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="hbPrize_share_btn_png" source.down="hbPrize_share_btn_png" source.disabled="hbPrize_share_btn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Image id="shareTips" source="hbPrize_share_tips_png" x="394" y="878"/>
<e:Label text="手速之王就是你\n恭喜你获得现金/优惠券/抵用券" y="453" textColor="0x8e8e8e" textAlign="center" horizontalCenter="0.5" lineSpacing="8"/>
</e:Skin>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="LoadingSceneSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="LoadingSceneSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16e64c53e86"/>
<e:Image source="index_bg_png"/> <e:Image source="index_bg_png"/>
<e:Image source="index_panel_bg_png" y="425" horizontalCenter="0"/>
<e:Image id="rule_btn" source="index_rule_btn_png" x="42" y="28.45"/>
<e:Image id="myprize_btn" source="index_myprize_btn_png" x="611.18" y="28.45"/>
<e:Image id="tips_img" source="index_tips_cuting_png" y="588.14" x="321"/>
<e:Group x="150" y="965.2" width="455" height="143">
<e:Image id="hongbao1" y="0" x="0" source="index_hongbao_png"/>
<e:Label id="label1" text="20:00" x="26.5" y="122.8" size="20"/>
<e:Image id="hongbao2" source="index_hongbao_png" y="0" x="173"/>
<e:Label text="21:00" y="122.8" size="20" id="label2" x="200"/>
<e:Image id="hongbao3" source="index_hongbao_png" y="0" x="351"/>
<e:Label id="label3" text="22:00" x="377.5" y="122.8" size="20"/>
</e:Group>
<e:Group x="141" y="731" width="468" height="133">
<e:BitmapLabel id="cutLabel" y="44" font="cutTimeFont_fnt" text="00时00分00秒" letterSpacing="7" horizontalCenter="0" visible="false"/>
<e:Image id="btn" source="index_start_btn_png" y="5" horizontalCenter="0"/>
<e:Label id="tipsLabel" text="距离第一次开始还剩" y="0" size="25" textColor="0xffffff" alpha="0.8" horizontalCenter="0"/>
</e:Group>
</e:Skin> </e:Skin>
\ No newline at end of file
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Label text="活动说明" y="111" bold="true" horizontalCenter="0"/> <e:Label text="活动说明" y="111" bold="true" horizontalCenter="0"/>
<e:Scroller y="176.97" anchorOffsetX="0" anchorOffsetY="0" x="61" height="750" width="628"> <e:Scroller y="176.97" anchorOffsetX="0" anchorOffsetY="0" height="750" width="628" horizontalCenter="0">
<e:Group anchorOffsetX="0" anchorOffsetY="0"> <e:Group anchorOffsetX="0" anchorOffsetY="0">
<e:Label id="ruleLabel" text="" anchorOffsetX="0" anchorOffsetY="0" scaleX="1" scaleY="1" width="628" y="0" x="0" lineSpacing="25"/> <e:Label id="ruleLabel" text="" anchorOffsetX="0" anchorOffsetY="0" scaleX="1" scaleY="1" width="628" y="0" lineSpacing="25" horizontalCenter="0" verticalAlign="justify"/>
</e:Group> </e:Group>
</e:Scroller> </e:Scroller>
</e:Skin> </e:Skin>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="CreditsTip" width="750" height="1335" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image x="0" y="40" source="TurnTableIDou_bg_png"/>
<e:Label id="prizeName" text="抽中爱豆卡" textColor="0x000000" size="36" horizontalCenter="0" y="435"/>
<e:Image id="prizeImg" scaleX="1" scaleY="1" height="376" y="480" width="253" horizontalCenter="0"/>
<e:Button id="ok_btn" label="" y="875" scaleX="1" scaleY="1" anchorOffsetY="0" anchorOffsetX="0" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="TurnTableIDou_ok_btn_png" source.down="TurnTableIDou_ok_btn_png" source.disabled="TurnTableIDou_ok_btn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="closeBtn" label="" x="603" y="274">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="closeBtn_png" source.down="closeBtn_png" source.disabled="closeBtn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>.33" anchorOffsetX="9.33" anchorOffsetY="25.33"/>
</e:Skin>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="CreditsTip" width="750" height="1335" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image x="0" y="40" source="turnTablePrize_bg_png"/>
<e:Label id="prizeName" text="奖品名字" textColor="0x000000" size="36" horizontalCenter="0" y="455"/>
<e:Image id="prizeImg" scaleX="1" scaleY="1" horizontalCenter="0" height="158" y="506" width="400"/>
<e:Button id="ok_btn" label="" y="695" scaleX="1" scaleY="1" anchorOffsetY="0" anchorOffsetX="0" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="turnTablePrize_ok_btn_png" source.down="turnTablePrize_ok_btn_png" source.disabled="turnTablePrize_ok_btn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="closeBtn" label="" x="603" y="274">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="closeBtn_png" source.down="closeBtn_png" source.disabled="closeBtn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>.33" anchorOffsetX="9.33" anchorOffsetY="25.33"/>
</e:Skin>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="LoadingSceneSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image source="turnTable_bg_png" y="392" horizontalCenter="0"/>
<e:Image source="turnTable_title_png" y="285" horizontalCenter="0"/>
<e:Button id="closeBtn" label="" x="597" y="218">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="closeBtn_png" source.down="closeBtn_png" source.disabled="closeBtn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Group id="prizeGroup" x="133" y="441" width="487" height="470">
<e:Group id="prizeGroup0" x="0" y="0" width="158" height="152">
<e:Image source="turnTable_prize_bg_png" x="0" y="0"/>
<e:Image id="prize0" source="" horizontalCenter="0" top="10"/>
<e:Label id="prizeLabel0" text="" left="10" right="10" size="20" anchorOffsetY="0" horizontalCenter="0" height="30" top="100"/>
</e:Group>
<e:Group x="165" y="0" width="158" height="152" id="prizeGroup1">
<e:Image source="turnTable_prize_bg_png" x="0" y="0"/>
<e:Image id="prize1" source="" horizontalCenter="0" top="10"/>
<e:Label id="prizeLabel1" text="" horizontalCenter="0" left="10" right="10" size="20" anchorOffsetY="0" height="30" top="100"/>
</e:Group>
<e:Group x="329" y="0" width="158" height="152" id="prizeGroup2">
<e:Image source="turnTable_prize_bg_png" x="0" y="0"/>
<e:Image id="prize2" source="" horizontalCenter="0" top="10"/>
<e:Label id="prizeLabel2" text="" horizontalCenter="0" left="10" right="10" size="20" anchorOffsetY="0" height="30" top="100"/>
</e:Group>
<e:Group x="329" y="159" width="158" height="152" id="prizeGroup3">
<e:Image source="turnTable_prize_bg_png" x="0" y="0"/>
<e:Image id="prize3" source="" horizontalCenter="0" top="10"/>
<e:Label id="prizeLabel3" text="" horizontalCenter="0" left="10" right="10" size="20" anchorOffsetY="0" height="30" top="100"/>
</e:Group>
<e:Group width="158" height="152" id="prizeGroup4" y="318" x="329">
<e:Image source="turnTable_prize_bg_png" x="0" y="0"/>
<e:Image id="prize4" source="" horizontalCenter="0" top="10"/>
<e:Label id="prizeLabel4" text="" horizontalCenter="0" left="10" right="10" size="20" anchorOffsetY="0" height="30" top="100"/>
</e:Group>
<e:Group x="165" y="318" width="158" height="152" id="prizeGroup5">
<e:Image source="turnTable_prize_bg_png" x="0" y="0"/>
<e:Image id="prize5" source="" horizontalCenter="0" top="10"/>
<e:Label id="prizeLabel5" text="" horizontalCenter="0" left="10" right="10" size="20" anchorOffsetY="0" height="30" top="100"/>
</e:Group>
<e:Group x="0" width="158" height="152" id="prizeGroup6" y="318">
<e:Image source="turnTable_prize_bg_png" x="0" y="0"/>
<e:Image id="prize6" source="" horizontalCenter="0" top="10"/>
<e:Label id="prizeLabel6" text="" horizontalCenter="0" left="10" right="10" size="20" anchorOffsetY="0" height="30" top="100"/>
</e:Group>
<e:Group x="0" y="159" width="158" height="152" id="prizeGroup7">
<e:Image source="turnTable_prize_bg_png" x="0" y="0"/>
<e:Image id="prize7" source="" horizontalCenter="0" top="10"/>
<e:Label id="prizeLabel7" text="" horizontalCenter="0" left="10" right="10" size="20" anchorOffsetY="0" height="30" top="100"/>
</e:Group>
<e:Rect id="selectRect" width="158" height="152" x="0" y="0" fillAlpha="0.5"/>
<e:Button id="startBtn" label="" x="165" y="159">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="turnTable_start_btn_png" source.down="turnTable_start_btn_png" source.disabled="turnTable_start_btn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
</e:Group>
</e:Skin>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
No preview for this file type
// import Panel from "../../../libs/new_wx/components/Panel";
// import CutTimer from "../../CutTimer";
// import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
// import { NetManager } from "../../../libs/tw/manager/NetManager";
// import HbRule from "./HbRule";
// import { getlogItem } from "../../Main";
// import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
// import { DataManager } from "../../../libs/tw/manager/DataManager";
// import { NetName } from "../../../libs/tw/enum/NetName";
//
// /**
// * 红包雨倒计时
// */
// export default class HbCutTime extends Panel {
// public cutTimeLabel: eui.BitmapLabel;
// public tipImage: eui.Image;
// public closeBtn: eui.Button;
// public rule_btn: eui.Button;
// public ok_btn: eui.Image;
//
// private cutTimer: CutTimer = null;
//
// constructor(data) {
// super();
// data ? this.data = data : this.data.res = DataManager.ins.getData(NetName.HBRAIN_BASEINFO);
// }
//
// start() {
// super.start();
// this.initUI();
// }
//
// initUI() {
// this.hbRainBaseInfo();
// this.ok_btn.anchorOffsetX = 179;
// this.ok_btn.anchorOffsetY = 52;
// }
//
// getData(): any {
// return new Promise((r) => {
// NetManager.ins.hbRainBaseInfo((success, res) => {
// r(res);
// });
// });
// }
//
// private hbRainBaseInfo(updateData?) {
// if(updateData && updateData.data){
// this.data.res = updateData;
// }
// const success = updateData ? updateData.success : this.data.res.success;
// const res = updateData || this.data.res;
// const data = (updateData && updateData.data) || this.data.res.data;
//
// if(!success) {
// this.ok_btn.source = 'hbCutTime_btn_soon_png';
// this.tipImage.source = 'hbCutTime_cutLine_disable_png';
// this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchClose, this);
// return;
// }
// this.cutTimer = this.cutTimer || new CutTimer(this.cutTimeLabel, 'hh时mm分ss秒', async () => {
// const getData = await this.getData(); //重新获取数据
// if(getData.success) {
// this.hbRainBaseInfo(getData);
// } else {
// this.hidePanel(); //没有数据关闭窗口
// }
// GDispatcher.dispatchEvent('updateHbRainIcon', getData.success, getData);
// });
// const sysTime = res.timestamp; // 当前系统时间
// let time;
// if(data.currentSession) {
// time = data.currentSession.endTime - sysTime + 3000;
// if(data.canJoin) {
// this.ok_btn.source = 'hbCutTime_btn_enable_png';
// NetManager.ins.showLog(getlogItem(58));
// this.btnEffect();
// this.ok_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchClose, this);
// } else {
// this.ok_btn.source = 'hbCutTime_btn_disable_png';
// this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchClose, this);
// }
// this.tipImage.source = 'hbCutTime_cutLine_enable_png';
// if(!this.cutTimer.start(time)) {
// this.cutTimer.stop();
// this.cutTimer.start(time);
// }
// } else if(data.nextSession) {
// egret.Tween.removeTweens(this.ok_btn);
// this.ok_btn.scaleX = this.ok_btn.scaleY = 1;
// time = data.nextSession.startTime - sysTime + 3000;
// this.ok_btn.source = 'hbCutTime_btn_soon_png';
// this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchClose, this);
// this.tipImage.source = 'hbCutTime_cutLine_disable_png';
// if(!this.cutTimer.start(time)) {
// this.cutTimer.stop();
// this.cutTimer.start(time);
// }
// } else {
// this.ok_btn.source = 'hbCutTime_btn_null_png';
// this.tipImage.source = 'hbCutTime_cutLine_disable_png';
// this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchClose, this);
// }
// }
//
// private btnEffect() {
// egret.Tween.removeTweens(this.ok_btn);
// egret.Tween.get(this.ok_btn).to({scaleX: 0.9, scaleY: 1.1}, 200, egret.Ease.quadInOut).call(() => {
// egret.Tween.get(this.ok_btn).to({scaleX: 1, scaleY: 1}, 200, egret.Ease.quadInOut).call(() => {
// egret.Tween.get(this.ok_btn).to({
// scaleX: 0.9618,
// scaleY: 1.0618
// }, 200, egret.Ease.quadInOut).call(() => {
// egret.Tween.get(this.ok_btn).to({
// scaleX: 1,
// scaleY: 1
// }, 200, egret.Ease.quadInOut).wait(1000).call(() => {
// this.btnEffect();
// })
// });
// })
// });
// }
//
// destroy() {
// if(this.cutTimer) {
// this.cutTimer.stop();
// }
// super.destroy();
// }
//
// protected onSkinComplete() {
//
// }
//
// initEvents() {
// super.initEvents();
// this.addEventListener(egret.Event.REMOVED_FROM_STAGE, this.destroy, this);
// this.closeBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap_closeBtn, this);
// this.ok_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchClose, this);
// this.rule_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.tapRuleBtn, this);
// }
//
// private tapRuleBtn() {
// const rule = new HbRule();
// rule.loadSkin();
// rule.start();
// this.addChild(rule);
// }
//
// removeEvents() {
// super.removeEvents();
// this.removeEventListener(egret.Event.REMOVED_FROM_STAGE, this.destroy, this);
// this.closeBtn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap_closeBtn, this);
// this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchClose, this);
// this.rule_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.tapRuleBtn, this);
// }
//
// onTouchTap_closeBtn() {
// super.onTouchTap_closeBtn();
// }
//
// onTouchClose() {
// NetManager.ins.clickLog(getlogItem(58));
// PanelCtrl.instance.show('HbGame', {needScore: this.data.res.data.currentSession.limitScore});
// }
//
// protected get closeBtns(): eui.Button[] {
// return [this['closeBtn']]
// }
//
// get skinKey() {
// return 'HbCutTime'
// }
// }
import RainMgr from "./RainMgr";
import { GDispatcher } from "../../libs/tc/util/GDispatcher";
import Scene from "../views/Scene";
import Utils from "../comm/Utils";
import { Submit } from "../comm/NetConst";
/**
* 红包雨主游戏
*/
export default class HbGame extends Scene {
public cutTimeGroup: eui.Group;
public cutLabel: eui.Label;
public rainGroup: eui.Group;
public readyGroup: eui.Group;
public readyTips: eui.Image;
public readyCutTime: eui.Image;
private rainMgr: RainMgr = null;
// private cutTime: egret.Timer = null;
private time: number = window['hbRainTime'] * 1000;
private score = 0;
private lastTime: number = egret.getTimer();
constructor(data) {
super();
this.data = data;
}
onLoad() {
this.initUI();
this.readyTipsEffect();
}
initUI() {
this.rainGroup.height = this.width / window.innerWidth * window.innerHeight;
this.cutLabel.text = `${this.time}`;
}
// 加分
private addScore(score: number) {
this.score += score;
}
private gameOver() {
// this.cutTime.stop();
// this.cutTime.removeEventListener(egret.TimerEvent.TIMER, this.timeCallFun, this);
this.rainMgr.gameOver();
// 提交游戏
Submit().then(
(res) => {
console.log(res);
},
(err) => {
console.log(err);
}
)
}
private startGame() {
this.rainMgr = new RainMgr({
parent: this,
rainGroup: this.rainGroup,
});
this.update = () => {
let currentTime: number = egret.getTimer(); // 当前时间
let dt: number = currentTime - this.lastTime; // 帧时间
this.timeCallFun(dt);
this.lastTime = egret.getTimer(); // 上一帧结束的时间
};
this.lastTime = egret.getTimer();
egret.lifecycle.addLifecycleListener((context) => {
context.onUpdate = () => {
this.update();
}
});
// this.cutTime = new egret.Timer(10, 0);
// this.cutTime.addEventListener(egret.TimerEvent.TIMER, this.timeCallFun, this);
// this.cutTime.start();
}
private update() {
}
private timeCallFun(dt) {
this.time -= dt;
if(this.time <= 0) {
this.time = 0;
this.gameOver();
this.update = () => {
};
}
let ms: any = this.time % 1000;
if(ms >= 100) {
ms = ~~(ms / 10);
}
ms = Utils.prefixInteger(ms, 2);
let s = Utils.prefixInteger(~~(this.time / 1000), 2);
this.cutLabel.text = `${s}:${ms}`;
}
private readyTipsEffect() {
egret.Tween.get(this.readyGroup).set({alpha: 0}).to({alpha: 1}, 300).call(() => {
this.readyCutTime.anchorOffsetX = 196 / 2;
this.readyCutTime.anchorOffsetY = 377 / 2;
this.readyCutTime.y += this.readyCutTime.anchorOffsetY;
this.readyGroup.visible = true;
let data = {
num: 3,
obj: this.readyCutTime,
scaleMin: 0, // 缩放最小值
scaleMax: 1.7, // 缩放最大值
t1: 430, // 缩放第一阶段时间
tw: 50, // 缩放中间停留时间 // t1 + tw + t2 = 1000; 1秒
t2: 520, // 缩放第二阶段时间
alpha: 0.1, // 最小透明度
ease: egret.Ease.quadInOut
};
this.readyGroupEffect(data);
});
}
private readyGroupEffect(d) {
d.obj.source = `hbGame_${d.num--}_png`
, d.obj.scaleX = d.obj.scaleY = d.scaleMin
, d.obj.alpha = 1;
egret.Tween.get(d.obj).to({scaleX: 1, scaleY: 1, alpha: 1}, d.t1, d.ease).wait(d.tw).call(() => {
egret.Tween.get(d.obj).to({scaleX: d.scaleMax, scaleY: d.scaleMax, alpha: d.alpha}, d.t2).call(() => {
(d.num === 0) ? this.startGameEffect() : this.readyGroupEffect(d);
})
});
}
private startGameEffect() {
this.readyGroupHide();
this.cutGroupEffect();
}
private readyGroupHide() {
egret.Tween.get(this.readyGroup).to({alpha: 0}, 300).call(() => {
this.readyGroup.visible = false;
this.readyGroup.touchEnabled = false;
})
}
private cutGroupEffect() {
this.cutTimeGroup.visible = true;
egret.Tween.get(this.cutTimeGroup).to({y: 0}, 300).call(() => {
this.startGame();
})
}
protected onSkinComplete(): void {
super.onSkinComplete();
this.onLoad();
}
initEvents() {
super.initEvents();
GDispatcher.addEvent('hbGameAddScore', this.addScore, this);
}
removeEvents() {
super.removeEvents();
GDispatcher.removeEvent('hbGameAddScore', this.addScore, this);
}
protected get closeBtns(): eui.Button[] {
return [this['closeBtn']]
}
get skinKey() {
return 'HbGame'
}
get groupName() {
return 'hbRainGame'
}
}
/**
* 红包雨无奖励
*/
import Panel from "../views/Panel";
export default class HbNoPrize extends Panel {
public closeBtn: eui.Button;
public ok_btn: eui.Button;
public share_btn: eui.Button;
constructor(data) {
super(data);
}
async start() {
super.start();
this.initUI();
}
initUI() {
}
protected onSkinComplete(): void {
super.onSkinComplete();
}
private onTouchTap(e: egret.TouchEvent) {
switch(e.target) {
case this.ok_btn:
console.log("立即查看");
break;
case this.share_btn:
console.log("分享再抢");
break;
default:
break;
}
}
protected getTapEvts(): any[] {
return super.getTapEvts().concat([
[this.ok_btn, this.onTouchTap, this],
[this.share_btn, this.onTouchTap, this]
])
}
get skinKey() {
return 'HbNoPrize'
}
get groupName() {
return "hbNoPrize";
}
}
/**
* 红包雨奖励
*/
import { NetManager } from "../../libs/tw/manager/NetManager";
import { getlogItem } from "../getlogItem";
import { getSkinPath } from "../utils";
import Panel from "../views/Panel";
export default class HbPrize extends Panel {
public closeBtn: eui.Button;
public sGroup: eui.Group;
public sMask: eui.Image;
public scroller: eui.Scroller;
public sBg: eui.Image;
public ok_btn: eui.Button;
public share_btn: eui.Button;
public shareTips: eui.Image;
public ssss = 1;
constructor(data) {
super(data);
// this.data = data;
}
start() {
super.start();
this.initUI();
}
initUI() {
}
protected onSkinComplete(): void {
super.onSkinComplete();
}
private onTouchTap(e: egret.TouchEvent) {
switch(e.target) {
case this.ok_btn:
console.log("立即查看");
break;
case this.share_btn:
console.log("分享再抢");
break;
default:
break;
}
}
protected getTapEvts() {
return super.getTapEvts().concat([
[this.ok_btn, this.onTouchTap, this],
[this.share_btn, this.onTouchTap, this],
]);
}
destroy() {
super.destroy();
}
get skinKey() {
return 'HbPrize'
}
get groupName() {
return "hbPrize";
}
};
///////////////////////////////////////////////////////////////////////////////////////
/**
* 奖品列表
*/
class HbPrizeItem extends eui.ItemRenderer {
public prizeLabel: eui.Label;
constructor() {
super();
this.skinName = getSkinPath('HbPrizeItem');
}
dataChanged() {
this.prizeLabel.text = this.data.prizeName;
}
}
// import Panel from "../../../libs/new_wx/components/Panel";
// import { HtmlTextParser } from "../../../libs/new_wx/HtmlTextParser";
// import getSkinPath from "../../../libs/new_wx/utils/getSkinPath";
//
// /**
// * 邀请规则面板
// */
// export default class HbRule extends Panel {
// public scroller: eui.Scroller;
// public group: eui.Group;
// public labContent: eui.Label;
// public closeBtn: eui.Button;
// private _mask: egret.Sprite;
//
// start() {
// super.start();
// this.addRule();
// this.closeBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, ()=>{
// this.visible = false;
// }, this);
// }
//
// loadSkin() {
// this.skinName = getSkinPath(this.skinKey);
// if (this.skin) {
// this.onSkinComplete();
// } else {
// this.addEventListener(egret.Event.COMPLETE, this.onSkinComplete, this);
// }
// }
//
// private addRule() {
// const text =
// `<br>1、红包雨活动在当天多个时间段开启;每个时间段,所有用户均有1次参与机会,奖励先到先得。
// 2、在倒计时结束后,收集红包达到目标数量,即有机会获得奖励;未达到目标数量,则无法获得奖励。
// 3、游戏过程中,点击1个红包记为1个红包,点击1个动物元素记为2个红包。
// 4、发放的奖励请在规定的有效时间内尽快领取或使用,逾期未领取或使用的会失效哦。
// 5、活动过程中,凡以不正当手段(包括但不限于作弊、恶意套现、扰乱系统、网络攻击等违规行为)参与本次活动的用户,苏宁易购有权终止其参加活动,并取消其获得奖励的资格。
// 6、极少数特殊情况下,若用户在完成活动的任务中被系统判定异常账户或风控账户,则可能导致奖励发放异常。
// 7、如遇不可抗力(包括但不限于重大自然灾害事件、活动受政府机关指令需要停止举办或调整的、活动遭受严重网络攻击不能正常进行的),苏宁易购有权取消、修改或暂停活动`
// this.labContent.textFlow = (new HtmlTextParser).parser(text);
// }
//
// protected onSkinComplete() {
//
// }
//
// get skinKey() {
// return 'HbRule'
// }
// }
/**
* 简单对象池
*/
export default class Polling {
private pool: any[] = [];
constructor() {
}
/**
* 存入对象
* @param obj - 要存入的对象
*/
public push(obj: any) {
this.pool.push(obj);
}
/**
* 返回对象池中的随机对象
* @returns 返回获得的对象 null 对象用完了
*/
public get() {
if (this.pool.length <= 0) { // 如果对象池用完了就返回 null
return null;
}
// 返回随机对象
let index = ~~(Math.random() * this.pool.length);
let obj = this.pool[index];
this.pool.splice(index, 1);
return obj
}
/**
* 清空对象池
*/
public clear() {
for (let i = 0; i < this.pool.length; i++) {
delete this.pool[i];
}
this.pool = [];
}
}
\ No newline at end of file
let RainData = {
key: [
'hongbao'
],
data: {
hongbao: {
score: 1,
},
}
};
export default RainData;
\ No newline at end of file
import RainObj from "./RainObj";
import RainData from "./RainData";
import Pooling from "./Pooling";
import { GDispatcher } from "../../libs/tc/util/GDispatcher";
import Utils from "../comm/Utils";
export default class RainMgr {
private rainPool: Pooling = null;
private data;
private parent;
private readonly rainGroup;
private timer: egret.Timer = null;
constructor(data) {
this.data = data;
this.parent = this.data.parent;
this.rainGroup = this.data.rainGroup;
this.start();
}
public gameOver() {
this.timer.stop(); // 停止计时器
this.timer.removeEventListener(egret.TimerEvent.TIMER, this.addRain, this);
// 隐藏全部掉落物品
this.rainGroup.$children.forEach(v => v.visible = false);
}
private start() {
this.addPool();
GDispatcher.addEvent('hbRainGameOver', this.gameOver, this);
this.timer = new egret.Timer(1000, 0);
this.timer.addEventListener(egret.TimerEvent.TIMER, this.addRain, this);
this.timer.start();
}
// 添加掉落物品
private addRain() {
let num = Utils.RandomInt(3, 6);
for(let i = 0; i < num; i++) {
let newRainObj = this.rainPool.get();
if(!newRainObj) {
newRainObj = new RainObj({
key: RainData[~~(Math.random() * RainData.key.length)],
rainGroup: this.rainGroup,
pool: this.rainPool,
});
}
setTimeout(() => {
newRainObj.addStage((this.rainGroup.width) / num * i + 100, Utils.RandomInt(8, 11) / 10);
}, Utils.RandomInt(0, 8) * 100);
}
}
private addPool() {
this.rainPool = new Pooling();
for(let v of RainData.key) {
let num = 1;
if(v == 'hongbao') {
num = 45;
}
for(let i = 0; i < num; i++) {
let newObj = new RainObj({
key: v,
rainGroup: this.rainGroup,
pool: this.rainPool,
});
this.rainPool.push(newObj);
}
}
}
}
\ No newline at end of file
import { GDispatcher } from "../../libs/tc/util/GDispatcher";
import RainData from "./RainData";
import { getResPath } from "../utils";
import { loadSvga } from "../loadSvga";
export default class RainObj {
private data = null;
private module: eui.Image = null;
private rainGroup = null;
constructor(data) {
this.data = data;
this.module = new eui.Image(`hbGame_${this.data.key}_png`);
this.module.anchorOffsetX = 75;
this.module.anchorOffsetY = 70;
this.rainGroup = this.data.rainGroup;
}
public addStage(x, scale) {
this.module.x = x;
this.module.y = -200;
this.module.scaleX = this.module.scaleY = scale;
this.module.visible = true;
this.rainGroup.addChild(this.module);
this.start();
}
private start() {
this.module.alpha = 1;
this.module.touchEnabled = true;
this.module.source = `hbGame_${this.data.key}_png`;
this.module.addEventListener(egret.TouchEvent.TOUCH_BEGIN, this.touchTap, this);
egret.Tween.get(this.module, {loop: true}).to({rotation: ~~(Math.random() * 2) ? 360 : -360}, 18000);
egret.Tween.get(this.module).to({y: this.rainGroup.height + 200}, 4000).call(() => this.destroy());
}
private touchTap() {
egret.Tween.removeTweens(this.module);
this.moduleEffect(); // 模型特效
GDispatcher.dispatchEvent('hbGameAddScore', RainData.data[this.data.key].score); // 加分
this.destroy();
}
// 模型特效
private moduleEffect() {
let _scaleX = this.module.scaleX;
let _scaleY = this.module.scaleY;
egret.Tween.get(this.module).to({scaleX: _scaleX + 0.2, scaleY: _scaleY + 0.2}, 100).call(() => {
egret.Tween.get(this.module).to({scaleX: _scaleX, scaleY: _scaleY}, 100).call(() => {
loadSvga(getResPath() + 'resource/assets/svgas/hbRainHb.svga', this.rainGroup).then((mv: any) => {
mv.x = this.module.x - 180 * this.module.scaleX;
mv.y = this.module.y - 250 * this.module.scaleY;
mv.touchEnable = false;
mv.scaleX = this.module.scaleX;
mv.scaleY = this.module.scaleY;
mv.once(egret.Event.COMPLETE, () => {
mv.stop();
this.rainGroup.removeChild(mv);
}, this);
});
egret.Tween.get(this.module).to({alpha: 0}, 500);
})
});
}
private destroy() {
this.module.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.touchTap, this);
this.module.touchEnabled = false;
setTimeout(() => {
this.rainGroup.removeChild(this.module);
this.data.pool.push(this);
}, 600);
}
}
\ No newline at end of file
...@@ -16,11 +16,14 @@ import ToastPanel from './toastPanel/ToastPanel'; ...@@ -16,11 +16,14 @@ import ToastPanel from './toastPanel/ToastPanel';
////// //////
import TurnTableNoPrizePanel from "./Panels/TurnTableNoPrizePanel/TurnTableNoPrizePanel";
import TurnTablePrizePanel from "./Panels/TurnTablePrizePanel/TurnTablePrizePanel";
import RulePanel from "./Panels/RulePanel/RulePanel"; import RulePanel from "./Panels/RulePanel/RulePanel";
import IndexScene from "./indexScene/IndexScene"; import IndexScene from "./indexScene/IndexScene";
import TurnTablePanel from "./Panels/TurnTablePanel/TurnTablePanel"; import HbPrize from "./HongbaoRain/HbPrize";
import HbNoPrize from "./HongbaoRain/HbNoPrize";
import HbGame from "./HongbaoRain/HbGame";
import { NetManager } from "../libs/tw/manager/NetManager";
import { ABNetManager } from "../libs/tc/manager/ABNetManager";
import { showToast } from "./comm/UtilsConst";
////// //////
...@@ -52,19 +55,19 @@ class Main extends eui.UILayer { ...@@ -52,19 +55,19 @@ class Main extends eui.UILayer {
this.stage.scaleMode = egret.StageScaleMode.FIXED_WIDTH; this.stage.scaleMode = egret.StageScaleMode.FIXED_WIDTH;
SceneCtrl.instance.registerSceneClass(ModuleTypes.LOADING_SCENE, LoadingScene); // 注册Scene
SceneCtrl.instance.registerScenes([
[ModuleTypes.LOADING_SCENE, LoadingScene],
[ModuleTypes.INDEX_SCENE, IndexScene],
[ModuleTypes.HBGAME_SCENE, HbGame],
]);
/////// // 注册Panel
SceneCtrl.instance.registerSceneClass(ModuleTypes.INDEX_SCENE, IndexScene); PanelCtrl.instance.registerPanels([
[ModuleTypes.RULE_PANEL, RulePanel],
PanelCtrl.instance.registerPanelClass(ModuleTypes.TURNTABLE_PANEL, TurnTablePanel); [ModuleTypes.HBPRIZE_PANEL, HbPrize],
[ModuleTypes.HBNOPRIZE_PANEL, HbNoPrize],
PanelCtrl.instance.registerPanelClass(ModuleTypes.TURNTABLE_NO_PRIZE_PANEL, TurnTableNoPrizePanel); ]);
PanelCtrl.instance.registerPanelClass(ModuleTypes.TURNTABLE_PRIZE_PANEL, TurnTablePrizePanel);
PanelCtrl.instance.registerPanelClass(ModuleTypes.RULE_PANEL, RulePanel);
//////
TopLayerCtrl.instance.registerPanelClass(ModuleTypes.TOAST_PANEL, ToastPanel); TopLayerCtrl.instance.registerPanelClass(ModuleTypes.TOAST_PANEL, ToastPanel);
...@@ -88,8 +91,7 @@ class Main extends eui.UILayer { ...@@ -88,8 +91,7 @@ class Main extends eui.UILayer {
// await RES.loadGroup("msg", 10); // await RES.loadGroup("msg", 10);
// this.stage.removeChild(loadingView); // this.stage.removeChild(loadingView);
} } catch(e) {
catch (e) {
console.error(e); console.error(e);
} }
} }
...@@ -106,40 +108,36 @@ class Main extends eui.UILayer { ...@@ -106,40 +108,36 @@ class Main extends eui.UILayer {
}) })
} }
private onError(net: any, desc: any, result): void { // private onError(net: any, desc: any, result): void {
console.log(desc); // console.log(desc);
console.log(result); // console.log(result);
var msg: string; // var msg: string;
var msgArr: any = window['errorMessage']; // var msgArr: any = window['errorMessage'];
if (!isNaN(desc)) { // if(!isNaN(desc)) {
msg = msgArr[desc] ? msgArr[desc] : '活动太火爆了,请稍后再来~'; // msg = msgArr[desc] ? msgArr[desc] : '活动太火爆了,请稍后再来~';
} else { // } else {
msg = desc; // msg = desc;
} // }
//
var code; // var code;
if (result) { // if(result) {
code = result.code; // code = result.code;
} // }
if (code == "600001" || code == "100002") { // if(code == "600001" || code == "100002") {
this.showToast("昵称不符合,请重新输入"); // showToast("昵称不符合,请重新输入");
} else if (code == "0800101") { // } else if(code == "0800101") {
this.showToast("网络异常"); // showToast("网络异常");
} else { // } else {
if (msg) { // if(msg) {
this.showToast(msg); // showToast(msg);
} else { // } else {
this.showToast("网络异常,请检查网络稍后重试"); // showToast("网络异常,请检查网络稍后重试");
} // }
} // }
} // }
showToast(val) {
//console.log(val)
TopLayerCtrl.instance.show(ModuleTypes.TOAST_PANEL, { msg: val });
}
private textfield: egret.TextField; private textfield: egret.TextField;
/** /**
* 创建场景界面 * 创建场景界面
* Create scene interface * Create scene interface
...@@ -147,40 +145,25 @@ class Main extends eui.UILayer { ...@@ -147,40 +145,25 @@ class Main extends eui.UILayer {
protected createGameScene(): void { protected createGameScene(): void {
Buried.init(); Buried.init();
//获取签到信息 //获取签到信息
// DataManager.ins.customCfgData = window["CFG"] DataManager.ins.customCfgData = window["CFG"]
// NetManager.ins.ajaxElement((success) => { NetManager.ins.ajaxElement((success) => {
// if (!success) { return; } if(!success) {
// GDispatcher.addEvent(ABNetManager.ERROR, this.onError, this); return;
// this.getGameRes(); }
// }) // GDispatcher.addEvent(ABNetManager.ERROR, this.onError, this);
this.getGameRes(); this.getGameRes();
});
// this.getGameRes();
} }
//加载游戏中的资源 //加载游戏中的资源
private async getGameRes() { private async getGameRes() {
SceneCtrl.instance.change(ModuleTypes.INDEX_SCENE); SceneCtrl.instance.change(ModuleTypes.INDEX_SCENE);
GDispatcher.dispatchEvent('progress', [10]);
await RES.loadGroup('common'); await RES.loadGroup('common');
GDispatcher.dispatchEvent('progress', [20]);
await RES.loadGroup('index_scene'); await RES.loadGroup('index_scene');
GDispatcher.dispatchEvent('progress', [35]); // GDispatcher.dispatchEvent('progress', [100]);
await RES.loadGroup('creditsTip_panel');
GDispatcher.dispatchEvent('progress', [50]);
await RES.loadGroup('noMore_panel');
GDispatcher.dispatchEvent('progress', [65]);
GDispatcher.dispatchEvent('progress', [80]);
await RES.loadGroup('noTimes_panel');
GDispatcher.dispatchEvent('progress', [90]);
await RES.loadGroup('prize_panel');
GDispatcher.dispatchEvent('progress', [100]);
} }
} }
......
import Panel from "../../views/Panel"; import Panel from "../../views/Panel";
import { HtmlTextParser } from "../../../libs/tc/util/HtmlTextParser"; import { HtmlTextParser } from "../../../libs/tc/util/HtmlTextParser";
import { DataManager } from "../../../libs/tw/manager/DataManager";
export default class RulePanel extends Panel { export default class RulePanel extends Panel {
public closeBtn: eui.Button; public closeBtn: eui.Button;
...@@ -11,13 +12,6 @@ export default class RulePanel extends Panel { ...@@ -11,13 +12,6 @@ export default class RulePanel extends Panel {
super(data); super(data);
} }
initEvents() {
this.closeBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap, this);
}
removeEvents() {
this.closeBtn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap, this);
}
protected onSkinComplete(): void { protected onSkinComplete(): void {
super.onSkinComplete(); super.onSkinComplete();
...@@ -32,7 +26,8 @@ export default class RulePanel extends Panel { ...@@ -32,7 +26,8 @@ export default class RulePanel extends Panel {
} }
private initUI(): void { private initUI(): void {
this.ruleLabel.textFlow = new HtmlTextParser().parse(window['rule']); let rule = DataManager.ins.ajaxElementData.rule;
this.ruleLabel.textFlow = new HtmlTextParser().parse(rule);
} }
protected async preLoadRes() { protected async preLoadRes() {
......
import Panel from "../../views/Panel";
export default class TurnTableIDouPanel extends Panel {
public closeBtn: eui.Button;
public prizeImg: eui.Image;
public prizeName: eui.Label;
public ok_btn: eui.Button;
constructor(data?) {
super(data);
}
initEvents() {
this.ok_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.touch_tap_ok_btn, this);
this.closeBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap, this);
}
onTouchTap(){
super.onTouchTap();
}
touch_tap_ok_btn() {
}
removeEvents() {
this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.touch_tap_ok_btn, this);
this.closeBtn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap, this);
}
protected onSkinComplete(): void {
super.onSkinComplete();
this.preLoadRes();
this.onLoad();
}
protected onLoad(): void {
this.initUI();
}
private initUI(): void {
}
protected async preLoadRes() {
return new Promise(function (resolve, reject) {
resolve();
});
}
public get skinKey() { return 'TurnTableIDouPanel' }
public get groupName() { return 'turnTableIDou_panel' }
}
\ No newline at end of file
import Panel from "../../views/Panel";
export default class TurnTableNoPrizePanel extends Panel {
public ok_btn: eui.Button;
public closeBtn: eui.Button;
public get skinKey() { return 'TurnTableNoPrizePanel' }
public get groupName() { return 'TurnTableNoPrize_panel' }
constructor(data?) {
super(data);
}
initEvents() {
this.ok_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap, this);
this.closeBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap, this);
}
removeEvents() {
this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap, this);
this.closeBtn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap, this);
}
protected onSkinComplete(): void {
super.onSkinComplete();
this.preLoadRes();
this.onLoad();
}
start(data?) {
}
protected onLoad(): void {
this.initUI();
}
private initUI(): void {
}
protected async preLoadRes() {
}
}
\ No newline at end of file
let RotaryData = {
key: [
],
data: {
}
};
export default RotaryData;
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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