Commit 175f47d5 authored by 邱旭's avatar 邱旭

m

parent 1adf6cb2
...@@ -3,10 +3,11 @@ ...@@ -3,10 +3,11 @@
<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/FreePowerPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/FreePowerPanel.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/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -65,7 +66,7 @@ ...@@ -65,7 +66,7 @@
<recent name="$PROJECT_DIR$/lotties" /> <recent name="$PROJECT_DIR$/lotties" />
</key> </key>
</component> </component>
<component name="RunManager" selected="npm.buildTS"> <component name="RunManager" selected="npm.dev">
<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" />
...@@ -114,9 +115,9 @@ ...@@ -114,9 +115,9 @@
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.dev" />
<item itemvalue="npm.buildTS" /> <item itemvalue="npm.buildTS" />
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.flushRes" /> <item itemvalue="npm.flushRes" />
</list> </list>
</recent_temporary> </recent_temporary>
...@@ -135,14 +136,7 @@ ...@@ -135,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="1111000" /> <workItem from="1614131869846" duration="1683000" />
</task>
<task id="LOCAL-00004" summary="Rule">
<created>1612598313143</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1612598313143</updated>
</task> </task>
<task id="LOCAL-00005" summary="Rule"> <task id="LOCAL-00005" summary="Rule">
<created>1612599420632</created> <created>1612599420632</created>
...@@ -480,7 +474,14 @@ ...@@ -480,7 +474,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1614131940838</updated> <updated>1614131940838</updated>
</task> </task>
<option name="localTasksCounter" value="53" /> <task id="LOCAL-00053" summary="m">
<created>1614133120877</created>
<option name="number" value="00053" />
<option name="presentableId" value="LOCAL-00053" />
<option name="project" value="LOCAL" />
<updated>1614133120877</updated>
</task>
<option name="localTasksCounter" value="54" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
"activityId": "activityId", "activityId": "activityId",
"openId": "openId", "openId": "openId",
"isFirstLogin": true, "isFirstLogin": true,
"loginAddPower": 3, "loginAddPower": 0,
"isNewUser": true, "isNewUser": false,
"inviteId": "inviteId", "inviteId": "",
"isFollow": true "isFollow": true
} }
} }
...@@ -11191,7 +11191,7 @@ var FreePowerPanel = (function (_super) { ...@@ -11191,7 +11191,7 @@ var FreePowerPanel = (function (_super) {
.addEventListener(MouseEvent.CLICK, this.hidePanel, this) .addEventListener(MouseEvent.CLICK, this.hidePanel, this)
.position.set(190, 893); .position.set(190, 893);
this.addChild(Tools_1.Tools.getSprite('powerIcon.png')).position.set(280, 763); this.addChild(Tools_1.Tools.getSprite('powerIcon.png')).position.set(280, 763);
var powerTxt = this.addChild(Tools_1.Tools.getText("+" + Tools_1.Tools.globalData.loginAddPower, 38, "#ffe090", TEXT_ALIGN.LEFT)); var powerTxt = this.addChild(Tools_1.Tools.getText("+" + this.data.loginAddPower, 38, "#ffe090", TEXT_ALIGN.LEFT));
powerTxt.strokeColor = '#7f3c05'; powerTxt.strokeColor = '#7f3c05';
powerTxt.stroke = 2; powerTxt.stroke = 2;
powerTxt.position.set(400, 795); powerTxt.position.set(400, 795);
...@@ -15549,7 +15549,9 @@ var MapScene = (function (_super) { ...@@ -15549,7 +15549,9 @@ var MapScene = (function (_super) {
this.initMap(); this.initMap();
this.updateMapCheck(); this.updateMapCheck();
if (!Tools_1.Tools.globalData.isNewUser && Tools_1.Tools.globalData.loginAddPower > 0) { if (!Tools_1.Tools.globalData.isNewUser && Tools_1.Tools.globalData.loginAddPower > 0) {
ctrls_1.showPanel(FreePowerPanel_1.FreePowerPanel); ctrls_1.showPanel(FreePowerPanel_1.FreePowerPanel, {
loginAddPower: Tools_1.Tools.globalData.loginAddPower
});
} }
Tools_1.Tools.globalData.loginAddPower = 0; Tools_1.Tools.globalData.loginAddPower = 0;
if (Tools_1.Tools.globalData.inviteId) { if (Tools_1.Tools.globalData.inviteId) {
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -48,6 +48,8 @@ export class SuccessPrizePanel extends Panel { ...@@ -48,6 +48,8 @@ export class SuccessPrizePanel extends Panel {
const prizeImg = this.addChild(new Sprite()); const 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) {
......
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