Skip to content

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

1

parent 57ada2df
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 792 additions and 603 deletions
.idea/workspace.xml
View file @ 1c5e3412
...@@ -3,8 +3,10 @@ ...@@ -3,8 +3,10 @@
<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$/.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$/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" /> <change beforePath="$PROJECT_DIR$/src/scene/map/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -64,7 +66,7 @@ ...@@ -64,7 +66,7 @@
<recent name="$PROJECT_DIR$/resource/SuccessPrizePanel" /> <recent name="$PROJECT_DIR$/resource/SuccessPrizePanel" />
</key> </key>
</component> </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"> <configuration name="dev" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" /> <package-json value="$PROJECT_DIR$/package.json" />
<command value="run" /> <command value="run" />
...@@ -130,7 +132,7 @@ ...@@ -130,7 +132,7 @@
<workItem from="1596079283722" duration="2448000" /> <workItem from="1596079283722" duration="2448000" />
<workItem from="1596185145914" duration="75000" /> <workItem from="1596185145914" duration="75000" />
<workItem from="1596187812585" duration="636000" /> <workItem from="1596187812585" duration="636000" />
<workItem from="1596418925126" duration="4681000" /> <workItem from="1596418925126" duration="5389000" />
</task> </task>
<task id="LOCAL-00001" summary="111"> <task id="LOCAL-00001" summary="111">
<created>1594122339119</created> <created>1594122339119</created>
...@@ -449,38 +451,38 @@ ...@@ -449,38 +451,38 @@
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="131" y="123" width="730" height="977" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596165868169" /> <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" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </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.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="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" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </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.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="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" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </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.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="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" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </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.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" />
</state> </state>
<state x="82" y="353" key="IDE.errors.dialog/31.23.1889.1177@31.23.1889.1177" timestamp="1594777965326" /> <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" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </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="210" y="320" key="RollbackChangesDialog/31.23.1889.1177@31.23.1889.1177" timestamp="1594173186663" />
<state x="289" y="314" key="SettingsEditor" timestamp="1596079390860"> <state x="289" y="314" key="SettingsEditor" timestamp="1596079390860">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
...@@ -518,10 +520,10 @@ ...@@ -518,10 +520,10 @@
</state> </state>
<state x="156" y="286" key="run.anything.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596432664001" /> <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="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" /> <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="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" /> <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.getGameInfo.json
View file @ 1c5e3412
This diff is collapsed.
mock/miniTb/babycare.getIndex.json
View file @ 1c5e3412
This diff is collapsed.
resource/res.json
View file @ 1c5e3412
...@@ -5,13 +5,6 @@ ...@@ -5,13 +5,6 @@
"name": "BuyPowerPanel" "name": "BuyPowerPanel"
}, },
{ {
<<<<<<< HEAD
=======
"keys": "boomBtn.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,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common"
},
{
>>>>>>> 882d90540f4da80e7c4999e6c1032fe61b3a3a8a
"keys": "积分不足背景.png,赚取积分.png", "keys": "积分不足背景.png,赚取积分.png",
"name": "CreditsOutPanel" "name": "CreditsOutPanel"
}, },
......
src/ResJson.ts
View file @ 1c5e3412
...@@ -2,371 +2,7 @@ export const ResJson = { ...@@ -2,371 +2,7 @@ export const ResJson = {
"groups": [ "groups": [
{ {
"keys": "增加体力背景.png,无字按钮底.png", "keys": "增加体力背景.png,无字按钮底.png",
<<<<<<< HEAD
"name": "BuyPowerPanel" "name": "BuyPowerPanel"
=======
"name": "BuyPowerPanel",
"atlas": {
"增加体力背景.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 477,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 477,
"ro": true
},
"无字按钮底.png": {
"x": 2,
"y": 644,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": false
}
}
},
{
"keys": "boomBtn.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,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common",
"atlas": {
"boomBtn.png": {
"x": 108,
"y": 874,
"w": 101,
"h": 109,
"ox": 0,
"oy": 0,
"sw": 101,
"sh": 109,
"ro": false
},
"comCloseBtn.png": {
"x": 347,
"y": 908,
"w": 48,
"h": 48,
"ox": 0,
"oy": 0,
"sw": 48,
"sh": 48,
"ro": false
},
"comm_light.png": {
"x": 464,
"y": 2,
"w": 439,
"h": 439,
"ox": 0,
"oy": 0,
"sw": 439,
"sh": 439,
"ro": false
},
"ele0.png": {
"x": 188,
"y": 762,
"w": 80,
"h": 66,
"ox": 0,
"oy": 13,
"sw": 80,
"sh": 80,
"ro": true
},
"ele1.png": {
"x": 279,
"y": 922,
"w": 66,
"h": 72,
"ox": 7,
"oy": 8,
"sw": 80,
"sh": 80,
"ro": false
},
"ele10.png": {
"x": 256,
"y": 761,
"w": 76,
"h": 74,
"ox": 2,
"oy": 6,
"sw": 80,
"sh": 80,
"ro": true
},
"ele11.png": {
"x": 211,
"y": 844,
"w": 76,
"h": 74,
"ox": 2,
"oy": 6,
"sw": 80,
"sh": 80,
"ro": true
},
"ele12.png": {
"x": 211,
"y": 844,
"w": 76,
"h": 74,
"ox": 2,
"oy": 6,
"sw": 80,
"sh": 80,
"ro": true
},
"ele13.png": {
"x": 287,
"y": 839,
"w": 67,
"h": 67,
"ox": 0,
"oy": 0,
"sw": 67,
"sh": 67,
"ro": false
},
"ele14.png": {
"x": 332,
"y": 754,
"w": 61,
"h": 66,
"ox": 0,
"oy": 0,
"sw": 61,
"sh": 66,
"ro": false
},
"ele2.png": {
"x": 118,
"y": 762,
"w": 80,
"h": 68,
"ox": 0,
"oy": 10,
"sw": 80,
"sh": 80,
"ro": true
},
"ele3.png": {
"x": 280,
"y": 598,
"w": 72,
"h": 70,
"ox": 4,
"oy": 10,
"sw": 80,
"sh": 80,
"ro": true
},
"ele4.png": {
"x": 279,
"y": 678,
"w": 74,
"h": 64,
"ox": 6,
"oy": 14,
"sw": 80,
"sh": 80,
"ro": true
},
"ele5.png": {
"x": 118,
"y": 598,
"w": 80,
"h": 80,
"ox": 0,
"oy": 0,
"sw": 80,
"sh": 80,
"ro": false
},
"ele6.png": {
"x": 211,
"y": 922,
"w": 66,
"h": 72,
"ox": 7,
"oy": 5,
"sw": 80,
"sh": 80,
"ro": false
},
"ele7.png": {
"x": 278,
"y": 528,
"w": 72,
"h": 68,
"ox": 4,
"oy": 6,
"sw": 80,
"sh": 80,
"ro": false
},
"ele8.png": {
"x": 118,
"y": 680,
"w": 78,
"h": 80,
"ox": 1,
"oy": 0,
"sw": 80,
"sh": 80,
"ro": false
},
"ele9.png": {
"x": 200,
"y": 598,
"w": 78,
"h": 78,
"ox": 1,
"oy": 1,
"sw": 80,
"sh": 80,
"ro": false
},
"hammerBtn.png": {
"x": 2,
"y": 874,
"w": 104,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 104,
"sh": 114,
"ro": false
},
"stepBtn.png": {
"x": 905,
"y": 2,
"w": 124,
"h": 117,
"ox": 0,
"oy": 0,
"sw": 124,
"sh": 117,
"ro": true
},
"toastBg.png": {
"x": 2,
"y": 2,
"w": 460,
"h": 130,
"ox": 0,
"oy": 0,
"sw": 460,
"sh": 130,
"ro": false
},
"waitingBg.png": {
"x": 278,
"y": 366,
"w": 160,
"h": 180,
"ox": 0,
"oy": 0,
"sw": 160,
"sh": 180,
"ro": true
},
"waitingRot.png": {
"x": 345,
"y": 672,
"w": 56,
"h": 56,
"ox": 0,
"oy": 0,
"sw": 56,
"sh": 56,
"ro": false
},
"关闭按钮.png": {
"x": 198,
"y": 680,
"w": 79,
"h": 79,
"ox": 0,
"oy": 0,
"sw": 79,
"sh": 79,
"ro": false
},
"再想想.png": {
"x": 2,
"y": 598,
"w": 274,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 274,
"sh": 114,
"ro": true
},
"开始闯关不要能量.png": {
"x": 2,
"y": 250,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": false
},
"开始闯关要能量.png": {
"x": 2,
"y": 134,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": false
},
"确定.png": {
"x": 2,
"y": 482,
"w": 274,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 274,
"sh": 114,
"ro": false
},
"继续闯关大.png": {
"x": 905,
"y": 128,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": true
},
"继续闯关小.png": {
"x": 2,
"y": 366,
"w": 274,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 274,
"sh": 114,
"ro": false
}
}
>>>>>>> 882d90540f4da80e7c4999e6c1032fe61b3a3a8a
}, },
{ {
"keys": "积分不足背景.png,赚取积分.png", "keys": "积分不足背景.png,赚取积分.png",
...@@ -461,114 +97,8 @@ export const ResJson = { ...@@ -461,114 +97,8 @@ export const ResJson = {
"name": "map" "name": "map"
}, },
{ {
<<<<<<< HEAD
"keys": "prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png", "keys": "prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png",
"name": "mapCheckPrizeEffect" "name": "mapCheckPrizeEffect"
=======
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,开奖按钮120.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
"name": "SuccessPanel",
"atlas": {
"star_dis.png": {
"x": 835,
"y": 957,
"w": 150,
"h": 144,
"ox": 0,
"oy": 0,
"sw": 150,
"sh": 144,
"ro": false
},
"star_en.png": {
"x": 835,
"y": 644,
"w": 164,
"h": 157,
"ox": 0,
"oy": 0,
"sw": 164,
"sh": 157,
"ro": false
},
"去抽奖.png": {
"x": 2,
"y": 1402,
"w": 274,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 274,
"sh": 114,
"ro": false
},
"圆角矩形 648.png": {
"x": 2,
"y": 1529,
"w": 502,
"h": 196,
"ox": 0,
"oy": 2,
"sw": 504,
"sh": 200,
"ro": true
},
"开奖按钮120.png": {
"x": 835,
"y": 1103,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": true
},
"道具圆圈.png": {
"x": 835,
"y": 803,
"w": 152,
"h": 152,
"ox": 0,
"oy": 0,
"sw": 152,
"sh": 152,
"ro": false
},
"闯关成功.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 971,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 971,
"ro": true
},
"闯关成功Bg.png": {
"x": 2,
"y": 644,
"w": 640,
"h": 831,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 831,
"ro": true
},
"闯关成功不满星按钮.png": {
"x": 2,
"y": 1286,
"w": 274,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 274,
"sh": 114,
"ro": false
}
}
>>>>>>> 882d90540f4da80e7c4999e6c1032fe61b3a3a8a
}, },
{ {
"keys": "map_crab_0.png,map_crab_1.png,map_crab_10.png,map_crab_11.png,map_crab_12.png,map_crab_13.png,map_crab_14.png,map_crab_15.png,map_crab_16.png,map_crab_17.png,map_crab_18.png,map_crab_19.png,map_crab_2.png,map_crab_20.png,map_crab_21.png,map_crab_22.png,map_crab_23.png,map_crab_24.png,map_crab_25.png,map_crab_26.png,map_crab_27.png,map_crab_28.png,map_crab_29.png,map_crab_3.png,map_crab_30.png,map_crab_4.png,map_crab_5.png,map_crab_6.png,map_crab_7.png,map_crab_8.png,map_crab_9.png", "keys": "map_crab_0.png,map_crab_1.png,map_crab_10.png,map_crab_11.png,map_crab_12.png,map_crab_13.png,map_crab_14.png,map_crab_15.png,map_crab_16.png,map_crab_17.png,map_crab_18.png,map_crab_19.png,map_crab_2.png,map_crab_20.png,map_crab_21.png,map_crab_22.png,map_crab_23.png,map_crab_24.png,map_crab_25.png,map_crab_26.png,map_crab_27.png,map_crab_28.png,map_crab_29.png,map_crab_3.png,map_crab_30.png,map_crab_4.png,map_crab_5.png,map_crab_6.png,map_crab_7.png,map_crab_8.png,map_crab_9.png",
...@@ -591,9 +121,5 @@ export const ResJson = { ...@@ -591,9 +121,5 @@ export const ResJson = {
"name": "starLight" "name": "starLight"
} }
], ],
<<<<<<< HEAD
"path": "./resource/" "path": "./resource/"
=======
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1596423352/resource/"
>>>>>>> 882d90540f4da80e7c4999e6c1032fe61b3a3a8a
} }
\ No newline at end of file
src/scene/map/MapUI.ts
View file @ 1c5e3412
...@@ -10,7 +10,7 @@ import { showPanel, changeScene, showToast } from "../../../module/ctrls"; ...@@ -10,7 +10,7 @@ import { showPanel, changeScene, showToast } from "../../../module/ctrls";
import { RulePanel } from "../../panels/RulePanel"; import { RulePanel } from "../../panels/RulePanel";
import { BuyPowerPanel } from "../../panels/BuyPowerPanel"; import { BuyPowerPanel } from "../../panels/BuyPowerPanel";
import { TaskPanel } from "../../panels/TaskPanel"; import { TaskPanel } from "../../panels/TaskPanel";
import { sendTbNet, TbNetName } from "../../TaoBaoNet"; import { getTbData, sendTbNet, TbNetName } from "../../TaoBaoNet";
import Texture = FYGE.Texture; import Texture = FYGE.Texture;
import { LotteryScene } from "../LotteryScene"; import { LotteryScene } from "../LotteryScene";
import { GDispatcher } from "../../Main"; import { GDispatcher } from "../../Main";
...@@ -315,7 +315,9 @@ class PrizeBox extends Button { ...@@ -315,7 +315,9 @@ class PrizeBox extends Button {
}, this) }, this)
} else if (prizes.length == 1 && +prizes[0].level == 120) { } else if (prizes.length == 1 && +prizes[0].level == 120) {
// this.checkTip.text = `等待开奖`; // 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.tip.text = `8月28日10点`;
this.prizeImg.y += 4; this.prizeImg.y += 4;
...@@ -323,7 +325,7 @@ class PrizeBox extends Button { ...@@ -323,7 +325,7 @@ class PrizeBox extends Button {
this.addEventListener(FYGE.MouseEvent.CLICK, () => { this.addEventListener(FYGE.MouseEvent.CLICK, () => {
//有需要，到时再改 //有需要，到时再改
Tools.btnDelay(this); Tools.btnDelay(this);
showToast(Tools.gameData.topAward.openPrizeStatus showToast(index.topAward.openPrizeStatus
? '已开奖' : this.tip.text) ? '已开奖' : this.tip.text)
}, this) }, this)
} else { } 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