Skip to content

B
babycare_xiaoxiao
Commit 6bf50a53 authored by 邱旭's avatar 邱旭
Browse files
Options

换了点皮

parent 241b3cd1
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 19 deletions
.idea/workspace.xml
View file @ 6bf50a53
......@@ -2,7 +2,21 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="换了点皮">
<change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/panelBgS.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/再想想.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/确定.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/继续闯关大.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/继续闯关小.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/lotteryScene/lotteryBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/lotteryScene/lotteryBtn.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/lotteryScene/lotteryItemBg.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/lotteryScene/lotteryMachineBg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/lotteryScene/lotteryMachineBg.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/lotteryScene/lotteryReturnBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/lotteryScene/lotteryReturnBtn.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/lotteryScene/老虎机好的.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/lotteryScene/老虎机好的.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/lotteryScene/老虎机领取奖励.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/lotteryScene/老虎机领取奖励.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/LotteryPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/LotteryPanel.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -196,14 +210,7 @@
<workItem from="1617871191619" duration="121000" />
<workItem from="1617890665920" duration="181000" />
<workItem from="1617960804439" duration="639000" />
<workItem from="1618193237335" duration="9335000" />
</task>
<task id="LOCAL-00036" summary="m">
<created>1613812861760</created>
<option name="number" value="00036" />
<option name="presentableId" value="LOCAL-00036" />
<option name="project" value="LOCAL" />
<updated>1613812861760</updated>
<workItem from="1618193237335" duration="10154000" />
</task>
<task id="LOCAL-00037" summary="m">
<created>1613815472565</created>
......@@ -541,7 +548,14 @@
<option name="project" value="LOCAL" />
<updated>1618208032096</updated>
</task>
<option name="localTasksCounter" value="85" />
<task id="LOCAL-00085" summary="换了点皮">
<created>1618208075916</created>
<option name="number" value="00085" />
<option name="presentableId" value="LOCAL-00085" />
<option name="project" value="LOCAL" />
<updated>1618208075916</updated>
</task>
<option name="localTasksCounter" value="86" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......
resource/lotteryScene/lotteryBtn.png
View replaced file @ 241b3cd1 View file @ 6bf50a53
resource/lotteryScene/lotteryBtn.png

72.7 KB | W: | H:

resource/lotteryScene/lotteryBtn.png

11.9 KB | W: | H:

resource/lotteryScene/lotteryBtn.png
resource/lotteryScene/lotteryBtn.png
resource/lotteryScene/lotteryBtn.png
resource/lotteryScene/lotteryBtn.png
  • 2-up
  • Swipe
  • Onion skin
resource/res.json
View file @ 6bf50a53
......@@ -53,7 +53,7 @@
"name": "UseStep"
},
{
"keys": "boomBtn.png,comCloseBtn.png,comm_light.png,e305be55-fdfd-453b-9e6d-41edfe68c0f1.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,panelBgS.png,powerIcon.png,powerImg.png,stepBtn.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,target0.png,target1.png,target2.png,target3.png,target4.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,确定.png,继续闯关大.png,继续闯关小.png",
"keys": "boomBtn.png,comCloseBtn.png,comm_light.png,e305be55-fdfd-453b-9e6d-41edfe68c0f1.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,powerIcon.png,powerImg.png,stepBtn.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,target0.png,target1.png,target2.png,target3.png,target4.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png",
"name": "common"
},
{
......@@ -69,7 +69,7 @@
"name": "loadingScene"
},
{
"keys": "lotteryBtn.png,lotteryItemBg.png,lotteryMachineBg.png,lotteryReturnBtn.png,prizeItemBg.png,老虎机好的.png,老虎机领取奖励.png",
"keys": "lotteryBtn.png,lotteryMachineBg.png,lotteryReturnBtn.png,prizeItemBg.png,老虎机好的.png,老虎机领取奖励.png",
"name": "lotteryScene"
},
{
......
src/ResJson.ts
View file @ 6bf50a53
......@@ -53,7 +53,7 @@ export const ResJson = {
"name": "UseStep"
},
{
"keys": "boomBtn.png,comCloseBtn.png,comm_light.png,e305be55-fdfd-453b-9e6d-41edfe68c0f1.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,panelBgS.png,powerIcon.png,powerImg.png,stepBtn.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,target0.png,target1.png,target2.png,target3.png,target4.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,确定.png,继续闯关大.png,继续闯关小.png",
"keys": "boomBtn.png,comCloseBtn.png,comm_light.png,e305be55-fdfd-453b-9e6d-41edfe68c0f1.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,powerIcon.png,powerImg.png,stepBtn.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,target0.png,target1.png,target2.png,target3.png,target4.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png",
"name": "common"
},
{
......@@ -69,7 +69,7 @@ export const ResJson = {
"name": "loadingScene"
},
{
"keys": "lotteryBtn.png,lotteryItemBg.png,lotteryMachineBg.png,lotteryReturnBtn.png,prizeItemBg.png,老虎机好的.png,老虎机领取奖励.png",
"keys": "lotteryBtn.png,lotteryMachineBg.png,lotteryReturnBtn.png,prizeItemBg.png,老虎机好的.png,老虎机领取奖励.png",
"name": "lotteryScene"
},
{
......
src/panels/LotteryPanel.ts
View file @ 6bf50a53
......@@ -111,10 +111,10 @@ export class LotteryPanel extends Panel {
// scroll.position.set(195, 1013);
// scroll.updateData(list || [])
//摇奖部分
var p = [91, 731]
var p = [91, 738]
list.push({
activityId: "602f33eb086e65bb22759048",
image: "https://yun.duiba.com.cn/aurora/assets/20a5c02da9d2eb507af7f5dda581083798e8aa84.png",
image: "https://yun.duiba.com.cn/aurora/assets/8edfc228ddf9ef1515b7e7a2a158c2f97db20078.png",
name: "谢谢参与",
type: 5,
_id: "thanks",
......@@ -169,14 +169,13 @@ class LotteryItem extends FYGE.Container {
constructor(data: PrizeInt) {
super();
this.id = data._id;
// this.addChild(new FYGE.Sprite(RES.getRes("lotteryItemBg.png")));
this.showImage = this.addChild(new FYGE.Sprite(FYGE.Texture.from(data.image)));
this.showImage.width = this.showImage.height = 160;//88
// this.showImage.position.set((103 - 88) / 2, 6);
var mask = this.addChild(new FYGE.Shape())
mask.beginFill(0);
// mask.drawRoundedRect((103 - 88) / 2, 6, 88, 88, 10);
mask.drawRoundedRect(0, 0, 160, 160, 10);
mask.drawRoundedRect(0, 0, 160, 160, 15);
mask.endFill();
this.showImage.mask = mask
}
......@@ -279,7 +278,7 @@ class LotteryScroll extends FYGE.Container {
var mask = this.addChild(new FYGE.Shape())
mask.beginFill(0)
// mask.drawRect(0, h + 3, 350, 195 - 5)
mask.drawRect(0, h + 3, 590, 422)
mask.drawRoundedRect(-6, h + 3, 590, 417, 19)
mask.endFill();
this.mask = mask;
//蒙层
......
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