萨满消消乐OK

assets/Script/Common/Tools.ts

@@ -16,6 +16,13 @@ import AudioMgr from "./manage/AudioMgr";
 
 export default class Tools {
 
+       
+    public onLoad(): void {
+        console.log('zh:tools.ts  onLoad')
+
+    }
+
+
     public static subStr(str, n) {
         let r = /[^\x00-\xff]/g;
         if (str.replace(r, "mm").length <= n) {
@@ -259,6 +266,7 @@ export default class Tools {
      *  播放视频， resolve 返回 true 为获得奖励， false 为未获得奖励
      */
     public static handleVideo() {
+        console.log('zh:tools.ts handleVideo   resolve 返回 true 为获得奖励， false 为未获得奖励 ')
         return new Promise((resolve, reject) => {
             if (!Global.isVivo) {
                 resolve(true);

assets/Script/Common/manage/PanelMgr.ts

@@ -128,6 +128,7 @@ export default class PanelMgr extends cc.Component {
 
         node.getComponent(LayerPanel).unscheduleAllCallbacks() //取消所有定时器
         if (panel.getUrl().name == "endView") { //如果是endView的化 ，需要同步数据
+            console.log('zh:close endView ，需要同步数据')
             CacheMgr.updateData();
         }
 

assets/Script/Moudle/View/EndView.ts

@@ -182,10 +182,12 @@ export default class EndView extends LayerPanel {
     }
 
     handle_continue() {
+        console.log('zh: hammer 继续游戏')
         PanelMgr.INS.openPanel({
             panel : GameView,
             layer : Layer.gameLayer,
             call : ()=>{
+                console.log('zh:call handle_continue')
                 PanelMgr.INS.closePanel(EndView) ;
             }
         })

assets/Script/Moudle/View/GameInfoView.ts

@@ -59,6 +59,7 @@ export default class GameInfoView extends LayerPanel {
     }
 
     initUI(): void {
+        console.log('zh:gameInfoView initUI')
         GameInfoView.gameInfoViewIns = this;
         this.gold_num = CacheMgr.gold;
         this.diamond_num = CacheMgr.diamond;

assets/Script/Moudle/View/GameView.ts

@@ -1,4 +1,4 @@
-import LayerPanel, {UrlInfo} from "../../Common/manage/Layer/LayerPanel";
+import LayerPanel, { UrlInfo } from "../../Common/manage/Layer/LayerPanel";
 import Tools from "../../Common/Tools";
 import EndView from "./EndView";
 import Text from "./logic/common/text";
@@ -8,7 +8,7 @@ import CacheMgr from "../../Common/manage/CacheMgr";
 import AudioMgr from "../../Common/manage/AudioMgr";
 import LoadMgr from "../../Common/manage/LoadMgr";
 import Constant from "../../Common/Constant";
-import PanelMgr, {Layer} from "../../Common/manage/PanelMgr";
+import PanelMgr, { Layer } from "../../Common/manage/PanelMgr";
 import tween = cc.tween;
 import ShowConfig from "../../Common/ShowConfig";
 import Global from "../../Common/Global";
@@ -16,7 +16,17 @@ import QgBanner from "../../Common/manage/Api/QgBanner";
 import Emit from "../../Common/manage/Emit/Emit";
 import EmitData from "../../Common/manage/Emit/EmitData";
 
-const {ccclass, property} = cc._decorator;
+
+
+import AESUtil from "../../AESUtil"
+import ATSDK from "../../AnyThinkAds/ATJSSDK";
+import ATRewardedVideoSDK from "../../AnyThinkAds/ATRewardedVideoJSSDK";
+import AAJS2 from "../../ATAndroidJS2";
+import GlobalManager from '../../GlobalManager';
+
+
+
+const { ccclass, property } = cc._decorator;
 
 @ccclass
 export default class GameView extends LayerPanel {
@@ -95,7 +105,7 @@ export default class GameView extends LayerPanel {
     private _lineDatas: lineData[] = [null]
     private _hintData: lineData = null
     private blockPool: cc.NodePool = null
-    private nextBlockInfo: nextBlockInfo [] = []
+    private nextBlockInfo: nextBlockInfo[] = []
     private touchEndFlag: boolean = false
     private hardLevel: number = 1
     private score: number = 0
@@ -269,7 +279,7 @@ export default class GameView extends LayerPanel {
 
     public show(param: any) {
         //todo 逻辑
-
+        console.log('zh:GameView  show')
         ShowConfig.show('gameConfig').then((res) => {
             if (Global.config.gameConfig.bannerShow == 1) {
                 QgBanner.showBanner();
@@ -279,10 +289,189 @@ export default class GameView extends LayerPanel {
         });
     }
 
+    public onLoad(): void {
+        console.log('zh:gameView.ts onload')
+        this.initAd();
+        this.initAdForPage();
+
+        // for (let i = 0; i < 5; i++) {
+        //     // let th = this;
+        //     setTimeout(() => {
+        //         console.log('zh:gameView.ts 测试测试=' + i)
+        //         // th.node.emit('env_playAdEnd', 'Hello,开发发放shop道具吧'); 
+        //         GlobalManager.instance.callMethod('env_playAdEnd');
+        //     }, 5000);
+        // }
+
+    }
+
+
+    initAd() {
+        let adKey = "zh_ad_type"
+        cc.sys.localStorage.setItem(adKey, "");
+
+        if (cc.sys.os != cc.sys.OS_ANDROID) {
+            return;
+        }
+
+        let placementId = AAJS2.getPlacementId();
+        let deviceId = AAJS2.getDeviceUserId();
+        var setting = {};
+        setting[ATRewardedVideoSDK.userIdKey] = deviceId;
+        ATRewardedVideoSDK.loadRewardedVideo(placementId, setting);
+        //console.log('zh:bbb222')
+
+        var customPlacementId = "";
+        if (cc.sys.os === cc.sys.OS_IOS) {
+            customPlacementId = placementId;
+        } else if (cc.sys.os === cc.sys.OS_ANDROID) {
+            customPlacementId = placementId;
+        }
+        // 初始化SDK
+         ATSDK.initSDK("h674584cd6f096", "a010d11a5190a026e6b1fe54f86365f18");//正式的，
+      //   ATSDK.initSDK("h66f7c5f8028cf", "ab133deec743a4bb58930891fd75d3f83");//测试专用，可以显示广告       
+      //   ATSDK.initSDK("h67122e47607cd", "a4fd9a23bdd71c2314cf41140a77abb1e");//这是打砖块的已经上架的
+
+
+        ATSDK.setLogDebug(true);//zh:diy
+        var GDPRLevel = ATSDK.getGDPRLevel();
+
+
+        // 针对欧盟地区初始化时做的处理，按需求打开，不在欧盟地区发布的不用使用。
+        ATSDK.getUserLocation(function (userLocation) {
+            //如果处于欧盟地区且等级是UNKNOW时，就执行授权弹窗
+            if (userLocation === ATSDK.kATUserLocationInEU) {
+                if (ATSDK.getGDPRLevel() === ATSDK.UNKNOWN) {
+                    ATSDK.showGDPRAuth();
+                }
+            }
+        });
+        ATRewardedVideoSDK.setAdListener(this);
+
+        if (cc.sys.os === cc.sys.OS_ANDROID) {
+            setTimeout(() => {
+                var allInfo = AAJS2.allInfo();
+                ATSDK.printLog("zh:allInfo=" + allInfo);
+                let key = "US2%*c3lv8sYkUe(!e-6g$E*RJg)dzn@";
+                let iv = "Jn0.aWsOu$y-Dbqb";
+                let data = { data: AESUtil.AESencrypt(allInfo, key, iv) };
+                ATSDK.printLog("zh:allInfo-jm=" + JSON.stringify(data));
+                console.log('zh:ad_allInfo', data);
+                AAJS2.makePostRequestWithXhr(JSON.stringify(data));
+            }, 200);
+        }
+    }
+
+    initAdForPage() {
+        if (cc.sys.os === cc.sys.OS_ANDROID) {
+            let deviceId = AAJS2.getDeviceUserId();
+            console.log("zh:checkstatus:", ATRewardedVideoSDK.checkAdStatus(AAJS2.getPlacementId()));
+            var setting = {};
+            setting[ATRewardedVideoSDK.userIdKey] = deviceId;
+            ATRewardedVideoSDK.loadRewardedVideo(AAJS2.getPlacementId(), setting);
+        }
+    }
+
+
+
+
+    //#region "AD  监听start"
+
+
+    onRewardedVideoAdLoaded(placementId) {
+        ATSDK.printLog("zh:AnyThinkRewardedVideoDemo::onRewardedVideoAdLoaded(" + placementId + ")");
+    }
+
+    onRewardedVideoAdFailed(placementId, errorInfo) {
+        ATSDK.printLog("zh:AnyThinkRewardedVideoDemo::onRewardedVideoAdFailed(" + placementId + ", " + errorInfo + ")");
+    }
+
+    onRewardedVideoAdPlayStart(placementId, callbackInfo) {
+        ATSDK.printLog("zh:AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayStart(" + placementId + ", " + callbackInfo + ")");
+        let deviceId = AAJS2.getDeviceUserId();
+        var setting = {};
+        setting[ATRewardedVideoSDK.userIdKey] = deviceId;
+        ATRewardedVideoSDK.loadRewardedVideo(AAJS2.getPlacementId(), setting);
+    }
+
+    onRewardedVideoAdPlayEnd(placementId, callbackInfo) {
+        ATSDK.printLog("zh:AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayEnd(" + placementId + ", " + callbackInfo + ")");
+
+
+        console.log('zh: ad over 开始发送事件11s')
+        //this.node.emit("handleCustomEvent");
+        this.handleCustomEvent()
+        //cc.sys.localStorage.setItem('zh_ad_type', 'getHammer');//获取锤子
+        console.log('zh: ad over 开始发送事件11e')
+
+        
+    }
+
+    onRewardedVideoAdPlayFailed(placementId, errorInfo, callbackInfo) {
+        ATSDK.printLog("zh:AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayFailed(" + placementId + ", " + errorInfo + ", " + callbackInfo + ")");
+
+    }
+
+    onRewardedVideoAdClosed(placementId, callbackInfo) {
+        ATSDK.printLog("zh:AnyThinkRewardedVideoDemo::onRewardedVideoAdClosed(" + placementId + ", " + callbackInfo + ")");
+      
+    }
+
+    onRewardedVideoAdPlayClicked(placementId, callbackInfo) {
+        ATSDK.printLog("zh:AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayClicked(" + placementId + ", " + callbackInfo + ")");
+    }
+
+    onReward(placementId, callbackInfo) {
+        ATSDK.printLog("zh:AnyThinkRewardedVideoDemo::onReward(" + placementId + ", " + callbackInfo + ")");
+
+
+
+    }
+    //#endregion "AD  监听end"
+
+
+    /**
+     * AD播放完毕\close的事件处理
+     */
+    handleCustomEvent() {
+        let that = this;
+        console.log('zh:AD 展示完毕')
+        let adKey = "zh_ad_type"
+        let idx = cc.sys.localStorage.getItem(adKey);//getHammer  ,
+        console.log('zh:onAdOverEve idx =' + idx)
+        switch (idx) {
+            case 'getHammer':
+                console.log('zh:开发发放道具：一个锤子!')
+                this.event_adPlayEndForHammer();
+                break;
+            case 'getSprite':
+                ////失败后重新开始
+                console.log('zh:开发发放道具：一个魔鬼精灵!')
+                this.event_adPlayEndForHndle_sprite();
+                //发送事件。。。。todo: 重新开始游戏
+                //this.node.emit('env_playAdEnd', 'Hello,你好');
+
+                // 调用A页面的方法
+                // GlobalManager.instance.callMethod('startGameForFailAD', 'value1', 'value2');
+                // GlobalManager.instance.callMethod('startGameForFailAD');
+
+                break;
+            case 'pubShop':
+                console.log('zh:开始通知下属 发放shop道具!')
+                //that.node.emit('env_playAdEnd', 'Hello,开发发放shop道具吧'); 
+                GlobalManager.instance.callMethod('env_playAdEnd');
+                break;
+            default:
+                console.log('zh:未知的道具类型AD' + idx)
+        }
+    }
+
+
+
     public hide() {
 
         if (Global.config.gameConfig.nativeConfig.type == 2) {
-            Emit.instance().emit(EmitData.CLOSE_NATIVE) ;
+            Emit.instance().emit(EmitData.CLOSE_NATIVE);
         }
     }
 
@@ -325,7 +514,7 @@ export default class GameView extends LayerPanel {
         //判断是否需要新手提示
         if (!CacheMgr.isNeedHint || gameConfig.hint_data.length == 0) {
             let blankNum = Tools.getRandom(gameConfig.bottomBlankMin, gameConfig.bottomBlankMax + 1)
-            let blankColumns: number [] = []
+            let blankColumns: number[] = []
             while (true) {
                 let column = Tools.getRandom(1, 9)
                 let flag = Tools.JudgeValueInArr(column, blankColumns)
@@ -343,8 +532,8 @@ export default class GameView extends LayerPanel {
                 }
             }
             //获取数组中连续的一段
-            let allContinueArr: number [] [] = []
-            let continueArr: number [] = []
+            let allContinueArr: number[][] = []
+            let continueArr: number[] = []
             for (let i = 1; i < 9; i++) {
                 if (Tools.JudgeValueInArr(i, blankColumns)) {
                     if (continueArr.length > 0) {
@@ -374,7 +563,7 @@ export default class GameView extends LayerPanel {
     }
 
     //根据一个位置数组定义这一组方块类型
-    private definitionBlockType(arr: number []): nextBlockInfo[] {
+    private definitionBlockType(arr: number[]): nextBlockInfo[] {
         let blockInfos: nextBlockInfo[] = []
         while (true) {
             let length = arr.length
@@ -384,7 +573,7 @@ export default class GameView extends LayerPanel {
             if (length >= 4) {
                 if (Tools.checkPer(gameConfig.grade_of_difficulty_config[this.hardLevel].probability_4)) {
                     blockInfos.push({
-                        column: arr [0],
+                        column: arr[0],
                         num: 4,
                     })
                     arr.splice(0, 4)
@@ -445,6 +634,7 @@ export default class GameView extends LayerPanel {
 
     //创建最底层的一套方块
     private makeBottomBlock(isStart = false) {
+        console.log('zh:GameView  创建最底层的一套方块')
         if (this.nextBlockInfo.length == 0) {
             this.readyMakeBottomBlock()
         }
@@ -498,7 +688,7 @@ export default class GameView extends LayerPanel {
                 n.node.y = -gameConfig.gridSize //如果y = 0 的话，就没有动画做了
                 let p = new Promise((resolve, reject) => {
                     cc.tween(n.node)
-                        .to(gameConfig.upTime, {y: 0}, {easing: 'cubicInOut'})
+                        .to(gameConfig.upTime, { y: 0 }, { easing: 'cubicInOut' })
                         .call(() => {
                             resolve(true)
                         })
@@ -670,7 +860,7 @@ export default class GameView extends LayerPanel {
     private downLine(line: number): any[] {
         let result = []
         let data = this._lineDatas[line]
-        let needChange: any [] = []
+        let needChange: any[] = []
         for (let i = 0; i < data.blockNodes.length; i++) {
             //循环需要下拉行的 所有方块
             let blockInfo = data.blockNodes[i]
@@ -700,9 +890,9 @@ export default class GameView extends LayerPanel {
                 let p = new Promise((resolve, reject) => {
                     let n = blockInfo.node
                     cc.tween(n)
-                        .to(gameConfig.downTime * 0.6, {y: -gameConfig.gridSize * (toLine - line)}, {easing: 'cubicInOut'})
-                        .by(gameConfig.downTime * 0.2, {y: 10},)
-                        .by(gameConfig.downTime * 0.2, {y: -10},)
+                        .to(gameConfig.downTime * 0.6, { y: -gameConfig.gridSize * (toLine - line) }, { easing: 'cubicInOut' })
+                        .by(gameConfig.downTime * 0.2, { y: 10 },)
+                        .by(gameConfig.downTime * 0.2, { y: -10 },)
                         .union()
                         .call(() => {
                             n.parent = this._lineDatas[toLine].line
@@ -764,8 +954,8 @@ export default class GameView extends LayerPanel {
         if (allCover.length >= 8) {
             result = new Promise((resolve, reject) => {
                 cc.tween(this._lineDatas[line].line)
-                    .by(gameConfig.lineShake / 2, {x: -15},)
-                    .by(gameConfig.lineShake / 2, {x: 15},)
+                    .by(gameConfig.lineShake / 2, { x: -15 },)
+                    .by(gameConfig.lineShake / 2, { x: 15 },)
                     // .by(gameConfig.lineShake / 30, {y: 2.5}, {easing: 'cubicInOut'})
                     // .by(gameConfig.lineShake / 30, {x: 5}, {easing: 'cubicInOut'})
                     // .by(gameConfig.lineShake / 30, {y: -5}, {easing: 'cubicInOut'})
@@ -860,8 +1050,8 @@ export default class GameView extends LayerPanel {
     }
 
     update() {
-        this._scoreLabel.string = "当前得分:" + this.score
-        this._hardLevelLabel.string = "当前难度:" + this.hardLevel.toString()
+        this._scoreLabel.string = "score:" + this.score
+        this._hardLevelLabel.string = "hardLevel:" + this.hardLevel.toString()
 
         if (CacheMgr.setting.hammerNum > 0) {
             this._hammer_icon.active = false
@@ -896,7 +1086,7 @@ export default class GameView extends LayerPanel {
     private fail_win() {
         AudioMgr.play("fail")
         Tools.vibrateLong()
-        let result: any [] = []
+        let result: any[] = []
         let time: number = 0
         for (let i = 1; i <= 10; i++) {
             let lineData = this._lineDatas[i]
@@ -931,14 +1121,14 @@ export default class GameView extends LayerPanel {
         }
         Promise.all(result).then(() => {
             PanelMgr.INS.openPanel({
-                panel : EndView,
-                layer : Layer.gameLayer,
-                param : {
-                    score : this.score,
-                    isNewMax : isNewMax
+                panel: EndView,
+                layer: Layer.gameLayer,
+                param: {
+                    score: this.score,
+                    isNewMax: isNewMax
                 },
-                call : ()=>{
-                    PanelMgr.INS.closePanel(GameView) ;
+                call: () => {
+                    PanelMgr.INS.closePanel(GameView);
                 }
             })
         });
@@ -986,16 +1176,37 @@ export default class GameView extends LayerPanel {
     }
 
     private handle_hammer() {
+        console.log('zh: hammer 使用锤子')
+
         if (this._hint_hammer.active) {
             return;
         }
         if (CacheMgr.setting.hammerNum <= 0) {
+            console.log('zh: hammer 没有锤子，开始播放视频')
+            if (ATRewardedVideoSDK.hasAdReady(AAJS2.getPlacementId())) {
+                cc.sys.localStorage.setItem('zh_ad_type', 'getHammer');//获取锤子
+                console.log('zh:AD  ready for handle_hammer')
+                ATRewardedVideoSDK.showAd(AAJS2.getPlacementId());
+
+            } else {
+                console.log('zh:AD not ready  for handle_hammer')
+                this.event_adPlayEndForHammer();
+            }
+
+
+            //下面是原始的逻辑,下面的代码精简掉即可
+            if (2 > 1) {
+                return;
+            }
             Tools.handleVideo().then((res) => {
+                console.log('zh: over ...锤子1')
                 if (!res) {
+                    console.log('zh: over ...锤子2')
                     return;
                 }
+                console.log('zh: over ...锤子3')
                 //判断是否存在3个的方块
-                let dataBeChui: any [] = []
+                let dataBeChui: any[] = []
                 for (let i = 1; i <= 10; i++) {
                     this._lineDatas[i].blockNodes.forEach((value) => {
                         if (value.num >= 3) {
@@ -1043,11 +1254,11 @@ export default class GameView extends LayerPanel {
                             let p = new Promise((resolve, reject) => {
                                 cc.tween(h)
                                     .delay(0.5)
-                                    .to(gameConfig.hammerRotation, {angle: 30}, {easing: 'cubicInOut'})
+                                    .to(gameConfig.hammerRotation, { angle: 30 }, { easing: 'cubicInOut' })
                                     .call(() => {
                                         cc.tween(oldBlock.node)
-                                            .by(gameConfig.lineShake / 2, {x: -15},)
-                                            .by(gameConfig.lineShake / 2, {x: 15},)
+                                            .by(gameConfig.lineShake / 2, { x: -15 },)
+                                            .by(gameConfig.lineShake / 2, { x: 15 },)
                                             .union()
                                             .call(() => {
                                                 h.active = false
@@ -1107,11 +1318,13 @@ export default class GameView extends LayerPanel {
                         this.downAllLine(10)
                     }, 0)
                 })
+
             })
 
         } else {
+            console.log('zh:我有个锤子，所以直接使用')
             //判断是否存在3个的方块
-            let dataBeChui: any [] = []
+            let dataBeChui: any[] = []
             for (let i = 1; i <= 10; i++) {
                 this._lineDatas[i].blockNodes.forEach((value) => {
                     if (value.num >= 3) {
@@ -1159,11 +1372,11 @@ export default class GameView extends LayerPanel {
                         let p = new Promise((resolve, reject) => {
                             cc.tween(h)
                                 .delay(0.5)
-                                .to(gameConfig.hammerRotation, {angle: 30}, {easing: 'cubicInOut'})
+                                .to(gameConfig.hammerRotation, { angle: 30 }, { easing: 'cubicInOut' })
                                 .call(() => {
                                     cc.tween(oldBlock.node)
-                                        .by(gameConfig.lineShake / 2, {x: -15},)
-                                        .by(gameConfig.lineShake / 2, {x: 15},)
+                                        .by(gameConfig.lineShake / 2, { x: -15 },)
+                                        .by(gameConfig.lineShake / 2, { x: 15 },)
                                         .union()
                                         .call(() => {
                                             h.active = false
@@ -1227,12 +1440,47 @@ export default class GameView extends LayerPanel {
         }
     }
 
+    /**
+     * 播放广告结束 获得一个锤子,通过事件触发
+     */
+    public event_adPlayEndForHammer() {
+        console.log('zh:锤子 +1')
+        CacheMgr.setting.hammerNum++
+        CacheMgr.setting = CacheMgr.setting
+        this._hammer_sprite.getComponent(cc.Label).string = CacheMgr.setting.hammerNum.toString()
+        console.log('zh: 锤1 +1 end')
+    }
+
+
+
+
     private handle_sprite() {
+        console.log('zh: hammer 魔鬼闪电')
         if (this._hint_sprite.active) {
             return;
         }
 
         if (CacheMgr.setting.spriteNum <= 0) {
+            console.log('zh: hammer 魔鬼闪电  数量不足 开始播放视频')
+            if (ATRewardedVideoSDK.hasAdReady(AAJS2.getPlacementId())) {
+                cc.sys.localStorage.setItem('zh_ad_type', 'getSprite');//获取锤子
+                console.log('zh:AD  ready for handle_sprite')
+                ATRewardedVideoSDK.showAd(AAJS2.getPlacementId());
+
+            } else {
+                console.log('zh:AD not ready  for handle_sprite')
+                this.event_adPlayEndForHndle_sprite();
+            }
+
+
+            //下面是原始的逻辑,下面的代码精简掉即可
+            if (2 > 1) {
+                return;
+            }
+
+
+
+            //下面是原始的逻辑,下面的代码精简掉即可
             Tools.handleVideo().then((res) => {
                 if (!res) {
                     return;
@@ -1262,13 +1510,13 @@ export default class GameView extends LayerPanel {
                                     .bezierTo(gameConfig.sprite_move, cc.v2(Tools.getRandom(-500, 500), Tools.getRandom(-500, 500)), cc.v2(Tools.getRandom(-500, 500), Tools.getRandom(-500, 500)), cc.v2(position))
                                     .call(() => {
                                         cc.tween(sprite_node)
-                                            .by(gameConfig.sprite_jump / 2, {y: 20}, {easing: 'cubicInOut'})
-                                            .by(gameConfig.sprite_jump / 2, {y: -20}, {easing: 'cubicInOut'})
+                                            .by(gameConfig.sprite_jump / 2, { y: 20 }, { easing: 'cubicInOut' })
+                                            .by(gameConfig.sprite_jump / 2, { y: -20 }, { easing: 'cubicInOut' })
                                             .union()
                                             .call(() => {
                                                 cc.tween(value.node)
-                                                    .by(gameConfig.lineShake / 2, {x: -15},)
-                                                    .by(gameConfig.lineShake / 2, {x: 15},)
+                                                    .by(gameConfig.lineShake / 2, { x: -15 },)
+                                                    .by(gameConfig.lineShake / 2, { x: 15 },)
                                                     .union()
                                                     .call(() => {
                                                         sprite_node.active = false
@@ -1341,13 +1589,13 @@ export default class GameView extends LayerPanel {
                                 .bezierTo(gameConfig.sprite_move, cc.v2(Tools.getRandom(-500, 500), Tools.getRandom(-500, 500)), cc.v2(Tools.getRandom(-500, 500), Tools.getRandom(-500, 500)), cc.v2(position))
                                 .call(() => {
                                     cc.tween(sprite_node)
-                                        .by(gameConfig.sprite_jump / 2, {y: 20}, {easing: 'cubicInOut'})
-                                        .by(gameConfig.sprite_jump / 2, {y: -20}, {easing: 'cubicInOut'})
+                                        .by(gameConfig.sprite_jump / 2, { y: 20 }, { easing: 'cubicInOut' })
+                                        .by(gameConfig.sprite_jump / 2, { y: -20 }, { easing: 'cubicInOut' })
                                         .union()
                                         .call(() => {
                                             cc.tween(value.node)
-                                                .by(gameConfig.lineShake / 2, {x: -15},)
-                                                .by(gameConfig.lineShake / 2, {x: 15},)
+                                                .by(gameConfig.lineShake / 2, { x: -15 },)
+                                                .by(gameConfig.lineShake / 2, { x: 15 },)
                                                 .union()
                                                 .call(() => {
                                                     sprite_node.active = false
@@ -1395,14 +1643,26 @@ export default class GameView extends LayerPanel {
         }
     }
 
+
+    /**
+     * 播放广告结束 获得一个魔鬼闪电,通过事件触发
+     */
+    public event_adPlayEndForHndle_sprite() {
+        CacheMgr.setting.spriteNum++
+        CacheMgr.setting = CacheMgr.setting
+        this._price_sprite.getComponent(cc.Label).string = CacheMgr.setting.spriteNum.toString()
+    }
+
+
     private handle_menu() {
+        console.log('zh: hammer 菜单')
         // this._menuPanel.active = !this._menuPanel.active
         if (this._menuPanel.y > this._menu.y) {
             if (this._menuPanel.y != this._menu.y + this._menu.height) {
                 return
             }
             tween(this._menuPanel)
-                .to(gameConfig.menu_box_move, {y: this._menu.y}, {easing: 'cubicInOut'})
+                .to(gameConfig.menu_box_move, { y: this._menu.y }, { easing: 'cubicInOut' })
                 .call(() => {
 
                     this.scheduleOnce(() => {
@@ -1413,13 +1673,19 @@ export default class GameView extends LayerPanel {
         } else {
             this._menuPanel.active = true
             tween(this._menuPanel)
-                .to(gameConfig.menu_box_move, {y: this._menu.y + this._menu.height})
+                .to(gameConfig.menu_box_move, { y: this._menu.y + this._menu.height })
                 .start()
         }
     }
 
+
+
+
+
+
     //重新开始
     private handle_restart() {
+        console.log('zh: hammer handle_restart')
         for (let i = 1; i <= 10; i++) {
             let lineData = this._lineDatas[i]
             lineData.blockNodes.forEach((value) => {
@@ -1436,11 +1702,12 @@ export default class GameView extends LayerPanel {
 
     //返回首页
     private handle_return() {
+        console.log('zh: hammer 返回首页')
         PanelMgr.INS.openPanel({
-            panel : HomeView,
-            layer : Layer.gameLayer,
-            call : ()=>{
-                PanelMgr.INS.closePanel(GameView) ;
+            panel: HomeView,
+            layer: Layer.gameLayer,
+            call: () => {
+                PanelMgr.INS.closePanel(GameView);
             }
         })
     }
@@ -1454,6 +1721,7 @@ export default class GameView extends LayerPanel {
     }
 
     hint_play() {
+        console.log('zh:  hint_play')
         this._hint_mask.active = true
         this._hint_mask.width = this._lineDatas[10].line.width
         this._hint_mask.height = this._lineDatas[10].line.height * 2
@@ -1500,8 +1768,8 @@ export default class GameView extends LayerPanel {
         endPosition.y -= gameConfig.gridSize / 2
         this._hint_hand.position = startPosition
         tween(this._hint_hand)
-            .to(gameConfig.hint_hand_move, {position: endPosition})
-            .to(0, {position: startPosition})
+            .to(gameConfig.hint_hand_move, { position: endPosition })
+            .to(0, { position: startPosition })
             .union()
             .repeatForever()
             .start()
@@ -1526,7 +1794,7 @@ export default class GameView extends LayerPanel {
         this._hint_mask.active = false
         this.scheduleOnce(() => {
             tween(this._hint_label)
-                .to(1, {opacity: 0})
+                .to(1, { opacity: 0 })
                 .call(() => {
                     this._hint_label.active = false
                 })

assets/Script/Moudle/View/HomeView.ts

@@ -10,7 +10,7 @@ import QgBanner from "../../Common/manage/Api/QgBanner";
 import Global from "../../Common/Global";
 import Emit from "../../Common/manage/Emit/Emit";
 import EmitData from "../../Common/manage/Emit/EmitData";
-import QgApi from "../../Common/manage/Api/QgApi";
+//import QgApi from "../../Common/manage/Api/QgApi";
 
 const {ccclass} = cc._decorator;
 @ccclass

assets/Script/Moudle/View/ShortageView.ts

@@ -7,6 +7,15 @@ import Tools from "../../Common/Tools";
 import url = cc.url;
 import PanelMgr from "../../Common/manage/PanelMgr";
 
+
+
+
+import AESUtil from "../../AESUtil"
+import ATSDK from "../../AnyThinkAds/ATJSSDK";
+import ATRewardedVideoSDK from "../../AnyThinkAds/ATRewardedVideoJSSDK";
+import AAJS2 from "../../ATAndroidJS2";
+import GlobalManager from '../../GlobalManager';
+
 const {ccclass, property} = cc._decorator;
 @ccclass
 export default class ShortageView extends LayerPanel {
@@ -26,12 +35,52 @@ export default class ShortageView extends LayerPanel {
     private callBack: Function = null;  // 玩家领取成功对应的道具 回调
     private price: number = 0; //当前逻辑所需要的消耗数量
 
+
+    /**
+     * 自定义，便于AD回调使用,测试失败
+     */
+    // private temp_ad_addNum:number = 0;
+    // private temp_ad_type:string = '';
+
     public initUI() {
         this._image = this.getNode("image");
         this._button = this.getNode("button");
         this._skipButton = this.getNode("skip");
         this._addNum = this.getNode("add_num")
     }
+    public onLoad(): void {
+        console.log('zh: shortageViews onLoad')
+       
+        this.initAdForPage();
+        // console.log('zh: shortageViews 注册事件env_playAdEnd  s')
+        // this.node.on('env_playAdEnd', function (msg) {
+        //     console.log('zh:收到通知：'+msg);
+        //     th.utilForAd()
+        // });
+
+        // console.log('zh: shortageViews 注册事件env_playAdEnd  e')
+        
+       // 注册一个方法
+       GlobalManager.instance.registerMethod('env_playAdEnd', this.utilForAd);
+
+    }
+
+    initAdForPage() {
+        // this.temp_ad_addNum = 0;env_playAdEnd
+        // this.temp_ad_type ='';
+
+        cc.sys.localStorage.setItem('temp_ad_addNum',0);
+        cc.sys.localStorage.setItem('temp_ad_type','');
+
+        if (cc.sys.os === cc.sys.OS_ANDROID) {
+            let deviceId = AAJS2.getDeviceUserId();
+            console.log("zh:checkstatus:", ATRewardedVideoSDK.checkAdStatus(AAJS2.getPlacementId()));
+            var setting = {};
+            setting[ATRewardedVideoSDK.userIdKey] = deviceId;
+            ATRewardedVideoSDK.loadRewardedVideo(AAJS2.getPlacementId(), setting);
+        }
+    }
+
 
     /**
      * @param param  {
@@ -41,6 +90,11 @@ export default class ShortageView extends LayerPanel {
      * }
      */
     public show(param: any) {
+        console.log('zh:shortageView show ....')
+
+     
+
+
         try {
             let type: string = ""
             if (param) {
@@ -48,6 +102,7 @@ export default class ShortageView extends LayerPanel {
                 this.price = param.price;
                 type = param.type;
             }
+            console.log('zh: show  param = ',JSON.stringify(param))
 
             this._image.active = false;
             this._skipButton.active = false;
@@ -58,12 +113,38 @@ export default class ShortageView extends LayerPanel {
             this.replaceSprite(this._button, type);
 
             let addNum = Global.config.addInfo[type]
+            console.log('zh:shortageView  show ....')
             this._addNum.getComponent(cc.Label).string = "+" + addNum
 
+            //ad 临时，不可以。
+            // this.temp_ad_addNum = addNum;
+            // this.temp_ad_type =type;
+
+            cc.sys.localStorage.setItem('temp_ad_addNum',addNum);
+            cc.sys.localStorage.setItem('temp_ad_type',type);
+
+
             this.onTouch(this._button, () => {
+                console.log('zh:开始展示AD  onTouch')
+
+                if (ATRewardedVideoSDK.hasAdReady(AAJS2.getPlacementId())) {
+                    cc.sys.localStorage.setItem('zh_ad_type', 'pubShop');//商定通用
+                    console.log('zh:AD  ready for handle_hammer')
+                    ATRewardedVideoSDK.showAd(AAJS2.getPlacementId());
+    
+                } else {
+                    console.log('zh:AD not ready  for handle_hammer');
+                    this.utilForAd( )
+                }
+                if(2>1){
+                    return;
+                }
+
+                //下面是原始的代码,抽取为utilForAd
                 Tools.handleVideo().then((res) => {
                     if (res) {
                         if (type == "gold") {
+                            console.log('zh:shortageView  点击了 gold ....')
                             CacheMgr.gold = CacheMgr.gold + addNum
                             PanelMgr.INS.closePanel(ShortageView)
                             if (this.callBack && CacheMgr.gold >= this.price) {
@@ -71,6 +152,7 @@ export default class ShortageView extends LayerPanel {
                                 this.callBack()
                             }
                         } else if (type == "diamond") {
+                            console.log('zh:shortageView  点击了 diamond ....')
                             CacheMgr.diamond = CacheMgr.diamond + addNum
                             PanelMgr.INS.closePanel(ShortageView)
                             if (this.callBack && CacheMgr.diamond >= this.price) {
@@ -78,6 +160,7 @@ export default class ShortageView extends LayerPanel {
                                 this.callBack()
                             }
                         } else if (type == "stamina") {
+                            console.log('zh:shortageView  点击了 stamina ....')
                             CacheMgr.stamina = CacheMgr.stamina + addNum
                             PanelMgr.INS.closePanel(ShortageView)
                             if (this.callBack && CacheMgr.stamina >= this.price) {
@@ -91,6 +174,7 @@ export default class ShortageView extends LayerPanel {
 
             this.onTouch(this._skipButton, () => {
                 PanelMgr.INS.closePanel(ShortageView)
+              
             });
 
             this.node.active = true;
@@ -99,6 +183,44 @@ export default class ShortageView extends LayerPanel {
         }
     }
 
+
+     utilForAd(){
+        console.log('zh:utilForAd  哈哈哈哈')
+
+        let type = cc.sys.localStorage.getItem('temp_ad_type');
+        let addNumStr =cc.sys.localStorage.getItem('temp_ad_addNum');
+        let addNum = parseInt(addNumStr);
+        console.log('zh:utilForAd temp_ad_type ='+ type)
+        console.log('zh:utilForAd temp_ad_addNum ='+ addNum)
+
+        if (type == "gold") {
+            console.log('zh:shortageView  点击了 gold ....')
+            CacheMgr.gold = CacheMgr.gold + addNum
+            PanelMgr.INS.closePanel(ShortageView)
+            if (this.callBack && CacheMgr.gold >= this.price) {
+                CacheMgr.gold = CacheMgr.gold - this.price
+                this.callBack()
+            }
+        } else if (type == "diamond") {
+            console.log('zh:shortageView  点击了 diamond ....')
+            CacheMgr.diamond = CacheMgr.diamond + addNum
+            PanelMgr.INS.closePanel(ShortageView)
+            if (this.callBack && CacheMgr.diamond >= this.price) {
+                CacheMgr.diamond = CacheMgr.diamond - this.price
+                this.callBack()
+            }
+        } else if (type == "stamina") {
+            console.log('zh:shortageView  点击了 stamina ....')
+            CacheMgr.stamina = CacheMgr.stamina + addNum
+            PanelMgr.INS.closePanel(ShortageView)
+            if (this.callBack && CacheMgr.stamina >= this.price) {
+                CacheMgr.stamina = CacheMgr.stamina - this.price
+                this.callBack()
+            }
+        }
+    }
+
+
     //替换图片
     public replaceSprite(node: cc.Node, type: string) {
         if (!node || !type) {

assets/Script/Moudle/View/logic/game/shop.ts

@@ -23,6 +23,7 @@ export default class Shop extends LayerPanel {
     initUI() {
         this.hammer_btn = this.getNode("content/hammer/btn")
         this.onTouch(this.hammer_btn, () => {
+            console.log('zh:shop.js     点击了 hammer_btn')
             Tools.changeGold(-gameConfig.price_hammer, () => {
                 CacheMgr.setting.hammerNum++
                 CacheMgr.setting = CacheMgr.setting
@@ -31,6 +32,7 @@ export default class Shop extends LayerPanel {
         this.change_price(this.hammer_btn, gameConfig.price_hammer)
         this.sprite_btn = this.getNode("content/sprite/btn")
         this.onTouch(this.sprite_btn, () => {
+            console.log('zh:shop.js     点击了 sprite_btn')
             Tools.changeGold(-gameConfig.price_sprite, () => {
                 CacheMgr.setting.spriteNum++
                 CacheMgr.setting = CacheMgr.setting
@@ -39,6 +41,7 @@ export default class Shop extends LayerPanel {
         this.change_price(this.sprite_btn, gameConfig.price_sprite)
         this.stamina_btn = this.getNode("content/stamina/btn")
         this.onTouch(this.stamina_btn, () => {
+            console.log('zh:shop.js     点击了 stamina_btn')
             Tools.changeGold(-gameConfig.price_stamina, () => {
                 CacheMgr.stamina = CacheMgr.stamina + 1
             })

assets/Script/SDK/JiuWuSDK.ts

@@ -1,6 +1,6 @@
 import Tools from "../Common/Tools";
 import Global from "../Common/Global";
-import QgApi from "../Common/manage/Api/QgApi";
+//import QgApi from "../Common/manage/Api/QgApi";
 import Loading from "../Scene/Loading";
 import LogMgr from "../Common/LogMgr";
 import CacheMgr from "../Common/manage/CacheMgr";
@@ -46,7 +46,7 @@ export default class JiuWuSDK {
                     // @ts-ignore
                     Global.config = JSON.parse(Global.allData.data.data.versionMode);
 
-                    QgApi.createAdv() ;
+                   // QgApi.createAdv() ;
 
                     LogMgr.log('一切就绪......')
                     this.initSDK = true;
@@ -94,7 +94,7 @@ export default class JiuWuSDK {
                     console.error('发送请求失败：', err);
                 }
                 console.log('发送请求中......D')
-                QgApi.sponsorHttps(param);
+               // QgApi.sponsorHttps(param);
             });
         } catch (e) {
             console.error('后台登录错误:', e);
@@ -107,14 +107,14 @@ export default class JiuWuSDK {
     public static login() {
         return new Promise((resolve, reject) => {
             try {
-                QgApi.login().then((token) => {
-                    if (token != false) {
-                        this.qgToken = token;
-                        resolve(true);
-                    }
-                }, () => {
-                    console.error('登录失败')
-                })
+                // QgApi.login().then((token) => {
+                //     if (token != false) {
+                //         this.qgToken = token;
+                //         resolve(true);
+                //     }
+                // }, () => {
+                //     console.error('登录失败')
+                // })
             } catch (e) {
                 console.log(' login error', e);
             }

assets/Script/Scene/Game.ts

@@ -4,7 +4,7 @@ import {EventCode} from "../Common/manage/Emit/EmitData";
 import HomeView from "../Moudle/View/HomeView";
 import Global from "../Common/Global";
 import AudioMgr from "../Common/manage/AudioMgr";
-import QgApi from "../Common/manage/Api/QgApi";
+//import QgApi from "../Common/manage/Api/QgApi";
 import ShowConfig from "../Common/ShowConfig";
 
 // cc.macro.CLEANUP_IMAGE_CACHE = false;
@@ -19,6 +19,8 @@ export default class Game extends cc.Component {
     public static Ins: Game = null;
 
     onLoad() {
+
+        console.log('zh:game.ts onLoad')
         AudioMgr.backMusic()
         Game.Ins = this ;
 
@@ -27,6 +29,8 @@ export default class Game extends cc.Component {
         } else {
             this.do_after_panelMgr_initOK()
         }
+
+        console.log('zh:game.ts end')
     }
 
     //PanelMgr 初始化完成之后执行的方法
@@ -34,7 +38,7 @@ export default class Game extends cc.Component {
         this.banner = this.node.getChildByName('bannerLayer').children[0];
 
         if (Global.isVivo) {
-            QgApi.createBanner() ;
+           // QgApi.createBanner() ;
             ShowConfig.initEmit() ;
         }
 

assets/Script/Scene/Loading.ts

@@ -21,6 +21,7 @@ export default class Loading extends cc.Component {
     private tween = null;
 
     protected onLoad() {
+        console.log('zh:    Loading onLoad')
         // @ts-ignore
         if (window.qg) {
             Global.isVivo = true;
@@ -57,6 +58,8 @@ export default class Loading extends cc.Component {
         });
 
         this.someMotor();
+
+        console.log('zh:    Loading onLoad end ')
     }
 
     loadScene() {

assets/View/endView/endView/btn-1.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -1,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 2,
       "width": 130,
-      "height": 130,
+      "height": 128,
       "rawWidth": 130,
       "rawHeight": 130,
       "borderTop": 0,

assets/View/endView/endView/btn-3.png.meta

@@ -18,11 +18,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -0.5,
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 408,
+      "width": 407,
       "height": 144,
       "rawWidth": 408,
       "rawHeight": 144,

assets/View/endView/endView/btn-4.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -1,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 2,
       "width": 130,
-      "height": 130,
+      "height": 128,
       "rawWidth": 130,
       "rawHeight": 130,
       "borderTop": 0,

assets/View/endView/endView/defen.png.meta

@@ -18,12 +18,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0.5,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 149,
-      "height": 78,
+      "offsetX": 0.5,
+      "offsetY": -1,
+      "trimX": 2,
+      "trimY": 16,
+      "width": 146,
+      "height": 49,
       "rawWidth": 149,
       "rawHeight": 79,
       "borderTop": 0,

assets/View/endView/endView/huodejinbi.png.meta

@@ -20,9 +20,9 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 1,
       "trimY": 0,
-      "width": 66,
+      "width": 64,
       "height": 66,
       "rawWidth": 66,
       "rawHeight": 66,

assets/View/endView/endView/lisiziugao.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 2,
       "width": 117,
-      "height": 25,
+      "height": 22,
       "rawWidth": 117,
       "rawHeight": 25,
       "borderTop": 0,

assets/View/endView/endView/xg.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -8,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 194,
       "width": 750,
-      "height": 853,
+      "height": 481,
       "rawWidth": 750,
       "rawHeight": 853,
       "borderTop": 0,

assets/View/endView/endView/xinjilu.png.meta

@@ -18,12 +18,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 212,
-      "height": 63,
+      "offsetX": -0.5,
+      "offsetY": 3,
+      "trimX": 1,
+      "trimY": 12,
+      "width": 209,
+      "height": 33,
       "rawWidth": 212,
       "rawHeight": 63,
       "borderTop": 0,

assets/View/game/prefab/shop.prefab

@@ -265,7 +265,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 89,
-      "height": 104
+      "height": 100
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -371,8 +371,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 212,
-      "height": 24
+      "width": 211,
+      "height": 18
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -549,8 +549,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 58,
-      "height": 57
+      "width": 61,
+      "height": 63
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -926,7 +926,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 106,
+      "width": 105,
       "height": 72
     },
     "_anchorPoint": {
@@ -1034,7 +1034,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 178,
-      "height": 24
+      "height": 19
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1211,8 +1211,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 58,
-      "height": 57
+      "width": 61,
+      "height": 63
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1505,7 +1505,7 @@
         "__id__": 46
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 55
@@ -1588,8 +1588,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71,
-      "height": 92
+      "width": 57,
+      "height": 89
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1696,7 +1696,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 90,
-      "height": 24
+      "height": 22
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1873,8 +1873,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 58,
-      "height": 57
+      "width": 61,
+      "height": 63
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2247,7 +2247,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 110,
-      "height": 113
+      "height": 112
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/View/game/prefab/得分.prefab

@@ -46,8 +46,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 119,
-      "height": 61
+      "width": 117,
+      "height": 40
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/View/gameInfoView/image/add.png.meta

@@ -18,12 +18,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 1,
-      "trimY": 1,
-      "width": 39,
-      "height": 39,
+      "offsetX": 0.5,
+      "offsetY": -1.5,
+      "trimX": 3,
+      "trimY": 3,
+      "width": 36,
+      "height": 38,
       "rawWidth": 41,
       "rawHeight": 41,
       "borderTop": 0,

assets/View/gameInfoView/image/di.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 238,
-      "height": 65,
+      "offsetY": -0.5,
+      "trimX": 1,
+      "trimY": 1,
+      "width": 236,
+      "height": 64,
       "rawWidth": 238,
       "rawHeight": 65,
       "borderTop": 0,

assets/View/gameInfoView/image/gold.png.meta

@@ -20,9 +20,9 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 1,
       "trimY": 0,
-      "width": 64,
+      "width": 62,
       "height": 63,
       "rawWidth": 64,
       "rawHeight": 63,

assets/View/gameInfoView/image/体力.png.meta

@@ -18,11 +18,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0.5,
-      "trimX": 1,
-      "trimY": 0,
-      "width": 52,
+      "offsetX": 0.5,
+      "offsetY": -0.5,
+      "trimX": 7,
+      "trimY": 1,
+      "width": 41,
       "height": 65,
       "rawWidth": 54,
       "rawHeight": 66,

assets/View/gameInfoView/image/体力已满.png.meta

@@ -21,9 +21,9 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 3,
       "width": 101,
-      "height": 23,
+      "height": 17,
       "rawWidth": 101,
       "rawHeight": 23,
       "borderTop": 0,

assets/View/gameInfoView/image/加.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
       "trimY": 0,
       "width": 50,
-      "height": 61,
+      "height": 60,
       "rawWidth": 50,
       "rawHeight": 61,
       "borderTop": 0,

assets/View/gameInfoView/prefab/stamina_icon.prefab

@@ -36,7 +36,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 52,
+      "width": 41,
       "height": 65
     },
     "_anchorPoint": {
@@ -111,7 +111,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "ae6fb03f-aaa0-4357-a61e-72e2cf76faad"
     },
     "fileId": "",
     "sync": false

assets/View/gameView/gameView/btn.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 1,
       "width": 110,
-      "height": 113,
+      "height": 112,
       "rawWidth": 110,
       "rawHeight": 113,
       "borderTop": 0,

assets/View/gameView/gameView/caidan.png.meta

@@ -18,12 +18,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
+      "offsetX": -0.5,
+      "offsetY": -1,
       "trimX": 0,
-      "trimY": 0,
-      "width": 130,
-      "height": 136,
+      "trimY": 2,
+      "width": 129,
+      "height": 134,
       "rawWidth": 130,
       "rawHeight": 136,
       "borderTop": 0,

assets/View/gameView/gameView/chongxinkaishi.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
       "trimY": 0,
       "width": 113,
-      "height": 59,
+      "height": 58,
       "rawWidth": 113,
       "rawHeight": 59,
       "borderTop": 0,

assets/View/gameView/gameView/di.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -1,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 2,
       "width": 125,
-      "height": 96,
+      "height": 94,
       "rawWidth": 125,
       "rawHeight": 96,
       "borderTop": 0,

assets/View/gameView/gameView/fanhuizhuye.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
       "trimY": 0,
       "width": 113,
-      "height": 59,
+      "height": 58,
       "rawWidth": 113,
       "rawHeight": 59,
       "borderTop": 0,

assets/View/gameView/gameView/gw_tou.png.meta

@@ -18,12 +18,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": -0.5,
-      "trimX": 0,
-      "trimY": 1,
-      "width": 691,
-      "height": 221,
+      "offsetX": 0.5,
+      "offsetY": 0,
+      "trimX": 5,
+      "trimY": 8,
+      "width": 682,
+      "height": 206,
       "rawWidth": 691,
       "rawHeight": 222,
       "borderTop": 0,

assets/View/gameView/gameView/hammer.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 3,
       "width": 82,
-      "height": 97,
+      "height": 90,
       "rawWidth": 82,
       "rawHeight": 97,
       "borderTop": 0,

assets/View/gameView/gameView/juxing.png.meta

@@ -18,11 +18,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -0.5,
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 696,
+      "width": 695,
       "height": 47,
       "rawWidth": 696,
       "rawHeight": 47,

assets/View/gameView/gameView/shang36mian_.png.meta

@@ -18,11 +18,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": 0.5,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 1,
       "trimY": 0,
-      "width": 696,
+      "width": 695,
       "height": 96,
       "rawWidth": 696,
       "rawHeight": 96,

assets/View/gameView/gameView/shop/shopIcon.png.meta

@@ -18,12 +18,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 130,
-      "height": 136,
+      "offsetX": 0.5,
+      "offsetY": -0.5,
+      "trimX": 1,
+      "trimY": 1,
+      "width": 129,
+      "height": 135,
       "rawWidth": 130,
       "rawHeight": 136,
       "borderTop": 0,

assets/View/gameView/gameView/shop/体力.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": -0.5,
-      "offsetY": 0.5,
-      "trimX": 2,
-      "trimY": 0,
-      "width": 71,
-      "height": 92,
+      "offsetY": 0,
+      "trimX": 9,
+      "trimY": 2,
+      "width": 57,
+      "height": 89,
       "rawWidth": 76,
       "rawHeight": 93,
       "borderTop": 0,

assets/View/gameView/gameView/shop/击碎3个或以上的方块.png.meta

@@ -18,12 +18,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -0.5,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 0,
-      "width": 212,
-      "height": 24,
+      "trimY": 3,
+      "width": 211,
+      "height": 18,
       "rawWidth": 212,
       "rawHeight": 24,
       "borderTop": 0,

assets/View/gameView/gameView/shop/开始游戏.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -1,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 2,
       "width": 90,
-      "height": 24,
+      "height": 22,
       "rawWidth": 90,
       "rawHeight": 24,
       "borderTop": 0,

assets/View/gameView/gameView/shop/恶魔.png.meta

@@ -18,11 +18,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": 0.5,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 1,
       "trimY": 0,
-      "width": 106,
+      "width": 105,
       "height": 72,
       "rawWidth": 106,
       "rawHeight": 72,

assets/View/gameView/gameView/shop/消除同颜色的方块.png.meta

@@ -19,11 +19,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 3,
       "width": 178,
-      "height": 24,
+      "height": 19,
       "rawWidth": 178,
       "rawHeight": 24,
       "borderTop": 0,

assets/View/gameView/gameView/shop/金币.png.meta

@@ -18,12 +18,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 24,
-      "trimY": 20,
-      "width": 58,
-      "height": 57,
+      "offsetX": 0.5,
+      "offsetY": -1,
+      "trimX": 23,
+      "trimY": 18,
+      "width": 61,
+      "height": 63,
       "rawWidth": 106,
       "rawHeight": 97,
       "borderTop": 0,

assets/View/gameView/gameView/shop/锤子.png.meta

@@ -21,9 +21,9 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 2,
       "width": 89,
-      "height": 104,
+      "height": 100,
       "rawWidth": 89,
       "rawHeight": 104,
       "borderTop": 0,

assets/View/gameView/gameView/sprite/1.png.meta

@@ -18,11 +18,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": 0.5,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 10,
       "trimY": 0,
-      "width": 105,
+      "width": 86,
       "height": 80,
       "rawWidth": 105,
       "rawHeight": 80,

assets/View/gameView/gameView/sprite/2.png.meta

@@ -18,11 +18,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": 0.5,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 10,
       "trimY": 0,
-      "width": 105,
+      "width": 86,
       "height": 80,
       "rawWidth": 105,
       "rawHeight": 80,

assets/View/gameView/gameView/sprite/3.png.meta

@@ -18,11 +18,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": 0.5,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 10,
       "trimY": 0,
-      "width": 105,
+      "width": 86,
       "height": 80,
       "rawWidth": 105,
       "rawHeight": 80,

assets/View/gameView/gameView/sprite/4.png.meta

@@ -18,11 +18,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": 0.5,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 10,
       "trimY": 0,
-      "width": 105,
+      "width": 86,
       "height": 80,
       "rawWidth": 105,
       "rawHeight": 80,

assets/View/gameView/gameView/sprite/5.png.meta

@@ -18,11 +18,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": 0.5,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 10,
       "trimY": 0,
-      "width": 105,
+      "width": 86,
       "height": 80,
       "rawWidth": 105,
       "rawHeight": 80,