Skip to content

X
xiaoxiaole
Commit 247d4654 authored by wildfirecode's avatar wildfirecode
Browse files
Options

Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev

parents a2d28148 fc87f6c6
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 44 deletions
egret/resource/assets/hbCutTime/hbCutTimeFont.fnt的副本 deleted 100644 → 0
View file @ a2d28148
{"file":"hbCutTimeFont.png","frames":{
"0":{"x":116,"y":83,"w":55,"h":81,"offX":0,"offY":0,"sourceW":55,"sourceH":81},
"1":{"x":57,"y":166,"w":55,"h":81,"offX":0,"offY":0,"sourceW":55,"sourceH":81},
"2":{"x":174,"y":0,"w":56,"h":81,"offX":0,"offY":0,"sourceW":56,"sourceH":81},
"3":{"x":58,"y":0,"w":56,"h":81,"offX":0,"offY":0,"sourceW":56,"sourceH":81},
"4":{"x":116,"y":0,"w":56,"h":81,"offX":0,"offY":0,"sourceW":56,"sourceH":81},
"5":{"x":0,"y":0,"w":56,"h":81,"offX":0,"offY":0,"sourceW":56,"sourceH":81},
"6":{"x":0,"y":166,"w":55,"h":81,"offX":0,"offY":0,"sourceW":55,"sourceH":81},
"7":{"x":173,"y":83,"w":55,"h":81,"offX":0,"offY":0,"sourceW":55,"sourceH":81},
"8":{"x":58,"y":83,"w":56,"h":81,"offX":0,"offY":0,"sourceW":56,"sourceH":81},
"9":{"x":0,"y":83,"w":56,"h":81,"offX":0,"offY":0,"sourceW":56,"sourceH":81},
"分":{"x":153,"y":166,"w":36,"h":34,"offX":3,"offY":23,"sourceW":42,"sourceH":81},
"秒":{"x":114,"y":166,"w":37,"h":35,"offX":2,"offY":23,"sourceW":42,"sourceH":81},
"时":{"x":191,"y":166,"w":34,"h":34,"offX":4,"offY":23,"sourceW":42,"sourceH":81}}}
egret/resource/default.res.json
View file @ 247d4654
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
"name": "turntableprize" "name": "turntableprize"
}, },
{ {
"keys": "hbCutTime_bg_png,hbCutTime_btn_disable_png,hbCutTime_btn_enable_png,hbCutTime_cutLine_disable_png,hbCutTime_cutLine_enable_png,hbCutTime_rule_btn_png", "keys": "hbCutTime_bg_png,hbCutTime_btn_disable_png,hbCutTime_btn_enable_png,hbCutTime_cutLine_disable_png,hbCutTime_cutLine_enable_png,hbCutTime_rule_btn_png,hbCutTime_btn_null_png",
"name": "hbcuttime" "name": "hbcuttime"
}, },
{ {
...@@ -3301,6 +3301,11 @@ ...@@ -3301,6 +3301,11 @@
"url": "assets/hbRule/hbRule_bg.png", "url": "assets/hbRule/hbRule_bg.png",
"type": "image", "type": "image",
"name": "hbRule_bg_png" "name": "hbRule_bg_png"
},
{
"url": "assets/hbCutTime/hbCutTime_btn_null.png",
"type": "image",
"name": "hbCutTime_btn_null_png"
} }
] ]
} }
\ No newline at end of file
egret/resource/skins/HbPrizeSkin.exml
View file @ 247d4654
...@@ -2,29 +2,29 @@ ...@@ -2,29 +2,29 @@
<e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" <e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui"
xmlns:w="http://ns.egret.com/wing"> xmlns:w="http://ns.egret.com/wing">
<e:Image y="59.5" source="hbPrize_bg_png" horizontalCenter="0"/> <e:Image y="59.5" source="hbPrize_bg_png" horizontalCenter="0"/>
<e:Image id="img" width="508" height="225" source="{data.url}" horizontalCenter="1" y="424.76"/> <e:Image id="img" width="508" height="225" source="{data.url}" y="466.96" horizontalCenter="0"/>
<e:Image id="money" source="signprize元宝_png" y="423.2" horizontalCenter="1" scaleX="0.8" scaleY="0.8" visible="false"/> <e:Image id="money" source="signprize元宝_png" y="465.4" scaleX="0.8" scaleY="0.8" horizontalCenter="0" visible="false"/>
<e:Image id="blood" source="singprize体力_png" y="385.8" horizontalCenter="1" visible="false"/> <e:Image id="blood" source="singprize体力_png" y="428" horizontalCenter="0" visible="false"/>
<e:Group id="numsgroup" x="397.38" y="431.4" visible="false"> <e:Group id="numsgroup" x="397.38" y="473.6" visible="false">
<e:Image id="numsbg" source="signprize_numsbg_png" x="0" y="0"/> <e:Image id="numsbg" source="signprize_numsbg_png" x="0" y="0"/>
<e:Label id="propnums" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center"/> <e:Label id="propnums" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center"/>
</e:Group> </e:Group>
<e:Image id="prizeImg" y="422.5" source="" horizontalCenter="0" visible="false"/> <e:Button id="ok_btn" label="" y="826" anchorOffsetX="150" anchorOffsetY="48" horizontalCenter="0">
<e:Button id="closeBtn" label="" x="597" y="284.33">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" <e:Image width="100%" height="100%" source="hbPrize_btn_png" source.down="hbPrize_btn_png" source.disabled="hbPrize_btn_png"/>
source.disabled="closeCommonBtn_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="ok_btn" label="" y="814" anchorOffsetX="150" anchorOffsetY="48" horizontalCenter="0"> <e:Button id="closeBtn" label="" x="597" y="284.33">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="hbPrize_btn_png" source.down="hbPrize_btn_png" source.disabled="hbPrize_btn_png"/> <e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_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:Label text="不愧是卓越的手速达人！" y="400" textColor="0xf54500" fontFamily="FZY3JW" size="36" horizontalCenter="0"/>
<e:Label id="tipLabel" text="一共抢到18个红包" y="350" textColor="0xF54500" fontFamily="FZY3JW" size="36" horizontalCenter="0"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/src/panels/HongbaoRain/HbGame.ts
View file @ 247d4654
...@@ -7,6 +7,7 @@ import { DataManager } from "../../../libs/tw/manager/DataManager"; ...@@ -7,6 +7,7 @@ import { DataManager } from "../../../libs/tw/manager/DataManager";
import { NetName } from "../../../libs/tw/enum/NetName"; import { NetName } from "../../../libs/tw/enum/NetName";
import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl"; import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
import SceneCtrl from "../../../libs/new_wx/ctrls/sceneCtrl"; import SceneCtrl from "../../../libs/new_wx/ctrls/sceneCtrl";
import Utils from "../../Utils";
/** /**
* 红包雨主游戏 * 红包雨主游戏
...@@ -118,7 +119,9 @@ export default class HbGame extends Panel { ...@@ -118,7 +119,9 @@ export default class HbGame extends Panel {
if(!data || !data.option || data.categoryType == 1) { if(!data || !data.option || data.categoryType == 1) {
PanelCtrl.instance.show("HbNoPrize", {type: 1}); PanelCtrl.instance.show("HbNoPrize", {type: 1});
} else { } else {
PanelCtrl.instance.show('HbPrize', data); let _data = Utils.deepClone(data);
_data.score = this.score;
PanelCtrl.instance.show('HbPrize', _data);
} }
}, session, this.score); }, session, this.score);
} }
...@@ -148,6 +151,8 @@ export default class HbGame extends Panel { ...@@ -148,6 +151,8 @@ export default class HbGame extends Panel {
, tw = 50 // 缩放中间停留时间 // t1 + tw + t2 = 1000; 1秒 , tw = 50 // 缩放中间停留时间 // t1 + tw + t2 = 1000; 1秒
, t2 = 500 // 缩放第二阶段时间 , t2 = 500 // 缩放第二阶段时间
, _ease = egret.Ease.quadInOut; , _ease = egret.Ease.quadInOut;
obj.anchorOffsetX = 196 / 2;
obj.anchorOffsetY = 377 / 2;
this.readyGroup.visible = true; this.readyGroup.visible = true;
obj.source = "hbGame_3_png", obj.scaleX = obj.scaleY = _scaleMin, obj.alpha = 1; obj.source = "hbGame_3_png", obj.scaleX = obj.scaleY = _scaleMin, obj.alpha = 1;
egret.Tween.get(obj).to({scaleX: 1, scaleY: 1, alpha: 1}, t1, _ease).wait(tw).call(() => { egret.Tween.get(obj).to({scaleX: 1, scaleY: 1, alpha: 1}, t1, _ease).wait(tw).call(() => {
......
egret/src/panels/HongbaoRain/HbPrize.ts
View file @ 247d4654
...@@ -3,16 +3,15 @@ import getHomeData from "../../getHomeData"; ...@@ -3,16 +3,15 @@ import getHomeData from "../../getHomeData";
import { changeMapScene } from "../../startScene/StartScene"; import { changeMapScene } from "../../startScene/StartScene";
import { GDispatcher } from "../../../libs/tc/util/GDispatcher"; import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl"; import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
import SceneCtrl from "../../../libs/new_wx/ctrls/sceneCtrl"; import { HtmlTextParser } from "../../../libs/new_wx/HtmlTextParser";
import { NetManager } from "../../../libs/tw/manager/NetManager";
/** /**
* 红包雨奖励 * 红包雨奖励
*/ */
export default class HbPrize extends Panel { export default class HbPrize extends Panel {
public prizeImg:eui.Image;
public closeBtn:eui.Button;
public ok_btn:eui.Button; public ok_btn:eui.Button;
public closeBtn:eui.Button;
public tipLabel:eui.Label;
constructor(data) { constructor(data) {
super(); super();
...@@ -23,6 +22,9 @@ export default class HbPrize extends Panel { ...@@ -23,6 +22,9 @@ export default class HbPrize extends Panel {
super.start(); super.start();
this.initUI(); this.initUI();
this.updateOption(this.data.option); this.updateOption(this.data.option);
let str = `一共抢到<b>${this.data.score}</b>个红包`;
this.tipLabel.textFlow = (new HtmlTextParser).parser(str);
} }
updateOption(option: any) { updateOption(option: any) {
......
mock/happyclear/hbRainBaseInfo.json
View file @ 247d4654
...@@ -3,16 +3,8 @@ ...@@ -3,16 +3,8 @@
"data": { "data": {
"canJoin": true, "canJoin": true,
"currentRemainTimes": 1, "currentRemainTimes": 1,
"currentSession": { "currentSession": null,
"endTime": 157292106000, "nextSession":null
"sessionIndex": 1,
"startTime": 157292105000
},
"nextSession": {
"endTime": 157292106000,
"sessionIndex": 2,
"startTime": 157292105000
}
}, },
"desc": "OK", "desc": "OK",
"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