Skip to content

B
babycare_xiaoxiao
Commit 02f20e2c authored by wjf's avatar wjf
Browse files
Options

Merge branch 'master' of gitlab2.dui88.com:MrKwon/babycare_xiaoxiao

parents ac39082c 758f2ac7
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 48 deletions
.idea/workspace.xml
View file @ 02f20e2c
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="Success Panel Effect!">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Tools.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tools.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$/mock/miniTb/babycare.getActivityBaseInfoById.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/babycare.getActivityBaseInfoById.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -111,7 +112,7 @@
<workItem from="1594864188027" duration="20343000" />
<workItem from="1594950738970" duration="22032000" />
<workItem from="1595209499266" duration="21574000" />
<workItem from="1595296313180" duration="9406000" />
<workItem from="1595296313180" duration="14308000" />
</task>
<task id="LOCAL-00001" summary="111">
<created>1594122339119</created>
......@@ -295,7 +296,14 @@
<option name="project" value="LOCAL" />
<updated>1595314404681</updated>
</task>
<option name="localTasksCounter" value="27" />
<task id="LOCAL-00027" summary="Success Panel Effect!">
<created>1595315161168</created>
<option name="number" value="00027" />
<option name="presentableId" value="LOCAL-00027" />
<option name="project" value="LOCAL" />
<updated>1595315161168</updated>
</task>
<option name="localTasksCounter" value="28" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -321,10 +329,10 @@
<screen x="31" y="23" width="1889" height="1177" />
</state>
<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="754" y="183" key="CommitChangelistDialog2" timestamp="1595314404349">
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1595315196034">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="754" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595314404349" />
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595315196034" />
<state width="866" height="321" key="GridCell.Tab.0.bottom" timestamp="1595296522573">
<screen x="31" y="23" width="1889" height="1177" />
</state>
......@@ -357,10 +365,10 @@
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2" timestamp="1595314406084">
<state x="92" y="351" key="Vcs.Push.Dialog.v2" timestamp="1595315162424">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595314406084" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595315162424" />
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
<screen x="31" y="23" width="1889" height="1177" />
</state>
......@@ -385,9 +393,9 @@
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594712635697" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1595315059105">
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1595323216913">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595315059105" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595323216913" />
</component>
</project>
\ No newline at end of file
mock/miniTb/babycare.getActivityBaseInfoById.json
View file @ 02f20e2c
......@@ -3,58 +3,57 @@
"data": {
"inviteFriends": {
"type": 2,
"value": 10,
"value": 8,
"taskNum": 3
},
"openId": "AAFwCvE-ALiIWXYsJuTQVRpH",
"rule": "测试规则4455334354",
"updateTime": 1594627802429,
"title": "测试活动",
"openId": "AAEaCvE-ALiIWXQsJuac30pr",
"rule": "测试活动规则",
"updateTime": 1594987802814,
"title": "澎锋测试1",
"toolsProbability": {
"HAMMERS": {
"properiodfrom": 1,
"properiodto": 500,
"probability": 5
"properiodto": 3300,
"probability": 33
},
"STEPS": {
"properiodfrom": 1001,
"properiodto": 1400,
"probability": 4
"properiodfrom": 3301,
"properiodto": 6700,
"probability": 34
},
"BOOMS": {
"properiodfrom": 501,
"properiodto": 1000,
"probability": 5
"properiodfrom": 6701,
"properiodto": 10000,
"probability": 33
}
},
"levelPrize": {
"level_60": "https://img.alicdn.com/imgextra/i3/2275046294/O1CN01Llkz1U1wMhRqE4D0f_!!2275046294-2-miniprogram.png",
"level_90": "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01xTeKMI1wMhRux48Y6_!!2275046294-2-miniprogram.png",
"level_120": "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01WvSfpG1wMhRrsjqFq_!!2275046294-2-miniprogram.png",
"level_30": "https://img.alicdn.com/imgextra/i3/2275046294/O1CN01Mf9wLi1wMhRoCuoOs_!!2275046294-2-miniprogram.png",
"level_10": "https://img.alicdn.com/imgextra/i3/2275046294/O1CN01bsypJm1wMhRsRMjh1_!!2275046294-2-miniprogram.png"
"level_90": "https://img.alicdn.com/imgextra/i4/2275046294/O1CN01rG9iDU1wMhRtEnjA8_!!2275046294-2-miniprogram.png",
"level_60": "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01Sytynw1wMhRuqjy5V_!!2275046294-2-miniprogram.png",
"level_120": "https://img.alicdn.com/imgextra/i2/2275046294/O1CN01Jh6dtM1wMhRxULetP_!!2275046294-2-miniprogram.png",
"level_30": "https://img.alicdn.com/imgextra/i3/2275046294/O1CN019uAoYk1wMhRsoAgag_!!2275046294-2-miniprogram.png",
"level_10": "https://img.alicdn.com/imgextra/i3/2275046294/O1CN01FwiFBB1wMhRybF1V4_!!2275046294-2-miniprogram.png"
},
"buyCredits": {
"HAMMERS": "8",
"POWERS": "9",
"BOOMS": "6",
"STEPS": "7"
"HAMMERS": "3",
"POWERS": "4",
"STEPS": "2",
"BOOMS": "1"
},
"beMembership": 65,
"openPrizeMsg": "",
"createTime": 1594361933457,
"beMembership": 7,
"createTime": 1594987659195,
"deleteStatus": 1,
"browseGoods": {
"itemIds": "32223",
"type": 1,
"value": 10,
"itemIds": "616444374083,617466150499,616903228711",
"type": 2,
"value": 5,
"taskNum": 3
},
"startTime": 1592448580000,
"_id": "5f08084ec3ad3494b9201c0e",
"endTime": 1594966980000,
"attentionStore": 7,
"openPrizeStatus": 3
"startTime": 1594988024000,
"_id": "5f11948b3075d9927ec1f4ce",
"endTime": 1595592824000,
"attentionStore": 6,
"openPrizeStatus": 2
},
"success": true,
"message": "成功"
......
mock/miniTb/babycare.getIndex.json
View file @ 02f20e2c
......@@ -3,9 +3,9 @@
"code": "1111",
"message": "OK",
"data": {
"power": 0,
"power": 100,
"loginAddPower": true,
"currentLevel": 120,
"currentLevel": 25,
"tools": {
"STEPS": 1,
"BOOMS": 2,
......
src/scene/map/MapScene.ts
View file @ 02f20e2c
......@@ -155,8 +155,8 @@ export class MapScene extends Scene {
});
// 奖励关卡
data.prizes.forEach((v) => {
MapScene.checkArr[v.level].isPrize = true;
Tools.baseInfo.prizeLevels.forEach((v) => {
MapScene.checkArr[v].isPrize = true;
});
if (this.data && this.data.level) {
......
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