Skip to content

T
taobaominiDemo
Commit b11e960b authored by lujinlei's avatar lujinlei
Browse files
Options

-a

parent e0d432ee
Hide whitespace changes
Inline Side-by-side
Showing with 399 additions and 691 deletions
.tea/entryFiles-production/index$.worker.js
View file @ b11e960b
/*BUGME_START*/
const __BUGME_START__ = 1;
!function(e){var t={};function n(o){if(t[o])return t[o].exports;var r=t[o]={i:o,l:!1,exports:{}};return e[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)n.d(o,r,function(t){return e[t]}.bind(null,r));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=43)}({0:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),function(e){e.Connect="RemoteX.connect",e.Disconnect="RemoteX.disconnect",e.PageChanged="RemoteX.pageChanged",e.DataChanged="RemoteX.dataChanged",e.EvaluteScript="RemoteX.evaluteScript",e.RegisterChannel="RemoteX.registerChannel",e.PassByWorker="RemoteX.PassByWorker",e.syncStorage="RemoteX.syncStorage",e.setStorage="RemoteX.setStorage",e.removeStorage="RemoteX.removeStoarge",e.requestWillBeSent="RemoteX.requestWillBeSent",e.requestFinished="RemoteX.requestFinished",e.ExitApp="RemoteX.exitApp",e.Ping="RemoteX.ping",e.Pong="RemoteX.pong",e.PerfTrace="Perf.trace",e.NativeTrace="Perf.native",e.NetworkTrace="Perf.network",e.JsapiTrace="Perf.jsapi"}(t.RemoteXMethods||(t.RemoteXMethods={}))},1:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.getUserAgent=function(){return navigator.swuserAgent||navigator.userAgent||""},t.checkIOS=function(){return/\(i[^;]+;( U;)? CPU.+Mac OS X/.test(t.getUserAgent())};var o=self.AlipayJSBridge&&self.AlipayJSBridge.call,r=self.fetch;t.callInternalAPI=function(e,t){var n={data:{method:e,param:t},action:"internalAPI"},s=encodeURIComponent(JSON.stringify(n));r?r("https://alipay.kylinBridge/?data="+s,{mode:"no-cors"}).then((function(){})).catch((function(){})):o&&o("internalAPI",{method:e,param:t})},t.getStartupParams=function(){return self.__appxStartupParams||{}},t.getBridge=function(){return self.AFAppX.bridge},t.debug=console.log,t.waitForAppx=function(e){self.AFAppX?e():setTimeout((function(){t.waitForAppx(e)}),50)};var s=Function;t.executeScript=function(e){return new s("var res = "+e+"; return res;")()}},11:function(e,t){
/*!
Copyright (C) 2013-2017 by Andrea Giammarchi - @WebReflection
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
var n="\\x"+("0"+"~".charCodeAt(0).toString(16)).slice(-2),o="\\"+n,r=new RegExp(n,"g"),s=new RegExp(o,"g"),a=new RegExp("(?:^|([^\\\\]))"+o),i=[].indexOf||function(e){for(var t=this.length;t--&&this[t]!==e;);return t},c=String;function u(e,t,n){return t instanceof Array?function(e,t,n){for(var o=0,r=t.length;o<r;o++)t[o]=u(e,t[o],n);return t}(e,t,n):t instanceof c?t.length?n.hasOwnProperty(t)?n[t]:n[t]=function(e,t){for(var n=0,o=t.length;n<o;e=e[t[n++].replace(s,"~")]);return e}(e,t.split("~")):e:t instanceof Object?function(e,t,n){for(var o in t)t.hasOwnProperty(o)&&(t[o]=u(e,t[o],n));return t}(e,t,n):t}var l={stringify:function(e,t,s,a){return l.parser.stringify(e,function(e,t,s){var a,c,u=!1,l=!!t,d=[],f=[e],g=[e],h=[s?"~":"[Circular]"],p=e,m=1;return l&&(c="object"==typeof t?function(e,n){return""!==e&&t.indexOf(e)<0?void 0:n}:t),function(e,t){return l&&(t=c.call(this,e,t)),u?(p!==this&&(a=m-i.call(f,this)-1,m-=a,f.splice(m,f.length),d.splice(m-1,d.length),p=this),"object"==typeof t&&t?(i.call(f,t)<0&&f.push(p=t),m=f.length,(a=i.call(g,t))<0?(a=g.push(t)-1,s?(d.push((""+e).replace(r,n)),h[a]="~"+d.join("~")):h[a]=h[0]):t=h[a]):"string"==typeof t&&s&&(t=t.replace(n,o).replace("~",n))):u=!0,t}}(e,t,!a),s)},parse:function(e,t){return l.parser.parse(e,function(e){return function(t,r){var s="string"==typeof r;return s&&"~"===r.charAt(0)?new c(r.slice(1)):(""===t&&(r=u(r,r,{})),s&&(r=r.replace(a,"$1~").replace(o,n)),e?e.call(this,t,r):r)}}(t))},parser:JSON};e.exports=l},4:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var o=n(5),r=n(0),s=n(1);t.ChannelPot={_activeViewId:null,_map:{},get:function(e){return this._map[e]||null},set:function(e,t){this._map[e]=t},remove:function(e){delete this._map[e]},setActiveId:function(e){this._activeViewId=e},sendToMainChannel:function(e){o.SocketConn.send(e)},sendToActiveChannel:function(e){this.get(this._activeViewId)?this.get(this._activeViewId).postMessage(e):s.debug("[bugme] missing active channel",e,this._activeViewId)}};var a=function(){function e(e){var t=this;this._port=e,this._port.onmessage=this.onMessage,Object.defineProperty(e,"onmessage",{get:function(){return t.onMessage},set:function(){}})}return e.prototype.onMessage=function(e){if(e.data){var n=e.data,o=n.method,s=n.params;o===r.RemoteXMethods.PassByWorker&&t.ChannelPot.sendToMainChannel(s)}},e.prototype.postMessage=function(e){this._port.postMessage(e)},e}();t.ChannelHandler=a},43:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var o=n(44),r=n(47),s=n(1);s.getStartupParams().isRemoteX?s.waitForAppx(o.registerRemoteX):r.registerPreview()},44:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var o=n(4),r=n(5),s=n(1),a=n(0),i=n(45);t.registerRemoteX=function(){if(self.addEventListener&&self.navigator){s.debug("[bugme] start to register remotex"),i.listenEvents(),r.SocketConn.open(),self.addEventListener("message",(function(e){if(e&&e.data){var t=e.data;if(t.method===a.RemoteXMethods.RegisterChannel){var n=e.ports[0],r=String(t.params.viewId);o.ChannelPot.set(r,new o.ChannelHandler(n)),o.ChannelPot.setActiveId(r),o.ChannelPot.sendToMainChannel({method:a.RemoteXMethods.PageChanged})}}})),self.bugmeAPI={send:function(e){r.SocketConn.send(e)}};self.document&&self.document.dispatchEvent?self.document.dispatchEvent("bugmeInjected"):self.dispatchEvent&&self.dispatchEvent(new CustomEvent("bugmeInjected"))}}},45:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var o=n(4),r=n(0),s=n(1),a=n(5),i=n(46);function c(e){if(!e||"object"!=typeof e)return{};var t={};return Object.keys(e).forEach((function(n){t[n]=""+e[n]})),t}var u=/^https?:\/\/hpmweb\.alipay\.com/,l=function(e){u.test(e.url)||o.ChannelPot.sendToMainChannel({method:r.RemoteXMethods.requestWillBeSent,params:{reqId:e.requestId,url:e.url,method:(e.method||"GET").toUpperCase(),body:e.postBody,headers:c(e.headers)}})},d=function(e){u.test(e.url)||o.ChannelPot.sendToMainChannel({method:r.RemoteXMethods.requestFinished,params:{reqId:e.requestId,url:e.url,status:e.status,body:e.body,headers:c(e.headers)}})},f=function(e){u.test(e.url)||o.ChannelPot.sendToMainChannel({method:r.RemoteXMethods.requestFinished,params:{reqId:e.requestId,url:e.url,status:null}})},g=function(e){var t={};Object.keys(e.data).forEach((function(n){try{t[n]=JSON.parse(e.data[n]).APDataStorage}catch(e){}})),o.ChannelPot.sendToMainChannel({method:r.RemoteXMethods.syncStorage,params:{data:t}})};t.listenEvents=function(){var e=s.getBridge();e.on("pageResume",(function(){var e=self.getCurrentPages().filter((function(e){return e})),t=e[e.length-1].$viewId;o.ChannelPot.setActiveId(String(t)),o.ChannelPot.sendToMainChannel({method:r.RemoteXMethods.PageChanged})})),e.on("tinyRemoteDebugPanelButtonClick",(function(){a.SocketConn.close()})),s.checkIOS()?(e.on(i.ERiverDebugEvent.networkRequest,(function(e){var t=e.data;l(t)})),e.on(i.ERiverDebugEvent.networkResponse,(function(e){var t=e.data;d(t)})),e.on(i.ERiverDebugEvent.networkError,(function(e){var t=e.data;f(t)})),e.on(i.ERiverDebugEvent.storageChanged,(function(e){var t=e.data;g(t)}))):e.on(i.ERiverDebugEvent.debugConsole,(function(e){var t,n=e.data,o=n.type,r=n.content;try{t=JSON.parse(r)}catch(e){return}switch(o){case i.ERiverDebugEvent.networkRequest:l(t);break;case i.ERiverDebugEvent.networkResponse:d(t);break;case i.ERiverDebugEvent.networkError:f(t);break;case i.ERiverDebugEvent.storageChanged:g(t)}}))}},46:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),function(e){e.networkRequest="tinyAppRemoteDebug_network_request",e.networkResponse="tinyAppRemoteDebug_network_response",e.networkError="tinyAppRemoteDebug_network_error",e.storageChanged="tinyAppRemoteDebug_storage",e.debugConsole="onTinyDebugConsole"}(t.ERiverDebugEvent||(t.ERiverDebugEvent={}))},47:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var o=n(11),r=n(1),s=function(e,t){return void 0===t?"©undefined":null===t?"©null":t===-1/0?"©- Infinity":t===1/0?"©Infinity":"number"==typeof t&&isNaN(t)?"©NaN":"function"==typeof t?"©function":t},a=Function,i=function(e){try{if(e.fromVConsoleToWorker){var t=e.requestId;if("exec"===e.method){try{new a("requestId","sendBack","var res = "+e.script+";console.log(res);")(t,(function(e){return r.callInternalAPI("tinyDebugConsole",{type:"msgFromWorkerToVConsole",content:o.stringify({requestId:t,returnValue:e},s)})}))}catch(e){console.error(e.name+":"+e.message)}}}}catch(e){}};t.registerPreview=function(){setTimeout((function(){self.document?self.document.addEventListener("push",(function(e){try{var t=e.data.param;i(JSON.parse(t.content||t.data.content))}catch(e){}})):self.addEventListener&&self.addEventListener("push",(function(e){try{var t=JSON.parse(JSON.parse(e.data.text()).param.data.content);i(t)}catch(e){}}))}),10),["log","info","error","debug","warn"].forEach((function(e){var t="o"+e;console[t]||(console[t]=console[e],console[e]=function(){for(var n,a=[],i=0;i<arguments.length;i++)a[i]=arguments[i];console[t].apply(console,a);try{n=o.stringify(a.map((function(e){return e instanceof Error?e.name+": "+e.message:e})),s)}catch(e){return void console.error(e.name+": "+e.message)}r.callInternalAPI("tinyDebugConsole",{content:n,type:"console_"+e})})}))}},5:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var o=n(11),r=n(4),s=n(1),a=n(0),i=function(){s.getBridge().call("showRemoteDebugPanel",{status:"connecting",text:"远程调试准备中",buttonTitle:"退出"})},c=function(){s.getBridge().call("showRemoteDebugPanel",{status:"connected",text:"远程调试已连接",buttonTitle:"退出"})},u=function(){s.getBridge().call("showRemoteDebugPanel",{status:"disconnected",text:"远程调试已断开",buttonTitle:"退出"})},l=function(){r.ChannelPot.sendToActiveChannel({method:a.RemoteXMethods.ExitApp})};t.SocketConn={messageQueue:[],socketTask:null,send:function(e){var t=this,n="string"==typeof e?e:JSON.stringify(e);n.length>5242880?s.debug("[bugme] socket send failed, size: ",n.length):this.socketTask?(this.messageQueue.length&&(this.messageQueue.forEach((function(e){t.socketTask.send({data:e})})),this.messageQueue=[]),this.socketTask.send({data:n})):this.messageQueue.push(n)},close:function(){this.socketTask?this.socketTask.close():l()},connect:function(e){var t=this,n=s.getBridge(),o=n.connectSocket({url:e,multiple:!0});o.onOpen((function(){t.socketTask=o,t.onopen()})),o.onMessage((function(e){t.onmessage(e)})),o.onClose((function(){t.onclose()})),o.onError((function(){t.socketTask||(u(),n.showToast({content:"本次真机调试已结束，请重新生成调试版本",duration:2e3,success:function(){l()}}))}))},open:function(){var e=this,t=s.getStartupParams().channelId;if(t){i();var n=s.getBridge(),o="wss://openchannel.alipay.com/host/"+t;if(s.checkIOS()){this.connect(o);var r=n.connectSocket;n.connectSocket=function(e){if(e&&e.multiple)return r(e);n.showToast({content:"iOS 真机调试暂不支持 connectSocket JSAPI",duration:1e3})},n.onSocketOpen=n.offSocketOpen=n.onSocketMessage=n.offSocketMessage=function(){}}else setTimeout((function(){e.connect(o)}),1200)}else s.debug("[bugme] missing channelId in startup params")},onopen:function(){var e=s.getBridge(),t=e.getSystemInfoSync();this.send({method:a.RemoteXMethods.Connect,params:{userAgent:s.getUserAgent(),sdkVersion:e.SDKVersion,alipayVersion:t.version,model:t.model,system:t.system}}),c()},onmessage:function(e){try{var t=JSON.parse(e.data.data),n=t.method,i=t.id,c=t.params;if(n===a.RemoteXMethods.Disconnect)this.close();else if(n===a.RemoteXMethods.EvaluteScript){if(c&&c.code)try{var u=s.executeScript(c.code);this.send({returnId:i,payload:o.stringify(u)})}catch(e){s.debug("[remoteX worker evaluteScript] ",e)}}else n===a.RemoteXMethods.Ping?this.send({method:a.RemoteXMethods.Pong,params:{returnId:i}}):r.ChannelPot.sendToActiveChannel(t)}catch(t){s.debug("RemoteX onSocketMessage error",t,e)}},onclose:function(){this.socketTask=null,this.messageQueue=[],u(),s.getBridge().call("alert",{title:"调试中断",button:"退出"},(function(){l()}))}}}});
const __BUGME_END__ = 1;
/*BUGME_END*/if(!self.__appxInited) {
if(!self.__appxInited) {
self.__appxInited = 1;
......
client/pages/index/output.js
View file @ b11e960b
......@@ -1878,6 +1878,7 @@ var ResJson_1 = __webpack_require__(/*! ./ResJson */ "./src/ResJson.ts");
var TaoBaoNet_1 = __webpack_require__(/*! ./TaoBaoNet */ "./src/TaoBaoNet.ts");
var global_1 = __webpack_require__(/*! ./datas/global */ "./src/datas/global.ts");
var StartScene_1 = __webpack_require__(/*! ./scenes/StartScene */ "./src/scenes/StartScene.ts");
var AssistScene_1 = __webpack_require__(/*! ./scenes/AssistScene */ "./src/scenes/AssistScene.ts");
var sendLog_1 = __webpack_require__(/*! ./ctrls/sendLog */ "./src/ctrls/sendLog.ts");
var LogType_1 = __webpack_require__(/*! ./datas/LogType */ "./src/datas/LogType.ts");
exports.GDispatcher = new FYGE.EventDispatcher();
......@@ -1941,7 +1942,13 @@ var Main = (function () {
return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.filaStarGetActivityBaseInfoById, { activityId: global_1.getActivityId() })];
case 6:
_a.sent();
ctrls_1.changeScene(StartScene_1.StartScene);
console.log('邀请测试', global_1.getShareCode());
if (global_1.getShareCode()) {
ctrls_1.changeScene(AssistScene_1.AssistScene);
}
else {
ctrls_1.changeScene(StartScene_1.StartScene);
}
return [2];
}
});
......@@ -2852,72 +2859,27 @@ exports.ResJson = {
}
},
{
"keys": "ball_0.png,ball_1.png,ball_2.png,ball_3.png,ball_4.png,ball_5.png,ball_num_0.png,ball_num_1.png,ball_num_2.png,ball_num_3.png,ball_num_4.png,ball_num_5.png,ball_num_6.png,ball_num_7.png,ball_num_8.png,ball_num_9.png,ball_num_black_0.png,ball_num_black_1.png,ball_num_black_2.png,ball_num_black_3.png,ball_num_black_4.png,ball_num_black_5.png,ball_num_black_6.png,ball_num_black_7.png,ball_num_black_8.png,ball_num_black_9.png,ball_num_black_k.png,ball_num_k.png,bullet.png,car.png,car_particle.png,drop_bullet_0.png,drop_bullet_1.png,drop_power_0.png,drop_power_1.png,drop_power_2.png,main_bg.jpg,main_bullet.png,main_countdown.png,main_power.png,mask.png,ring.png,score_num_0.png,score_num_1.png,score_num_2.png,score_num_3.png,score_num_4.png,score_num_5.png,score_num_6.png,score_num_7.png,score_num_8.png,score_num_9.png,star.png",
"keys": "ball_0.png,ball_1.png,ball_2.png,ball_3.png,ball_4.png,ball_5.png,bullet.png,car.png,car_particle.png,drop_bullet_0.png,drop_bullet_1.png,drop_power_0.png,drop_power_1.png,drop_power_2.png,main_bg.jpg,main_bullet.png,main_power.png,mask.png,ring.png,star.png",
"name": "dxqPlayScene",
"atlas": {
"ball_0.png": {
"x": 932,
"y": 516,
"w": 254,
"h": 254,
"ox": 0,
"oy": 0,
"sw": 254,
"sh": 254,
"ro": false
},
"ball_1.png": {
"x": 932,
"y": 260,
"w": 254,
"h": 254,
"ox": 0,
"oy": 0,
"sw": 254,
"sh": 254,
"ro": false
},
"ball_2.png": {
"x": 676,
"y": 285,
"w": 254,
"h": 254,
"ox": 0,
"oy": 0,
"sw": 254,
"sh": 254,
"ro": false
},
"ball_3.png": {
"x": 514,
"y": 676,
"w": 254,
"h": 254,
"ox": 0,
"oy": 0,
"sw": 254,
"sh": 254,
"ro": false
},
"ball_4.png": {
"x": 258,
"y": 676,
"w": 254,
"h": 254,
"y": 260,
"w": 235,
"h": 226,
"ox": 0,
"oy": 0,
"sw": 254,
"sh": 254,
"sw": 235,
"sh": 226,
"ro": false
},
"ball_5.png": {
"ball_1.png": {
"x": 2,
"y": 676,
"w": 254,
"h": 254,
"w": 235,
"h": 225,
"ox": 0,
"oy": 0,
<<<<<<< HEAD
"sw": 235,
"sh": 225,
"ro": false
......@@ -2938,153 +2900,34 @@ exports.ResJson = {
"y": 715,
"w": 235,
"h": 224,
=======
"sw": 254,
"sh": 254,
"ro": false
},
"ball_num_0.png": {
"x": 786,
"y": 622,
"w": 38,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 38,
"sh": 69,
"ro": true
},
"ball_num_1.png": {
"x": 747,
"y": 183,
"w": 20,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 20,
"sh": 68,
"ro": false
},
"ball_num_2.png": {
"x": 799,
"y": 541,
"w": 39,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 69,
"ro": true
},
"ball_num_3.png": {
"x": 676,
"y": 243,
"w": 40,
"h": 69,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"ox": 0,
"oy": 0,
"sw": 40,
"sh": 69,
"ro": true
},
"ball_num_4.png": {
"x": 786,
"y": 662,
"w": 44,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 44,
"sh": 68,
"ro": true
},
"ball_num_5.png": {
"x": 875,
"y": 851,
"w": 39,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 68,
"ro": false
},
"ball_num_6.png": {
"x": 758,
"y": 541,
"w": 39,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 69,
"ro": false
},
"ball_num_7.png": {
"x": 852,
"y": 781,
"w": 39,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 68,
"sw": 235,
"sh": 224,
"ro": false
},
"ball_num_8.png": {
"ball_4.png": {
"x": 676,
"y": 157,
"w": 42,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 42,
"sh": 69,
"ro": true
},
"ball_num_9.png": {
"x": 811,
"y": 793,
"w": 39,
"h": 68,
"y": 488,
"w": 235,
"h": 225,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 68,
"sw": 235,
"sh": 225,
"ro": false
},
<<<<<<< HEAD
"ball_5.png": {
"x": 239,
"y": 676,
"w": 235,
"h": 224,
=======
"ball_num_black_0.png": {
"x": 799,
"y": 582,
"w": 38,
"h": 69,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"ox": 0,
"oy": 0,
"sw": 38,
"sh": 69,
"ro": true
},
"ball_num_black_1.png": {
"x": 747,
"y": 113,
"w": 20,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 20,
"sh": 68,
"sw": 235,
"sh": 224,
"ro": false
},
<<<<<<< HEAD
"bullet.png": {
"x": 1002,
"y": 80,
......@@ -3095,137 +2938,10 @@ exports.ResJson = {
"sw": 12,
"sh": 28,
"ro": false
=======
"ball_num_black_2.png": {
"x": 717,
"y": 541,
"w": 39,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 69,
"ro": false
},
"ball_num_black_3.png": {
"x": 676,
"y": 201,
"w": 40,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 40,
"sh": 69,
"ro": true
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
},
"ball_num_black_4.png": {
"x": 857,
"y": 650,
"w": 44,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 44,
"sh": 68,
"ro": true
},
"ball_num_black_5.png": {
"x": 770,
"y": 793,
"w": 39,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 68,
"ro": false
},
"ball_num_black_6.png": {
"x": 676,
"y": 541,
"w": 39,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 69,
"ro": false
},
"ball_num_black_7.png": {
"x": 770,
"y": 752,
"w": 39,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 68,
"ro": true
},
"ball_num_black_8.png": {
"x": 676,
"y": 113,
"w": 42,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 42,
"sh": 69,
"ro": true
},
"ball_num_black_9.png": {
"x": 840,
"y": 740,
"w": 39,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 68,
"ro": true
},
"ball_num_black_k.png": {
"x": 770,
"y": 708,
"w": 42,
"h": 68,
"ox": 8,
"oy": 0,
"sw": 50,
"sh": 68,
"ro": true
},
"ball_num_k.png": {
"x": 856,
"y": 696,
"w": 42,
"h": 68,
"ox": 8,
"oy": 0,
"sw": 50,
"sh": 68,
"ro": true
},
"bullet.png": {
"x": 754,
"y": 39,
"w": 11,
"h": 43,
"ox": 0,
"oy": 0,
"sw": 11,
"sh": 43,
"ro": false
},
"car.png": {
<<<<<<< HEAD
"x": 476,
"y": 676,
=======
"x": 1042,
"y": 134,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 124,
"h": 125,
"ox": 0,
......@@ -3235,119 +2951,74 @@ exports.ResJson = {
"ro": true
},
"car_particle.png": {
<<<<<<< HEAD
"x": 948,
"y": 188,
=======
"x": 676,
"y": 2,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 87,
"h": 35,
"ox": 0,
"oy": 0,
"sw": 87,
"sh": 35,
"ro": false
"ro": true
},
"drop_bullet_0.png": {
<<<<<<< HEAD
"x": 913,
"y": 260,
"w": 25,
"h": 26,
=======
"x": 916,
"y": 889,
"w": 30,
"h": 30,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"ox": 0,
"oy": 0,
"sw": 30,
"sh": 30,
"ro": false
"sw": 25,
"sh": 26,
"ro": true
},
"drop_bullet_1.png": {
<<<<<<< HEAD
"x": 985,
"y": 188,
"w": 25,
"h": 27,
=======
"x": 916,
"y": 889,
"w": 30,
"h": 30,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"ox": 0,
"oy": 0,
"sw": 30,
"sh": 30,
"ro": false
"sw": 25,
"sh": 27,
"ro": true
},
"drop_power_0.png": {
<<<<<<< HEAD
"x": 985,
"y": 215,
"w": 26,
"h": 26,
=======
"x": 947,
"y": 802,
"w": 28,
"h": 27,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"ox": 0,
"oy": 0,
"sw": 28,
"sh": 27,
"ro": true
"sw": 26,
"sh": 26,
"ro": false
},
"drop_power_1.png": {
<<<<<<< HEAD
"x": 985,
"y": 270,
"w": 25,
"h": 26,
=======
"x": 947,
"y": 772,
"w": 28,
"h": 27,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"ox": 0,
"oy": 0,
"sw": 28,
"sh": 27,
"sw": 25,
"sh": 26,
"ro": true
},
"drop_power_2.png": {
<<<<<<< HEAD
"x": 985,
"y": 243,
"w": 25,
"h": 26,
=======
"x": 948,
"y": 889,
"w": 28,
"h": 27,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"ox": 0,
"oy": 0,
"sw": 28,
"sh": 27,
"sw": 25,
"sh": 26,
"ro": true
},
"main_bullet.png": {
<<<<<<< HEAD
"x": 948,
"y": 134,
=======
"x": 916,
"y": 835,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 52,
"h": 52,
"ox": 0,
......@@ -3356,25 +3027,9 @@ exports.ResJson = {
"sh": 52,
"ro": false
},
"main_countdown.png": {
"x": 1042,
"y": 2,
"w": 139,
"h": 130,
"ox": 0,
"oy": 0,
"sw": 139,
"sh": 130,
"ro": false
},
"main_power.png": {
<<<<<<< HEAD
"x": 948,
"y": 80,
=======
"x": 893,
"y": 781,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 52,
"h": 52,
"ox": 0,
......@@ -3384,7 +3039,7 @@ exports.ResJson = {
"ro": false
},
"mask.png": {
"x": 770,
"x": 676,
"y": 2,
"w": 270,
"h": 256,
......@@ -3405,131 +3060,16 @@ exports.ResJson = {
"sh": 672,
"ro": false
},
"score_num_0.png": {
"x": 870,
"y": 576,
"w": 33,
"h": 59,
"ox": 0,
"oy": 0,
"sw": 33,
"sh": 59,
"ro": true
},
"score_num_1.png": {
"x": 1169,
"y": 134,
"w": 17,
"h": 58,
"ox": 0,
"oy": 0,
"sw": 17,
"sh": 58,
"ro": false
},
"score_num_2.png": {
"x": 870,
"y": 541,
"w": 33,
"h": 59,
"ox": 0,
"oy": 0,
"sw": 33,
"sh": 59,
"ro": true
},
"score_num_3.png": {
"x": 750,
"y": 612,
"w": 34,
"h": 59,
"ox": 0,
"oy": 0,
"sw": 34,
"sh": 59,
"ro": false
},
"score_num_4.png": {
"x": 870,
"y": 611,
"w": 37,
"h": 58,
"ox": 0,
"oy": 0,
"sw": 37,
"sh": 58,
"ro": true
},
"score_num_5.png": {
"x": 840,
"y": 863,
"w": 33,
"h": 58,
"ox": 0,
"oy": 0,
"sw": 33,
"sh": 58,
"ro": false
},
"score_num_6.png": {
"x": 714,
"y": 612,
"w": 34,
"h": 59,
"ox": 0,
"oy": 0,
"sw": 34,
"sh": 59,
"ro": false
},
"score_num_7.png": {
"x": 805,
"y": 863,
"w": 33,
"h": 58,
"ox": 0,
"oy": 0,
"sw": 33,
"sh": 58,
"ro": false
},
"score_num_8.png": {
"x": 676,
"y": 612,
"w": 36,
"h": 59,
"ox": 0,
"oy": 0,
"sw": 36,
"sh": 59,
"ro": false
},
"score_num_9.png": {
"x": 770,
"y": 863,
"w": 33,
"h": 58,
"ox": 0,
"oy": 0,
"sw": 33,
"sh": 58,
"ro": false
},
"star.png": {
<<<<<<< HEAD
"x": 948,
"y": 2,
=======
"x": 676,
"y": 39,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 76,
"h": 72,
"ox": 0,
"oy": 0,
"sw": 76,
"sh": 72,
"ro": false
"ro": true
}
}
},
......@@ -3788,13 +3328,8 @@ exports.ResJson = {
"ro": false
},
"rank_placeholder.png": {
<<<<<<< HEAD
"x": 624,
"y": 2,
=======
"x": 2,
"y": 624,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 120,
"h": 119,
"ox": 0,
......@@ -3810,13 +3345,8 @@ exports.ResJson = {
"name": "recordScene",
"atlas": {
"addressBtn.png": {
<<<<<<< HEAD
"x": 445,
"y": 204,
=======
"x": 126,
"y": 940,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 200,
"h": 60,
"ox": 0,
......@@ -3826,61 +3356,41 @@ exports.ResJson = {
"ro": true
},
"againGetBtn.png": {
<<<<<<< HEAD
"x": 243,
"y": 188,
=======
"x": 64,
"y": 940,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 200,
"h": 60,
"ox": 0,
"oy": 0,
"sw": 200,
"sh": 60,
"ro": true
"ro": false
},
"awaitGetBtn.png": {
<<<<<<< HEAD
"x": 243,
"y": 250,
=======
"x": 188,
"y": 940,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 174,
"h": 60,
"ox": 0,
"oy": 0,
"sw": 174,
"sh": 60,
"ro": true
"ro": false
},
"failBtn.png": {
<<<<<<< HEAD
"x": 243,
"y": 126,
=======
"x": 2,
"y": 940,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 200,
"h": 60,
"ox": 0,
"oy": 0,
"sw": 200,
"sh": 60,
"ro": true
"ro": false
},
"getBtn.png": {
<<<<<<< HEAD
"x": 243,
"y": 64,
=======
"x": 2,
"y": 878,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 200,
"h": 60,
"ox": 0,
......@@ -3890,29 +3400,19 @@ exports.ResJson = {
"ro": false
},
"invalidBtn.png": {
<<<<<<< HEAD
"x": 445,
"y": 2,
=======
"x": 2,
"y": 816,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 200,
"h": 60,
"ox": 0,
"oy": 0,
"sw": 200,
"sh": 60,
"ro": false
"ro": true
},
"prizePanelBack.png": {
<<<<<<< HEAD
"x": 243,
"y": 312,
=======
"x": 204,
"y": 754,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 35,
"h": 35,
"ox": 0,
......@@ -3922,8 +3422,8 @@ exports.ResJson = {
"ro": false
},
"receivedBtn.png": {
"x": 2,
"y": 754,
"x": 243,
"y": 2,
"w": 200,
"h": 60,
"ox": 0,
......@@ -3933,11 +3433,7 @@ exports.ResJson = {
"ro": false
},
"recordSceneLine.png": {
<<<<<<< HEAD
"x": 507,
=======
"x": 243,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"y": 2,
"w": 688,
"h": 1,
......@@ -3993,30 +3489,18 @@ exports.ResJson = {
"name": "startScene",
"atlas": {
"drawBtn.png": {
<<<<<<< HEAD
"x": 2,
"y": 279,
=======
"x": 85,
"y": 146,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 165,
"h": 142,
"ox": 0,
"oy": 0,
"sw": 165,
"sh": 142,
<<<<<<< HEAD
"ro": true
},
"drawBtn2.png": {
"x": 284,
=======
"ro": false
},
"drawBtn2.png": {
"x": 85,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"y": 2,
"w": 165,
"h": 142,
......@@ -4027,13 +3511,8 @@ exports.ResJson = {
"ro": false
},
"music_Close.png": {
<<<<<<< HEAD
"x": 451,
"y": 61,
=======
"x": 156,
"y": 349,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 57,
"h": 57,
"ox": 0,
......@@ -4043,13 +3522,8 @@ exports.ResJson = {
"ro": false
},
"music_Open.png": {
<<<<<<< HEAD
"x": 451,
"y": 2,
=======
"x": 156,
"y": 290,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 57,
"h": 57,
"ox": 0,
......@@ -4059,29 +3533,30 @@ exports.ResJson = {
"ro": false
},
"newbieBtn.png": {
<<<<<<< HEAD
"x": 146,
"y": 187,
=======
"x": 152,
"y": 424,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 96,
"h": 132,
"ox": 0,
"oy": 0,
"sw": 96,
"sh": 132,
"ro": false
"ro": true
},
"rankBtn.png": {
"x": 146,
"y": 85,
"w": 100,
"h": 132,
"ox": 0,
"oy": 0,
"sw": 100,
"sh": 132,
"ro": true
},
"recordBtn.png": {
<<<<<<< HEAD
"x": 280,
"y": 146,
=======
"x": 100,
"y": 424,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 157,
"h": 50,
"ox": 0,
......@@ -4091,13 +3566,8 @@ exports.ResJson = {
"ro": false
},
"ruleBtn.png": {
<<<<<<< HEAD
"x": 451,
"y": 120,
=======
"x": 2,
"y": 284,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 157,
"h": 50,
"ox": 0,
......@@ -4115,15 +3585,11 @@ exports.ResJson = {
"oy": 0,
"sw": 280,
"sh": 81,
"ro": true
"ro": false
},
"task_Btn.png": {
"x": 2,
<<<<<<< HEAD
"y": 85,
=======
"y": 443,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 96,
"h": 132,
"ox": 0,
......@@ -4172,13 +3638,8 @@ exports.ResJson = {
"ro": true
},
"follow.png": {
<<<<<<< HEAD
"x": 868,
"y": 126,
=======
"x": 530,
"y": 868,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 38,
"h": 38,
"ox": 0,
......@@ -4199,13 +3660,8 @@ exports.ResJson = {
"ro": false
},
"member.png": {
<<<<<<< HEAD
"x": 868,
"y": 166,
=======
"x": 570,
"y": 868,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 38,
"h": 37,
"ox": 0,
......@@ -4390,11 +3846,7 @@ exports.ResJson = {
}
}
],
<<<<<<< HEAD
"path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593331345/resource/"
=======
"path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593395168/resource/"
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593481084/resource/"
};
......@@ -4976,6 +4428,75 @@ exports.default = (function () { return __awaiter(_this, void 0, void 0, functio
}); });
/***/ }),
/***/ "./src/ctrls/doHelp.ts":
/*!*****************************!*\
!*** ./src/ctrls/doHelp.ts ***!
\*****************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __generator = (this && this.__generator) || function (thisArg, body) {
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
function verb(n) { return function (v) { return step([n, v]); }; }
function step(op) {
if (f) throw new TypeError("Generator is already executing.");
while (_) try {
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
if (y = 0, t) op = [op[0] & 2, t.value];
switch (op[0]) {
case 0: case 1: t = op; break;
case 4: _.label++; return { value: op[1], done: false };
case 5: _.label++; y = op[1]; op = [0]; continue;
case 7: op = _.ops.pop(); _.trys.pop(); continue;
default:
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
if (t[2]) _.ops.pop();
_.trys.pop(); continue;
}
op = body.call(thisArg, _);
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
}
};
var _this = this;
Object.defineProperty(exports, "__esModule", { value: true });
var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts");
var global_1 = __webpack_require__(/*! ../datas/global */ "./src/datas/global.ts");
exports.default = (function () { return __awaiter(_this, void 0, void 0, function () {
var params;
return __generator(this, function (_a) {
switch (_a.label) {
case 0:
global_1.getAppData().data.shareCode = "1abc";
if (!global_1.getShareCode())
return [2];
params = {
inviteId: global_1.getShareCode(),
activityId: global_1.getActivityId()
};
return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.filaStarDoHelp, params)];
case 1: return [2, _a.sent()];
}
});
}); });
/***/ }),
/***/ "./src/ctrls/doRecord.ts":
......@@ -6141,19 +5662,19 @@ var __extends = (this && this.__extends) || (function () {
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts");
var Pool_1 = __webpack_require__(/*! ../Component/Pool */ "./src/Component/Pool.ts");
var GUtils_1 = __webpack_require__(/*! ../Global/GUtils */ "./src/Global/GUtils.ts");
var MoveObject_1 = __webpack_require__(/*! ./MoveObject */ "./src/game/MoveObject.ts");
var MConfigs_1 = __webpack_require__(/*! ../Global/MConfigs */ "./src/Global/MConfigs.ts");
var GUtils_1 = __webpack_require__(/*! ../Global/GUtils */ "./src/Global/GUtils.ts");
var Pool_1 = __webpack_require__(/*! ../Component/Pool */ "./src/Component/Pool.ts");
var MConst_1 = __webpack_require__(/*! ../Global/MConst */ "./src/Global/MConst.ts");
var MTimer_1 = __webpack_require__(/*! ../Global/MTimer */ "./src/Global/MTimer.ts");
var MUtils_1 = __webpack_require__(/*! ../Global/MUtils */ "./src/Global/MUtils.ts");
var DataMgr_1 = __webpack_require__(/*! ../Mgr/DataMgr */ "./src/Mgr/DataMgr.ts");
var MTimer_1 = __webpack_require__(/*! ../Global/MTimer */ "./src/Global/MTimer.ts");
var Collider_1 = __webpack_require__(/*! ./Collider */ "./src/game/Collider.ts");
var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts");
var GuideMgr_1 = __webpack_require__(/*! ../Mgr/GuideMgr */ "./src/Mgr/GuideMgr.ts");
var SoundMgr_1 = __webpack_require__(/*! ../Mgr/SoundMgr */ "./src/Mgr/SoundMgr.ts");
var TextureMgr_1 = __webpack_require__(/*! ../Mgr/TextureMgr */ "./src/Mgr/TextureMgr.ts");
var Collider_1 = __webpack_require__(/*! ./Collider */ "./src/game/Collider.ts");
var MoveObject_1 = __webpack_require__(/*! ./MoveObject */ "./src/game/MoveObject.ts");
var tempPower = null;
var tempIndexOffset = null;
var imageNames = [
......@@ -6175,8 +5696,7 @@ var Ball = (function (_super) {
_this.colorIndex = 0;
_this.sizeIndex = 0;
_this.bitmap = null;
_this.labelScorewhite = null;
_this.labelScoreBlack = null;
_this.labelScore = null;
_this.scaleRatio = 1;
_this.initScore = null;
_this.initColorIndex = 0;
......@@ -6200,30 +5720,18 @@ var Ball = (function (_super) {
_this.anchorY = bitmapHeight / 2;
_this.bitmap.x = -bitmapWidth / 2;
_this.bitmap.y = -bitmapHeight / 2;
var textures = {};
for (var i = 0; i < 10; i++)
textures[i] = RES_1.RES.getRes("ball_num_" + i + ".png");
textures['k'] = RES_1.RES.getRes("ball_num_k.png");
var labelScore2 = new FYGE.BitmapText(textures);
labelScore2.textAlign = FYGE.TEXT_ALIGN.LEFT;
labelScore2.scaleX = labelScore2.scaleY = scaleRatio;
_this.addChild(labelScore2);
var textures2 = {};
for (var i = 0; i < 10; i++)
textures2[i] = RES_1.RES.getRes("ball_num_black_" + i + ".png");
textures2['k'] = RES_1.RES.getRes("ball_num_black_k.png");
var labelScore3 = new FYGE.BitmapText(textures2);
labelScore3.textAlign = FYGE.TEXT_ALIGN.LEFT;
labelScore3.scaleX = labelScore3.scaleY = scaleRatio;
_this.addChild(labelScore3);
var labelScore = new FYGE.TextField();
labelScore.size = 60;
labelScore.scaleX = labelScore.scaleY = scaleRatio;
labelScore.verticalAlign = FYGE.VERTICAL_ALIGN.MIDDLE;
_this.addChild(labelScore);
var collider = _this.addComponent(Collider_1.CircleCollider);
collider.group = Collider_1.ColliderGroup.Ball;
_this.collider = collider;
collider.setData(0, 0, bitmapHeight / 2);
_this.scaleRatio = scaleRatio;
_this.sizeIndex = sizeIndex;
_this.labelScorewhite = labelScore2;
_this.labelScoreBlack = labelScore3;
_this.labelScore = labelScore;
return _this;
}
Object.defineProperty(Ball.prototype, "score", {
......@@ -6261,14 +5769,6 @@ var Ball = (function (_super) {
this.colorIndex = colorIndex;
this.initColorIndex = colorIndex;
this.bitmap.texture = RES_1.RES.getRes(imageNames[colorIndex]);
this.labelScorewhite.visible = false;
this.labelScoreBlack.visible = false;
if (colorIndex == 0) {
this.labelScoreBlack.visible = true;
}
else {
this.labelScorewhite.visible = true;
}
this.initScore = score;
this.score = score;
this.physics.rotateVelocity = direction * MConst_1.MConst.BallRotateSpeed * Math.pow(1 / this.scaleRatio, 0.5);
......@@ -6367,22 +5867,17 @@ var Ball = (function (_super) {
};
Ball.prototype.updateScoreLabel = function () {
if (this.scoreUpdateFlag == true) {
var labelScore21white_1 = this.labelScorewhite;
var labelScoreBlack_1 = this.labelScoreBlack;
var labelScore_1 = this.labelScore;
var score = this.score;
if (score >= 1000) {
labelScore21white_1.text = (Math.floor(score / 100) / 10).toString() + "k";
labelScoreBlack_1.text = (Math.floor(score / 100) / 10).toString() + "k";
labelScore_1.text = (Math.floor(score / 100) / 10).toString() + "k";
}
else {
labelScore21white_1.text = score.toString();
labelScoreBlack_1.text = score.toString();
labelScore_1.text = score.toString();
}
setTimeout(function () {
labelScoreBlack_1.x = -labelScore21white_1.width / 2;
labelScoreBlack_1.y = -labelScore21white_1.height / 2;
labelScore21white_1.x = -labelScore21white_1.width / 2;
labelScore21white_1.y = -labelScore21white_1.height / 2;
labelScore_1.x = -labelScore_1.width / 2;
labelScore_1.y = -labelScore_1.height / 2;
});
this.scoreUpdateFlag = false;
if (this.score <= 0) {
......@@ -7252,13 +6747,9 @@ var DxqPlayScene = (function (_super) {
_this.powerScoreLabel = Tools_1.Tool.getText("0%", 30, "#ffffff", FYGE.TEXT_ALIGN.LEFT, 500);
_this.powerScoreLabel.x = 370;
_this.powerScoreLabel.y = powerIcon.height / 2 - 10;
var textures = {};
for (var i = 0; i < 10; i++)
textures[i] = RES_1.RES.getRes("score_num_" + i + ".png");
var labelScore2 = new FYGE.BitmapText(textures);
labelScore2.textAlign = FYGE.TEXT_ALIGN.LEFT;
labelScore2.y = 100;
_this.totalScoreLabel = labelScore2;
_this.totalScoreLabel = Tools_1.Tool.getText("0%", 75, "#ffffff", FYGE.TEXT_ALIGN.CENTER, 500);
_this.totalScoreLabel.x = 125;
_this.totalScoreLabel.y = 100;
_this.timeLabel = Tools_1.Tool.getText("00:00", 30, "#ffffff", FYGE.TEXT_ALIGN.RIGHT, 300);
_this.timeLabel.x = layers_1.layers.stageOffsetX + layers_1.layers.stageWidth - 400;
_this.timeLabel.y = 50;
......@@ -7658,7 +7149,9 @@ var DxqPlayScene = (function (_super) {
this.createBall();
}
}
this.outputEvent();
if (!this.pause) {
this.outputEvent();
}
if (this.timing) {
if (this.timer > 0) {
if (MTimer_1.default.deltaTime > 0) {
......@@ -9236,6 +8729,7 @@ var TaskPanel = (function (_super) {
_a = _b.sent(), success = _a.success, message = _a.message, data = _a.data;
if (success) {
ctrls_1.showToast("任务完成，游戏次数+1");
FYGE.GDispatcher.dispatchEvent('completeTaskUpdate');
}
else {
ctrls_1.showToast(message || "网络异常，请重试");
......@@ -10281,6 +9775,231 @@ var TaskItem = (function (_super) {
exports.TaskItem = TaskItem;
/***/ }),
/***/ "./src/scenes/AssistScene.ts":
/*!***********************************!*\
!*** ./src/scenes/AssistScene.ts ***!
\***********************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
return function (d, b) {
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __generator = (this && this.__generator) || function (thisArg, body) {
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
function verb(n) { return function (v) { return step([n, v]); }; }
function step(op) {
if (f) throw new TypeError("Generator is already executing.");
while (_) try {
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
if (y = 0, t) op = [op[0] & 2, t.value];
switch (op[0]) {
case 0: case 1: t = op; break;
case 4: _.label++; return { value: op[1], done: false };
case 5: _.label++; y = op[1]; op = [0]; continue;
case 7: op = _.ops.pop(); _.trys.pop(); continue;
default:
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
if (t[2]) _.ops.pop();
_.trys.pop(); continue;
}
op = body.call(thisArg, _);
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
}
};
Object.defineProperty(exports, "__esModule", { value: true });
var toastCtrl_1 = __webpack_require__(/*! ./../../module/ctrls/toastCtrl */ "./module/ctrls/toastCtrl.ts");
var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/views/Scene.ts");
var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts");
var layers_1 = __webpack_require__(/*! ../../module/views/layers */ "./module/views/layers.ts");
var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts");
var doHelp_1 = __webpack_require__(/*! ../ctrls/doHelp */ "./src/ctrls/doHelp.ts");
var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts");
var Main_1 = __webpack_require__(/*! ../Main */ "./src/Main.ts");
var global_1 = __webpack_require__(/*! ../datas/global */ "./src/datas/global.ts");
var doRecord_1 = __webpack_require__(/*! ../ctrls/doRecord */ "./src/ctrls/doRecord.ts");
var sendLog_1 = __webpack_require__(/*! ../ctrls/sendLog */ "./src/ctrls/sendLog.ts");
var LogType_1 = __webpack_require__(/*! ../datas/LogType */ "./src/datas/LogType.ts");
var getVipInfo_1 = __webpack_require__(/*! ../ctrls/getVipInfo */ "./src/ctrls/getVipInfo.ts");
var getCaixukunTime_1 = __webpack_require__(/*! ../ctrls/getCaixukunTime */ "./src/ctrls/getCaixukunTime.ts");
var AssistScene = (function (_super) {
__extends(AssistScene, _super);
function AssistScene() {
return _super.call(this) || this;
}
Object.defineProperty(AssistScene.prototype, "groupNames", {
get: function () { return ["assistScene", "common"]; },
enumerable: true,
configurable: true
});
AssistScene.prototype.initUi = function () {
var _this = this;
sendLog_1.default(LogType_1.default.sharePageVisit);
this.y = -(1624 - layers_1.layers.stageHeight) / 2;
var assistBG = new FYGE.Sprite(RES_1.RES.getRes("assistBG.jpg"));
assistBG.x = 0;
assistBG.y = 0;
this.addChild(assistBG);
var hintTxt = Tools_1.Tool.getText("", 40, "#ffffff");
hintTxt.text = "\u52A9\u6211\u8D62" + getCaixukunTime_1.getCaixukunName() + "\u4EB2\u7B14\u7B7E\u540D";
hintTxt.position.set((750 - hintTxt.textWidth) / 2, 610);
this.addChild(hintTxt);
var assistBtn = this._assistBtn = new FYGE.Sprite(RES_1.RES.getRes("assistBtn.png"));
assistBtn.anchorTexture.set(0.5, 0.5);
assistBtn.position.set(750 / 2, 1050);
this.addChild(assistBtn);
assistBtn.addEventListener(FYGE.MouseEvent.CLICK, this.assistClick, this);
var goPlayBtn = this._goPlayBtn = new FYGE.Sprite(RES_1.RES.getRes("goPlayBtn.png"));
goPlayBtn.anchorTexture.set(0.5, 0.5);
goPlayBtn.position.set(750 / 2, 1050);
goPlayBtn.visible = false;
goPlayBtn.addEventListener(FYGE.MouseEvent.CLICK, function () { return __awaiter(_this, void 0, void 0, function () {
return __generator(this, function (_a) {
switch (_a.label) {
case 0: return [4, doRecord_1.default("winAwards")];
case 1:
_a.sent();
console.log('跳转活动界面');
return [2];
}
});
}); }, this);
this.addChild(goPlayBtn);
};
AssistScene.prototype.assistClick = function () {
return __awaiter(this, void 0, void 0, function () {
var _a, success, data, code, message;
return __generator(this, function (_b) {
switch (_b.label) {
case 0:
if (global_1.getBeforeStartTime()) {
return [2, toastCtrl_1.showToast('活动未开始')];
}
if (global_1.getAfterEndTime()) {
return [2, toastCtrl_1.showToast('活动已结束')];
}
sendLog_1.default(LogType_1.default.clickAssistBtn);
return [4, doRecord_1.default('help')];
case 1:
_b.sent();
return [4, doHelp_1.default()];
case 2:
_a = _b.sent(), success = _a.success, data = _a.data, code = _a.code, message = _a.message;
if (success) {
this.assistSuccessShow();
}
else {
if (code == "930004") {
this.needJoin(data.url);
}
else if (code == "930005") {
console.log('邀请码', global_1.getShareCode());
toastCtrl_1.showToast('邀请码无效');
}
else if (code == "930003") {
this.assistFailShow();
}
else {
toastCtrl_1.showToast(message);
}
}
return [2];
}
});
});
};
AssistScene.prototype.needJoin = function (vipUrl) {
var _this = this;
if (this._joinVIPNode) {
this._joinVIPNode.visible = true;
return;
}
this._joinVIPNode = new FYGE.Container();
this._joinVIPNode.visible = true;
this.addChild(this._joinVIPNode);
var comCloseBtn = new FYGE.Sprite(RES_1.RES.getRes("comCloseBtn.png"));
comCloseBtn.anchorTexture.set(0.5, 0.5);
comCloseBtn.position.set(650, 500);
this._joinVIPNode.addChild(comCloseBtn);
comCloseBtn.addEventListener(FYGE.MouseEvent.CLICK, function () {
_this._joinVIPNode.visible = false;
}, this);
var memberBG = new FYGE.Sprite(RES_1.RES.getRes("memberBG.png"));
memberBG.position.set((750 - memberBG.width) / 2, 540);
this._joinVIPNode.addChild(memberBG);
var joinMemberBtn = new FYGE.Sprite(RES_1.RES.getRes("joinMemberBtn.png"));
joinMemberBtn.position.set((memberBG.width - joinMemberBtn.width) / 2, 300);
joinMemberBtn.addEventListener(FYGE.MouseEvent.CLICK, function () {
console.log('加入会员');
Main_1.GDispatcher.addEventListener('onShow', _this.onShow, _this);
_this._joinVIPNode.visible = false;
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateToOutside, { url: vipUrl });
}, this);
memberBG.addChild(joinMemberBtn);
};
AssistScene.prototype.onShow = function () {
return __awaiter(this, void 0, void 0, function () {
var _a, success, code, isVip;
return __generator(this, function (_b) {
switch (_b.label) {
case 0: return [4, getVipInfo_1.default()];
case 1:
_a = _b.sent(), success = _a.success, code = _a.code, isVip = _a.data.isVip;
if (isVip) {
this.assistClick();
}
return [2];
}
});
});
};
AssistScene.prototype.assistSuccessShow = function () {
toastCtrl_1.showToast("助力成功");
sendLog_1.default(LogType_1.default.assisSuccess);
this._goPlayBtn.visible = true;
this._assistBtn.visible = false;
var assistSuccess = new FYGE.Sprite(RES_1.RES.getRes("assistSuccess.png"));
assistSuccess.anchorTexture.set(0.5, 0.5);
assistSuccess.position.set(750 / 2, 800);
this.addChild(assistSuccess);
};
AssistScene.prototype.assistFailShow = function () {
this._goPlayBtn.visible = true;
this._assistBtn.visible = false;
var assistFail = new FYGE.Sprite(RES_1.RES.getRes("assistFail.png"));
assistFail.anchorTexture.set(0.5, 0.5);
assistFail.position.set(750 / 2, 820);
this.addChild(assistFail);
};
return AssistScene;
}(Scene_1.Scene));
exports.AssistScene = AssistScene;
/***/ }),
/***/ "./src/scenes/RecordScene.ts":
......@@ -10993,6 +10712,20 @@ var StartScene = (function (_super) {
});
});
};
StartScene.prototype.completeTaskUpdateGame = function () {
return __awaiter(this, void 0, void 0, function () {
var result;
return __generator(this, function (_a) {
switch (_a.label) {
case 0: return [4, getGameInfo_1.default()];
case 1:
result = _a.sent();
this.updateGameInfo(result);
return [2];
}
});
});
};
StartScene.prototype.updateGameInfo = function (result) {
var gameTimes = result.data.gameTimes;
this.times.text = gameTimes + "\u6B21";
......@@ -11000,6 +10733,7 @@ var StartScene = (function (_super) {
};
StartScene.prototype.initEvents = function () {
FYGE.GDispatcher.addEventListener("signPrizeMoving", this.signPrizeMoving, this);
FYGE.GDispatcher.addEventListener('completeTaskUpdate', this.completeTaskUpdateGame, this);
};
StartScene.prototype.signPrizeMoving = function (args) {
var propType = args.data;
......@@ -11011,6 +10745,7 @@ var StartScene = (function (_super) {
};
StartScene.prototype.removeEvents = function () {
FYGE.GDispatcher.removeEventListener("signPrizeMoving", this.signPrizeMoving, this);
FYGE.GDispatcher.removeEventListener('completeTaskUpdate', this.completeTaskUpdateGame, this);
};
StartScene.prototype.testMove = function () {
var image = new FYGE.Sprite(RES_1.RES.getRes("silverDraft.png"));
......
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