Skip to content

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

游戏结束中体力

parent e9d86996
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 10511 deletions
.idea/workspace.xml
View file @ 9d5551c9
......@@ -2,8 +2,18 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/resource/common/power.png" afterDir="false" />
<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$/mock/miniTb/popmartXXL2c.doJoin.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.doJoin.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.drawLotteryPrize.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.drawLotteryPrize.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$/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$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/FesRedPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/FesRedPrizePanel.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/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/LoadingScene.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -118,10 +128,10 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="npm.build" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.build" />
<item itemvalue="JavaScript Debug.aaa.html" />
</list>
</recent_temporary>
......@@ -192,14 +202,7 @@
<workItem from="1602310800241" duration="30000" />
<workItem from="1602310896602" duration="5137000" />
<workItem from="1602322734643" duration="2339000" />
<workItem from="1602380089772" duration="3648000" />
</task>
<task id="LOCAL-00029" summary="Success Panel Effect!">
<created>1595387247496</created>
<option name="number" value="00029" />
<option name="presentableId" value="LOCAL-00029" />
<option name="project" value="LOCAL" />
<updated>1595387247496</updated>
<workItem from="1602380089772" duration="5893000" />
</task>
<task id="LOCAL-00030" summary="Success Panel Effect!">
<created>1595387386892</created>
......@@ -537,7 +540,14 @@
<option name="project" value="LOCAL" />
<updated>1602386844577</updated>
</task>
<option name="localTasksCounter" value="78" />
<task id="LOCAL-00078" summary="fk">
<created>1602397093257</created>
<option name="number" value="00078" />
<option name="presentableId" value="LOCAL-00078" />
<option name="project" value="LOCAL" />
<updated>1602397093257</updated>
</task>
<option name="localTasksCounter" value="79" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -576,7 +586,8 @@
<MESSAGE value="guide" />
<MESSAGE value="task" />
<MESSAGE value="1" />
<option name="LAST_COMMIT_MESSAGE" value="1" />
<MESSAGE value="fk" />
<option name="LAST_COMMIT_MESSAGE" value="fk" />
</component>
<component name="WindowStateProjectService">
<state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1595229546530">
......@@ -600,51 +611,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="1602386843831">
<state x="557" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1602397093085">
<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="1602386843831" />
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1602397093085" />
<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="63" width="1683" height="1037" key="DiffContextDialog" timestamp="1602321352721">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="131" y="63" width="1683" height="1037" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1602321352721" />
<state width="935" height="321" key="GridCell.Tab.0.bottom" timestamp="1602387367295">
<state width="935" height="321" key="GridCell.Tab.0.bottom" timestamp="1602403250047">
<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="935" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1602344179438" />
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="935" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1602387367295" />
<state width="935" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1602403250047" />
<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="935" height="321" key="GridCell.Tab.0.center" timestamp="1602387367294">
<state width="935" height="321" key="GridCell.Tab.0.center" timestamp="1602403250045">
<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="935" height="321" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1602344179437" />
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="935" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1602387367294" />
<state width="935" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1602403250045" />
<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="935" height="321" key="GridCell.Tab.0.left" timestamp="1602387367293">
<state width="935" height="321" key="GridCell.Tab.0.left" timestamp="1602403250045">
<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="935" height="321" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1602344179437" />
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="935" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1602387367293" />
<state width="935" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1602403250045" />
<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="935" height="321" key="GridCell.Tab.0.right" timestamp="1602387367295">
<state width="935" height="321" key="GridCell.Tab.0.right" timestamp="1602403250046">
<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="935" height="321" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1602344179438" />
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="935" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1602387367295" />
<state width="935" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1602403250046" />
<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">
......@@ -661,12 +672,12 @@
</state>
<state x="762" y="247" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1602321211804" />
<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="1602386845878">
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1602397094205">
<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="1602386845878" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1602397094205" />
<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" />
......@@ -699,11 +710,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="1602396873467">
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup" timestamp="1602403358039">
<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="1602396873467" />
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1602403358039" />
<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="249" y="530" key="vcs.readOnlyHandler.ReadOnlyStatusDialog" timestamp="1602310103215">
<screen x="30" y="23" width="1890" height="1177" />
......
mock/miniTb/popmartXXL2c.doJoin.json
View file @ 9d5551c9
......@@ -4,6 +4,6 @@
"message": "成功",
"data": {
"power": 100,
"isGiftPrizeLevel": false
"isGiftPrizeLevel": true
}
}
mock/miniTb/popmartXXL2c.drawLotteryPrize.json
View file @ 9d5551c9
{
"code": "000000",
"data": {
"image": "https://img.alicdn.com/imgextra/i3/2885348004/O1CN01Lw5ZoM28zsjhMDLVE_!!2885348004-0-miniprogram.jpg",
"name": "游戏测试3",
"id": "5f8059c8e5c0d7c634f186c5",
"type": 1
"name": "体力",
"type": 6,
"toolType": "power"
},
"success": true,
"message": "成功"
......
mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json
View file @ 9d5551c9
{
"code": "000000",
"data": {
"currentLevel": 1,
"currentLevel": 4,
"isFirstLogin": false,
"records": [{
"score": 0,
......
output.js
View file @ 9d5551c9
......@@ -13565,13 +13565,15 @@ var Tools = (function () {
if (s) {
_this.propInfo[type] -= 1;
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getToolsInfo, {}, function (st, rt) {
if (!st)
if (!st) {
resolve(true);
return;
_this.propInfo.booms = +rt.data.tools.booms;
_this.propInfo.steps = +rt.data.tools.steps;
_this.propInfo.hammers = +rt.data.tools.hammers;
});
}
_this.propInfo.booms = Tools.propInfo.booms = +rt.data.tools.booms;
_this.propInfo.steps = Tools.propInfo.steps = +rt.data.tools.steps;
_this.propInfo.hammers = Tools.propInfo.hammers = +rt.data.tools.hammers;
resolve(true);
});
}
else {
resolve(false);
output.js.map
View file @ 9d5551c9
This source diff could not be displayed because it is too large. You can view the blob instead.
resource/res.json
View file @ 9d5551c9
......@@ -49,7 +49,7 @@
"name": "bonus"
},
{
"keys": "boomBtn.png,closeBtn2.png,comCloseBtn.png,comm_light.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,liaojiele.png,powerImg.png,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,开心收下.png,确定.png,继续闯关大.png,继续闯关小.png",
"keys": "boomBtn.png,closeBtn2.png,comCloseBtn.png,comm_light.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,liaojiele.png,power.png,powerImg.png,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,开心收下.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common"
},
{
......
src/ResJson.ts
View file @ 9d5551c9
This source diff could not be displayed because it is too large. You can view the blob instead.
src/panels/FesRedPrizePanel.ts
View file @ 9d5551c9
import { Panel } from "../../module/views/Panel";
import { PropType } from "../something/enum/PropType";
import { RES } from "../../module/RES";
import { Tools } from "../Tools";
import { getTbData, TbNetName } from "../TaoBaoNet";
......@@ -9,12 +8,6 @@ import Sprite = FYGE.Sprite;
import MouseEvent = FYGE.MouseEvent;
import Button = FYGE.Button;
const propImg = {
[PropType.BOOMS]: 'boomBtn.png',
[PropType.HAMMERS]: 'hammerBtn.png',
[PropType.STEPS]: 'stepBtn.png'
}
export class FesRedPrizePanel extends Panel {
get groupNames() {
return ['FesRedPrizePanel']
......
src/panels/SuccessPrizePanel.ts
View file @ 9d5551c9
......@@ -16,7 +16,8 @@ import { sendTbNet, TbNetName } from "../TaoBaoNet";
const propImg = {
[PropType.BOOMS]: 'boomBtn.png',
[PropType.HAMMERS]: 'hammerBtn.png',
[PropType.STEPS]: 'stepBtn.png'
[PropType.STEPS]: 'stepBtn.png',
[PropType.POWER]:'power.png'
}
export class SuccessPrizePanel extends Panel {
......
src/scene/LoadingScene.ts
View file @ 9d5551c9
......@@ -61,15 +61,12 @@ export class LoadingScene extends Scene {
async start() {
super.start()
// 访问页面埋点
sendTbNet(TbNetName.reportAnalytics, {logkey: 'visit'});
this.addEventListener(FYGE.Event.PROGRESS, this.progressEvent, this)
//首次进度一点
this.dispatchEvent(FYGE.Event.PROGRESS, 0.2)
//获取app数据
Tools.getAppData();
await Tools.getAppData();
this.dispatchEvent(FYGE.Event.PROGRESS, 0.3)
//询问读取权限，不阻止进程
......
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