Skip to content

B
babycare_xiaoxiao
Commit d8be2daf authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

guide

parent cabc914a
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 34 deletions
.idea/workspace.xml
View file @ d8be2daf
......@@ -3,13 +3,9 @@
<component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scripts/copyJs.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/copyJs.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scripts/textureMerge.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/textureMerge.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SkinJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/SkinJson.ts" afterDir="false" />
<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$/mock/miniTb/popmartXXL2c.doJoin.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.doJoin.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/uis/GameGuide.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/GameGuide.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -178,14 +174,7 @@
<workItem from="1601170975973" duration="20963000" />
<workItem from="1601257315718" duration="48496000" />
<workItem from="1601429998970" duration="22651000" />
<workItem from="1601689013718" duration="15604000" />
</task>
<task id="LOCAL-00022" summary="Success Panel Effect!">
<created>1595214630434</created>
<option name="number" value="00022" />
<option name="presentableId" value="LOCAL-00022" />
<option name="project" value="LOCAL" />
<updated>1595214630434</updated>
<workItem from="1601689013718" duration="19732000" />
</task>
<task id="LOCAL-00023" summary="Success Panel Effect!">
<created>1595215296744</created>
......@@ -523,7 +512,14 @@
<option name="project" value="LOCAL" />
<updated>1601709128879</updated>
</task>
<option name="localTasksCounter" value="71" />
<task id="LOCAL-00071" summary="guide">
<created>1601714506189</created>
<option name="number" value="00071" />
<option name="presentableId" value="LOCAL-00071" />
<option name="project" value="LOCAL" />
<updated>1601714506189</updated>
</task>
<option name="localTasksCounter" value="72" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -576,51 +572,51 @@
</state>
<state x="250" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/30.23.1890.1177@30.23.1890.1177" timestamp="1601454738211" />
<state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" />
<state x="557" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1601709128556">
<state x="557" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1601714504510">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="557" y="23" key="CommitChangelistDialog2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472142620" />
<state x="423" y="142" width="783" height="664" key="CommitChangelistDialog2/30.23.1410.877@30.23.1410.877" timestamp="1601389896862" />
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601709128556" />
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601714504510" />
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584297912" />
<state x="131" y="123" width="730" height="977" key="DiffContextDialog" timestamp="1596165868169">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="131" y="123" width="730" height="977" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596165868169" />
<state width="877" height="321" key="GridCell.Tab.0.bottom" timestamp="1601714233880">
<state width="877" height="321" key="GridCell.Tab.0.bottom" timestamp="1601714462247">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.bottom/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="896" height="406" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1601389901237" />
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="877" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1601714233880" />
<state width="877" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1601714462247" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state width="877" height="321" key="GridCell.Tab.0.center" timestamp="1601714233879">
<state width="877" height="321" key="GridCell.Tab.0.center" timestamp="1601714462247">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.center/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="896" height="406" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1601389901237" />
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="877" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1601714233879" />
<state width="877" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1601714462247" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918464" />
<state width="877" height="321" key="GridCell.Tab.0.left" timestamp="1601714233878">
<state width="877" height="321" key="GridCell.Tab.0.left" timestamp="1601714462246">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.left/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154150" />
<state width="896" height="406" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1601389901237" />
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="877" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1601714233878" />
<state width="877" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1601714462246" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577197" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918463" />
<state width="877" height="321" key="GridCell.Tab.0.right" timestamp="1601714233880">
<state width="877" height="321" key="GridCell.Tab.0.right" timestamp="1601714462247">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.right/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="896" height="406" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1601389901237" />
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="877" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1601714233880" />
<state width="877" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1601714462247" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326">
......@@ -637,12 +633,12 @@
</state>
<state x="289" y="314" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1596079390860" />
<state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1601709129844">
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1601714567116">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472144830" />
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877@30.23.1410.877" timestamp="1601389898667" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601709129844" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601714567116" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584299423" />
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
<screen x="31" y="23" width="1889" height="1177" />
......@@ -675,11 +671,11 @@
</state>
<state x="156" y="286" key="run.anything.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596432664001" />
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" />
<state x="639" y="288" width="670" height="158" key="search.everywhere.popup" timestamp="1601714273023">
<state x="639" y="288" width="670" height="158" key="search.everywhere.popup" timestamp="1601717350560">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="484" y="220" width="670" height="504" key="search.everywhere.popup/30.23.1410.877@30.23.1410.877" timestamp="1600829323295" />
<state x="639" y="288" width="670" height="158" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1601714273023" />
<state x="639" y="288" width="670" height="158" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1601717350560" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" />
</component>
</project>
\ No newline at end of file
mock/miniTb/popmartXXL2c.doJoin.json
View file @ d8be2daf
......@@ -4,6 +4,6 @@
"message": "成功",
"data": {
"power": 100,
"isGiftPrizeLevel": true
"isGiftPrizeLevel": false
}
}
mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json
View file @ d8be2daf
......@@ -4,7 +4,7 @@
"message": "nisei amet sunt Lorem",
"data": {
"rule": "测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试",
"currentLevel": 1,
"currentLevel": 120,
"power": 101,
"tools": {
"steps": 100,
......@@ -217,7 +217,7 @@
"isReceive": true
}
],
"isFristLogin": true,
"isFristLogin": false,
"loginAddPower": false
}
}
src/something/uis/GameGuide.ts
View file @ d8be2daf
......@@ -137,7 +137,7 @@ export class MsgBoard extends FYGE.Sprite {
"#ffffff",
FYGE.TEXT_ALIGN.LEFT,
540,
105,
50,
0
))
msg.textHeight = 182;
......
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