Skip to content

B
babycare_xiaoxiao
Commit 501f4151 authored by wjf's avatar wjf
Browse files
Options

l

parents 27424630 c79a7f79
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 792 additions and 43111 deletions
.idea/workspace.xml
View file @ 501f4151
......@@ -3,8 +3,10 @@
<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$/mock/miniTb/babycare.getGameInfo.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/babycare.getGameInfo.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$/resource/map/guide_tip.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/guide_tip.png" 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/scene/map/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
......@@ -64,7 +66,7 @@
<recent name="$PROJECT_DIR$/resource/SuccessPrizePanel" />
</key>
</component>
<component name="RunManager" selected="npm.flushRes">
<component name="RunManager" selected="npm.dev">
<configuration name="dev" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
......@@ -130,7 +132,7 @@
<workItem from="1596079283722" duration="2448000" />
<workItem from="1596185145914" duration="75000" />
<workItem from="1596187812585" duration="636000" />
<workItem from="1596418925126" duration="4681000" />
<workItem from="1596418925126" duration="5389000" />
</task>
<task id="LOCAL-00001" summary="111">
<created>1594122339119</created>
......@@ -449,38 +451,38 @@
<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="888" height="321" key="GridCell.Tab.0.bottom" timestamp="1596433522647">
<state width="888" height="321" key="GridCell.Tab.0.bottom" timestamp="1596434405974">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1596433522647" />
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1596434405974" />
<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="888" height="321" key="GridCell.Tab.0.center" timestamp="1596433522643">
<state width="888" height="321" key="GridCell.Tab.0.center" timestamp="1596434405973">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1596433522643" />
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1596434405973" />
<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="888" height="321" key="GridCell.Tab.0.left" timestamp="1596433522641">
<state width="888" height="321" key="GridCell.Tab.0.left" timestamp="1596434405972">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1596433522641" />
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1596434405972" />
<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="888" height="321" key="GridCell.Tab.0.right" timestamp="1596433522646">
<state width="888" height="321" key="GridCell.Tab.0.right" timestamp="1596434405973">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1596433522646" />
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1596434405973" />
<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">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="82" y="353" key="IDE.errors.dialog/31.23.1889.1177@31.23.1889.1177" timestamp="1594777965326" />
<state x="209" y="320" key="RollbackChangesDialog" timestamp="1596074500976">
<state x="209" y="320" key="RollbackChangesDialog" timestamp="1596434350752">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="209" y="320" key="RollbackChangesDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596074500976" />
<state x="209" y="320" key="RollbackChangesDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596434350752" />
<state x="210" y="320" key="RollbackChangesDialog/31.23.1889.1177@31.23.1889.1177" timestamp="1594173186663" />
<state x="289" y="314" key="SettingsEditor" timestamp="1596079390860">
<screen x="30" y="23" width="1890" height="1177" />
......@@ -518,10 +520,10 @@
</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="671" height="676" key="search.everywhere.popup" timestamp="1596433751950">
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1596434723742">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596433751950" />
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596434723742" />
<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/babycare.getGameInfo.json
View file @ 501f4151
This diff is collapsed.
mock/miniTb/babycare.getIndex.json
View file @ 501f4151
This diff is collapsed.
output.js deleted 100644 → 0
View file @ 27424630
This diff is collapsed.
output.js.map deleted 100644 → 0
View file @ 27424630
This diff is collapsed.
resource/res.json deleted 100644 → 0
View file @ 27424630
This diff is collapsed.
src/ResJson.ts deleted 100644 → 0
View file @ 27424630
This diff is collapsed.
src/scene/map/MapUI.ts
View file @ 501f4151
......@@ -10,7 +10,7 @@ import { showPanel, changeScene, showToast } from "../../../module/ctrls";
import { RulePanel } from "../../panels/RulePanel";
import { BuyPowerPanel } from "../../panels/BuyPowerPanel";
import { TaskPanel } from "../../panels/TaskPanel";
import { sendTbNet, TbNetName } from "../../TaoBaoNet";
import { getTbData, sendTbNet, TbNetName } from "../../TaoBaoNet";
import Texture = FYGE.Texture;
import { LotteryScene } from "../LotteryScene";
import { GDispatcher } from "../../Main";
......@@ -315,7 +315,9 @@ class PrizeBox extends Button {
}, this)
} else if (prizes.length == 1 && +prizes[0].level == 120) {
// this.checkTip.text = `等待开奖`;
this.checkTip.text = Tools.gameData.topAward.openPrizeStatus
const index = getTbData(TbNetName.getIndex).data
this.checkTip.text = index.topAward.openPrizeStatus
? '已开奖' : '等待开奖';
this.tip.text = `8月28日10点`;
this.prizeImg.y += 4;
......@@ -323,7 +325,7 @@ class PrizeBox extends Button {
this.addEventListener(FYGE.MouseEvent.CLICK, () => {
//有需要，到时再改
Tools.btnDelay(this);
showToast(Tools.gameData.topAward.openPrizeStatus
showToast(index.topAward.openPrizeStatus
? '已开奖' : this.tip.text)
}, this)
} else {
......
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