Skip to content

X
xiaoxiaole
Commit c21f6477 authored by wildfirecode's avatar wildfirecode
Browse files
Options

1

parent 6ef16c25
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 51 deletions
egret/libs/new_wx/onNotSuccess.ts
View file @ c21f6477
...@@ -6,17 +6,12 @@ export default (data?: Data, netname?: NetName) => { ...@@ -6,17 +6,12 @@ export default (data?: Data, netname?: NetName) => {
if (!data) { if (!data) {
return showToast('网络异常\n请隔一段时间再尝试'); return showToast('网络异常\n请隔一段时间再尝试');
} }
if (data.code == 'E999999999')//系统级别错误 系统异常，\n请刷新后重试。 if (data.code == '999999999')//系统级别错误 系统异常，\n请刷新后重试。
showToast('网络异常\n请隔一段时间再尝试'); showToast('网络异常\n请隔一段时间再尝试');
else if (data.code == 'C600004') else if (data.code == '2002007013')
showToast('元宝不足哦，快去玩游戏赢元宝吧'); showToast('元宝不足哦，快去玩游戏赢元宝吧');
else if (data.code == 'E100201001') else if (data.code == 'E100201001')
showToast('请登录后重试。') showToast('请登录后重试。')
else if (data.code == 'E100201007') {
showToast(`对不起\n您的${CFG.unitName}不足`);
}
else if (data.code == 'E100202007' || data.code == 'E100202008' || data.code == 'E100202009' || data.code == 'E100202010')
showToast('对不起\n您的次数不足。')
else//其他异常 else//其他异常
showToast('网络异常\n请隔一段时间再尝试') showToast('网络异常\n请隔一段时间再尝试')
} }
......
egret/resource/TextureMerger/blood.tmproject deleted 100644 → 0
View file @ 6ef16c25
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"blood","version":5,"files":["../assets/blood/按钮 副本.png","../assets/blood/按钮 副本1.png","../assets/blood/按钮.png","../assets/blood/体力补济站.png"]}
\ No newline at end of file
egret/resource/TextureMerger/buy1.tmproject deleted 100644 → 0
View file @ 6ef16c25
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy1","version":5,"files":["../assets/buy1/购买锤子.png"]}
\ No newline at end of file
egret/resource/TextureMerger/buy2.tmproject deleted 100644 → 0
View file @ 6ef16c25
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy2","version":5,"files":["../assets/buy2/购买炸弹.png"]}
\ No newline at end of file
egret/resource/TextureMerger/buy3.tmproject deleted 100644 → 0
View file @ 6ef16c25
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy3","version":5,"files":["../assets/buy3/购买步数增加.png"]}
\ No newline at end of file
egret/resource/TextureMerger/common.tmproject deleted 100644 → 0
View file @ 6ef16c25
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/toast.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png"]}
\ No newline at end of file
egret/resource/TextureMerger/fail.tmproject deleted 100644 → 0
View file @ 6ef16c25
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"fail","version":5,"files":["../assets/faild/闯关失败.png","../assets/faild/按钮 副本 9.png"]}
\ No newline at end of file
egret/resource/TextureMerger/failed.tmproject deleted 100644 → 0
View file @ 6ef16c25
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"failed","version":5,"files":["../assets/faild/闯关失败.png","../assets/faild/按钮 副本 9.png"]}
\ No newline at end of file
egret/resource/TextureMerger/main.tmproject deleted 100644 → 0
View file @ 6ef16c25
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"main","version":5,"files":["../assets/mainScene/yezi1.png","../assets/mainScene/unlightedStar.png","../assets/mainScene/targetBoard.png","../assets/mainScene/stepsBoard.png","../assets/mainScene/stepNumber9.png","../assets/mainScene/stepNumber8.png","../assets/mainScene/stepNumber7.png","../assets/mainScene/stepNumber6.png","../assets/mainScene/stepNumber5.png","../assets/mainScene/stepNumber4.png","../assets/mainScene/stepNumber3.png","../assets/mainScene/stepNumber2.png","../assets/mainScene/stepNumber1.png","../assets/mainScene/stepNumber0.png","../assets/mainScene/stepBtn.png","../assets/mainScene/starProgress.png","../assets/mainScene/setting.png","../assets/mainScene/scoreNumber9.png","../assets/mainScene/scoreNumber8.png","../assets/mainScene/scoreNumber7.png","../assets/mainScene/scoreNumber6.png","../assets/mainScene/scoreNumber5.png","../assets/mainScene/scoreNumber4.png","../assets/mainScene/scoreNumber3.png","../assets/mainScene/scoreNumber2.png","../assets/mainScene/scoreNumber1.png","../assets/mainScene/scoreNumber0.png","../assets/mainScene/rock6.png","../assets/mainScene/rock5.png","../assets/mainScene/rock4.png","../assets/mainScene/rock3.png","../assets/mainScene/rock2.png","../assets/mainScene/rock1.png","../assets/mainScene/rightMark.png","../assets/mainScene/rightArrow.png","../assets/mainScene/rectLat.png","../assets/mainScene/progressDown.png","../assets/mainScene/playSceneBg.png","../assets/mainScene/magicLionBg.png","../assets/mainScene/magicLion.png","../assets/mainScene/lockUp.png","../assets/mainScene/lockDown.png","../assets/mainScene/lineLight.png","../assets/mainScene/lightedStar.png","../assets/mainScene/leftArrow.png","../assets/mainScene/ice6.png","../assets/mainScene/ice5.png","../assets/mainScene/ice4.png","../assets/mainScene/ice3.png","../assets/mainScene/ice2.png","../assets/mainScene/ice1.png","../assets/mainScene/hammerBtn.png","../assets/mainScene/eleDis9.png","../assets/mainScene/eleDis8.png","../assets/mainScene/eleDis7.png","../assets/mainScene/eleDis6.png","../assets/mainScene/eleDis5.png","../assets/mainScene/eleDis4.png","../assets/mainScene/eleDis3.png","../assets/mainScene/eleDis2.png","../assets/mainScene/eleDis12.png","../assets/mainScene/eleDis11.png","../assets/mainScene/eleDis10.png","../assets/mainScene/eleDis1.png","../assets/mainScene/ele5.png","../assets/mainScene/ele42.png","../assets/mainScene/ele41.png","../assets/mainScene/ele40.png","../assets/mainScene/ele4.png","../assets/mainScene/ele32.png","../assets/mainScene/ele31.png","../assets/mainScene/ele30.png","../assets/mainScene/ele3.png","../assets/mainScene/ele22.png","../assets/mainScene/ele21.png","../assets/mainScene/ele20.png","../assets/mainScene/ele2.png","../assets/mainScene/ele12.png","../assets/mainScene/ele11.png","../assets/mainScene/ele10.png","../assets/mainScene/ele1.png","../assets/mainScene/ele02.png","../assets/mainScene/ele01.png","../assets/mainScene/ele00.png","../assets/mainScene/ele0.png","../assets/mainScene/dangqianfenshu.png","../assets/mainScene/chooseRect.png","../assets/mainScene/boomBtn.png","../assets/mainScene/boom9.png","../assets/mainScene/boom8.png","../assets/mainScene/boom7.png","../assets/mainScene/boom6.png","../assets/mainScene/boom5.png","../assets/mainScene/boom4.png","../assets/mainScene/boom3.png","../assets/mainScene/boom2.png","../assets/mainScene/boom18.png","../assets/mainScene/boom17.png","../assets/mainScene/boom16.png","../assets/mainScene/boom15.png","../assets/mainScene/boom14.png","../assets/mainScene/boom13.png","../assets/mainScene/boom12.png","../assets/mainScene/boom11.png","../assets/mainScene/boom10.png","../assets/mainScene/boom1.png","../assets/mainScene/mainSoundBtnOn.png","../assets/mainScene/mainSettingBg.png","../assets/mainScene/mainQuestionBtn.png","../assets/mainScene/mainMusicBtnOn.png","../assets/mainScene/mainQuitBtn.png","../assets/mainScene/mainSoundBtnOff.png","../assets/mainScene/mainMusicBtnOff.png","../assets/mainScene/targetNumber9.png","../assets/mainScene/targetNumber8.png","../assets/mainScene/targetNumber7.png","../assets/mainScene/targetNumber6.png","../assets/mainScene/targetNumber5.png","../assets/mainScene/targetNumber4.png","../assets/mainScene/targetNumber3.png","../assets/mainScene/targetNumber2.png","../assets/mainScene/targetNumber1.png","../assets/mainScene/targetNumber0.png","../assets/mainScene/ele7.png","../assets/mainScene/ele6.png","../assets/mainScene/bonusFra9.png","../assets/mainScene/bonusFra8.png","../assets/mainScene/bonusFra7.png","../assets/mainScene/bonusFra6.png","../assets/mainScene/bonusFra5.png","../assets/mainScene/bonusFra4.png","../assets/mainScene/bonusFra3.png","../assets/mainScene/bonusFra27.png","../assets/mainScene/bonusFra26.png","../assets/mainScene/bonusFra25.png","../assets/mainScene/bonusFra24.png","../assets/mainScene/bonusFra23.png","../assets/mainScene/bonusFra22.png","../assets/mainScene/bonusFra21.png","../assets/mainScene/bonusFra20.png","../assets/mainScene/bonusFra2.png","../assets/mainScene/bonusFra19.png","../assets/mainScene/bonusFra18.png","../assets/mainScene/bonusFra17.png","../assets/mainScene/bonusFra16.png","../assets/mainScene/bonusFra15.png","../assets/mainScene/bonusFra14.png","../assets/mainScene/bonusFra13.png","../assets/mainScene/bonusFra12.png","../assets/mainScene/bonusFra11.png","../assets/mainScene/bonusFra10.png","../assets/mainScene/bonusFra1.png","../assets/mainScene/bonusShoot.png","../assets/mainScene/guideTxt5.png","../assets/mainScene/guideTxt4.png","../assets/mainScene/guideTxt3.png","../assets/mainScene/guideTxt2.png","../assets/mainScene/guideTxt1.png","../assets/mainScene/guideKnowBtn.png","../assets/mainScene/guideBg.png","../assets/mainScene/propNum9.png","../assets/mainScene/propNum8.png","../assets/mainScene/propNum7.png","../assets/mainScene/propNum6.png","../assets/mainScene/propNum5.png","../assets/mainScene/propNum4.png","../assets/mainScene/propNum3.png","../assets/mainScene/propNum2.png","../assets/mainScene/propNum1.png","../assets/mainScene/propNum0.png","../assets/mainScene/propNumBg.png"]}
\ No newline at end of file
egret/resource/TextureMerger/map.tmproject deleted 100644 → 0
View file @ 6ef16c25
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/icon.png","../assets/map/animal1.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/iconbg.png","../assets/map/光 副本 4.png"]}
\ No newline at end of file
egret/resource/TextureMerger/noprize.tmproject deleted 100644 → 0
View file @ 6ef16c25
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"noprize","version":5,"files":["../assets/nprize/擦肩而过弹窗 .png","../assets/nprize/得分- 无发券.png","../assets/nprize/再来一次.png"]}
\ No newline at end of file
egret/resource/TextureMerger/prize.tmproject deleted 100644 → 0
View file @ 6ef16c25
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize","version":5,"files":["../assets/prize/PrizePanelX.png","../assets/prize/prizePanelUseBtn.png","../assets/prize/prizePanelbg.png","../assets/prize/点亮.png","../assets/prize/点亮 副本 2.png"]}
\ No newline at end of file
egret/resource/TextureMerger/quit.tmproject deleted 100644 → 0
View file @ 6ef16c25
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"quit","version":5,"files":["../assets/quit/quit_bg.png","../assets/quit/关闭按钮.png","../assets/quit/按钮 副本 8.png","../assets/quit/按钮 副本 7.png"]}
\ No newline at end of file
egret/resource/TextureMerger/rule.tmproject deleted 100644 → 0
View file @ 6ef16c25
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"rule","version":5,"files":["../assets/rule/ruleBg.png"]}
\ No newline at end of file
egret/resource/TextureMerger/shop.tmproject deleted 100644 → 0
View file @ 6ef16c25
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"shop","version":5,"files":["../assets/shop/道具商城.png","../assets/shop/按钮 副本.png"]}
\ No newline at end of file
egret/resource/TextureMerger/start.tmproject deleted 100644 → 0
View file @ 6ef16c25
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"start","version":5,"files":["../assets/startScene/mask3.png","../assets/startScene/mask2.png","../assets/startScene/mask.png","../assets/startScene/loadingbg.png","../assets/startScene/头顶树丛.png"]}
\ No newline at end of file
egret/resource/TextureMerger/startpanel.tmproject deleted 100644 → 0
View file @ 6ef16c25
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["../assets/startpanel2/通关条件.png","../assets/startpanel2/数量.png","../assets/startpanel2/数量 副本 3.png","../assets/startpanel2/按钮.png"]}
\ No newline at end of file
egret/resource/default.res.json
View file @ c21f6477
...@@ -12,10 +12,6 @@ ...@@ -12,10 +12,6 @@
"keys": "toast_png,nums_png,nums_fnt,closeCommonBtn_png,btn_png,alertbg_png,按钮 副本 4_png,按钮 副本 3_png", "keys": "toast_png,nums_png,nums_fnt,closeCommonBtn_png,btn_png,alertbg_png,按钮 副本 4_png,按钮 副本 3_png",
"name": "common" "name": "common"
}, },
{
"keys": "按钮 副本2_png,按钮 副本1_png,按钮3_png,体力补济站_png",
"name": "blood"
},
{ {
"keys": "购买锤子_png", "keys": "购买锤子_png",
"name": "buy1" "name": "buy1"
...@@ -63,6 +59,10 @@ ...@@ -63,6 +59,10 @@
{ {
"keys": "闯关失败_png,按钮 副本 9_png", "keys": "闯关失败_png,按钮 副本 9_png",
"name": "fail" "name": "fail"
},
{
"keys": "blood体力补济站_png,blood按钮_png,blood按钮 副本1_png,blood按钮 副本_png",
"name": "blood"
} }
], ],
"resources": [ "resources": [
...@@ -371,26 +371,6 @@ ...@@ -371,26 +371,6 @@
"type": "image", "type": "image",
"name": "btn_png" "name": "btn_png"
}, },
{
"url": "assets/blood/体力补济站.png",
"type": "image",
"name": "体力补济站_png"
},
{
"url": "assets/blood/按钮 副本.png",
"type": "image",
"name": "按钮 副本2_png"
},
{
"url": "assets/blood/按钮.png",
"type": "image",
"name": "按钮3_png"
},
{
"url": "assets/blood/按钮 副本1.png",
"type": "image",
"name": "按钮 副本1_png"
},
{ {
"url": "assets/prize/点亮.png", "url": "assets/prize/点亮.png",
"type": "image", "type": "image",
...@@ -1415,6 +1395,26 @@ ...@@ -1415,6 +1395,26 @@
"url": "assets/map/iconbg.png", "url": "assets/map/iconbg.png",
"type": "image", "type": "image",
"name": "iconbg_png" "name": "iconbg_png"
},
{
"url": "assets/blood/blood按钮 副本.png",
"type": "image",
"name": "blood按钮 副本_png"
},
{
"url": "assets/blood/blood按钮.png",
"type": "image",
"name": "blood按钮_png"
},
{
"url": "assets/blood/blood按钮 副本1.png",
"type": "image",
"name": "blood按钮 副本1_png"
},
{
"url": "assets/blood/blood体力补济站.png",
"type": "image",
"name": "blood体力补济站_png"
} }
] ]
} }
\ No newline at end of file
egret/resource/skins/BloodSkin.exml
View file @ c21f6477
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="BloodSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="BloodSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image source="体力补济站_png" y="46" horizontalCenter="0"/> <e:Image y="46" horizontalCenter="0" source="blood体力补济站_png"/>
<e:Button id="closeBtn" label="" x="614" y="241"> <e:Button id="closeBtn" label="" x="614" y="241">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing"> <e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<e:Button id="resumeBtn" label="" y="787" horizontalCenter="0"> <e:Button id="resumeBtn" label="" y="787" horizontalCenter="0">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮3_png" source.down="按钮3_png" source.disabled="按钮3_png"/> <e:Image width="100%" height="100%" source="blood按钮_png" source.down="blood按钮_png" source.disabled="blood按钮_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/> <e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<e:Button id="buyBtn" label="" x="433" y="522"> <e:Button id="buyBtn" label="" x="433" y="522">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮 副本2_png" source.down="按钮 副本2_png" source.disabled="按钮 副本2_png"/> <e:Image width="100%" height="100%" source="blood按钮 副本_png" source.down="blood按钮 副本_png" source.disabled="blood按钮 副本_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/> <e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<e:Button id="inviteBtn" label="" x="433" y="661"> <e:Button id="inviteBtn" label="" x="433" y="661">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮 副本1_png" source.down="按钮 副本1_png" source.disabled="按钮 副本1_png"/> <e:Image width="100%" height="100%" source="blood按钮 副本1_png" source.down="blood按钮 副本1_png" source.disabled="blood按钮 副本1_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/> <e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
......
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