Commit d3f2c856 authored by haiyoucuv's avatar haiyoucuv

Merge remote-tracking branch 'origin/master'

parents 6c08df48 67cc4243
...@@ -11,6 +11,11 @@ build/web-mobile/remote ...@@ -11,6 +11,11 @@ build/web-mobile/remote
build/web-mobile/src build/web-mobile/src
build/web-mobile/*.js build/web-mobile/*.js
build/web-mobile/*.css build/web-mobile/*.css
build/web-mobile-001/cocos-js
build/web-mobile-001/remote
build/web-mobile-001/src
build/web-mobile-001/*.js
build/web-mobile-001/*.css
profiles/ profiles/
native native
#////////////////////////// #//////////////////////////
......
...@@ -78,7 +78,7 @@ export default class TaskCenter { ...@@ -78,7 +78,7 @@ export default class TaskCenter {
{taskCode: code, taskId: id} {taskCode: code, taskId: id}
); );
// location.href = jumpUrl; // location.href = jumpUrl;
jumpUrl && appJump(jumpUrl); (jumpUrl && jumpUrl != '/' ) && appJump(jumpUrl);
}); });
} }
} }
...@@ -99,8 +99,8 @@ export default class TaskCenter { ...@@ -99,8 +99,8 @@ export default class TaskCenter {
// appJump(ju mpUrl) // appJump(ju mpUrl)
// } // }
// location.href = jumpUrl; // location.href = jumpUrl;
console.info('jumpUrl', jumpUrl) console.info('jumpUrl', jumpUrl);
jumpUrl && appJump(jumpUrl); (jumpUrl && jumpUrl != '/' ) && appJump(jumpUrl);
}) })
} }
/** 会员等级达标任务 */ /** 会员等级达标任务 */
...@@ -108,7 +108,7 @@ export default class TaskCenter { ...@@ -108,7 +108,7 @@ export default class TaskCenter {
// 能给链接跳转 就配置正常配置jumpUrl // 能给链接跳转 就配置正常配置jumpUrl
// 不能跳转 jumpUrl配置$$$ 需要toast提示就配置buttonText // 不能跳转 jumpUrl配置$$$ 需要toast提示就配置buttonText
beforeDoComplete(item, () => { beforeDoComplete(item, () => {
jumpUrl && appJump(jumpUrl); (jumpUrl && jumpUrl != '/' ) && appJump(jumpUrl);
}); });
} }
} }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"6c48a": { "6c48a": {
"importer": "texture", "importer": "texture",
"uuid": "2ff03921-0804-417d-849d-93bf9a90c21e@6c48a", "uuid": "2ff03921-0804-417d-849d-93bf9a90c21e@6c48a",
"displayName": "bg", "displayName": "Bg",
"id": "6c48a", "id": "6c48a",
"name": "texture", "name": "texture",
"userData": { "userData": {
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
"f9941": { "f9941": {
"importer": "sprite-frame", "importer": "sprite-frame",
"uuid": "2ff03921-0804-417d-849d-93bf9a90c21e@f9941", "uuid": "2ff03921-0804-417d-849d-93bf9a90c21e@f9941",
"displayName": "bg", "displayName": "Bg",
"id": "f9941", "id": "f9941",
"name": "spriteFrame", "name": "spriteFrame",
"userData": { "userData": {
......
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>财富游园会</title>
<!--http://www.html5rocks.com/en/mobile/mobifying/-->
<meta name="viewport"
content="width=device-width,user-scalable=no,initial-scale=1,minimum-scale=1,maximum-scale=1,minimal-ui=true"/>
<!--https://developer.apple.com/library/safari/documentation/AppleApplications/Reference/SafariHTMLRef/Articles/MetaTags.html-->
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<meta name="format-detection" content="telephone=no">
<!-- force webkit on 360 -->
<meta name="renderer" content="webkit"/>
<meta name="force-rendering" content="webkit"/>
<!-- force edge on IE -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
<meta name="msapplication-tap-highlight" content="no">
<!-- force full screen on some browser -->
<meta name="full-screen" content="yes"/>
<meta name="x5-fullscreen" content="true"/>
<meta name="360-fullscreen" content="true"/>
<!--fix fireball/issues/3568 -->
<!--<meta name="browsermode" content="application">-->
<meta name="x5-page-mode" content="app">
<!--<link rel="apple-touch-icon" href=".png" />-->
<!--<link rel="apple-touch-icon-precomposed" href=".png" />-->
<script src="//yun.duiba.com.cn/h5/lib/zepto.min.js"></script>
<script src="//yun.duiba.com.cn/polaris/declare-process.edbd0793356569c4e3aa91ec7d0aebf5a7bd7364.js" crossorigin="anonymous"></script>
<script src="//yun.duiba.com.cn/polaris/SVGA.Lite.v2.1.1.d3a67cbc13c591c53c6f87ab34c57ce387010374.js" crossorigin="anonymous"></script>
<script src="//yun.duiba.com.cn/aurora/assets/2403d1edf2acd15b179306b6ddaa5f0967d78a8f.js"></script>
<link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1719491674279/style.css"/>
<style>
.sui-captcha {
visibility: hidden;
position: fixed;
z-index: 10000;
top: 0;
right: 0;
bottom: 0;
left: 0;
background-color: rgba(0, 0, 0, 0.7);
/*.neCaptcha-dialog::after {
position: absolute;
content: '加载中…';
width: 100%;
height: 30px;
top: -40px;
left: 0;
text-align: center;
line-height: 30px;
font-size: 16px;
color: #ffff00;
}*/
}
.neCaptcha-dialog {
visibility: hidden;
background-color: #fff;
box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.35);
-webkit-box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.35);
position: absolute;
left: 50%;
top: 45%;
-moz-transform: translate(-50%, -50%);
-ms-transform: translate(-50%, -50%);
-o-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
-webkit-transform: translate(-50%, -50%);
padding: 10px;
min-width: 100px;
border-radius: 10px;
width: 80%;
}
</style><script id="sparkVConsoleJS">
var script = document.createElement('script');
script.src = "//yun.duiba.com.cn/webapp/js/duiba-vconsole-1.0.0.js"
document.head.append(script);
</script></head>
<body>
<div id="GameDiv" cc_exact_fit_screen="true">
<div id="Cocos3dGameContainer">
<canvas id="GameCanvas" oncontextmenu="event.preventDefault()" tabindex="99"></canvas>
</div>
</div>
<!-- Polyfills bundle. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1719491674279/src/polyfills.bundle.js" charset="utf-8"></script>
<!-- SystemJS support. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1719491674279/src/system.bundle.js" charset="utf-8"></script>
<!-- Import map -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1719491674279/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>
<script>
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1719491674279/index.js').catch(function (err) {
console.error(err);
})
</script>
</body>
</html>
File mode changed from 100644 to 100755
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"enable": true, "enable": true,
"customSplash": { "customSplash": {
"complete": true, "complete": true,
"form": "https://creator-api.cocos.com/api/form/show?sid=441e6f8e3e7ba0c9581ed7936daee45d" "form": "https://creator-api.cocos.com/api/form/show?sid=0cabb9f83b4ae7b4476456a30932ea05"
} }
}, },
"removeSplash": { "removeSplash": {
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
"enable": true, "enable": true,
"removeSplash": { "removeSplash": {
"complete": true, "complete": true,
"form": "https://creator-api.cocos.com/api/form/show?sid=441e6f8e3e7ba0c9581ed7936daee45d" "form": "https://creator-api.cocos.com/api/form/show?sid=0cabb9f83b4ae7b4476456a30932ea05"
} }
} }
} }
......
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