Skip to content

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

Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev

parents 7752b716 ea4bf58a
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 6 deletions
egret/libs/new_wx/MainBase.ts
View file @ b0b2a6ab
......@@ -44,7 +44,7 @@ export default class MainBase extends eui.UILayer {
protected registerModules() {
const panels = [
[ModuleTypes.ALERT_PANEL, { cls: Alert }],
[ModuleTypes.RULE_PANEL, { cls: RulePanel }],
[ModuleTypes.PRIZE_PANEL, { cls: PrizePanel }],
[ModuleTypes.NO_PRIZE_PANEL, { cls: NoPrizePanel }],
......@@ -57,14 +57,14 @@ export default class MainBase extends eui.UILayer {
['Buy3', { cls: Buy3Panel }],
['failed', { cls: FailedPanel }],
['quit', { cls: QuitPanel }],
['box', { cls:BoxPanel }],
['box', { cls: BoxPanel }],
];
const scenes = [
[ModuleTypes.START_SCENE, { cls: StartScene }],
[ModuleTypes.MAP_SCENE, { cls: MapScene }],
[ModuleTypes.PLAY_SCENE, { cls: PlayScene }],
[ModuleTypes. MAIN_SCENE,{ cls: MainScene }]
[ModuleTypes.MAIN_SCENE, { cls: MainScene }]
];
panels.forEach(item => PanelCtrl.instance.registerPanel(item[0], item[1]));
......@@ -126,6 +126,53 @@ export default class MainBase extends eui.UILayer {
if (!window['development'])
RES.getResAsync(`common_json`);
else {
for (var i = 1; i < 19; i++) {
RES.getResAsync("boom" + i + "_png")
}
for (var i = 0; i < 5; i++) {
RES.getResAsync("ele" + i + "_png")
for (var j = 0; j < 3; j++) {
RES.getResAsync("ele" + i + j + "_png")
}
}
for (var i = 1; i <= 12; i++) {
RES.getResAsync("eleDis" + i + "_png")
}
for (var i = 1; i <= 6; i++) {
RES.getResAsync("ice" + i + "_png")
}
for (var i = 1; i <= 6; i++) {
RES.getResAsync("ice" + i + "_png")
}
for (var i = 1; i <= 6; i++) {
RES.getResAsync("rock" + i + "_png")
}
for (var i = 0; i <= 9; i++) {
RES.getResAsync("scoreNumber" + i + "_png")
}
for (var i = 0; i <= 9; i++) {
RES.getResAsync("stepNumber" + i + "_png")
}
var arr = [
"ele5",
"iceEle",
"leftArrow",
"chooseRect",
"lightedStar",
"lineLight",
"lockDown",
"lockUp",
"magicLion",
"magicLionBg",
"rectLat",
"rightArrow",
"rightMark",
"unlightedStar"
]
for(var i=0;i<arr.length;i++){
RES.getResAsync(arr[i]+"_png")
}
}
this.createGameScene();
......@@ -162,7 +209,7 @@ export default class MainBase extends eui.UILayer {
NetManager.ins.ajaxElement(async () => {
Buried.init();
SceneCtrl.instance.change(ModuleTypes.START_SCENE,this.svgaList);
SceneCtrl.instance.change(ModuleTypes.START_SCENE, this.svgaList);
})
}
......
egret/resource/default.res.json
View file @ b0b2a6ab
......@@ -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,iceEle_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",
"name": "mainScene"
},
{
"name": "preload",
"keys": "eliminate_mp3,fail_mp3,fall_mp3,line_mp3,sucess_mp3,mapBg_mp3,toast_mp3,playBg_mp3,magic_mp3,boom_mp3"
}
],
"resources": [
......@@ -1026,6 +1030,56 @@
"url": "assets/mainScene/yezi1.png",
"type": "image",
"name": "yezi1_png"
},
{
"name": "eliminate_mp3",
"type": "sound",
"url": "assets/sounds/eliminate.mp3"
},
{
"name": "fail_mp3",
"type": "sound",
"url": "assets/sounds/fail.mp3"
},
{
"name": "fall_mp3",
"type": "sound",
"url": "assets/sounds/fall.mp3"
},
{
"name": "line_mp3",
"type": "sound",
"url": "assets/sounds/line.mp3"
},
{
"name": "sucess_mp3",
"type": "sound",
"url": "assets/sounds/sucess.mp3"
},
{
"name": "mapBg_mp3",
"type": "sound",
"url": "assets/sounds/mapBg.mp3"
},
{
"name": "toast_mp3",
"type": "sound",
"url": "assets/sounds/toast.mp3"
},
{
"name": "playBg_mp3",
"type": "sound",
"url": "assets/sounds/playBg.mp3"
},
{
"name": "magic_mp3",
"type": "sound",
"url": "assets/sounds/magic.mp3"
},
{
"name": "boom_mp3",
"type": "sound",
"url": "assets/sounds/boom.mp3"
}
]
}
\ No newline at end of file
egret/resource/default.thm.json
View file @ b0b2a6ab
......@@ -28,7 +28,9 @@
"resource/skins/StarSkin.exml",
"resource/skins/StartPanelSkin.exml",
"resource/skins/StartSkin.exml",
"resource/skins/VScrollBarSkin.exml"
"resource/skins/VScrollBarSkin.exml",
"resource/skins/MainSkin.exml",
"resource/skins/IconButtonSkin.exml"
],
"path": "resource/default.thm.json"
}
\ No newline at end of file
egret/resource/skins/mainSkin.exml
View file @ b0b2a6ab
......@@ -10,7 +10,8 @@
<e:Image x="162.5" y="74.85" source="yezi1_png"/>
<e:Image x="54" y="28.85" source="stepsBoard_png"/>
<e:Image x="226.5" y="88.85" source="dangqianfenshu_png"/>
<e:Button id="settingBtn" label="" anchorOffsetX="44.5" anchorOffsetY="43.5" verticalCenter="-716.5" icon="setting_png" skinName="ui.IconButtonSkin" x="682.5"/>
<e:Button id="settingBtn" label="" anchorOffsetX="44.5" anchorOffsetY="43.5" verticalCenter="-716.5" icon="setting_png" x="682.5" skinName="ui.IconButtonSkin">
</e:Button>
<e:Label id="scoreTxt" touchEnabled="false" size="20" width="194.85" anchorOffsetY="0" height="36" textAlign="left" bold="true" anchorOffsetX="0" verticalAlign="middle" fontFamily="Microsoft YaHei" text="XXXX" y="81.85" textColor="0x00556a" x="320.85"/>
<e:Label touchEnabled="false" size="20" width="101.85" anchorOffsetY="0" height="36" textAlign="left" anchorOffsetX="0" verticalAlign="middle" fontFamily="Microsoft YaHei" text="当前分数：" y="63.85" textColor="0x00556A" x="765"/>
<e:Label touchEnabled="false" size="19" width="115.18" anchorOffsetY="0" height="36" textAlign="center" anchorOffsetX="0" verticalAlign="middle" fontFamily="Microsoft YaHei" text="剩余步数" y="53.48" x="66.35" textColor="0xffffff"/>
......
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