diff --git a/src/script/external/ald/ald-game-config.js b/src/script/external/ald/ald-game-config.js deleted file mode 100644 index 6fce2aa..0000000 --- a/src/script/external/ald/ald-game-config.js +++ /dev/null @@ -1,9 +0,0 @@ -var ALD_GAME_CONFIG = { - app_key: "", //请在此行填写从阿拉丁后台获取的appkey - getLocation: false, //默认不获取用户坐标位置 - useOpen: true, //默认不启用,是否启用openid计算,开启后必须上传openid,否则数据不会上报。 - openKey: "key_of_qy_ald_open_id" //storage中的openid对应的key, SDK提供了通过读缓存的中openid来上传openid,需要配置缓存中openid对应的key -} - -// export -export {ALD_GAME_CONFIG as default} \ No newline at end of file diff --git a/src/script/external/ald/ald-qq-game-config.js b/src/script/external/ald/ald-qq-game-config.js deleted file mode 100644 index ca18847..0000000 --- a/src/script/external/ald/ald-qq-game-config.js +++ /dev/null @@ -1,9 +0,0 @@ -var ALD_QQ_GAME_CONFIG = { - app_key: "", //请在此行填写从阿拉丁后台获取的appkey - getLocation: false, //默认不获取用户坐标位置 - useOpen: true, //默认不启用,是否启用openid计算,开启后必须上传openid,否则数据不会上报。 - openKey: "key_of_qy_ald_open_id" //storage中的openid对应的key, SDK提供了通过读缓存的中openid来上传openid,需要配置缓存中openid对应的key -} - -// export -export {ALD_QQ_GAME_CONFIG as default} \ No newline at end of file diff --git a/src/script/external/qy/qy-config.js b/src/script/external/qy/qy-config.js deleted file mode 100644 index fa88a6d..0000000 --- a/src/script/external/qy/qy-config.js +++ /dev/null @@ -1,16 +0,0 @@ -// wx -var tjconf = { - // 微信小游戏的appid - app_key: "", - getLocation: false, - company: "quyou" -}; - -// qq -if (typeof window.qq !== "undefined") { - // qq小游戏的appid - tjconf.app_key = "" -} - -// export -export {tjconf as default} \ No newline at end of file diff --git a/src/script/external/qy/qy-ov-config.js b/src/script/external/qy/qy-ov-config.js deleted file mode 100644 index 08ecb3c..0000000 --- a/src/script/external/qy/qy-ov-config.js +++ /dev/null @@ -1,15 +0,0 @@ -// oppo -var tjconf = { - // OPPO小游戏的appid - app_key: "", - company: "quyou" -}; - -// vivo -if (typeof window.qg !== "undefined" && (window.qg.getProvider().toLowerCase().indexOf("vivo") > -1)) { - // VIVO小游戏的appid - tjconf.app_key = "" -} - -// export -export {tjconf as default} \ No newline at end of file diff --git a/src/script/game/ui/popup/FullScenePopup.js b/src/script/game/ui/popup/FullScenePopup.js index 285ddfd..0eb34c0 100644 --- a/src/script/game/ui/popup/FullScenePopup.js +++ b/src/script/game/ui/popup/FullScenePopup.js @@ -63,17 +63,7 @@ export default class FullScenePopup extends BaseUI { onCloseTouched( btn ) { G_UIHelper.playBtnTouchAction(btn, () => { - if (this._advLoadMgrs.length > 0) { - let randomIndex = G_Utils.random(0, this._advLoadMgrs.length - 1) - console.log(randomIndex, this._advLoadMgrs) - let advLoadMgr = this._advLoadMgrs[randomIndex] - advLoadMgr.randomNavigate((bOpen, bSucc) => { - G_UIManager.hideUI("fullSceneAd") - }) - } - else { - G_UIManager.hideUI("fullSceneAd") - } + G_UIManager.hideUI("fullSceneAd") }) G_SoundMgr.playSound(G_SoundName.SN_CLICK) diff --git a/src/script/game/ui/popup/MoreGamePopup.js b/src/script/game/ui/popup/MoreGamePopup.js index 9572e2c..e37bc42 100644 --- a/src/script/game/ui/popup/MoreGamePopup.js +++ b/src/script/game/ui/popup/MoreGamePopup.js @@ -55,21 +55,6 @@ export default class MoreGamePopup extends BaseUI { onCloseTouched( btn ) { G_UIHelper.playBtnTouchAction(btn, function () { - let ret = G_UIManager.getUI("moreGameAd") - - if (ret) { - let cls = ret[1] - - let closeCb = null - closeCb = function () { - // body... - cls.unregisterCallback("close", closeCb) - G_UIManager.showUI("fullSceneAd") - }.bind(this) - - cls.registerCallback("close", closeCb) - } - G_UIManager.hideUI("moreGameAd") }.bind(this), 0.7) diff --git a/src/script/sdk/helper/ui_helper.js b/src/script/sdk/helper/ui_helper.js index 575e236..bbfda76 100644 --- a/src/script/sdk/helper/ui_helper.js +++ b/src/script/sdk/helper/ui_helper.js @@ -48,6 +48,11 @@ var _UIHelper = (function () { })) } }, + + playOpenPopupAction: function (popup, cb) { + // body... + this.playUIScaleAction(popup, 0.8, 1.0, 500, cb) + }, playUIScaleAction: function (ui, fromScale, endScale, duration, cb) { // body... @@ -69,6 +74,46 @@ var _UIHelper = (function () { })) } }, + + playOpenPopupAction_FromLeft: function (popup, cb) { + // body... + if (popup) { + if (popup._tween) { + popup._tween.clear() + popup._tween = null + } + + popup.x = 240 + + popup._tween = Laya.Tween.to(popup, {x: 360}, 500, Laya.Ease.elasticOut, Laya.Handler.create(null, function () { + popup._tween = null + + if (typeof cb === "function") { + cb() + } + })) + } + }, + + playOpenPopupAction_FromBottom: function (popup, cb) { + // body... + if (popup) { + if (popup._tween) { + popup._tween.clear() + popup._tween = null + } + + popup.y = Laya.stage.height / 4 + + popup._tween = Laya.Tween.to(popup, {y: Laya.stage.height - popup.height}, 500, Laya.Ease.elasticOut, Laya.Handler.create(null, function () { + popup._tween = null + + if (typeof cb === "function") { + cb() + } + })) + } + }, layoutItemsInContent: function ( content, nodeArr, gap ) { // body...