Skip to content

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

换了点皮

parent 6bf50a53
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 23 deletions
.idea/workspace.xml
View file @ b09d7c8d
...@@ -3,19 +3,7 @@ ...@@ -3,19 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="换了点皮"> <list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="换了点皮">
<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$/resource/common/panelBgS.png" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/mock/miniTb/feile.drawTopLevelPrize.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/feile.drawTopLevelPrize.json" afterDir="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" /> <change beforePath="$PROJECT_DIR$/src/panels/LotteryPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/LotteryPanel.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -210,14 +198,7 @@ ...@@ -210,14 +198,7 @@
<workItem from="1617871191619" duration="121000" /> <workItem from="1617871191619" duration="121000" />
<workItem from="1617890665920" duration="181000" /> <workItem from="1617890665920" duration="181000" />
<workItem from="1617960804439" duration="639000" /> <workItem from="1617960804439" duration="639000" />
<workItem from="1618193237335" duration="10154000" /> <workItem from="1618193237335" duration="10269000" />
</task>
<task id="LOCAL-00037" summary="m">
<created>1613815472565</created>
<option name="number" value="00037" />
<option name="presentableId" value="LOCAL-00037" />
<option name="project" value="LOCAL" />
<updated>1613815472565</updated>
</task> </task>
<task id="LOCAL-00038" summary="m"> <task id="LOCAL-00038" summary="m">
<created>1613817216904</created> <created>1613817216904</created>
...@@ -555,7 +536,14 @@ ...@@ -555,7 +536,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1618208075916</updated> <updated>1618208075916</updated>
</task> </task>
<option name="localTasksCounter" value="86" /> <task id="LOCAL-00086" summary="换了点皮">
<created>1618208900151</created>
<option name="number" value="00086" />
<option name="presentableId" value="LOCAL-00086" />
<option name="project" value="LOCAL" />
<updated>1618208900151</updated>
</task>
<option name="localTasksCounter" value="87" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
mock/miniTb/feile.drawTopLevelPrize.json
View file @ b09d7c8d
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"data": { "data": {
"_id": 1, "_id": 1,
"name": "aa", "name": "aa",
"type": 5, "type": 6,
"image": 1, "image": 1,
"drawStatus": 1, "drawStatus": 1,
"prizeId": "5f213ff7738989c8b3f46f4d" "prizeId": "5f213ff7738989c8b3f46f4d"
......
src/panels/LotteryPanel.ts
View file @ b09d7c8d
...@@ -46,6 +46,12 @@ export class LotteryPanel extends Panel { ...@@ -46,6 +46,12 @@ export class LotteryPanel extends Panel {
this.hidePanel(); this.hidePanel();
}, this) }, this)
.position.set(0, 250) .position.set(0, 250)
this.addChild(Tools.getText(
`通关抽奖奖励`, 36, "#ffffff",
FYGE.TEXT_ALIGN.CENTER, 750, 0, 1103
));
//刷新奖品列表和摇奖列表 //刷新奖品列表和摇奖列表
this.updatePrizes(); this.updatePrizes();
} }
......
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