部分更新

Willis-Zhou · Apr 7, 2020 · f5c98f8 · f5c98f8
1 parent b3a61cc
commit f5c98f8
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 75 deletions.
diff --git a/src/script/external/ald/ald-game-config.js b/src/script/external/ald/ald-game-config.js
diff --git a/src/script/external/ald/ald-qq-game-config.js b/src/script/external/ald/ald-qq-game-config.js
diff --git a/src/script/external/qy/qy-config.js b/src/script/external/qy/qy-config.js
diff --git a/src/script/external/qy/qy-ov-config.js b/src/script/external/qy/qy-ov-config.js
diff --git 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
@@ -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
@@ -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...