Skip to content

B
babycare_xiaoxiao
Commit 80ca0a16 authored by wjf's avatar wjf
Browse files
Options

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

parents 4f05672b bc4c2959
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 52 deletions
.idea/workspace.xml
View file @ 80ca0a16
...@@ -2,9 +2,7 @@ ...@@ -2,9 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <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="">
<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/SuccessNoPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.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" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -87,8 +85,8 @@ ...@@ -87,8 +85,8 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" /> <item itemvalue="npm.dev" />
<item itemvalue="npm.flushRes" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
...@@ -116,7 +114,10 @@ ...@@ -116,7 +114,10 @@
<workItem from="1595382049907" duration="765000" /> <workItem from="1595382049907" duration="765000" />
<workItem from="1595382857407" duration="11007000" /> <workItem from="1595382857407" duration="11007000" />
<workItem from="1595468598356" duration="15042000" /> <workItem from="1595468598356" duration="15042000" />
<workItem from="1595555429502" duration="12586000" /> <workItem from="1595555429502" duration="13854000" />
<workItem from="1595815330125" duration="170000" />
<workItem from="1595815541868" duration="600000" />
<workItem from="1595820295687" duration="3708000" />
</task> </task>
<task id="LOCAL-00001" summary="111"> <task id="LOCAL-00001" summary="111">
<created>1594122339119</created> <created>1594122339119</created>
...@@ -335,7 +336,14 @@ ...@@ -335,7 +336,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1595388353249</updated> <updated>1595388353249</updated>
</task> </task>
<option name="localTasksCounter" value="32" /> <task id="LOCAL-00032" summary="Success Panel Effect!">
<created>1595584298167</created>
<option name="number" value="00032" />
<option name="presentableId" value="LOCAL-00032" />
<option name="project" value="LOCAL" />
<updated>1595584298167</updated>
</task>
<option name="localTasksCounter" value="33" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -361,29 +369,33 @@ ...@@ -361,29 +369,33 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </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="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" />
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1595388353114"> <state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1595584297912">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595388353114" /> <state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584297912" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom" timestamp="1595579918465"> <state width="883" height="321" key="GridCell.Tab.0.bottom" timestamp="1595849720127">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="866" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373239" /> <state width="883" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1595849720127" />
<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="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state width="1041" height="321" key="GridCell.Tab.0.center" timestamp="1595579918464"> <state width="883" height="321" key="GridCell.Tab.0.center" timestamp="1595849720127">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="866" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373238" /> <state width="883" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1595849720127" />
<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="1041" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918464" />
<state width="1041" height="321" key="GridCell.Tab.0.left" timestamp="1595579918463"> <state width="883" height="321" key="GridCell.Tab.0.left" timestamp="1595849720126">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="866" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373237" /> <state width="883" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1595849720126" />
<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="1041" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918463" />
<state width="1041" height="321" key="GridCell.Tab.0.right" timestamp="1595579918465"> <state width="883" height="321" key="GridCell.Tab.0.right" timestamp="1595849720127">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="866" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373239" /> <state width="883" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1595849720127" />
<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 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"> <state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
...@@ -397,10 +409,10 @@ ...@@ -397,10 +409,10 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" /> <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="1595388354092"> <state x="92" y="351" key="Vcs.Push.Dialog.v2" timestamp="1595584299423">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595388354092" /> <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"> <state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
...@@ -425,9 +437,10 @@ ...@@ -425,9 +437,10 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" /> <state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1595584259535"> <state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1595849266199">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1595849266199" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" /> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" />
</component> </component>
</project> </project>
\ No newline at end of file
mock/miniTb/babycare.gameOver.json
View file @ 80ca0a16
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
"currentLevel": 11, "currentLevel": 11,
"isPrizeLevel": false, "isPrizeLevel": false,
"tool": { "tool": {
"image": "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01xTeKMI1wMhRux48Y6_!!2275046294-2-miniprogram.png"
}, },
"prize": { "prize": {
"image": "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01xTeKMI1wMhRux48Y6_!!2275046294-2-miniprogram.png",
"type": "HAMMERS" "type": "HAMMERS"
} }
}, },
......
mock/miniTb/babycare.getIndex.json
View file @ 80ca0a16
...@@ -130,19 +130,22 @@ ...@@ -130,19 +130,22 @@
], ],
"isFristLogin": false, "isFristLogin": false,
"topAward": { "topAward": {
"image":"https://img.alicdn.com/imgextra/i1/2275046294/O1CN01TrcMYF1wMhRuCphHI_!!2275046294-2-miniprogram.png", "openPrizeStatus": true,
"level":90, "prize": {
"drawStatus":1, "image": "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01TrcMYF1wMhRuCphHI_!!2275046294-2-miniprogram.png",
"openId":"AAHuCvE-ALiIWXYsJuTb5S4W", "level": 90,
"createDay":"2020/07/14", "drawStatus": 1,
"avatar":"sdfwerwerwer", "openId": "AAHuCvE-ALiIWXYsJuTb5S4W",
"type":3, "createDay": "2020/07/14",
"prizeId":"5f08084e0cb7338a0a377c8d", "avatar": "sdfwerwerwer",
"activityId":"5f08084ec3ad3494b9201c0e", "type": 3,
"ename":"", "prizeId": "5f08084e0cb7338a0a377c8d",
"userNick":"wmmmmm", "activityId": "5f08084ec3ad3494b9201c0e",
"name":"90关奖品4", "ename": "",
"_id":"AAHuCvE-ALiIWXYsJuTb5S4W1594715684002" "userNick": "wmmmmm",
"name": "90关奖品4",
"_id": "AAHuCvE-ALiIWXYsJuTb5S4W1594715684002"
}
} }
} }
} }
src/Tools.ts
View file @ 80ca0a16
import { RES } from "../module/RES"; import { RES } from "../module/RES";
import { layers } from "../module/views/layers"; import { layers } from "../module/views/layers";
import Tween = FYGE.Tween; import Tween = FYGE.Tween;
import DisplayObject = FYGE.DisplayObject;
import Ease = FYGE.Ease; import Ease = FYGE.Ease;
import { sendTbNet, TbNetName } from "./TaoBaoNet"; import { sendTbNet, TbNetName } from "./TaoBaoNet";
import { PropType } from "./something/enum/PropType"; import { PropType } from "./something/enum/PropType";
...@@ -60,7 +59,10 @@ export class Tools { ...@@ -60,7 +59,10 @@ export class Tools {
"BOOMS": number "BOOMS": number
}, },
"isFristLogin": boolean,//是否是首次 "isFristLogin": boolean,//是否是首次
"topAward": any//120关自动开奖 "topAward": {
openPrizeStatus: boolean,
prize: any
}//120关自动开奖
} }
public static baseInfo: { public static baseInfo: {
...@@ -109,7 +111,7 @@ export class Tools { ...@@ -109,7 +111,7 @@ export class Tools {
*/ */
public static consumerTools(type: PropType): Promise<boolean> { public static consumerTools(type: PropType): Promise<boolean> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
sendTbNet(TbNetName.consumerTools, { type }, (s, res) => { sendTbNet(TbNetName.consumerTools, {type}, (s, res) => {
if (s) { if (s) {
//修改道具数量 //修改道具数量
this.gameData.tools = res.data.tools; this.gameData.tools = res.data.tools;
...@@ -148,7 +150,7 @@ export class Tools { ...@@ -148,7 +150,7 @@ export class Tools {
if (creditsData && !creditsData.success && !creditsData.data.isvip) { if (creditsData && !creditsData.success && !creditsData.data.isvip) {
return creditsData.data.url return creditsData.data.url
} }
const res = await sendTbNet(TbNetName.exchange, { type, credits: creditsData.data.credits }, null, true) const res = await sendTbNet(TbNetName.exchange, {type, credits: creditsData.data.credits}, null, true)
if (res.success) { if (res.success) {
//修改道具数量和体力 //修改道具数量和体力
this.gameData.power = res.data.power; this.gameData.power = res.data.power;
...@@ -173,11 +175,11 @@ export class Tools { ...@@ -173,11 +175,11 @@ export class Tools {
var tbMy = my var tbMy = my
if (!tbMy) return; if (!tbMy) return;
//@ts-ignore //@ts-ignore
const { cloud } = getApp(); const {cloud} = getApp();
//测试地址//到时云存储传一个小json，，改路径 //测试地址//到时云存储传一个小json，，改路径
var url = "cloud://B4F0300E5148F478B506DEDC26EA4C6C//butterfly0.svga"; var url = "cloud://B4F0300E5148F478B506DEDC26EA4C6C//butterfly0.svga";
//获取临时地址 //获取临时地址
var urls = await cloud.file.getTempFileURL({ fileId: [url] }) var urls = await cloud.file.getTempFileURL({fileId: [url]})
url = urls[0].url.replace('-internal', ''); url = urls[0].url.replace('-internal', '');
tbMy.downloadFile({ tbMy.downloadFile({
url: url, url: url,
...@@ -186,10 +188,10 @@ export class Tools { ...@@ -186,10 +188,10 @@ export class Tools {
tbMy.getFileSystemManager().readFile({ tbMy.getFileSystemManager().readFile({
filePath: i, filePath: i,
// encoding: "utf8", // encoding: "utf8",
success: function (r) { success: function(r) {
}, },
fail: function (res) { fail: function(res) {
} }
}) })
...@@ -333,11 +335,11 @@ export class Tools { ...@@ -333,11 +335,11 @@ export class Tools {
showTime: number = 300 showTime: number = 300
) { ) {
Tween.get(target) Tween.get(target)
.set({ alpha: 0, visible: true }) .set({alpha: 0, visible: true})
.to({ alpha: 1 }, showTime, Ease.quadIn) .to({alpha: 1}, showTime, Ease.quadIn)
.wait(time) .wait(time)
.to({ alpha: 0 }, showTime, Ease.quadOut) .to({alpha: 0}, showTime, Ease.quadOut)
.set({ alpha: 0, visible: false }) .set({alpha: 0, visible: false})
.call(() => { .call(() => {
call(); call();
}); });
......
src/scene/map/MapScene.ts
View file @ 80ca0a16
...@@ -60,11 +60,21 @@ export class MapScene extends Scene { ...@@ -60,11 +60,21 @@ export class MapScene extends Scene {
} }
let openPrize = GTool.readCache('openPrize'); let openPrize = GTool.readCache('openPrize');
if (Tools.gameData.topAward && Tools.gameData.topAward._id && openPrize !== 'true') { if (Tools.gameData.topAward.openPrizeStatus && openPrize !== 'true') { // 开奖了，并且没弹过
GTool.writeCache('openPrize', 'true'); GTool.writeCache('openPrize', 'true');
showPanel(PrizePanel, JSON.parse(JSON.stringify(Tools.gameData.topAward))); if (Tools.gameData.topAward.prize && Tools.gameData.topAward.prize._id) { // 有奖
showPanel(PrizePanel, JSON.parse(JSON.stringify(Tools.gameData.topAward.prize)));
} else { // 没奖
/// TODO 弹没奖的弹窗
console.log('弹没奖的弹窗');
}
Tools.gameData.topAward = null; Tools.gameData.topAward = null;
} }
// if (Tools.gameData.topAward && Tools.gameData.topAward.prize._id && openPrize !== 'true') {
// GTool.writeCache('openPrize', 'true');
// showPanel(PrizePanel, JSON.parse(JSON.stringify(Tools.gameData.topAward)));
// Tools.gameData.topAward = null;
// }
} }
private updateMapCheck() { private updateMapCheck() {
......
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