OK

assets/Scene/scene.fire

@@ -761,7 +761,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 316,
+      "width": 286,
       "height": 105
     },
     "_anchorPoint": {
@@ -2271,9 +2271,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 253,
-      "g": 255,
-      "b": 89,
+      "r": 144,
+      "g": 68,
+      "b": 153,
       "a": 255
     },
     "_contentSize": {
@@ -2290,8 +2290,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -38.1,
-        -55.8,
+        -44.1,
+        -53.8,
         0,
         0,
         0,
@@ -2366,14 +2366,14 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
+      "r": 144,
+      "g": 68,
+      "b": 153,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 99.22,
+      "width": 85.05,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -2385,7 +2385,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -73.1,
+        -86.1,
         -54,
         0,
         0,
@@ -2427,7 +2427,7 @@
     "_dstBlendFactor": 771,
     "_string": "Steps:",
     "_N$string": "Steps:",
-    "_fontSize": 35,
+    "_fontSize": 30,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -4247,7 +4247,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 82,
+      "width": 79,
       "height": 99
     },
     "_anchorPoint": {
@@ -4411,8 +4411,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 160,
-      "height": 125
+      "width": 163,
+      "height": 78
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4607,8 +4607,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 264,
-      "height": 190
+      "width": 261,
+      "height": 179
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4681,8 +4681,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        118.1,
-        138.2,
+        132.1,
+        106.19999999999999,
         0,
         0,
         0,
@@ -5519,7 +5519,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 158,
-      "height": 40
+      "height": 30
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -5681,7 +5681,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 223,
+      "width": 222,
       "height": 76
     },
     "_anchorPoint": {
@@ -11210,7 +11210,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 223,
+      "width": 222,
       "height": 76
     },
     "_anchorPoint": {
@@ -11698,7 +11698,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 461,
-      "height": 128
+      "height": 127
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -12585,7 +12585,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 76,
-      "height": 39
+      "height": 22
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -15181,7 +15181,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 90,
-      "height": 122
+      "height": 121
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -15539,7 +15539,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 90,
-      "height": 122
+      "height": 115
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/Script/controller.js

@@ -9,10 +9,10 @@
  */
 
 
-import ATSDK from "./AnyThinkAds/ATJSSDK";
-import ATRewardedVideoSDK from "./AnyThinkAds/ATRewardedVideoJSSDK";
-import AAJS2 from "./ATAndroidJS2";
-import AESUtil from "./AESUtil"
+// import ATSDK from "./AnyThinkAds/ATJSSDK";
+// import ATRewardedVideoSDK from "./AnyThinkAds/ATRewardedVideoJSSDK";
+// import AAJS2 from "./ATAndroidJS2";
+// import AESUtil from "./AESUtil"
 
 cc.Class({
   extends: cc.Component,
@@ -43,17 +43,18 @@ cc.Class({
     }
     this.musicManager.init()
     this.lateStart()
-    this.initAdForPage()
+    //this.initAdForPage()//这是里测试的时候用
 
   },
 
   initAdForPage() {
     console.log('zh:controller.js initAdForPage start')
     let deviceId = AAJS2.getDeviceUserId();
-    console.log("zh:checkstatus:", ATRewardedVideoSDK.checkAdStatus(AAJS2.getPlacementID()));
+    //console.log("zh:checkstatus:", ATRewardedVideoSDK.checkAdStatus(AAJS2.getPlacementID()));
     var setting = {};
     setting[ATRewardedVideoSDK.userIdKey] = deviceId;
     ATRewardedVideoSDK.loadRewardedVideo(AAJS2.getPlacementID(), setting);
+    console.log('zh:controller.js initAdForPage END')
   },
 
   lateStart() {
@@ -108,7 +109,7 @@ cc.Class({
   },
   openPictorial() {
 
-    //ZH测试显示AD
+    //ZH测试专用显示AD
     if (2 > 3) {
       setTimeout(() => {
         if (cc.sys.os === cc.sys.OS_ANDROID) {

assets/Script/elementCheck.js

@@ -10,7 +10,7 @@ cc.Class({
     mapLength: 8
   },
   init(g) {
-    console.log('zh:ec00000000')
+    //console.log('zh:ec00000000')
     this._game = g
     this.map = g.map
     this.mapLength = g.rowNum
@@ -28,7 +28,7 @@ cc.Class({
     }
   },
   elementCheck(g) { //该函数主要用于检测一个区块能否形成道具等
-    console.log('zh:ec00000000elementCheck')
+    //console.log('zh:ec00000000elementCheck')
     let propConfig = g._controller.config.json.propConfig
     this._game = g
     this.map = g.map

assets/Script/game.js

@@ -91,6 +91,10 @@ cc.Class({
         this.showReviveSuccess()
         //this.askRevive()
         break;
+      case "step2"://双倍步数奖励
+        console.log('zh:因为你看完了AD，所以开始发放双倍步数奖励道具')
+        this._score.onLevelUpButton(2)
+        break;
       default:
         console.log('zh:没有找到yxAdMark 相关的信息!!!!!!!')
         break;
@@ -152,10 +156,10 @@ cc.Class({
   },
 
   onRewardedVideoAdClosed(placementId, callbackInfo) {
-    console.log('zh:onRewardedVideoAdClosed')
-    ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdClosed(" + placementId + ", " + callbackInfo + ")");
-    console.log("onRewardxxxxxxclosed", this.state);
-    console.log("zh:onRewardxxxxxxclosed", this.state);
+    try {
+       //console.log('zh:onRewardedVideoAdClosed')
+    //ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdClosed(" + placementId + ", " + callbackInfo + ")");
+    //console.log("zh:onRewardedVideoAdClosed", this.state);
     if (this.state == true) {
 
       console.log('zh: ad onRewardedVideoAdClosed 开始发送事件s')
@@ -165,6 +169,9 @@ cc.Class({
     } else {
       this.state = false;
     }
+    } catch (error) {
+      console.log('zh:onRewardedVideoAdClosed error',error)
+    }
   },
 
   onRewardedVideoAdPlayClicked(placementId, callbackInfo) {
@@ -188,7 +195,7 @@ cc.Class({
    * 初始化广告
    */
   initAd() {
-    console.log('zh:AD   init start')
+    console.log('zh:AD   init start1')
     let placementID = AAJS2.getPlacementID();
     let deviceId = AAJS2.getDeviceUserId();
     var setting = {};
@@ -205,9 +212,9 @@ cc.Class({
     // 初始化SDK
 
     //ATSDK.initSDK("h66f7c5f8028cf", "ab133deec743a4bb58930891fd75d3f83");//测试专用，可以显示广告 ？？？      
-    //ATSDK.initSDK("h67122e47607cd", "a4fd9a23bdd71c2314cf41140a77abb1e");//这是cccc线上的
+    ATSDK.initSDK("h67122e47607cd", "a4fd9a23bdd71c2314cf41140a77abb1e");//这是cccc线上的
 
-    ATSDK.initSDK("h672d7ac280581", "a899a1cd61dd62b83793d38c70486c750");//hxz
+    //ATSDK.initSDK("h672d7ac280581", "a899a1cd61dd62b83793d38c70486c750");//hxz
 
     ATSDK.setLogDebug(true);
     var GDPRLevel = ATSDK.getGDPRLevel();
@@ -238,7 +245,7 @@ cc.Class({
         AAJS2.makePostRequestWithXhr(JSON.stringify(data));
       }, 300);
     }
-    console.log('zh:AD   init end')
+    console.log('zh:AD   init end1')
   },
 
 
@@ -392,16 +399,17 @@ cc.Class({
     }
 
     //zh:下面是原始的代码
-    // this.reviveTimer = setInterval(() => {
-    //   console.log('zh:timer ...')
-    //   if (+numLabel.string > 0) {
-    //     numLabel.string--
-    //     this.rangeSprite.fillRange = 1
-    //   } else {
-    //     console.log('zh:askRevive 2')
-    //     this.onSkipRevive()
-    //   }
-    // }, 1000)
+    this.reviveTimer = setInterval(() => {
+      console.log('zh:timer ...')
+      if (+numLabel.string > 0) {
+        numLabel.string--
+        this.rangeSprite.fillRange = 1
+      } else {
+        console.log('zh:askRevive 2')
+        //this.onSkipRevive()  这是有BUG的
+        this.onSkipReviveForDiy();
+      }
+    }, 1000)
 
   },
   onReviveButton() {
@@ -458,6 +466,18 @@ cc.Class({
       this.rangeSprite.fillRange -= 1 / 60
     }
   },
+
+  ///解决BUG
+  onSkipReviveForDiy() {
+    console.log('zh:onSkipReviveForDiy zh ')
+    clearInterval(this.reviveTimer)
+      // 5 复活页面
+    //this._controller.pageManager.pages[5].active = false
+    //this._score.onGameOver(true)
+    this.isRangeAction = false
+  },
+
+
   onSkipRevive() {
     console.log('zh:onSkipRevive')
     clearInterval(this.reviveTimer)

assets/Script/score.js

@@ -4,6 +4,14 @@
  */
 var AC = require('GameAct')
 
+
+import ATSDK from "./AnyThinkAds/ATJSSDK";
+import ATRewardedVideoSDK from "./AnyThinkAds/ATRewardedVideoJSSDK";
+import AAJS2 from "./ATAndroidJS2";
+import AESUtil from "./AESUtil"
+
+
+
 cc.Class({
   extends: cc.Component,
   properties: {
@@ -54,6 +62,7 @@ cc.Class({
   start() {
     this.generatePool()
     this.bindNode()
+    this.initAdForPage()
   },
   generatePool() {
     this.scorePool = new cc.NodePool()
@@ -72,6 +81,19 @@ cc.Class({
       this.multPropPool.put(multProp)
     }
   },
+
+  
+  initAdForPage() {
+    console.log('zh:score.js initAdForPage start')
+    let deviceId = AAJS2.getDeviceUserId();
+    //console.log("zh:checkstatus:", ATRewardedVideoSDK.checkAdStatus(AAJS2.getPlacementID()));
+    var setting = {};
+    setting[ATRewardedVideoSDK.userIdKey] = deviceId;
+    ATRewardedVideoSDK.loadRewardedVideo(AAJS2.getPlacementID(), setting);
+    console.log('zh:score.js initAdForPage END')
+  },
+
+
   // 实例化单个方块
   instantiateScore(self, num, pos) {
     let score = null
@@ -252,6 +274,7 @@ cc.Class({
   },
   // 点击升级按钮
   onLevelUpButton(double) {
+    console.log('zh:onLevelUpButton double ='+double)
     console.log(double)
     if (this.isLevelUp) {
       return
@@ -311,10 +334,29 @@ cc.Class({
   },
   onDoubleStepBtn() {
     console.log('zh:点击双倍加步22')
-    let testMark = true;//无限复活
-    if(testMark){
-      this.onLevelUpButton(2)
-    }
+    // let testMark = true;//无限复活
+    // if(testMark){
+    //   this.onLevelUpButton(2)
+    // }
+
+
+     //下面是上线后的逻辑
+     setTimeout(() => {
+      if (cc.sys.os === cc.sys.OS_ANDROID) {
+        let placementID = AAJS2.getPlacementID();
+        if (ATRewardedVideoSDK.hasAdReady(placementID)) {
+          cc.sys.localStorage.setItem('yxAdMark', 'step2');//看广告用于 双倍加步数 标记
+          ATRewardedVideoSDK.showAd(placementID);
+        } else {
+          cc.sys.localStorage.removeItem('yxAdMark')
+          console.log('zh:AD 没有准备好，所以直接给发放双倍奖励')
+          //广告没有准备好，所以直接给发放奖励
+          this.onLevelUpButton(2)
+
+        }
+      }
+    }, 300)
+
 
     // if (this._controller.social.node.active) {
     //   this._controller.social.onReviveButton(0)
@@ -323,6 +365,11 @@ cc.Class({
     // }
 
   },
+
+
+
+
+
   onDoubleStep() {
     this.onLevelUpButton(2)
   },

assets/Texture/4fail/shipin (1).png.meta

@@ -20,11 +20,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -0.5,
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 223,
+      "width": 222,
       "height": 76,
       "rawWidth": 223,
       "rawHeight": 76,

assets/Texture/4fail/组 27.png.meta

@@ -20,11 +20,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -0.5,
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 223,
+      "width": 222,
       "height": 76,
       "rawWidth": 223,
       "rawHeight": 76,

assets/Texture/4fail/组 29.png.meta

@@ -20,11 +20,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -0.5,
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 223,
+      "width": 222,
       "height": 76,
       "rawWidth": 223,
       "rawHeight": 76,

assets/Texture/4fail/组 3 拷贝.png.meta

@@ -20,11 +20,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -0.5,
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 223,
+      "width": 222,
       "height": 76,
       "rawWidth": 223,
       "rawHeight": 76,

assets/Texture/5.png.meta

@@ -20,12 +20,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 135,
-      "height": 44,
+      "offsetX": 0.5,
+      "offsetY": -1.5,
+      "trimX": 1,
+      "trimY": 5,
+      "width": 134,
+      "height": 37,
       "rawWidth": 135,
       "rawHeight": 44,
       "borderTop": 0,

assets/Texture/5but/share.png.meta

@@ -21,11 +21,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 1,
       "trimX": 0,
       "trimY": 0,
       "width": 90,
-      "height": 122,
+      "height": 120,
       "rawWidth": 90,
       "rawHeight": 122,
       "borderTop": 0,

assets/Texture/5but/图鉴.png.meta

@@ -21,11 +21,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
       "trimY": 0,
       "width": 90,
-      "height": 122,
+      "height": 121,
       "rawWidth": 90,
       "rawHeight": 122,
       "borderTop": 0,

assets/Texture/5but/图鉴1.png.meta

@@ -21,11 +21,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -1.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 10,
       "width": 76,
-      "height": 39,
+      "height": 22,
       "rawWidth": 76,
       "rawHeight": 39,
       "borderTop": 0,

assets/Texture/5but/开始游戏.png.meta

@@ -20,11 +20,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -1,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 14,
       "trimY": 0,
-      "width": 316,
+      "width": 286,
       "height": 105,
       "rawWidth": 316,
       "rawHeight": 105,

assets/Texture/5but/组 4 拷贝 3.png.meta

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

assets/Texture/alty.png.meta

@@ -20,12 +20,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -1.5,
-      "offsetY": -1,
-      "trimX": 1,
+      "offsetX": -0.5,
+      "offsetY": -0.5,
+      "trimX": 3,
       "trimY": 5,
-      "width": 755,
-      "height": 100,
+      "width": 753,
+      "height": 99,
       "rawWidth": 760,
       "rawHeight": 108,
       "borderTop": 0,

assets/Texture/btn-red.png.meta

@@ -21,15 +21,15 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 3,
       "width": 71,
-      "height": 76,
+      "height": 71,
       "rawWidth": 71,
       "rawHeight": 76,
       "borderTop": 34,
-      "borderBottom": 38,
+      "borderBottom": 37,
       "borderLeft": 34,
       "borderRight": 34,
       "subMetas": {}

assets/Texture/btn-y.png.meta

@@ -21,17 +21,17 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 75,
-      "height": 76,
+      "offsetY": -0.5,
+      "trimX": 2,
+      "trimY": 3,
+      "width": 71,
+      "height": 71,
       "rawWidth": 75,
       "rawHeight": 76,
       "borderTop": 37,
-      "borderBottom": 36,
+      "borderBottom": 34,
       "borderLeft": 36,
-      "borderRight": 36,
+      "borderRight": 35,
       "subMetas": {}
     }
   }

assets/Texture/cell1.png.meta

@@ -23,9 +23,9 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 2,
       "width": 94,
-      "height": 94,
+      "height": 90,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 26,

assets/Texture/cell2.png.meta

@@ -21,11 +21,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 6,
       "width": 94,
-      "height": 94,
+      "height": 83,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 17,

assets/Texture/cell3.png.meta

@@ -23,9 +23,9 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 4,
       "width": 94,
-      "height": 94,
+      "height": 86,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 25,

assets/Texture/cell4.png.meta

@@ -20,12 +20,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
+      "offsetX": -1,
+      "offsetY": 0.5,
+      "trimX": 1,
       "trimY": 0,
-      "width": 94,
-      "height": 94,
+      "width": 90,
+      "height": 93,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 18,

assets/Texture/gameover.png.meta

@@ -23,9 +23,9 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 5,
       "width": 158,
-      "height": 40,
+      "height": 30,
       "rawWidth": 158,
       "rawHeight": 40,
       "borderTop": 0,

assets/Texture/level-bg.png.meta

@@ -20,12 +20,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -0.5,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 0,
-      "width": 50,
-      "height": 91,
+      "trimY": 1,
+      "width": 49,
+      "height": 89,
       "rawWidth": 50,
       "rawHeight": 91,
       "borderTop": 0,

assets/Texture/newItem/addStepAdv.png.meta

@@ -20,11 +20,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -0.5,
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 223,
+      "width": 222,
       "height": 76,
       "rawWidth": 223,
       "rawHeight": 76,

assets/Texture/newItem/组 37.png.meta

@@ -21,11 +21,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 6,
       "width": 94,
-      "height": 94,
+      "height": 83,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,

assets/Texture/newItem/组 38.png.meta

@@ -21,11 +21,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 6,
       "width": 94,
-      "height": 94,
+      "height": 83,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,

assets/Texture/newItem/组 39.png.meta

@@ -23,9 +23,9 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 2,
       "width": 94,
-      "height": 94,
+      "height": 90,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,

assets/Texture/newItem/组 40.png.meta

@@ -21,11 +21,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 1,
       "width": 94,
-      "height": 94,
+      "height": 91,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,

assets/Texture/newItem/组 41.png.meta

@@ -23,9 +23,9 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 4,
       "width": 94,
-      "height": 94,
+      "height": 86,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,

assets/Texture/newItem/组 42.png.meta

@@ -21,11 +21,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
+      "offsetY": 0.5,
+      "trimX": 2,
       "trimY": 0,
-      "width": 94,
-      "height": 94,
+      "width": 90,
+      "height": 93,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,

assets/Texture/newItem/组 43.png.meta

@@ -23,9 +23,9 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 4,
       "width": 94,
-      "height": 94,
+      "height": 86,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,

assets/Texture/newItem/蓝.png.meta

@@ -21,11 +21,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
+      "offsetY": 0.5,
+      "trimX": 2,
       "trimY": 0,
-      "width": 94,
-      "height": 94,
+      "width": 90,
+      "height": 93,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,

assets/Texture/prop/+500红.png.meta

@@ -21,11 +21,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 1,
       "width": 94,
-      "height": 94,
+      "height": 91,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,

assets/Texture/prop/+500绿.png.meta

@@ -23,9 +23,9 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 4,
       "width": 94,
-      "height": 94,
+      "height": 86,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,

assets/Texture/prop/+500蓝.png.meta

@@ -21,11 +21,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
+      "offsetY": 0.5,
+      "trimX": 2,
       "trimY": 0,
-      "width": 94,
-      "height": 94,
+      "width": 90,
+      "height": 93,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,

assets/Texture/prop/+500黄.png.meta

@@ -21,11 +21,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 6,
       "width": 94,
-      "height": 94,
+      "height": 83,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,

assets/Texture/prop/X2红.png.meta

@@ -21,11 +21,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 1,
       "width": 94,
-      "height": 94,
+      "height": 91,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,

assets/Texture/prop/X2绿.png.meta

@@ -23,9 +23,9 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 4,
       "width": 94,
-      "height": 94,
+      "height": 86,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,

assets/Texture/prop/X2蓝.png.meta

@@ -21,11 +21,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
+      "offsetY": 0.5,
+      "trimX": 2,
       "trimY": 0,
-      "width": 94,
-      "height": 94,
+      "width": 90,
+      "height": 93,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,

assets/Texture/prop/X2黄.png.meta

@@ -21,11 +21,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 6,
       "width": 94,
-      "height": 94,
+      "height": 83,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,

assets/Texture/prop/炸弹-拷贝-4.png.meta

@@ -21,11 +21,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
+      "offsetY": 0.5,
+      "trimX": 2,
       "trimY": 0,
-      "width": 94,
-      "height": 94,
+      "width": 90,
+      "height": 93,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,

assets/Texture/prop/炸弹-拷贝-5.png.meta

@@ -23,9 +23,9 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 2,
       "width": 94,
-      "height": 94,
+      "height": 90,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,

assets/Texture/prop/炸弹绿-拷贝.png.meta

@@ -21,11 +21,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": -0.5,
       "trimX": 0,
-      "trimY": 0,
+      "trimY": 6,
       "width": 94,
-      "height": 94,
+      "height": 83,
       "rawWidth": 94,
       "rawHeight": 94,
       "borderTop": 0,