Skip to content

S
super-miner
Commit 6d0063d8 authored by rockyl's avatar rockyl
Browse files
Options

Merge branch 'master' into component-lib

parents 10396fe3 9f365599
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 17 deletions
assets/scenes/main.scene
View file @ 6d0063d8
...@@ -2978,11 +2978,9 @@ ...@@ -2978,11 +2978,9 @@
"script": "components/base/Transform", "script": "components/base/Transform",
"properties": { "properties": {
"position": { "position": {
"_hashCode": 101993,
"_x": 0,
"_y": 0,
"x": 155, "x": 155,
"y": 30 "y": 25,
"_type_": "scilla/support/Vector2D"
} }
} }
}, },
...@@ -3318,7 +3316,7 @@ ...@@ -3318,7 +3316,7 @@
"properties": { "properties": {
"position": { "position": {
"x": -170, "x": -170,
"y": -155, "y": -165,
"_type_": "scilla/support/Vector2D" "_type_": "scilla/support/Vector2D"
} }
} }
......
assets/scripts/dialogs/PKMatching.ts
View file @ 6d0063d8
...@@ -41,7 +41,7 @@ export default class PKMatching extends DialogContent { ...@@ -41,7 +41,7 @@ export default class PKMatching extends DialogContent {
this.AvatarOther.enabled = false; this.AvatarOther.enabled = false;
this.AvatarWaiting.enabled = true; this.AvatarWaiting.enabled = true;
this.CloseButton.enabled = true; this.CloseButton.enabled = false;
this.stop(); this.stop();
if(channel === 1){ if(channel === 1){
...@@ -69,7 +69,7 @@ export default class PKMatching extends DialogContent { ...@@ -69,7 +69,7 @@ export default class PKMatching extends DialogContent {
this.AvatarOther.enabled = true; this.AvatarOther.enabled = true;
this.AvatarWaiting.enabled = false; this.AvatarWaiting.enabled = false;
this.CloseButton.enabled = false; //this.CloseButton.enabled = false;
setTimeout(this.hide, 1000, 'success'); setTimeout(this.hide, 1000, 'success');
} }
......
assets/scripts/dialogs/PKResult.ts
View file @ 6d0063d8
...@@ -8,6 +8,7 @@ import {Entity, utils,} from "scilla"; ...@@ -8,6 +8,7 @@ import {Entity, utils,} from "scilla";
import DialogContent from "../popup/DialogContent"; import DialogContent from "../popup/DialogContent";
import AnimLayer from "./pkresult/AnimLayer"; import AnimLayer from "./pkresult/AnimLayer";
import ResultLayer from "./pkresult/ResultLayer"; import ResultLayer from "./pkresult/ResultLayer";
import globalEvent from "globalEvent";
export default class PKResult extends DialogContent { export default class PKResult extends DialogContent {
AnimLayer: Entity; AnimLayer: Entity;
...@@ -35,7 +36,9 @@ export default class PKResult extends DialogContent { ...@@ -35,7 +36,9 @@ export default class PKResult extends DialogContent {
await this._animLayer.play(data); await this._animLayer.play(data);
await utils.waitPromise(500); await utils.waitPromise(500);
this.ResultLayer.enabled = true; this.ResultLayer.enabled = true;
this._resultLayer.play(data); await this._resultLayer.play(data);
globalEvent.emit('runCredits');
} }
onBottomButtonTap(action){ onBottomButtonTap(action){
......
index.html
View file @ 6d0063d8
...@@ -16,18 +16,36 @@ ...@@ -16,18 +16,36 @@
margin: 0; margin: 0;
border: 0; border: 0;
} }
html, body{
html, body {
height: 100%; height: 100%;
background-color: #282C34; background-color: #282C34;
} }
#floatLayer::-webkit-scrollbar {display:none}
#loading {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
display: flex;
display: -webkit-flex;
justify-content: center;
-webkit-justify-content: center;
align-items: center;
-webkit-align-items: center;
}
#floatLayer::-webkit-scrollbar {
display: none
}
</style> </style>
<!--<script src="https://cdn.bootcss.com/fetch/3.0.0/fetch.min.js"></script>--> <!--<script src="https://cdn.bootcss.com/fetch/3.0.0/fetch.min.js"></script>-->
<script src="https://cdn.bootcss.com/fetch-jsonp/1.1.3/fetch-jsonp.min.js"></script> <script src="https://cdn.bootcss.com/fetch-jsonp/1.1.3/fetch-jsonp.min.js"></script>
</head> </head>
<body> <body>
<div id="gameContainer" style="width: 100%;height: 100%;overflow: hidden;"></div> <div id="gameContainer" style="width: 100%;height: 100%;overflow: hidden;"></div>
<div id="loading" style="position:absolute;left:0;right:0;top:0;bottom:0;display:flex;justify-content:center;align-items:center;"> <div id="loading">
<img src="loading.gif"/> <img src="loading.gif"/>
</div> </div>
<script src="debug/bundle.js"></script> <script src="debug/bundle.js"></script>
...@@ -43,6 +61,7 @@ ...@@ -43,6 +61,7 @@
title: '', //活动标题 title: '', //活动标题
rule: '<p><span style="color: rgb(51, 51, 51);">活动规则活动规则活动规则活动规则活动规则活动规则活动规则活动规则活动规则</span></p><p>hello</p><p>hello</p><p>hello</p><p>hello</p><p>hello</p><p>hello</p><p>hello</p><p>hello</p><p>hello</p><p>hello</p><p>hello</p><p>hello end</p>', //规则 rule: '<p><span style="color: rgb(51, 51, 51);">活动规则活动规则活动规则活动规则活动规则活动规则活动规则活动规则活动规则</span></p><p>hello</p><p>hello</p><p>hello</p><p>hello</p><p>hello</p><p>hello</p><p>hello</p><p>hello</p><p>hello</p><p>hello</p><p>hello</p><p>hello end</p>', //规则
loginFlag: false, //是否登录 true是为登录 loginFlag: false, //是否登录 true是为登录
logined: true, //是否登录 true是为登录
earnCreditsUrl: 'http://www.baidu.com', //加积分接口 earnCreditsUrl: 'http://www.baidu.com', //加积分接口
unitName: '贝壳', //积分单位 unitName: '贝壳', //积分单位
userNickname: '超级登山包', //用户昵称 userNickname: '超级登山包', //用户昵称
...@@ -51,17 +70,19 @@ ...@@ -51,17 +70,19 @@
configJson: '{"background":"//yun.duiba.com.cn/h5/miningMachine/home-bg.jpg","pk_button_normal":"//yun.duiba.com.cn/h5/miningMachine/pk-btn.png","pk_button_disabled":"//yun.duiba.com.cn/h5/miningMachine/pk-filter-btn.png","dig_button_normal":"//yun.duiba.com.cn/h5/miningMachine/mining-btn.png","dig_button_disabled":"//yun.dui88.com/h5/miningMachine/mining-filter-btn.png","dialog_background":"//yun.duiba.com.cn/h5/miningMachine/modal-bg.png","dialog_button":"//yun.duiba.com.cn/h5/miningMachine/modal-btn.png","pk_button_label_normal":"#FFF591","pk_button_label_disabled":"#666666","dig_button_label_normal":"#D12C00","dig_button_label_disabled":"#666666","dialog_text_color":"#AB5400","dialog_button_label":"#FFF591"}' configJson: '{"background":"//yun.duiba.com.cn/h5/miningMachine/home-bg.jpg","pk_button_normal":"//yun.duiba.com.cn/h5/miningMachine/pk-btn.png","pk_button_disabled":"//yun.duiba.com.cn/h5/miningMachine/pk-filter-btn.png","dig_button_normal":"//yun.duiba.com.cn/h5/miningMachine/mining-btn.png","dig_button_disabled":"//yun.dui88.com/h5/miningMachine/mining-filter-btn.png","dialog_background":"//yun.duiba.com.cn/h5/miningMachine/modal-bg.png","dialog_button":"//yun.duiba.com.cn/h5/miningMachine/modal-btn.png","pk_button_label_normal":"#FFF591","pk_button_label_disabled":"#666666","dig_button_label_normal":"#D12C00","dig_button_label_disabled":"#666666","dialog_text_color":"#AB5400","dialog_button_label":"#FFF591"}'
}; };
function requirelogin(){ function requirelogin() {
console.log('requirelogin'); console.log('requirelogin');
} }
setTimeout(function () { setTimeout(function () {
var loadingEl = document.getElementById('loading'); var loadingEl = document.getElementById('loading');
function onProcess(p){
if(p >= 1){ function onProcess(p) {
if (p >= 1) {
loadingEl.style.display = 'none'; loadingEl.style.display = 'none';
} }
} }
var options = {};//window['inputOptions'] || var options = {};//window['inputOptions'] ||
window['super-miner'].startup(document.getElementById('gameContainer'), options, onProcess); window['super-miner'].startup(document.getElementById('gameContainer'), options, onProcess);
}, 100); }, 100);
......
manifest.json
View file @ 6d0063d8
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
"entryScene": "main" "entryScene": "main"
}, },
"webServiceUrl-": "http://10.10.93.204:7555 http://localhost:3010", "webServiceUrl-": "http://10.10.93.204:7555 http://localhost:3010",
"webServiceUrl": "" "webServiceUrl": "http://localhost:3010"
}, },
"dataCenterConfig": { "dataCenterConfig": {
"dataCenterRoot": [ "dataCenterRoot": [
......
src/main.ts
View file @ 6d0063d8
...@@ -18,7 +18,7 @@ modifyEngineConfig({ ...@@ -18,7 +18,7 @@ modifyEngineConfig({
drawRenderRect: false, drawRenderRect: false,
}); });
export async function startup(containerElement, options: any = {}, onProgress: Function) { export function startup(containerElement, options: any = {}, onProgress: Function) {
launcher = new ScillaLauncher(); launcher = new ScillaLauncher();
const config = window['configJson'] = JSON.parse(window['CFG'].configJson); const config = window['configJson'] = JSON.parse(window['CFG'].configJson);
...@@ -34,5 +34,7 @@ export async function startup(containerElement, options: any = {}, onProgress: F ...@@ -34,5 +34,7 @@ export async function startup(containerElement, options: any = {}, onProgress: F
} }
}; };
await launcher.launch(containerElement, options, onProgress); return launcher.launch(containerElement, options, onProgress).catch(e=>{
console.log(e);
});
} }
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