Skip to content

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

1

parent 9ed6946a
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 43 deletions
egret/libs/new_tw/ctrls/hdGameDoDojoin.ts
View file @ 40e190cc
...@@ -2,7 +2,7 @@ import { DataManager } from "../../tw/manager/DataManager"; ...@@ -2,7 +2,7 @@ import { DataManager } from "../../tw/manager/DataManager";
import { NetManager } from "../../tw/manager/NetManager"; import { NetManager } from "../../tw/manager/NetManager";
const getHdGameOrderStatus = (callback: Function): void => { const getHdGameOrderStatus = (callback: Function): void => {
const dojoin = DataManager.ins.getData('dojoin'); const dojoin = DataManager.ins.getData('hc_doJoin');
NetManager.ins.getNgameStartStatus(callback, dojoin.data, () => { NetManager.ins.getNgameStartStatus(callback, dojoin.data, () => {
const data = DataManager.ins.getData('getNgameStartStatus'); const data = DataManager.ins.getData('getNgameStartStatus');
return data.code == 'C000000001'; return data.code == 'C000000001';
...@@ -19,7 +19,7 @@ const hdGameDoDojoin = (callback: Function, collectRuleId?: number): void => { ...@@ -19,7 +19,7 @@ const hdGameDoDojoin = (callback: Function, collectRuleId?: number): void => {
window['requirelogin'](); window['requirelogin']();
return; return;
} }
NetManager.ins.doJoin((success: boolean) => { NetManager.ins.hc_doJoin((success: boolean) => {
if (success) { if (success) {
getHdGameOrderStatus(callback); getHdGameOrderStatus(callback);
} else { } else {
......
egret/libs/tw/manager/NetManager.ts
View file @ 40e190cc
...@@ -980,8 +980,8 @@ export class NetManager extends ABNetManager { ...@@ -980,8 +980,8 @@ export class NetManager extends ABNetManager {
param.collectRuleId = collectRuleId; param.collectRuleId = collectRuleId;
} }
const net: INetData = { const net: INetData = {
name: 'dojoin', name: 'hc_doJoin',
uri: '/hdtool/recon/doJoin', uri: '/hdtool/happyclear/doJoin',
type: 'post', type: 'post',
dataType: 'json', dataType: 'json',
param: param, param: param,
......
egret/resource/TextureMerger/fail.tmproject 0 → 100644
View file @ 40e190cc
{"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/mainScene.tmproject deleted 100644 → 0
View file @ 9ed6946a
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"mainScene","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/default.res.json
View file @ 40e190cc
...@@ -59,6 +59,10 @@ ...@@ -59,6 +59,10 @@
{ {
"keys": "yezi1_png,unlightedStar_png,targetBoard_png,stepsBoard_png,stepNumber9_png,stepNumber8_png,stepNumber7_png,stepNumber6_png,stepNumber5_png,stepNumber4_png,stepNumber3_png,stepNumber2_png,stepNumber1_png,stepNumber0_png,stepBtn_png,starProgress_png,setting_png,scoreNumber9_png,scoreNumber8_png,scoreNumber7_png,scoreNumber6_png,scoreNumber5_png,scoreNumber4_png,scoreNumber3_png,scoreNumber2_png,scoreNumber1_png,scoreNumber0_png,rock6_png,rock5_png,rock4_png,rock3_png,rock2_png,rock1_png,rightMark_png,rightArrow_png,rectLat_png,progressDown_png,playSceneBg_png,magicLionBg_png,magicLion_png,lockUp_png,lockDown_png,lineLight_png,lightedStar_png,leftArrow_png,ice6_png,ice5_png,ice4_png,ice3_png,ice2_png,ice1_png,hammerBtn_png,eleDis9_png,eleDis8_png,eleDis7_png,eleDis6_png,eleDis5_png,eleDis4_png,eleDis3_png,eleDis2_png,eleDis12_png,eleDis11_png,eleDis10_png,eleDis1_png,ele5_png,ele42_png,ele41_png,ele40_png,ele4_png,ele32_png,ele31_png,ele30_png,ele3_png,ele22_png,ele21_png,ele20_png,ele2_png,ele12_png,ele11_png,ele10_png,ele1_png,ele02_png,ele01_png,ele00_png,ele0_png,dangqianfenshu_png,chooseRect_png,boomBtn_png,boom9_png,boom8_png,boom7_png,boom6_png,boom5_png,boom4_png,boom3_png,boom2_png,boom18_png,boom17_png,boom16_png,boom15_png,boom14_png,boom13_png,boom12_png,boom11_png,boom10_png,boom1_png,mainSoundBtnOn_png,mainSettingBg_png,mainQuestionBtn_png,mainMusicBtnOn_png,mainQuitBtn_png,mainSoundBtnOff_png,mainMusicBtnOff_png,targetNumber9_png,targetNumber8_png,targetNumber7_png,targetNumber6_png,targetNumber5_png,targetNumber4_png,targetNumber3_png,targetNumber2_png,targetNumber1_png,targetNumber0_png,ele7_png,ele6_png,bonusFra9_png,bonusFra8_png,bonusFra7_png,bonusFra6_png,bonusFra5_png,bonusFra4_png,bonusFra3_png,bonusFra27_png,bonusFra26_png,bonusFra25_png,bonusFra24_png,bonusFra23_png,bonusFra22_png,bonusFra21_png,bonusFra20_png,bonusFra2_png,bonusFra19_png,bonusFra18_png,bonusFra17_png,bonusFra16_png,bonusFra15_png,bonusFra14_png,bonusFra13_png,bonusFra12_png,bonusFra11_png,bonusFra10_png,bonusFra1_png,bonusShoot_png,guideTxt5_png,guideTxt4_png,guideTxt3_png,guideTxt2_png,guideTxt1_png,guideKnowBtn_png,guideBg_png,propNum9_png,propNum8_png,propNum7_png,propNum6_png,propNum5_png,propNum4_png,propNum3_png,propNum2_png,propNum1_png,propNum0_png,propNumBg_png", "keys": "yezi1_png,unlightedStar_png,targetBoard_png,stepsBoard_png,stepNumber9_png,stepNumber8_png,stepNumber7_png,stepNumber6_png,stepNumber5_png,stepNumber4_png,stepNumber3_png,stepNumber2_png,stepNumber1_png,stepNumber0_png,stepBtn_png,starProgress_png,setting_png,scoreNumber9_png,scoreNumber8_png,scoreNumber7_png,scoreNumber6_png,scoreNumber5_png,scoreNumber4_png,scoreNumber3_png,scoreNumber2_png,scoreNumber1_png,scoreNumber0_png,rock6_png,rock5_png,rock4_png,rock3_png,rock2_png,rock1_png,rightMark_png,rightArrow_png,rectLat_png,progressDown_png,playSceneBg_png,magicLionBg_png,magicLion_png,lockUp_png,lockDown_png,lineLight_png,lightedStar_png,leftArrow_png,ice6_png,ice5_png,ice4_png,ice3_png,ice2_png,ice1_png,hammerBtn_png,eleDis9_png,eleDis8_png,eleDis7_png,eleDis6_png,eleDis5_png,eleDis4_png,eleDis3_png,eleDis2_png,eleDis12_png,eleDis11_png,eleDis10_png,eleDis1_png,ele5_png,ele42_png,ele41_png,ele40_png,ele4_png,ele32_png,ele31_png,ele30_png,ele3_png,ele22_png,ele21_png,ele20_png,ele2_png,ele12_png,ele11_png,ele10_png,ele1_png,ele02_png,ele01_png,ele00_png,ele0_png,dangqianfenshu_png,chooseRect_png,boomBtn_png,boom9_png,boom8_png,boom7_png,boom6_png,boom5_png,boom4_png,boom3_png,boom2_png,boom18_png,boom17_png,boom16_png,boom15_png,boom14_png,boom13_png,boom12_png,boom11_png,boom10_png,boom1_png,mainSoundBtnOn_png,mainSettingBg_png,mainQuestionBtn_png,mainMusicBtnOn_png,mainQuitBtn_png,mainSoundBtnOff_png,mainMusicBtnOff_png,targetNumber9_png,targetNumber8_png,targetNumber7_png,targetNumber6_png,targetNumber5_png,targetNumber4_png,targetNumber3_png,targetNumber2_png,targetNumber1_png,targetNumber0_png,ele7_png,ele6_png,bonusFra9_png,bonusFra8_png,bonusFra7_png,bonusFra6_png,bonusFra5_png,bonusFra4_png,bonusFra3_png,bonusFra27_png,bonusFra26_png,bonusFra25_png,bonusFra24_png,bonusFra23_png,bonusFra22_png,bonusFra21_png,bonusFra20_png,bonusFra2_png,bonusFra19_png,bonusFra18_png,bonusFra17_png,bonusFra16_png,bonusFra15_png,bonusFra14_png,bonusFra13_png,bonusFra12_png,bonusFra11_png,bonusFra10_png,bonusFra1_png,bonusShoot_png,guideTxt5_png,guideTxt4_png,guideTxt3_png,guideTxt2_png,guideTxt1_png,guideKnowBtn_png,guideBg_png,propNum9_png,propNum8_png,propNum7_png,propNum6_png,propNum5_png,propNum4_png,propNum3_png,propNum2_png,propNum1_png,propNum0_png,propNumBg_png",
"name": "main" "name": "main"
},
{
"keys": "闯关失败_png,按钮 副本 9_png",
"name": "fail"
} }
], ],
"resources": [ "resources": [
......
egret/resource/default.thm.json
View file @ 40e190cc
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
"resource/skins/Buy3Skin.exml", "resource/skins/Buy3Skin.exml",
"resource/skins/FailSkin.exml", "resource/skins/FailSkin.exml",
"resource/skins/IconButtonSkin.exml", "resource/skins/IconButtonSkin.exml",
"resource/skins/MainSkin.exml",
"resource/skins/MapBottomSkin.exml", "resource/skins/MapBottomSkin.exml",
"resource/skins/MapRepeatSkin.exml", "resource/skins/MapRepeatSkin.exml",
"resource/skins/MapSkin.exml", "resource/skins/MapSkin.exml",
...@@ -31,8 +32,7 @@ ...@@ -31,8 +32,7 @@
"resource/skins/StartPanelSkin.exml", "resource/skins/StartPanelSkin.exml",
"resource/skins/StartSkin.exml", "resource/skins/StartSkin.exml",
"resource/skins/ToastSkin.exml", "resource/skins/ToastSkin.exml",
"resource/skins/VScrollBarSkin.exml", "resource/skins/VScrollBarSkin.exml"
"resource/skins/MainSkin.exml"
], ],
"path": "resource/default.thm.json" "path": "resource/default.thm.json"
} }
\ No newline at end of file
egret/src/mapScene/MapScene.ts
View file @ 40e190cc
...@@ -113,45 +113,48 @@ export default class MapScene extends Scene { ...@@ -113,45 +113,48 @@ export default class MapScene extends Scene {
} }
onTap_boxLayer() { onTap_boxLayer() {
this['boxLayer'].visible = true; const data = getHomeData();
this['boxFrame1'].visible=true; if (data.canReceiveTreasureBoxNum > 0) {
this['boxFrame2'].visible=false; this['boxLayer'].visible = true;
this['boxFrame3'].visible=false; this['boxFrame1'].visible = true;
this['boxFrame2'].visible = false;
this['boxFrame3'].visible = false;
}
} }
async playAni() { async playAni() {
this['boxFrame1'].visible=true; this['boxFrame1'].visible = true;
this['boxFrame2'].visible=false; this['boxFrame2'].visible = false;
this['boxFrame3'].visible=false; this['boxFrame3'].visible = false;
await wait(1000/10); await wait(1000 / 10);
this['boxFrame1'].visible=false; this['boxFrame1'].visible = false;
this['boxFrame2'].visible=true; this['boxFrame2'].visible = true;
this['boxFrame3'].visible=false; this['boxFrame3'].visible = false;
await wait(1000/10); await wait(1000 / 10);
this['boxFrame1'].visible=false; this['boxFrame1'].visible = false;
this['boxFrame2'].visible=false; this['boxFrame2'].visible = false;
this['boxFrame3'].visible=true; this['boxFrame3'].visible = true;
await wait(300); await wait(300);
this['boxLayer'].visible = false; this['boxLayer'].visible = false;
} }
async onTap_box() { async onTap_box() {
const data = getHomeData(); // const data = getHomeData();
if (data.canReceiveTreasureBoxNum > 0) { // if (data.canReceiveTreasureBoxNum > 0) {
await this.playAni(); this['box'].touchEnabled = false;
this['box'].touchEnabled = false; await this.playAni();
NetManager.ins.hc_openTreasureBox((success) => { NetManager.ins.hc_openTreasureBox((success) => {
this['box'].touchEnabled = true; this['box'].touchEnabled = true;
if (success) { if (success) {
const boxdata = DataManager.ins.getData('hc_openTreasureBox').data; const boxdata = DataManager.ins.getData('hc_openTreasureBox').data;
const homeData = DataManager.ins.getData('hc_home').data; const homeData = DataManager.ins.getData('hc_home').data;
homeData.canReceiveTreasureBoxNum = boxdata.canReceiveTreasureBoxNum; homeData.canReceiveTreasureBoxNum = boxdata.canReceiveTreasureBoxNum;
homeData.nextRangeStarsNum = boxdata.nextRangeStarsNum; homeData.nextRangeStarsNum = boxdata.nextRangeStarsNum;
homeData.totalStarts = boxdata.totalStarts; homeData.totalStarts = boxdata.totalStarts;
this.updateBox(); this.updateBox();
} }
}) })
} // }
} }
onTap_questionBtn() { onTap_questionBtn() {
...@@ -178,8 +181,6 @@ export default class MapScene extends Scene { ...@@ -178,8 +181,6 @@ export default class MapScene extends Scene {
setGray(order: number) { setGray(order: number) {
const d = MapScene.iconHash[order]; const d = MapScene.iconHash[order];
const colorMatrix = [ const colorMatrix = [
0.3, 0.6, 0, 0, 0, 0.3, 0.6, 0, 0, 0,
0.3, 0.6, 0, 0, 0, 0.3, 0.6, 0, 0, 0,
......
egret/src/panels/StartPanel.ts
View file @ 40e190cc
...@@ -7,6 +7,7 @@ import { Chapters } from "../something/Chapters"; ...@@ -7,6 +7,7 @@ import { Chapters } from "../something/Chapters";
import { PassType } from "../something/enum/PassType"; import { PassType } from "../something/enum/PassType";
import { getPropNums } from "../getHomeData"; import { getPropNums } from "../getHomeData";
import PropType from "../PropType"; import PropType from "../PropType";
import hdGameDoDojoin from "../../libs/new_tw/ctrls/hdGameDoDojoin";
export default class StartPanel extends Panel { export default class StartPanel extends Panel {
private _level; private _level;
...@@ -49,8 +50,13 @@ export default class StartPanel extends Panel { ...@@ -49,8 +50,13 @@ export default class StartPanel extends Panel {
onTap_startBtn() { onTap_startBtn() {
this.hidePanel(); this.hidePanel();
// console.log('level '+this._level+'game start......') this['startBtn'].enabled = false;
SceneCtrl.instance.change(ModuleTypes.MAIN_SCENE, { chapter: this._level }) hdGameDoDojoin((success) => {
this['startBtn'].enabled = true;
if (success) {
SceneCtrl.instance.change(ModuleTypes.MAIN_SCENE, { chapter: this._level });
}
})
} }
onTap_buy1btn() { onTap_buy1btn() {
PanelCtrl.instance.show('Buy1'); PanelCtrl.instance.show('Buy1');
......
mock/happyclear/home.json
View file @ 40e190cc
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"success": true, "success": true,
"code": "0000000000", "code": "0000000000",
"desc": "OK", "desc": "OK",
"timestamp": 1566457832261, "timestamp": 1566464290978,
"data": { "data": {
"wealth": 0, "wealth": 0,
"totalStars": 0, "totalStars": 0,
......
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