Commit 5a602f15 authored by lujinlei's avatar lujinlei

-a

parent 5a6a01de
...@@ -81,10 +81,10 @@ ...@@ -81,10 +81,10 @@
'question_4':5 'question_4':5
}; };
var questionTitle={ var questionTitle={
'question_1':'真假O粉大考验', 'question_1':'春节习俗大考验',
'question_2':'游戏玩家大比拼', 'question_2':'Reno3知识大比拼',
'question_3':'电影达人小测试', 'question_3':'生活小百科',
'question_4':'舌尖上的答题' 'question_4':'歌曲点唱机'
} }
//可以获取的积分 //可以获取的积分
var getCredits={ var getCredits={
......
{ {
"type": "activity", "type": "activity",
"name": "oppoAnswer" "name": "oppoAnswer2.1"
} }
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"alert","version":5,"files":["../assets/alert/Bitmap-4.png","../assets/alert/Bitmap-2.png","../assets/alert/Bitmap-1.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"alert","version":5,"files":["..\\assets\\alert\\Bitmap-4.png","..\\assets\\alert\\Bitmap-2.png","..\\assets\\alert\\Bitmap-1.png"]}
\ No newline at end of file \ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/closeBtn.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["..\\assets\\common\\closeBtn.png"]}
\ No newline at end of file \ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"gameOver_panel","version":5,"files":["../assets/gameOver_panel/overGoAppBtn.png","../assets/gameOver_panel/icon.png","../assets/gameOver_panel/flower.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"gameOver_panel","version":5,"files":["..\\assets\\gameOver_panel\\overGoAppBtn.png","..\\assets\\gameOver_panel\\icon.png","..\\assets\\gameOver_panel\\flower.png"]}
\ No newline at end of file \ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"game_scene","version":5,"files":["../assets/game_scene/wrong.png","../assets/game_scene/errorBg.png","../assets/game_scene/correctBg.png","../assets/game_scene/checkMark.png","../assets/game_scene/answerNormalBg.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"game_scene","version":5,"files":["..\\assets\\game_scene\\wrong.png","..\\assets\\game_scene\\errorBg.png","..\\assets\\game_scene\\correctBg.png","..\\assets\\game_scene\\checkMark.png","..\\assets\\game_scene\\answerNormalBg.png"]}
\ No newline at end of file \ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"loading","version":5,"files":["../assets/loading/bg.png","../assets/loading/progress.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"loading","version":5,"files":["..\\assets\\loading\\bg.png","..\\assets\\loading\\progress.png"]}
\ No newline at end of file \ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"msg_panel","version":5,"files":["../assets/msg_panel/msgBg.png","../assets/msg_panel/gotoAppBtn.png","../assets/msg_panel/msgCloseBtn.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"msg_panel","version":5,"files":["..\\assets\\msg_panel\\msgBg.png","..\\assets\\msg_panel\\gotoAppBtn.png","..\\assets\\msg_panel\\msgCloseBtn.png"]}
\ No newline at end of file \ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["../assets/rule_panel/ruleCloseBtn.png","../assets/msg_panel/msgBg.png","../assets/start_scene/ruleBtn.png","../assets/start_scene/startBtn.png","../assets/start_scene/hand1.png","../assets/start_scene/hand2.png","../assets/game_scene/answerNormalBg.png","../assets/game_scene/checkMark.png","../assets/game_scene/correctBg.png","../assets/game_scene/errorBg.png","../assets/game_scene/wrong.png","../assets/gameOver_panel/flower.png","../assets/gameOver_panel/icon.png","../assets/gameOver_panel/overGoAppBtn.png","../assets/msg_panel/gotoAppBtn.png","../assets/common/closeBtn.png","../assets/msg_panel/msgCloseBtn.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["..\\assets\\rule_panel\\ruleCloseBtn.png","..\\assets\\msg_panel\\msgBg.png","..\\assets\\start_scene\\ruleBtn.png","..\\assets\\start_scene\\startBtn.png","..\\assets\\start_scene\\hand1.png","..\\assets\\start_scene\\hand2.png","..\\assets\\game_scene\\answerNormalBg.png","..\\assets\\game_scene\\checkMark.png","..\\assets\\game_scene\\correctBg.png","..\\assets\\game_scene\\errorBg.png","..\\assets\\game_scene\\wrong.png","..\\assets\\gameOver_panel\\flower.png","..\\assets\\gameOver_panel\\icon.png","..\\assets\\gameOver_panel\\overGoAppBtn.png","..\\assets\\msg_panel\\gotoAppBtn.png","..\\assets\\common\\closeBtn.png","..\\assets\\msg_panel\\msgCloseBtn.png"]}
\ No newline at end of file \ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"rule_panel","version":5,"files":["../assets/rule_panel/ruleCloseBtn.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"rule_panel","version":5,"files":["..\\assets\\rule_panel\\ruleCloseBtn.png"]}
\ No newline at end of file \ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"start_scene","version":5,"files":["../assets/start_scene/startBtn.png","../assets/start_scene/ruleBtn.png","../assets/start_scene/hand2.png","../assets/start_scene/hand1.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"start_scene","version":5,"files":["..\\assets\\start_scene\\startBtn.png","..\\assets\\start_scene\\ruleBtn.png","..\\assets\\start_scene\\hand2.png","..\\assets\\start_scene\\hand1.png"]}
\ No newline at end of file \ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"timedown_panel","version":5,"files":["../assets/timedown_scene/downBg.png","../assets/timedown_scene/moneyIcon.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"timedown_panel","version":5,"files":["..\\assets\\timedown_scene\\downBg.png","..\\assets\\timedown_scene\\moneyIcon.png"]}
\ No newline at end of file \ No newline at end of file
{ {
"groups":[ "groups": [
{ {
"keys":"bg_png,progress_png", "keys": "bg_png,progress_png",
"name":"loading" "name": "loading"
}, },
{ {
"keys":"Bitmap-4_png,Bitmap-2_png,Bitmap-1_png", "keys": "Bitmap-4_png,Bitmap-2_png,Bitmap-1_png",
"name":"alert" "name": "alert"
}, },
{ {
"keys":"ruleBg_jpg,ruleCloseBtn_png,msgBg_png,ruleBtn_png,startBtn_png,titleBg_jpg,downBg_jpg,hand1_png,hand2_png,answerNormalBg_png,checkMark_png,correctBg_png,errorBg_png,gameBg_jpg,questionBg_jpg,wrong_png,flower_png,icon_png,overGoAppBtn_png,gotoAppBtn_png,question_1_jpg,question_2_jpg,closeBtn_png,msgCloseBtn_png,question_3_jpg,question_4_jpg", "keys": "ruleBg_jpg,ruleCloseBtn_png,msgBg_png,ruleBtn_png,startBtn_png,titleBg_jpg,downBg_jpg,hand1_png,hand2_png,answerNormalBg_png,checkMark_png,correctBg_png,errorBg_png,gameBg_jpg,questionBg_jpg,wrong_png,flower_png,icon_png,overGoAppBtn_png,gotoAppBtn_png,closeBtn_png,msgCloseBtn_png,question_4_jpg,question_3_jpg,question_1_jpg,question_2_jpg",
"name":"preload" "name": "preload"
}, },
{ {
"keys":"ruleCloseBtn_png,ruleBg_jpg", "keys": "ruleCloseBtn_png,ruleBg_jpg",
"name":"rule_panel" "name": "rule_panel"
}, },
{ {
"keys":"titleBg_jpg,startBtn_png,ruleBtn_png,hand2_png,hand1_png,downBg_jpg,question_2_jpg,question_1_jpg,question_4_jpg,question_3_jpg", "keys": "titleBg_jpg,startBtn_png,ruleBtn_png,hand2_png,hand1_png,downBg_jpg,question_4_jpg,question_3_jpg",
"name":"start_scene" "name": "start_scene"
}, },
{ {
"keys":"popupBg_jpg,overGoAppBtn_png,icon_png,flower_png", "keys": "popupBg_jpg,overGoAppBtn_png,icon_png,flower_png",
"name":"gameOver_panel" "name": "gameOver_panel"
}, },
{ {
"keys":"msgBg_png,gotoAppBtn_png,msgCloseBtn_png", "keys": "msgBg_png,gotoAppBtn_png,msgCloseBtn_png",
"name":"msg_panel" "name": "msg_panel"
}, },
{ {
"keys":"wrong_png,questionBg_jpg,gameBg_jpg,errorBg_png,correctBg_png,checkMark_png,answerNormalBg_png", "keys": "wrong_png,questionBg_jpg,gameBg_jpg,errorBg_png,correctBg_png,checkMark_png,answerNormalBg_png",
"name":"game_scene" "name": "game_scene"
}, },
{ {
"keys":"closeBtn_png", "keys": "closeBtn_png",
"name":"common" "name": "common"
}, },
{ {
"keys":"OPPOSans_S_R_0621_ttf,OPPOSans_J_H_0621_ttf", "keys": "OPPOSans_S_R_0621_ttf,OPPOSans_J_H_0621_ttf",
"name":"font" "name": "font"
}, },
{ {
"keys":"downBg_png,moneyIcon_png,timedownBg_jpg", "keys": "downBg_png,moneyIcon_png,timedownBg_jpg",
"name":"timedown_panel" "name": "timedown_panel"
} }
], ],
"resources":[ "resources": [
{ {
"name":"Bitmap-1_png", "url": "assets/alert/Bitmap-1.png",
"type":"image", "type": "image",
"url":"assets/alert/Bitmap-1.png" "name": "Bitmap-1_png"
}, },
{ {
"name":"Bitmap-2_png", "url": "assets/alert/Bitmap-2.png",
"type":"image", "type": "image",
"url":"assets/alert/Bitmap-2.png" "name": "Bitmap-2_png"
}, },
{ {
"name":"Bitmap-4_png", "url": "assets/alert/Bitmap-4.png",
"type":"image", "type": "image",
"url":"assets/alert/Bitmap-4.png" "name": "Bitmap-4_png"
}, },
{ {
"name":"bg_png", "url": "assets/loading/bg.png",
"type":"image", "type": "image",
"url":"assets/loading/bg.png" "name": "bg_png"
}, },
{ {
"name":"progress_png", "url": "assets/loading/progress.png",
"type":"image", "type": "image",
"url":"assets/loading/progress.png" "name": "progress_png"
}, },
{ {
"name":"ruleBg_jpg", "url": "assets/rule_panel/ruleBg.jpg",
"type":"image", "type": "image",
"url":"assets/rule_panel/ruleBg.jpg" "name": "ruleBg_jpg"
}, },
{ {
"name":"ruleCloseBtn_png", "url": "assets/rule_panel/ruleCloseBtn.png",
"type":"image", "type": "image",
"url":"assets/rule_panel/ruleCloseBtn.png" "name": "ruleCloseBtn_png"
}, },
{ {
"name":"msgBg_png", "url": "assets/msg_panel/msgBg.png",
"type":"image", "type": "image",
"url":"assets/msg_panel/msgBg.png" "name": "msgBg_png"
}, },
{ {
"name":"ruleBtn_png", "url": "assets/start_scene/ruleBtn.png",
"type":"image", "type": "image",
"url":"assets/start_scene/ruleBtn.png" "name": "ruleBtn_png"
}, },
{ {
"name":"startBtn_png", "url": "assets/start_scene/startBtn.png",
"type":"image", "type": "image",
"url":"assets/start_scene/startBtn.png" "name": "startBtn_png"
}, },
{ {
"name":"titleBg_jpg", "url": "assets/start_scene/titleBg.jpg",
"type":"image", "type": "image",
"url":"assets/start_scene/titleBg.jpg" "name": "titleBg_jpg"
}, },
{ {
"name":"downBg_jpg", "url": "assets/start_scene/downBg.jpg",
"type":"image", "type": "image",
"url":"assets/start_scene/downBg.jpg" "name": "downBg_jpg"
}, },
{ {
"name":"hand1_png", "url": "assets/start_scene/hand1.png",
"type":"image", "type": "image",
"url":"assets/start_scene/hand1.png" "name": "hand1_png"
}, },
{ {
"name":"hand2_png", "url": "assets/start_scene/hand2.png",
"type":"image", "type": "image",
"url":"assets/start_scene/hand2.png" "name": "hand2_png"
}, },
{ {
"name":"answerNormalBg_png", "url": "assets/game_scene/answerNormalBg.png",
"type":"image", "type": "image",
"url":"assets/game_scene/answerNormalBg.png" "name": "answerNormalBg_png"
}, },
{ {
"name":"checkMark_png", "url": "assets/game_scene/checkMark.png",
"type":"image", "type": "image",
"url":"assets/game_scene/checkMark.png" "name": "checkMark_png"
}, },
{ {
"name":"correctBg_png", "url": "assets/game_scene/correctBg.png",
"type":"image", "type": "image",
"url":"assets/game_scene/correctBg.png" "name": "correctBg_png"
}, },
{ {
"name":"errorBg_png", "url": "assets/game_scene/errorBg.png",
"type":"image", "type": "image",
"url":"assets/game_scene/errorBg.png" "name": "errorBg_png"
}, },
{ {
"name":"gameBg_jpg", "url": "assets/game_scene/gameBg.jpg",
"type":"image", "type": "image",
"url":"assets/game_scene/gameBg.jpg" "name": "gameBg_jpg"
}, },
{ {
"name":"questionBg_jpg", "url": "assets/game_scene/questionBg.jpg",
"type":"image", "type": "image",
"url":"assets/game_scene/questionBg.jpg" "name": "questionBg_jpg"
}, },
{ {
"name":"wrong_png", "url": "assets/game_scene/wrong.png",
"type":"image", "type": "image",
"url":"assets/game_scene/wrong.png" "name": "wrong_png"
}, },
{ {
"name":"flower_png", "url": "assets/gameOver_panel/flower.png",
"type":"image", "type": "image",
"url":"assets/gameOver_panel/flower.png" "name": "flower_png"
}, },
{ {
"name":"icon_png", "url": "assets/gameOver_panel/icon.png",
"type":"image", "type": "image",
"url":"assets/gameOver_panel/icon.png" "name": "icon_png"
}, },
{ {
"name":"overGoAppBtn_png", "url": "assets/gameOver_panel/overGoAppBtn.png",
"type":"image", "type": "image",
"url":"assets/gameOver_panel/overGoAppBtn.png" "name": "overGoAppBtn_png"
}, },
{ {
"name":"popupBg_jpg", "url": "assets/gameOver_panel/popupBg.jpg",
"type":"image", "type": "image",
"url":"assets/gameOver_panel/popupBg.jpg" "name": "popupBg_jpg"
}, },
{ {
"name":"gotoAppBtn_png", "url": "assets/msg_panel/gotoAppBtn.png",
"type":"image", "type": "image",
"url":"assets/msg_panel/gotoAppBtn.png" "name": "gotoAppBtn_png"
}, },
{ {
"name":"question_1_jpg", "url": "assets/common/closeBtn.png",
"type":"image", "type": "image",
"url":"assets/start_scene/question_1.jpg" "name": "closeBtn_png"
}, },
{ {
"name":"question_2_jpg", "url": "assets/msg_panel/msgCloseBtn.png",
"type":"image", "type": "image",
"url":"assets/start_scene/question_2.jpg" "name": "msgCloseBtn_png"
}, },
{ {
"name":"closeBtn_png", "url": "assets/font/OPPOSans_J_H_0621.ttf",
"type":"image", "type": "bin",
"url":"assets/common/closeBtn.png" "name": "OPPOSans_J_H_0621_ttf"
}, },
{ {
"name":"msgCloseBtn_png", "url": "assets/font/OPPOSans_S_R_0621.ttf",
"type":"image", "type": "bin",
"url":"assets/msg_panel/msgCloseBtn.png" "name": "OPPOSans_S_R_0621_ttf"
}, },
{ {
"name":"OPPOSans_J_H_0621_ttf", "url": "assets/timedown_scene/downBg.png",
"type":"bin", "type": "image",
"url":"assets/font/OPPOSans_J_H_0621.ttf" "name": "downBg_png"
}, },
{ {
"name":"OPPOSans_S_R_0621_ttf", "url": "assets/timedown_scene/moneyIcon.png",
"type":"bin", "type": "image",
"url":"assets/font/OPPOSans_S_R_0621.ttf" "name": "moneyIcon_png"
}, },
{ {
"name":"question_3_jpg", "url": "assets/timedown_scene/timedownBg.jpg",
"type":"image", "type": "image",
"url":"assets/start_scene/question_3.jpg" "name": "timedownBg_jpg"
}, },
{ {
"name":"question_4_jpg", "url": "assets/start_scene/question_4.jpg",
"type":"image", "type": "image",
"url":"assets/start_scene/question_4.jpg" "name": "question_4_jpg"
}, },
{ {
"name":"downBg_png", "url": "assets/start_scene/question_3.jpg",
"type":"image", "type": "image",
"url":"assets/timedown_scene/downBg.png" "name": "question_3_jpg"
}, },
{ {
"name":"moneyIcon_png", "name": "question_1_jpg",
"type":"image", "type": "image",
"url":"assets/timedown_scene/moneyIcon.png" "url": "assets/start_scene/question_1.jpg"
}, },
{ {
"name":"timedownBg_jpg", "name": "question_2_jpg",
"type":"image", "type": "image",
"url":"assets/timedown_scene/timedownBg.jpg" "url": "assets/start_scene/question_2.jpg"
} }
] ]
} }
\ No newline at end of file
...@@ -80,12 +80,10 @@ class Main extends eui.UILayer { ...@@ -80,12 +80,10 @@ class Main extends eui.UILayer {
PanelCtrl.instance.registerPanelClass(ModuleTypes.MSG_PANEL, MsgPanel); PanelCtrl.instance.registerPanelClass(ModuleTypes.MSG_PANEL, MsgPanel);
PanelCtrl.instance.registerPanelClass(ModuleTypes.TIMEDOWN_PANEL, TimeDownPanel); PanelCtrl.instance.registerPanelClass(ModuleTypes.TIMEDOWN_PANEL, TimeDownPanel);
PanelCtrl.instance.registerPanelClass(ModuleTypes.RULE_PANEL, RulePanel); PanelCtrl.instance.registerPanelClass(ModuleTypes.RULE_PANEL, RulePanel);
//PanelCtrl.instance.registerPanelClass(ModuleTypes.PRIZE_PANEL, PrizePanel);
PanelCtrl.instance.registerPanelClass(ModuleTypes.TOAST_PANEL, ToastPanel); PanelCtrl.instance.registerPanelClass(ModuleTypes.TOAST_PANEL, ToastPanel);
PanelCtrl.instance.registerPanelClass(ModuleTypes.GAMEOVER_PANEL, GameOverPanel); PanelCtrl.instance.registerPanelClass(ModuleTypes.GAMEOVER_PANEL, GameOverPanel);
//PanelCtrl.instance.registerPanelClass(ModuleTypes.SHARE_PANEL, SharePanel);
this.initHistoryHash(); //this.initHistoryHash();
GDispatcher.addEvent('hashchange', this.initHistoryHash, this) GDispatcher.addEvent('hashchange', this.initHistoryHash, this)
this.runGame().catch(e => { this.runGame().catch(e => {
...@@ -94,12 +92,7 @@ class Main extends eui.UILayer { ...@@ -94,12 +92,7 @@ class Main extends eui.UILayer {
} }
private initHistoryHash(){ private initHistoryHash(){
if (!window.location.hash) { if (!window.location.hash) {
window.history.pushState({ page: 1 }, '', "#/mine/rechargel"); window.history.pushState({ page: 1 }, '', "#/mine/rechargel");
// var state = {
// title: "title",
// url: "#"
// }
// window.history.pushState(state, "title", "#");
} }
this.initListener(); this.initListener();
} }
......
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