Commit f27aabfb authored by 邱旭's avatar 邱旭

m

parent 175f47d5
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<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$/mock/miniTb/feile.gameOver.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/feile.gameOver.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/mine.getAppData.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/mine.getAppData.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="false" /> <change beforePath="$PROJECT_DIR$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/HelpPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/HelpPanel.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/SuccessPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<recent name="$PROJECT_DIR$/lotties" /> <recent name="$PROJECT_DIR$/lotties" />
</key> </key>
</component> </component>
<component name="RunManager" selected="npm.dev"> <component name="RunManager" selected="npm.buildTS">
<configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true"> <configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" /> <package-json value="$PROJECT_DIR$/package.json" />
<command value="run" /> <command value="run" />
...@@ -115,8 +115,8 @@ ...@@ -115,8 +115,8 @@
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.dev" />
<item itemvalue="npm.buildTS" /> <item itemvalue="npm.buildTS" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
<item itemvalue="npm.flushRes" /> <item itemvalue="npm.flushRes" />
</list> </list>
...@@ -136,14 +136,7 @@ ...@@ -136,14 +136,7 @@
<workItem from="1613698993022" duration="22309000" /> <workItem from="1613698993022" duration="22309000" />
<workItem from="1613785579125" duration="17751000" /> <workItem from="1613785579125" duration="17751000" />
<workItem from="1613958457445" duration="19850000" /> <workItem from="1613958457445" duration="19850000" />
<workItem from="1614131869846" duration="1683000" /> <workItem from="1614131869846" duration="2614000" />
</task>
<task id="LOCAL-00005" summary="Rule">
<created>1612599420632</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1612599420632</updated>
</task> </task>
<task id="LOCAL-00006" summary="NoEnergyPanel"> <task id="LOCAL-00006" summary="NoEnergyPanel">
<created>1612601677844</created> <created>1612601677844</created>
...@@ -481,7 +474,14 @@ ...@@ -481,7 +474,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1614133120877</updated> <updated>1614133120877</updated>
</task> </task>
<option name="localTasksCounter" value="54" /> <task id="LOCAL-00054" summary="m">
<created>1614133895122</created>
<option name="number" value="00054" />
<option name="presentableId" value="LOCAL-00054" />
<option name="project" value="LOCAL" />
<updated>1614133895122</updated>
</task>
<option name="localTasksCounter" value="55" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
...@@ -12433,6 +12433,8 @@ var SuccessPrizePanel = (function (_super) { ...@@ -12433,6 +12433,8 @@ var SuccessPrizePanel = (function (_super) {
var prizeImg = this.addChild(new Sprite()); var prizeImg = this.addChild(new Sprite());
prizeImg.anchorTexture.set(0.5, 0.5); prizeImg.anchorTexture.set(0.5, 0.5);
prizeImg.position.set(375, 890); prizeImg.position.set(375, 890);
prizeImg.width = 200;
prizeImg.height = 200;
if (type == 6) { if (type == 6) {
switch (toolType) { switch (toolType) {
case PropType_1.PropType.BOOMS: case PropType_1.PropType.BOOMS:
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -36,7 +36,8 @@ export class HelpPanel extends Panel { ...@@ -36,7 +36,8 @@ export class HelpPanel extends Panel {
Tools.globalData.inviteId = ''; Tools.globalData.inviteId = '';
} }
async doHelp() { async doHelp(e) {
this.btnDelay(e.target);
if (Tools.globalData.inviteId == Tools.globalData.openId) { if (Tools.globalData.inviteId == Tools.globalData.openId) {
showToast('自己不能给自己助力'); showToast('自己不能给自己助力');
this.hidePanel(); this.hidePanel();
......
...@@ -57,7 +57,7 @@ export class LotteryPanel extends Panel { ...@@ -57,7 +57,7 @@ export class LotteryPanel extends Panel {
const { type, _id } = this.prizeData; const { type, _id } = this.prizeData;
switch (type) { switch (type) {
case 1: // 权益 case 1: // 权益
sendTbNet(TbNetName.receiveEnamePrize, { _id: _id }, sendTbNet(TbNetName.receiveEnamePrize, { _id: _id, id:_id },
(success, res) => { (success, res) => {
if (!success || !res) { if (!success || !res) {
showToast('奖品发放失败\n请前往我的奖品处进行处理'); showToast('奖品发放失败\n请前往我的奖品处进行处理');
......
...@@ -127,7 +127,7 @@ export class SuccessPrizePanel extends Panel { ...@@ -127,7 +127,7 @@ export class SuccessPrizePanel extends Panel {
switch (this.data.prize.type) { switch (this.data.prize.type) {
case 1: // 权益 case 1: // 权益
sendTbNet(TbNetName.receiveEnamePrize, { _id: _id }, sendTbNet(TbNetName.receiveEnamePrize, { _id: _id, id:_id },
(success, res) => { (success, res) => {
if (!success || !res) { if (!success || !res) {
showToast('奖品发放失败\n请前往我的奖品处进行处理'); showToast('奖品发放失败\n请前往我的奖品处进行处理');
......
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