diff --git a/assets/Scene/GameScene.fire b/assets/Scene/GameScene.fire index 2759746..5b9fe38 100644 --- a/assets/Scene/GameScene.fire +++ b/assets/Scene/GameScene.fire @@ -7978,8 +7978,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 40, - "height": 56 + "width": 18, + "height": 48 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts index 49fa276..6d1b9d4 100644 --- a/assets/Script/JiaZai.ts +++ b/assets/Script/JiaZai.ts @@ -726,11 +726,9 @@ export default class JiaZai extends cc.Component { } let name = "补发充值成功" + productId; cc.fx.GameTool.shushu_Track("payment", dataSuccess); - let version = cc.fx.GameTool.getWechatGameVersion(); - if (version == "正式版") { - MiniGameSdk.API.yinli_Pay(price, order.outTradeNo, name); - } + console.log("引力付费透传", price, order.outTradeNo, name); + MiniGameSdk.API.yinli_Pay(price, order.outTradeNo, name); } else { // 如果当前订单不处理，直接处理下一个订单 diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index ef5100d..ecb2b56 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -11,7 +11,7 @@ import NumberToImage from "./NumberToImage"; import SceneManager from "./SceneManager"; import { MiniGameSdk } from "./Sdk/MiniGameSdk"; import Animation = cc.Animation; -import Revive from "./Revive"; +// import Revive from "./Revive"; import Utils from "./module/Pay/Utils"; const { ccclass, property } = cc._decorator; @@ -664,19 +664,19 @@ export default class MapConroler extends cc.Component { if (type == "wall") opacity = 255; if (type == "turn") opacity = 250; if (this.mapBlocksWall[pointA.x][pointA.y].opacity == 249 && this.mapBlocksWall[pointB.x][pointB.y].opacity == 249) { - console.log("缺角", pointA, pointB); + //console.log("缺角", pointA, pointB); return null; } else if (this.mapBlocksWall[pointA.x][pointA.y].opacity == 249 && this.mapBlocksWall[pointC.x][pointC.y].opacity == 249) { - console.log("缺角", pointA, pointC); + //console.log("缺角", pointA, pointC); return null; } else if (this.mapBlocksWall[pointA.x][pointA.y].opacity == 249 && this.mapBlocksWall[pointD.x][pointD.y].opacity == 249) { - console.log("缺角", pointA, pointD); + //console.log("缺角", pointA, pointD); return null; } else if (this.mapBlocksWall[pointA.x][pointA.y].opacity == 249 && this.mapBlocksWall[pointE.x][pointE.y].opacity == 249) { - console.log("缺角", pointA, pointE); + //console.log("缺角", pointA, pointE); return null; } @@ -1840,7 +1840,7 @@ export default class MapConroler extends cc.Component { result: "fail" } if (cc.fx.GameConfig.GM_INFO.revive == 0 && this.revive) { - this.revive.getComponent(Revive).offShow(); + this.revive.getComponent("Revive").offShow(); this.node.active = false; } cc.fx.GameTool.shushu_Track("finish_stage", data); @@ -1929,7 +1929,7 @@ export default class MapConroler extends cc.Component { .to(0.15, { scale: 1.0 }, { easing: 'sineOut' }) .start(); this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Time").active = true; - this.revive.getComponent(Revive).init(); + this.revive.getComponent("Revive").init(); this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Boom").active = false; if (cc.fx.GameConfig.GM_INFO.otherLevel > 0) { this.node.parent.parent.getChildByName("Lose").getChildByName("share").active = false; diff --git a/assets/Script/Revive.ts b/assets/Script/Revive.ts index 33b573c..b6572e3 100644 --- a/assets/Script/Revive.ts +++ b/assets/Script/Revive.ts @@ -59,6 +59,7 @@ export default class Revive extends cc.Component { } cc.fx.GameTool.shushu_Track("payment", dataSuccess); let name = "购买金币道具:" + iosID; + console.log("引力付费透传", iosAmount, iosOutTradeNo, name); MiniGameSdk.API.yinli_Pay(iosAmount, iosOutTradeNo, name) Utils.setPayInfo( (res) => { @@ -135,8 +136,15 @@ export default class Revive extends cc.Component { } } init() { + this.addListener(); + this.btn_Touch = true; + if (cc.fx.GameConfig.GM_INFO.revive == 1) { + this.node.active = false; + } + } + + addListener() { if (cc.sys.platform === cc.sys.WECHAT_GAME) { - this.onShowListener = null; // 定义监听函数 this.onShowListener = () => { this.onShow(); @@ -144,10 +152,6 @@ export default class Revive extends cc.Component { //@ts-ignore wx.onShow(this.onShowListener); } - this.btn_Touch = true; - if (cc.fx.GameConfig.GM_INFO.revive == 1) { - this.node.active = false; - } } //购买 @@ -315,6 +319,7 @@ export default class Revive extends cc.Component { } cc.fx.GameTool.shushu_Track("payment", dataSuccess); let name = "购买金币道具:" + productId; + console.log("引力付费透传", price, Utils.outTradeNo, name); MiniGameSdk.API.yinli_Pay(price, Utils.outTradeNo, name) console.log("7.14_______________充值成功，轮训成功，准备发货"); Utils.setPayInfo( diff --git a/assets/Script/Sdk/MiniGameSdk.ts b/assets/Script/Sdk/MiniGameSdk.ts index 0edd14e..b07fca6 100644 --- a/assets/Script/Sdk/MiniGameSdk.ts +++ b/assets/Script/Sdk/MiniGameSdk.ts @@ -1192,7 +1192,7 @@ export namespace MiniGameSdk { current_health: cc.fx.GameConfig.GM_INFO.hp, //当前体力值 tmp_coin: cc.fx.GameConfig.GM_INFO.coin,//当前金币 version: cc.fx.GameConfig.GM_INFO.version.toString(),//当前版本号 - uid: cc.fx.GameConfig.GM_INFO.uid.toString() //用户id + user_id: cc.fx.GameConfig.GM_INFO.uid.toString() //用户id }; if (register_time != null) { // console.log("设置用户公共属性注册：————————————", register_time); @@ -1202,7 +1202,7 @@ export namespace MiniGameSdk { tmp_coin: cc.fx.GameConfig.GM_INFO.coin,//当前金币 version: cc.fx.GameConfig.GM_INFO.version.toString(), register_time: register_time, - uid: cc.fx.GameConfig.GM_INFO.uid.toString(), //用户id + user_id: cc.fx.GameConfig.GM_INFO.uid.toString(), //用户id pay_user: pay_user }; } @@ -1213,7 +1213,7 @@ export namespace MiniGameSdk { current_health: cc.fx.GameConfig.GM_INFO.hp, //当前体力值 tmp_coin: cc.fx.GameConfig.GM_INFO.coin,//当前金币 version: cc.fx.GameConfig.GM_INFO.version.toString(), - uid: cc.fx.GameConfig.GM_INFO.uid.toString(), //用户id + user_id: cc.fx.GameConfig.GM_INFO.uid.toString(), //用户id pay_user: pay_user } } @@ -1337,7 +1337,14 @@ export namespace MiniGameSdk { */ static yinli_Pay(payAmount, orderId, payReason) { if (typeof wx !== 'undefined' && wx !== null) { - API._ge.payEvent(payAmount, "CNY", orderId, payReason, "微信"); + let version = cc.fx.GameTool.getWechatGameVersion(); + if (version == "开发版" || version == "体验版") { + } + else { + API._ge.payEvent(payAmount, "CNY", orderId, payReason, "微信"); + } + console.log("版本:", version); + } } diff --git a/assets/Script/monthlyCard.ts b/assets/Script/monthlyCard.ts index c0a0e7c..cf20f9e 100644 --- a/assets/Script/monthlyCard.ts +++ b/assets/Script/monthlyCard.ts @@ -41,6 +41,7 @@ export default class NewClass extends cc.Component { } onShow() { + console.log("后台进入前台，monthlcard"); if (cc.sys.platform === cc.sys.WECHAT_GAME) { console.log("从后台进入前台订单号:", cc.fx.GameConfig.GM_INFO.iosOutTradeNo); if (cc.fx.GameConfig.GM_INFO.iosOutTradeNo != null && cc.fx.GameConfig.GM_INFO.iosOutTradeNo != "") { @@ -66,6 +67,7 @@ export default class NewClass extends cc.Component { } cc.fx.GameTool.shushu_Track("payment", dataSuccess); let name = "购买金币道具:" + iosID; + console.log("引力付费透传", iosAmount, iosOutTradeNo, name); MiniGameSdk.API.yinli_Pay(iosAmount, iosOutTradeNo, name) Utils.setPayInfo( (res) => { @@ -152,9 +154,9 @@ export default class NewClass extends cc.Component { } init() { if (cc.sys.platform === cc.sys.WECHAT_GAME) { - this.onShowListener = null; // 定义监听函数 this.onShowListener = () => { + console.log("微信小游戏切到前台,monthCard"); this.onShow(); }; //@ts-ignore @@ -261,7 +263,7 @@ export default class NewClass extends cc.Component { // update (dt) {} } closeMonthCard() { - this.init(); + // this.init(); //获取商城界面更新图标方法 let shop = cc.find("Canvas/shop"); if (shop) { @@ -273,8 +275,10 @@ export default class NewClass extends cc.Component { // 移除 wx.onShow 监听器 if (cc.sys.platform === cc.sys.WECHAT_GAME && this.onShowListener) { + console.log("月卡关闭监听"); //@ts-ignore wx.offShow(this.onShowListener); + } //jiazai const jiazaiNode = cc.find("Canvas"); // 假设 JiaZai 挂在 Canvas 节点 @@ -416,6 +420,7 @@ export default class NewClass extends cc.Component { } cc.fx.GameTool.shushu_Track("payment", dataSuccess); let name = "购买金币道具:" + productId; + console.log("引力付费透传", price, Utils.outTradeNo, name); MiniGameSdk.API.yinli_Pay(price, Utils.outTradeNo, name) console.log("7.14_______________充值成功，轮训成功，准备发货"); Utils.setPayInfo( diff --git a/assets/res/font/font.plist b/assets/res/font/font.plist index 953f459..52c7685 100644 --- a/assets/res/font/font.plist +++ b/assets/res/font/font.plist @@ -15,9 +15,9 @@ spriteSourceSize {25,39} textureRect - {{324,75},{25,39}} + {{180,1668},{25,39}} textureRotated - + big_1.png @@ -30,7 +30,7 @@ spriteSourceSize {20,38} textureRect - {{264,37},{20,38}} + {{109,1866},{20,38}} textureRotated @@ -45,7 +45,7 @@ spriteSourceSize {24,37} textureRect - {{390,0},{24,37}} + {{191,1449},{24,37}} textureRotated @@ -60,9 +60,9 @@ spriteSourceSize {23,38} textureRect - {{284,37},{23,38}} + {{131,1891},{23,38}} textureRotated - + big_4.png @@ -75,9 +75,9 @@ spriteSourceSize {26,38} textureRect - {{307,37},{26,38}} + {{38,1948},{26,38}} textureRotated - + big_5.png @@ -90,7 +90,7 @@ spriteSourceSize {24,38} textureRect - {{333,37},{24,38}} + {{191,1409},{24,38}} textureRotated @@ -105,7 +105,7 @@ spriteSourceSize {25,38} textureRect - {{357,37},{25,38}} + {{190,1369},{25,38}} textureRotated @@ -120,7 +120,7 @@ spriteSourceSize {25,39} textureRect - {{349,75},{25,39}} + {{194,1166},{25,39}} textureRotated @@ -135,9 +135,9 @@ spriteSourceSize {24,38} textureRect - {{382,37},{24,38}} + {{171,1891},{24,38}} textureRotated - + big_9.png @@ -150,9 +150,9 @@ spriteSourceSize {25,38} textureRect - {{406,37},{25,38}} + {{78,1947},{25,38}} textureRotated - + button_0.png @@ -165,22 +165,22 @@ spriteSourceSize {37,40} textureRect - {{374,75},{37,40}} + {{144,997},{37,40}} textureRotated - + button_1.png aliases spriteOffset - {0,0} + {-1,0} spriteSize - {37,40} + {23,40} spriteSourceSize {37,40} textureRect - {{411,75},{37,40}} + {{186,994},{23,40}} textureRotated @@ -191,11 +191,11 @@ spriteOffset {0,0} spriteSize - {37,40} + {33,40} spriteSourceSize {37,40} textureRect - {{448,75},{37,40}} + {{221,1658},{33,40}} textureRotated @@ -206,13 +206,13 @@ spriteOffset {0,0} spriteSize - {37,40} + {31,40} spriteSourceSize {37,40} textureRect - {{0,115},{37,40}} + {{94,1687},{31,40}} textureRotated - + button_4.png @@ -225,9 +225,9 @@ spriteSourceSize {37,40} textureRect - {{37,115},{37,40}} + {{136,1691},{37,40}} textureRotated - + button_5.png @@ -236,26 +236,26 @@ spriteOffset {0,0} spriteSize - {37,40} + {33,40} spriteSourceSize {37,40} textureRect - {{74,115},{37,40}} + {{178,1695},{33,40}} textureRotated - + button_6.png aliases spriteOffset - {0,0} + {-1,0} spriteSize - {37,40} + {35,40} spriteSourceSize {37,40} textureRect - {{111,115},{37,40}} + {{220,1700},{35,40}} textureRotated @@ -270,7 +270,7 @@ spriteSourceSize {37,40} textureRect - {{148,115},{37,40}} + {{181,1730},{37,40}} textureRotated @@ -281,11 +281,11 @@ spriteOffset {0,0} spriteSize - {37,40} + {35,40} spriteSourceSize {37,40} textureRect - {{185,115},{37,40}} + {{220,1742},{35,40}} textureRotated @@ -296,11 +296,11 @@ spriteOffset {0,0} spriteSize - {37,40} + {35,40} spriteSourceSize {37,40} textureRect - {{222,115},{37,40}} + {{96,1766},{35,40}} textureRotated @@ -315,9 +315,9 @@ spriteSourceSize {36,38} textureRect - {{431,37},{36,38}} + {{54,1692},{36,38}} textureRotated - + coin_1.png @@ -326,11 +326,11 @@ spriteOffset {0,0} spriteSize - {36,38} + {26,38} spriteSourceSize {36,38} textureRect - {{467,37},{36,38}} + {{190,1329},{26,38}} textureRotated @@ -341,11 +341,11 @@ spriteOffset {0,0} spriteSize - {36,38} + {16,30} spriteSourceSize {36,38} textureRect - {{288,75},{36,38}} + {{182,1086},{16,30}} textureRotated @@ -356,11 +356,11 @@ spriteOffset {0,0} spriteSize - {36,38} + {34,38} spriteSourceSize {36,38} textureRect - {{0,75},{36,38}} + {{221,1214},{34,38}} textureRotated @@ -371,13 +371,13 @@ spriteOffset {0,0} spriteSize - {36,38} + {32,38} spriteSourceSize {36,38} textureRect - {{36,75},{36,38}} + {{216,239},{32,38}} textureRotated - + coin_4.png @@ -390,9 +390,9 @@ spriteSourceSize {36,38} textureRect - {{72,75},{36,38}} + {{179,1772},{36,38}} textureRotated - + coin_5.png @@ -401,11 +401,11 @@ spriteOffset {0,0} spriteSize - {36,38} + {34,38} spriteSourceSize {36,38} textureRect - {{108,75},{36,38}} + {{221,1254},{34,38}} textureRotated @@ -416,11 +416,11 @@ spriteOffset {0,0} spriteSize - {36,38} + {34,38} spriteSourceSize {36,38} textureRect - {{144,75},{36,38}} + {{221,1294},{34,38}} textureRotated @@ -435,7 +435,7 @@ spriteSourceSize {36,38} textureRect - {{180,75},{36,38}} + {{219,1784},{36,38}} textureRotated @@ -446,11 +446,11 @@ spriteOffset {0,0} spriteSize - {36,38} + {34,38} spriteSourceSize {36,38} textureRect - {{216,75},{36,38}} + {{221,1334},{34,38}} textureRotated @@ -465,7 +465,7 @@ spriteSourceSize {36,38} textureRect - {{252,75},{36,38}} + {{219,1824},{36,38}} textureRotated @@ -480,7 +480,7 @@ spriteSourceSize {47,59} textureRect - {{127,469},{47,59}} + {{105,545},{47,59}} textureRotated @@ -495,9 +495,9 @@ spriteSourceSize {32,61} textureRect - {{385,469},{32,61}} + {{153,239},{32,61}} textureRotated - + coins2.png @@ -510,7 +510,7 @@ spriteSourceSize {45,60} textureRect - {{298,469},{45,60}} + {{1,1979},{45,60}} textureRotated @@ -525,9 +525,9 @@ spriteSourceSize {42,60} textureRect - {{343,469},{42,60}} + {{151,433},{42,60}} textureRotated - + coins4.png @@ -540,7 +540,7 @@ spriteSourceSize {50,59} textureRect - {{174,469},{50,59}} + {{205,492},{50,59}} textureRotated @@ -555,7 +555,7 @@ spriteSourceSize {44,59} textureRect - {{224,469},{44,59}} + {{137,936},{44,59}} textureRotated @@ -570,9 +570,9 @@ spriteSourceSize {47,58} textureRect - {{335,411},{47,58}} + {{154,339},{47,58}} textureRotated - + coins7.png @@ -585,9 +585,9 @@ spriteSourceSize {43,58} textureRect - {{382,411},{43,58}} + {{154,388},{43,58}} textureRotated - + coins8.png @@ -600,7 +600,7 @@ spriteSourceSize {47,58} textureRect - {{425,411},{47,58}} + {{151,676},{47,58}} textureRotated @@ -615,9 +615,9 @@ spriteSourceSize {44,58} textureRect - {{0,469},{44,58}} + {{62,1194},{44,58}} textureRotated - + coins_+.png @@ -630,7 +630,7 @@ spriteSourceSize {44,42} textureRect - {{259,115},{44,42}} + {{107,1475},{44,42}} textureRotated @@ -645,7 +645,7 @@ spriteSourceSize {23,26} textureRect - {{89,0},{23,26}} + {{191,1207},{23,26}} textureRotated @@ -660,9 +660,9 @@ spriteSourceSize {24,20} textureRect - {{22,0},{24,20}} + {{109,1906},{24,20}} textureRotated - + coins_x.png @@ -675,9 +675,9 @@ spriteSourceSize {43,49} textureRect - {{63,301},{43,49}} + {{100,673},{43,49}} textureRotated - + cost_0.png @@ -690,7 +690,7 @@ spriteSourceSize {43,46} textureRect - {{395,115},{43,46}} + {{212,789},{43,46}} textureRotated @@ -699,13 +699,13 @@ aliases spriteOffset - {0,0} + {-1,0} spriteSize - {43,46} + {29,46} spriteSourceSize {43,46} textureRect - {{438,115},{43,46}} + {{226,186},{29,46}} textureRotated @@ -720,7 +720,7 @@ spriteSourceSize {47,42} textureRect - {{303,115},{47,42}} + {{58,1472},{47,42}} textureRotated @@ -731,11 +731,11 @@ spriteOffset {0,0} spriteSize - {43,46} + {39,46} spriteSourceSize {43,46} textureRect - {{0,161},{43,46}} + {{216,933},{39,46}} textureRotated @@ -746,11 +746,11 @@ spriteOffset {0,0} spriteSize - {43,46} + {37,46} spriteSourceSize {43,46} textureRect - {{43,161},{43,46}} + {{212,1562},{37,46}} textureRotated @@ -765,7 +765,7 @@ spriteSourceSize {43,46} textureRect - {{86,161},{43,46}} + {{212,837},{43,46}} textureRotated @@ -776,11 +776,11 @@ spriteOffset {0,0} spriteSize - {43,46} + {39,46} spriteSourceSize {43,46} textureRect - {{129,161},{43,46}} + {{216,981},{39,46}} textureRotated @@ -789,13 +789,13 @@ aliases spriteOffset - {0,0} + {-1,0} spriteSize - {43,46} + {41,46} spriteSourceSize {43,46} textureRect - {{172,161},{43,46}} + {{214,380},{41,46}} textureRotated @@ -810,7 +810,7 @@ spriteSourceSize {43,46} textureRect - {{215,161},{43,46}} + {{212,885},{43,46}} textureRotated @@ -821,13 +821,13 @@ spriteOffset {0,0} spriteSize - {43,46} + {41,46} spriteSourceSize {43,46} textureRect - {{258,161},{43,46}} + {{164,808},{41,46}} textureRotated - + cost_9.png @@ -836,14 +836,164 @@ spriteOffset {0,0} spriteSize - {43,46} + {41,46} spriteSourceSize {43,46} textureRect - {{301,161},{43,46}} + {{194,1118},{41,46}} textureRotated + discount_0.png + + aliases + + spriteOffset + {0,0} + spriteSize + {40,44} + spriteSourceSize + {40,44} + textureRect + {{211,1029},{40,44}} + textureRotated + + + discount_1.png + + aliases + + spriteOffset + {0,0} + spriteSize + {28,42} + spriteSourceSize + {40,44} + textureRect + {{182,851},{28,42}} + textureRotated + + + discount_2.png + + aliases + + spriteOffset + {0,0} + spriteSize + {38,44} + spriteSourceSize + {40,44} + textureRect + {{217,1422},{38,44}} + textureRotated + + + discount_3.png + + aliases + + spriteOffset + {-1,0} + spriteSize + {36,44} + spriteSourceSize + {40,44} + textureRect + {{135,1730},{36,44}} + textureRotated + + + discount_4.png + + aliases + + spriteOffset + {0,0} + spriteSize + {40,44} + spriteSourceSize + {40,44} + textureRect + {{53,1730},{40,44}} + textureRotated + + + discount_5.png + + aliases + + spriteOffset + {-1,0} + spriteSize + {38,44} + spriteSourceSize + {40,44} + textureRect + {{217,1468},{38,44}} + textureRotated + + + discount_6.png + + aliases + + spriteOffset + {0,0} + spriteSize + {38,44} + spriteSourceSize + {40,44} + textureRect + {{95,1720},{38,44}} + textureRotated + + + discount_7.png + + aliases + + spriteOffset + {0,0} + spriteSize + {40,44} + spriteSourceSize + {40,44} + textureRect + {{54,1776},{40,44}} + textureRotated + + + discount_8.png + + aliases + + spriteOffset + {0,0} + spriteSize + {40,44} + spriteSourceSize + {40,44} + textureRect + {{54,1822},{40,44}} + textureRotated + + + discount_9.png + + aliases + + spriteOffset + {0,0} + spriteSize + {40,44} + spriteSourceSize + {40,44} + textureRect + {{133,1768},{40,44}} + textureRotated + + hp_,.png aliases @@ -855,7 +1005,7 @@ spriteSourceSize {46,68} textureRect - {{0,661},{46,68}} + {{62,1124},{46,68}} textureRotated @@ -870,9 +1020,9 @@ spriteSourceSize {66,29} textureRect - {{112,0},{66,29}} + {{38,1880},{66,29}} textureRotated - + hp_..png @@ -885,22 +1035,22 @@ spriteSourceSize {45,42} textureRect - {{350,115},{45,42}} + {{213,1071},{45,42}} textureRotated - + hp_0.png aliases spriteOffset - {0,0} + {0,1} spriteSize - {97,108} + {97,104} spriteSourceSize {97,108} textureRect - {{301,753},{97,108}} + {{1,596},{97,104}} textureRotated @@ -909,13 +1059,13 @@ aliases spriteOffset - {0,0} + {0,1} spriteSize - {97,108} + {57,104} spriteSourceSize {97,108} textureRect - {{398,753},{97,108}} + {{100,92},{57,104}} textureRotated @@ -926,11 +1076,11 @@ spriteOffset {0,0} spriteSize - {97,108} + {85,104} spriteSourceSize {97,108} textureRect - {{0,861},{97,108}} + {{1,808},{85,104}} textureRotated @@ -939,13 +1089,13 @@ aliases spriteOffset - {0,0} + {0,1} spriteSize - {97,108} + {81,104} spriteSourceSize {97,108} textureRect - {{97,861},{97,108}} + {{1,1018},{81,104}} textureRotated @@ -956,11 +1106,11 @@ spriteOffset {0,0} spriteSize - {97,108} + {95,104} spriteSourceSize {97,108} textureRect - {{194,861},{97,108}} + {{1,702},{95,104}} textureRotated @@ -971,11 +1121,11 @@ spriteOffset {0,0} spriteSize - {97,108} + {85,102} spriteSourceSize {97,108} textureRect - {{291,861},{97,108}} + {{1,914},{85,102}} textureRotated @@ -990,7 +1140,7 @@ spriteSourceSize {98,128} textureRect - {{94,970},{98,128}} + {{1,228},{98,128}} textureRotated @@ -1005,7 +1155,7 @@ spriteSourceSize {94,125} textureRect - {{0,970},{94,125}} + {{1,358},{94,125}} textureRotated @@ -1020,7 +1170,7 @@ spriteSourceSize {97,134} textureRect - {{288,970},{97,134}} + {{1,92},{97,134}} textureRotated @@ -1035,7 +1185,7 @@ spriteSourceSize {96,129} textureRect - {{192,970},{96,129}} + {{159,1},{96,129}} textureRotated @@ -1050,7 +1200,7 @@ spriteSourceSize {102,109} textureRect - {{388,861},{102,109}} + {{1,485},{102,109}} textureRotated @@ -1065,7 +1215,7 @@ spriteSourceSize {51,65} textureRect - {{104,596},{51,65}} + {{101,277},{51,65}} textureRotated @@ -1080,7 +1230,7 @@ spriteSourceSize {27,64} textureRect - {{470,532},{27,64}} + {{88,808},{27,64}} textureRotated @@ -1095,9 +1245,9 @@ spriteSourceSize {51,65} textureRect - {{155,596},{51,65}} + {{159,186},{51,65}} textureRotated - + ice_3.png @@ -1110,7 +1260,7 @@ spriteSourceSize {45,65} textureRect - {{206,596},{45,65}} + {{105,478},{45,65}} textureRotated @@ -1125,7 +1275,7 @@ spriteSourceSize {52,65} textureRect - {{251,596},{52,65}} + {{97,411},{52,65}} textureRotated @@ -1140,7 +1290,7 @@ spriteSourceSize {49,65} textureRect - {{303,596},{49,65}} + {{152,477},{49,65}} textureRotated @@ -1155,7 +1305,7 @@ spriteSourceSize {49,65} textureRect - {{352,596},{49,65}} + {{100,606},{49,65}} textureRotated @@ -1170,7 +1320,7 @@ spriteSourceSize {46,64} textureRect - {{0,596},{46,64}} + {{98,718},{46,64}} textureRotated @@ -1185,7 +1335,7 @@ spriteSourceSize {51,65} textureRect - {{401,596},{51,65}} + {{101,344},{51,65}} textureRotated @@ -1200,7 +1350,7 @@ spriteSourceSize {49,65} textureRect - {{452,596},{49,65}} + {{154,544},{49,65}} textureRotated @@ -1215,7 +1365,7 @@ spriteSourceSize {42,54} textureRect - {{138,301},{42,54}} + {{94,1519},{42,54}} textureRotated @@ -1226,13 +1376,13 @@ spriteOffset {0,0} spriteSize - {42,54} + {30,54} spriteSourceSize {42,54} textureRect - {{180,301},{42,54}} + {{88,1004},{30,54}} textureRotated - + level_2.png @@ -1241,11 +1391,11 @@ spriteOffset {0,0} spriteSize - {42,54} + {40,54} spriteSourceSize {42,54} textureRect - {{222,301},{42,54}} + {{138,1635},{40,54}} textureRotated @@ -1256,11 +1406,11 @@ spriteOffset {0,0} spriteSize - {42,54} + {38,54} spriteSourceSize {42,54} textureRect - {{264,301},{42,54}} + {{128,1036},{38,54}} textureRotated @@ -1275,7 +1425,7 @@ spriteSourceSize {42,54} textureRect - {{306,301},{42,54}} + {{94,1575},{42,54}} textureRotated @@ -1286,11 +1436,11 @@ spriteOffset {0,0} spriteSize - {42,54} + {40,54} spriteSourceSize {42,54} textureRect - {{348,301},{42,54}} + {{148,1356},{40,54}} textureRotated @@ -1301,11 +1451,11 @@ spriteOffset {0,0} spriteSize - {42,54} + {40,54} spriteSourceSize {42,54} textureRect - {{390,301},{42,54}} + {{149,1412},{40,54}} textureRotated @@ -1320,7 +1470,7 @@ spriteSourceSize {42,54} textureRect - {{432,301},{42,54}} + {{94,1631},{42,54}} textureRotated @@ -1335,7 +1485,7 @@ spriteSourceSize {42,54} textureRect - {{0,355},{42,54}} + {{84,1036},{42,54}} textureRotated @@ -1350,7 +1500,7 @@ spriteSourceSize {42,54} textureRect - {{42,355},{42,54}} + {{150,1124},{42,54}} textureRotated @@ -1365,9 +1515,9 @@ spriteSourceSize {22,32} textureRect - {{199,0},{22,32}} + {{98,784},{22,32}} textureRotated - + lock_1.png @@ -1380,9 +1530,9 @@ spriteSourceSize {17,32} textureRect - {{221,0},{17,32}} + {{96,1847},{17,32}} textureRotated - + lock_2.png @@ -1395,9 +1545,9 @@ spriteSourceSize {21,31} textureRect - {{178,0},{21,31}} + {{166,785},{21,31}} textureRotated - + lock_3.png @@ -1410,9 +1560,9 @@ spriteSourceSize {21,32} textureRect - {{238,0},{21,32}} + {{132,785},{21,32}} textureRotated - + lock_4.png @@ -1425,9 +1575,9 @@ spriteSourceSize {23,32} textureRect - {{259,0},{23,32}} + {{122,2013},{23,32}} textureRotated - + lock_5.png @@ -1440,9 +1590,9 @@ spriteSourceSize {21,32} textureRect - {{282,0},{21,32}} + {{118,1951},{21,32}} textureRotated - + lock_6.png @@ -1455,7 +1605,7 @@ spriteSourceSize {22,32} textureRect - {{303,0},{22,32}} + {{157,1967},{22,32}} textureRotated @@ -1470,7 +1620,7 @@ spriteSourceSize {22,32} textureRect - {{325,0},{22,32}} + {{181,1952},{22,32}} textureRotated @@ -1485,9 +1635,9 @@ spriteSourceSize {21,32} textureRect - {{347,0},{21,32}} + {{205,1967},{21,32}} textureRotated - + lock_9.png @@ -1500,7 +1650,7 @@ spriteSourceSize {22,32} textureRect - {{368,0},{22,32}} + {{181,1986},{22,32}} textureRotated @@ -1511,26 +1661,26 @@ spriteOffset {0,0} spriteSize - {40,46} + {40,44} spriteSourceSize {40,46} textureRect - {{344,161},{40,46}} + {{131,1810},{40,44}} textureRotated - + month_1.png aliases spriteOffset - {0,0} + {-1,0} spriteSize - {40,46} + {26,44} spriteSourceSize {40,46} textureRect - {{384,161},{40,46}} + {{190,1283},{26,44}} textureRotated @@ -1541,11 +1691,11 @@ spriteOffset {0,0} spriteSize - {40,46} + {38,44} spriteSourceSize {40,46} textureRect - {{424,161},{40,46}} + {{69,1868},{38,44}} textureRotated @@ -1556,11 +1706,11 @@ spriteOffset {0,0} spriteSize - {40,46} + {34,44} spriteSourceSize {40,46} textureRect - {{0,207},{40,46}} + {{221,1168},{34,44}} textureRotated @@ -1575,7 +1725,7 @@ spriteSourceSize {40,46} textureRect - {{40,207},{40,46}} + {{179,1235},{40,46}} textureRotated @@ -1584,13 +1734,13 @@ aliases spriteOffset - {0,0} + {-1,0} spriteSize - {40,46} + {38,44} spriteSourceSize {40,46} textureRect - {{80,207},{40,46}} + {{82,1974},{38,44}} textureRotated @@ -1601,11 +1751,11 @@ spriteOffset {0,0} spriteSize - {40,46} + {38,46} spriteSourceSize {40,46} textureRect - {{120,207},{40,46}} + {{217,1374},{38,46}} textureRotated @@ -1616,11 +1766,11 @@ spriteOffset {0,0} spriteSize - {40,46} + {40,44} spriteSourceSize {40,46} textureRect - {{160,207},{40,46}} + {{177,1810},{40,44}} textureRotated @@ -1635,7 +1785,7 @@ spriteSourceSize {40,46} textureRect - {{200,207},{40,46}} + {{203,1514},{40,46}} textureRotated @@ -1650,7 +1800,7 @@ spriteSourceSize {40,46} textureRect - {{240,207},{40,46}} + {{213,1610},{40,46}} textureRotated @@ -1665,7 +1815,7 @@ spriteSourceSize {33,37} textureRect - {{414,0},{33,37}} + {{96,1808},{33,37}} textureRotated @@ -1674,15 +1824,15 @@ aliases spriteOffset - {0,0} + {-1,0} spriteSize - {33,37} + {25,37} spriteSourceSize {33,37} textureRect - {{447,0},{33,37}} + {{205,1864},{25,37}} textureRotated - + mul10.png @@ -1695,7 +1845,7 @@ spriteSourceSize {58,64} textureRect - {{46,596},{58,64}} + {{154,273},{58,64}} textureRotated @@ -1710,7 +1860,7 @@ spriteSourceSize {33,37} textureRect - {{0,37},{33,37}} + {{131,1852},{33,37}} textureRotated @@ -1719,15 +1869,15 @@ aliases spriteOffset - {0,0} + {-1,0} spriteSize - {33,37} + {31,37} spriteSourceSize {33,37} textureRect - {{33,37},{33,37}} + {{69,1914},{31,37}} textureRotated - + mul4.png @@ -1740,9 +1890,9 @@ spriteSourceSize {33,37} textureRect - {{66,37},{33,37}} + {{166,1856},{33,37}} textureRotated - + mul5.png @@ -1751,11 +1901,11 @@ spriteOffset {0,0} spriteSize - {33,37} + {31,35} spriteSourceSize {33,37} textureRect - {{99,37},{33,37}} + {{211,1891},{31,35}} textureRotated @@ -1770,9 +1920,9 @@ spriteSourceSize {33,37} textureRect - {{132,37},{33,37}} + {{131,1916},{33,37}} textureRotated - + mul7.png @@ -1785,9 +1935,9 @@ spriteSourceSize {33,37} textureRect - {{165,37},{33,37}} + {{170,1917},{33,37}} textureRotated - + mul8.png @@ -1800,7 +1950,7 @@ spriteSourceSize {33,37} textureRect - {{198,37},{33,37}} + {{209,1928},{33,37}} textureRotated @@ -1815,7 +1965,7 @@ spriteSourceSize {33,37} textureRect - {{231,37},{33,37}} + {{122,1974},{33,37}} textureRotated @@ -1830,7 +1980,7 @@ spriteSourceSize {55,93} textureRect - {{0,753},{55,93}} + {{1,1219},{55,93}} textureRotated @@ -1845,7 +1995,7 @@ spriteSourceSize {35,97} textureRect - {{266,753},{35,97}} + {{1,1880},{35,97}} textureRotated @@ -1860,7 +2010,7 @@ spriteSourceSize {50,77} textureRect - {{46,661},{50,77}} + {{101,198},{50,77}} textureRotated @@ -1875,9 +2025,9 @@ spriteSourceSize {52,96} textureRect - {{214,753},{52,96}} + {{159,132},{52,96}} textureRotated - + mulo3.png @@ -1890,7 +2040,7 @@ spriteSourceSize {49,95} textureRect - {{165,753},{49,95}} + {{1,1501},{49,95}} textureRotated @@ -1905,7 +2055,7 @@ spriteSourceSize {59,93} textureRect - {{55,753},{59,93}} + {{1,1124},{59,93}} textureRotated @@ -1920,7 +2070,7 @@ spriteSourceSize {51,93} textureRect - {{114,753},{51,93}} + {{1,1598},{51,93}} textureRotated @@ -1935,7 +2085,7 @@ spriteSourceSize {56,92} textureRect - {{358,661},{56,92}} + {{1,1314},{56,92}} textureRotated @@ -1950,7 +2100,7 @@ spriteSourceSize {50,92} textureRect - {{414,661},{50,92}} + {{1,1693},{50,92}} textureRotated @@ -1965,7 +2115,7 @@ spriteSourceSize {55,91} textureRect - {{252,661},{55,91}} + {{1,1408},{55,91}} textureRotated @@ -1980,7 +2130,7 @@ spriteSourceSize {51,91} textureRect - {{307,661},{51,91}} + {{1,1787},{51,91}} textureRotated @@ -1995,7 +2145,7 @@ spriteSourceSize {33,48} textureRect - {{431,253},{33,48}} + {{168,1519},{33,48}} textureRotated @@ -2010,7 +2160,7 @@ spriteSourceSize {27,47} textureRect - {{240,253},{27,47}} + {{183,895},{27,47}} textureRotated @@ -2025,7 +2175,7 @@ spriteSourceSize {31,47} textureRect - {{267,253},{31,47}} + {{180,1619},{31,47}} textureRotated @@ -2040,9 +2190,9 @@ spriteSourceSize {30,47} textureRect - {{298,253},{30,47}} + {{84,1092},{30,47}} textureRotated - + rank_4.png @@ -2055,7 +2205,7 @@ spriteSourceSize {34,48} textureRect - {{464,253},{34,48}} + {{176,1569},{34,48}} textureRotated @@ -2070,9 +2220,9 @@ spriteSourceSize {30,47} textureRect - {{328,253},{30,47}} + {{133,1092},{30,47}} textureRotated - + rank_6.png @@ -2085,7 +2235,7 @@ spriteSourceSize {32,47} textureRect - {{358,253},{32,47}} + {{48,1976},{32,47}} textureRotated @@ -2100,7 +2250,7 @@ spriteSourceSize {32,49} textureRect - {{106,301},{32,49}} + {{153,1468},{32,49}} textureRotated @@ -2115,7 +2265,7 @@ spriteSourceSize {31,48} textureRect - {{0,301},{31,48}} + {{183,944},{31,48}} textureRotated @@ -2130,7 +2280,7 @@ spriteSourceSize {32,48} textureRect - {{31,301},{32,48}} + {{168,1036},{32,48}} textureRotated @@ -2145,7 +2295,7 @@ spriteSourceSize {21,24} textureRect - {{68,0},{21,24}} + {{187,1488},{21,24}} textureRotated @@ -2160,7 +2310,7 @@ spriteSourceSize {22,18} textureRect - {{0,0},{22,18}} + {{157,2001},{22,18}} textureRotated @@ -2175,7 +2325,7 @@ spriteSourceSize {45,57} textureRect - {{200,411},{45,57}} + {{58,1240},{45,57}} textureRotated @@ -2190,7 +2340,7 @@ spriteSourceSize {30,59} textureRect - {{268,469},{30,59}} + {{105,1240},{30,59}} textureRotated @@ -2205,7 +2355,7 @@ spriteSourceSize {43,58} textureRect - {{44,469},{43,58}} + {{59,1299},{43,58}} textureRotated @@ -2220,7 +2370,7 @@ spriteSourceSize {40,58} textureRect - {{87,469},{40,58}} + {{52,1516},{40,58}} textureRotated @@ -2235,7 +2385,7 @@ spriteSourceSize {48,57} textureRect - {{245,411},{48,57}} + {{205,553},{48,57}} textureRotated @@ -2250,7 +2400,7 @@ spriteSourceSize {42,57} textureRect - {{293,411},{42,57}} + {{213,433},{42,57}} textureRotated @@ -2265,9 +2415,9 @@ spriteSourceSize {45,56} textureRect - {{84,355},{45,56}} + {{199,742},{45,56}} textureRotated - + result_7.png @@ -2280,7 +2430,7 @@ spriteSourceSize {41,56} textureRect - {{129,355},{41,56}} + {{214,273},{41,56}} textureRotated @@ -2295,7 +2445,7 @@ spriteSourceSize {45,56} textureRect - {{170,355},{45,56}} + {{59,1359},{45,56}} textureRotated @@ -2310,7 +2460,7 @@ spriteSourceSize {42,56} textureRect - {{215,355},{42,56}} + {{104,1301},{42,56}} textureRotated @@ -2325,7 +2475,7 @@ spriteSourceSize {41,47} textureRect - {{390,253},{41,47}} + {{214,331},{41,47}} textureRotated @@ -2334,15 +2484,15 @@ aliases spriteOffset - {0,0} + {0,1} spriteSize - {47,63} + {47,51} spriteSourceSize {47,63} textureRect - {{417,469},{47,63}} + {{146,736},{47,51}} textureRotated - + scoin_09.png @@ -2351,11 +2501,11 @@ spriteOffset {0,0} spriteSize - {47,63} + {45,63} spriteSourceSize {47,63} textureRect - {{376,532},{47,63}} + {{117,808},{45,63}} textureRotated @@ -2366,11 +2516,11 @@ spriteOffset {0,0} spriteSize - {47,63} + {25,53} spriteSourceSize {47,63} textureRect - {{0,532},{47,63}} + {{164,1180},{25,53}} textureRotated @@ -2381,11 +2531,11 @@ spriteOffset {0,0} spriteSize - {47,63} + {21,25} spriteSourceSize {47,63} textureRect - {{423,532},{47,63}} + {{205,1990},{21,25}} textureRotated @@ -2394,13 +2544,13 @@ aliases spriteOffset - {0,0} + {0,1} spriteSize - {47,63} + {47,53} spriteSourceSize {47,63} textureRect - {{47,532},{47,63}} + {{58,1417},{47,53}} textureRotated @@ -2415,7 +2565,7 @@ spriteSourceSize {47,63} textureRect - {{94,532},{47,63}} + {{151,611},{47,63}} textureRotated @@ -2430,7 +2580,7 @@ spriteSourceSize {47,63} textureRect - {{141,532},{47,63}} + {{200,612},{47,63}} textureRotated @@ -2439,13 +2589,13 @@ aliases spriteOffset - {0,0} + {-1,0} spriteSize - {47,63} + {45,63} spriteSourceSize {47,63} textureRect - {{188,532},{47,63}} + {{88,874},{45,63}} textureRotated @@ -2460,7 +2610,7 @@ spriteSourceSize {47,63} textureRect - {{235,532},{47,63}} + {{200,677},{47,63}} textureRotated @@ -2469,13 +2619,13 @@ aliases spriteOffset - {0,0} + {-1,0} spriteSize - {47,63} + {45,61} spriteSourceSize {47,63} textureRect - {{282,532},{47,63}} + {{135,873},{45,61}} textureRotated @@ -2490,7 +2640,7 @@ spriteSourceSize {47,63} textureRect - {{329,532},{47,63}} + {{88,939},{47,63}} textureRotated @@ -2501,26 +2651,26 @@ spriteOffset {0,0} spriteSize - {40,46} + {40,44} spriteSourceSize {40,46} textureRect - {{280,207},{40,46}} + {{131,1810},{40,44}} textureRotated - + tili_1.png aliases spriteOffset - {0,0} + {-1,0} spriteSize - {40,46} + {26,44} spriteSourceSize {40,46} textureRect - {{320,207},{40,46}} + {{190,1283},{26,44}} textureRotated @@ -2531,11 +2681,11 @@ spriteOffset {0,0} spriteSize - {40,46} + {38,44} spriteSourceSize {40,46} textureRect - {{360,207},{40,46}} + {{69,1868},{38,44}} textureRotated @@ -2546,11 +2696,11 @@ spriteOffset {0,0} spriteSize - {40,46} + {34,44} spriteSourceSize {40,46} textureRect - {{400,207},{40,46}} + {{221,1168},{34,44}} textureRotated @@ -2565,7 +2715,7 @@ spriteSourceSize {40,46} textureRect - {{440,207},{40,46}} + {{179,1235},{40,46}} textureRotated @@ -2574,13 +2724,13 @@ aliases spriteOffset - {0,0} + {-1,0} spriteSize - {40,46} + {38,44} spriteSourceSize {40,46} textureRect - {{0,253},{40,46}} + {{82,1974},{38,44}} textureRotated @@ -2591,11 +2741,11 @@ spriteOffset {0,0} spriteSize - {40,46} + {38,46} spriteSourceSize {40,46} textureRect - {{40,253},{40,46}} + {{217,1374},{38,46}} textureRotated @@ -2606,11 +2756,11 @@ spriteOffset {0,0} spriteSize - {40,46} + {40,44} spriteSourceSize {40,46} textureRect - {{80,253},{40,46}} + {{177,1810},{40,44}} textureRotated @@ -2625,7 +2775,7 @@ spriteSourceSize {40,46} textureRect - {{120,253},{40,46}} + {{203,1514},{40,46}} textureRotated @@ -2640,7 +2790,7 @@ spriteSourceSize {40,46} textureRect - {{160,253},{40,46}} + {{213,1610},{40,46}} textureRotated @@ -2649,15 +2799,15 @@ aliases spriteOffset - {0,0} + {-1,0} spriteSize - {40,46} + {16,32} spriteSourceSize {40,46} textureRect - {{200,253},{40,46}} + {{82,2020},{16,32}} textureRotated - + time_0.png @@ -2670,7 +2820,7 @@ spriteSourceSize {40,56} textureRect - {{257,355},{40,56}} + {{106,1359},{40,56}} textureRotated @@ -2681,11 +2831,11 @@ spriteOffset {0,0} spriteSize - {40,56} + {28,56} spriteSourceSize {40,56} textureRect - {{297,355},{40,56}} + {{138,1519},{28,56}} textureRotated @@ -2696,11 +2846,11 @@ spriteOffset {0,0} spriteSize - {40,56} + {18,48} spriteSourceSize {40,56} textureRect - {{160,411},{40,56}} + {{237,1118},{18,48}} textureRotated @@ -2711,11 +2861,11 @@ spriteOffset {0,0} spriteSize - {40,56} + {38,56} spriteSourceSize {40,56} textureRect - {{337,355},{40,56}} + {{54,1576},{38,56}} textureRotated @@ -2726,11 +2876,11 @@ spriteOffset {0,0} spriteSize - {40,56} + {36,56} spriteSourceSize {40,56} textureRect - {{377,355},{40,56}} + {{138,1577},{36,56}} textureRotated @@ -2745,7 +2895,7 @@ spriteSourceSize {40,56} textureRect - {{417,355},{40,56}} + {{107,1417},{40,56}} textureRotated @@ -2756,11 +2906,11 @@ spriteOffset {0,0} spriteSize - {40,56} + {38,56} spriteSourceSize {40,56} textureRect - {{457,355},{40,56}} + {{54,1634},{38,56}} textureRotated @@ -2771,11 +2921,11 @@ spriteOffset {0,0} spriteSize - {40,56} + {38,56} spriteSourceSize {40,56} textureRect - {{0,411},{40,56}} + {{110,1124},{38,56}} textureRotated @@ -2790,7 +2940,7 @@ spriteSourceSize {40,56} textureRect - {{40,411},{40,56}} + {{122,1182},{40,56}} textureRotated @@ -2805,7 +2955,7 @@ spriteSourceSize {40,56} textureRect - {{80,411},{40,56}} + {{137,1240},{40,56}} textureRotated @@ -2820,7 +2970,7 @@ spriteSourceSize {40,56} textureRect - {{120,411},{40,56}} + {{148,1298},{40,56}} textureRotated @@ -2835,7 +2985,7 @@ spriteSourceSize {156,89} textureRect - {{96,661},{156,89}} + {{1,1},{156,89}} textureRotated @@ -2850,7 +3000,7 @@ spriteSourceSize {22,22} textureRect - {{46,0},{22,22}} + {{205,2017},{22,22}} textureRotated @@ -2866,9 +3016,9 @@ realTextureFileName font.png size - {503,1104} + {256,2040} smartupdate - $TexturePacker:SmartUpdate:3cab7c28b17bd3c8ee67b66490395a2a:f8c9d78b5a8f5cba8d47fdeb3aba3aaf:90bd8558f1bc1540882ee9b431362e98$ + $TexturePacker:SmartUpdate:b43195dff15c8126595451a22022634e:038b722b3d3f0405b262c4249637d1ba:90bd8558f1bc1540882ee9b431362e98$ textureFileName font.png diff --git a/assets/res/font/font.plist.meta b/assets/res/font/font.plist.meta index b51fae2..58c7235 100644 --- a/assets/res/font/font.plist.meta +++ b/assets/res/font/font.plist.meta @@ -4,8 +4,8 @@ "importer": "asset", "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "size": { - "width": 503, - "height": 1104 + "width": 256, + "height": 2040 }, "type": "Texture Packer", "subMetas": { @@ -16,11 +16,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 324, - "trimY": 75, + "trimX": 180, + "trimY": 1668, "width": 25, "height": 39, "rawWidth": 25, @@ -42,8 +42,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 264, - "trimY": 37, + "trimX": 109, + "trimY": 1866, "width": 20, "height": 38, "rawWidth": 20, @@ -65,8 +65,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 390, - "trimY": 0, + "trimX": 191, + "trimY": 1449, "width": 24, "height": 37, "rawWidth": 24, @@ -85,11 +85,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 284, - "trimY": 37, + "trimX": 131, + "trimY": 1891, "width": 23, "height": 38, "rawWidth": 23, @@ -108,11 +108,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 307, - "trimY": 37, + "trimX": 38, + "trimY": 1948, "width": 26, "height": 38, "rawWidth": 26, @@ -134,8 +134,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 333, - "trimY": 37, + "trimX": 191, + "trimY": 1409, "width": 24, "height": 38, "rawWidth": 24, @@ -157,8 +157,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 357, - "trimY": 37, + "trimX": 190, + "trimY": 1369, "width": 25, "height": 38, "rawWidth": 25, @@ -180,8 +180,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 349, - "trimY": 75, + "trimX": 194, + "trimY": 1166, "width": 25, "height": 39, "rawWidth": 25, @@ -200,11 +200,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 382, - "trimY": 37, + "trimX": 171, + "trimY": 1891, "width": 24, "height": 38, "rawWidth": 24, @@ -223,11 +223,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 406, - "trimY": 37, + "trimX": 78, + "trimY": 1947, "width": 25, "height": 38, "rawWidth": 25, @@ -246,11 +246,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 374, - "trimY": 75, + "trimX": 144, + "trimY": 997, "width": 37, "height": 40, "rawWidth": 37, @@ -270,11 +270,11 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -1, "offsetY": 0, - "trimX": 411, - "trimY": 75, - "width": 37, + "trimX": 186, + "trimY": 994, + "width": 23, "height": 40, "rawWidth": 37, "rawHeight": 40, @@ -295,9 +295,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 448, - "trimY": 75, - "width": 37, + "trimX": 221, + "trimY": 1658, + "width": 33, "height": 40, "rawWidth": 37, "rawHeight": 40, @@ -315,12 +315,12 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 115, - "width": 37, + "trimX": 94, + "trimY": 1687, + "width": 31, "height": 40, "rawWidth": 37, "rawHeight": 40, @@ -338,11 +338,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 37, - "trimY": 115, + "trimX": 136, + "trimY": 1691, "width": 37, "height": 40, "rawWidth": 37, @@ -361,12 +361,12 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 74, - "trimY": 115, - "width": 37, + "trimX": 178, + "trimY": 1695, + "width": 33, "height": 40, "rawWidth": 37, "rawHeight": 40, @@ -385,11 +385,11 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -1, "offsetY": 0, - "trimX": 111, - "trimY": 115, - "width": 37, + "trimX": 220, + "trimY": 1700, + "width": 35, "height": 40, "rawWidth": 37, "rawHeight": 40, @@ -410,8 +410,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 148, - "trimY": 115, + "trimX": 181, + "trimY": 1730, "width": 37, "height": 40, "rawWidth": 37, @@ -433,9 +433,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 185, - "trimY": 115, - "width": 37, + "trimX": 220, + "trimY": 1742, + "width": 35, "height": 40, "rawWidth": 37, "rawHeight": 40, @@ -456,9 +456,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 222, - "trimY": 115, - "width": 37, + "trimX": 96, + "trimY": 1766, + "width": 35, "height": 40, "rawWidth": 37, "rawHeight": 40, @@ -476,11 +476,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 431, - "trimY": 37, + "trimX": 54, + "trimY": 1692, "width": 36, "height": 38, "rawWidth": 36, @@ -502,9 +502,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 467, - "trimY": 37, - "width": 36, + "trimX": 190, + "trimY": 1329, + "width": 26, "height": 38, "rawWidth": 36, "rawHeight": 38, @@ -525,10 +525,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 288, - "trimY": 75, - "width": 36, - "height": 38, + "trimX": 182, + "trimY": 1086, + "width": 16, + "height": 30, "rawWidth": 36, "rawHeight": 38, "borderTop": 0, @@ -548,9 +548,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 75, - "width": 36, + "trimX": 221, + "trimY": 1214, + "width": 34, "height": 38, "rawWidth": 36, "rawHeight": 38, @@ -568,12 +568,12 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 36, - "trimY": 75, - "width": 36, + "trimX": 216, + "trimY": 239, + "width": 32, "height": 38, "rawWidth": 36, "rawHeight": 38, @@ -591,11 +591,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 72, - "trimY": 75, + "trimX": 179, + "trimY": 1772, "width": 36, "height": 38, "rawWidth": 36, @@ -617,9 +617,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 108, - "trimY": 75, - "width": 36, + "trimX": 221, + "trimY": 1254, + "width": 34, "height": 38, "rawWidth": 36, "rawHeight": 38, @@ -640,9 +640,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 144, - "trimY": 75, - "width": 36, + "trimX": 221, + "trimY": 1294, + "width": 34, "height": 38, "rawWidth": 36, "rawHeight": 38, @@ -663,8 +663,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 180, - "trimY": 75, + "trimX": 219, + "trimY": 1784, "width": 36, "height": 38, "rawWidth": 36, @@ -686,9 +686,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 216, - "trimY": 75, - "width": 36, + "trimX": 221, + "trimY": 1334, + "width": 34, "height": 38, "rawWidth": 36, "rawHeight": 38, @@ -709,8 +709,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 252, - "trimY": 75, + "trimX": 219, + "trimY": 1824, "width": 36, "height": 38, "rawWidth": 36, @@ -732,8 +732,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 127, - "trimY": 469, + "trimX": 105, + "trimY": 545, "width": 47, "height": 59, "rawWidth": 47, @@ -752,11 +752,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 385, - "trimY": 469, + "trimX": 153, + "trimY": 239, "width": 32, "height": 61, "rawWidth": 32, @@ -778,8 +778,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 298, - "trimY": 469, + "trimX": 1, + "trimY": 1979, "width": 45, "height": 60, "rawWidth": 45, @@ -798,11 +798,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 343, - "trimY": 469, + "trimX": 151, + "trimY": 433, "width": 42, "height": 60, "rawWidth": 42, @@ -824,8 +824,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 174, - "trimY": 469, + "trimX": 205, + "trimY": 492, "width": 50, "height": 59, "rawWidth": 50, @@ -847,8 +847,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 224, - "trimY": 469, + "trimX": 137, + "trimY": 936, "width": 44, "height": 59, "rawWidth": 44, @@ -867,11 +867,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 335, - "trimY": 411, + "trimX": 154, + "trimY": 339, "width": 47, "height": 58, "rawWidth": 47, @@ -890,11 +890,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 382, - "trimY": 411, + "trimX": 154, + "trimY": 388, "width": 43, "height": 58, "rawWidth": 43, @@ -916,8 +916,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 425, - "trimY": 411, + "trimX": 151, + "trimY": 676, "width": 47, "height": 58, "rawWidth": 47, @@ -936,11 +936,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 469, + "trimX": 62, + "trimY": 1194, "width": 44, "height": 58, "rawWidth": 44, @@ -962,8 +962,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 259, - "trimY": 115, + "trimX": 107, + "trimY": 1475, "width": 44, "height": 42, "rawWidth": 44, @@ -985,8 +985,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 89, - "trimY": 0, + "trimX": 191, + "trimY": 1207, "width": 23, "height": 26, "rawWidth": 23, @@ -1005,11 +1005,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 22, - "trimY": 0, + "trimX": 109, + "trimY": 1906, "width": 24, "height": 20, "rawWidth": 24, @@ -1028,11 +1028,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 63, - "trimY": 301, + "trimX": 100, + "trimY": 673, "width": 43, "height": 49, "rawWidth": 43, @@ -1054,8 +1054,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 395, - "trimY": 115, + "trimX": 212, + "trimY": 789, "width": 43, "height": 46, "rawWidth": 43, @@ -1075,11 +1075,11 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -1, "offsetY": 0, - "trimX": 438, - "trimY": 115, - "width": 43, + "trimX": 226, + "trimY": 186, + "width": 29, "height": 46, "rawWidth": 43, "rawHeight": 46, @@ -1100,8 +1100,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 303, - "trimY": 115, + "trimX": 58, + "trimY": 1472, "width": 47, "height": 42, "rawWidth": 47, @@ -1123,9 +1123,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 161, - "width": 43, + "trimX": 216, + "trimY": 933, + "width": 39, "height": 46, "rawWidth": 43, "rawHeight": 46, @@ -1146,9 +1146,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 43, - "trimY": 161, - "width": 43, + "trimX": 212, + "trimY": 1562, + "width": 37, "height": 46, "rawWidth": 43, "rawHeight": 46, @@ -1169,8 +1169,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 86, - "trimY": 161, + "trimX": 212, + "trimY": 837, "width": 43, "height": 46, "rawWidth": 43, @@ -1192,9 +1192,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 129, - "trimY": 161, - "width": 43, + "trimX": 216, + "trimY": 981, + "width": 39, "height": 46, "rawWidth": 43, "rawHeight": 46, @@ -1213,11 +1213,11 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -1, "offsetY": 0, - "trimX": 172, - "trimY": 161, - "width": 43, + "trimX": 214, + "trimY": 380, + "width": 41, "height": 46, "rawWidth": 43, "rawHeight": 46, @@ -1238,8 +1238,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 215, - "trimY": 161, + "trimX": 212, + "trimY": 885, "width": 43, "height": 46, "rawWidth": 43, @@ -1258,12 +1258,12 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 258, - "trimY": 161, - "width": 43, + "trimX": 164, + "trimY": 808, + "width": 41, "height": 46, "rawWidth": 43, "rawHeight": 46, @@ -1284,9 +1284,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 301, - "trimY": 161, - "width": 43, + "trimX": 194, + "trimY": 1118, + "width": 41, "height": 46, "rawWidth": 43, "rawHeight": 46, @@ -1297,6 +1297,236 @@ "spriteType": "normal", "subMetas": {} }, + "discount_0.png": { + "ver": "1.0.6", + "uuid": "f99cb6b9-efed-48bb-81c7-3e5a8a194dff", + "importer": "sprite-frame", + "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 211, + "trimY": 1029, + "width": 40, + "height": 44, + "rawWidth": 40, + "rawHeight": 44, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "discount_1.png": { + "ver": "1.0.6", + "uuid": "0c3d3261-ef38-43bf-91e5-68a6b1670c34", + "importer": "sprite-frame", + "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 182, + "trimY": 851, + "width": 28, + "height": 42, + "rawWidth": 40, + "rawHeight": 44, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "discount_2.png": { + "ver": "1.0.6", + "uuid": "14be48df-47df-43c6-8dfe-3f58fd4ec953", + "importer": "sprite-frame", + "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 217, + "trimY": 1422, + "width": 38, + "height": 44, + "rawWidth": 40, + "rawHeight": 44, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "discount_3.png": { + "ver": "1.0.6", + "uuid": "c70710d1-3b7d-48a5-b5c5-3fc673884b1b", + "importer": "sprite-frame", + "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": -1, + "offsetY": 0, + "trimX": 135, + "trimY": 1730, + "width": 36, + "height": 44, + "rawWidth": 40, + "rawHeight": 44, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "discount_4.png": { + "ver": "1.0.6", + "uuid": "04587c66-e0a8-4e96-8a3d-108ece008a2f", + "importer": "sprite-frame", + "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 53, + "trimY": 1730, + "width": 40, + "height": 44, + "rawWidth": 40, + "rawHeight": 44, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "discount_5.png": { + "ver": "1.0.6", + "uuid": "68593393-51e9-4951-9696-ea88a9aba1d8", + "importer": "sprite-frame", + "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -1, + "offsetY": 0, + "trimX": 217, + "trimY": 1468, + "width": 38, + "height": 44, + "rawWidth": 40, + "rawHeight": 44, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "discount_6.png": { + "ver": "1.0.6", + "uuid": "83d73907-8f24-4b02-9c17-44a50e0ede38", + "importer": "sprite-frame", + "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 95, + "trimY": 1720, + "width": 38, + "height": 44, + "rawWidth": 40, + "rawHeight": 44, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "discount_7.png": { + "ver": "1.0.6", + "uuid": "0d9b3cdd-8615-44df-b4ef-0f2406b798dc", + "importer": "sprite-frame", + "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 54, + "trimY": 1776, + "width": 40, + "height": 44, + "rawWidth": 40, + "rawHeight": 44, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "discount_8.png": { + "ver": "1.0.6", + "uuid": "320888d6-aa36-4e07-a7a6-8a6c02783aeb", + "importer": "sprite-frame", + "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 54, + "trimY": 1822, + "width": 40, + "height": 44, + "rawWidth": 40, + "rawHeight": 44, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "discount_9.png": { + "ver": "1.0.6", + "uuid": "90fdf128-4208-4569-96cb-253868445849", + "importer": "sprite-frame", + "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 133, + "trimY": 1768, + "width": 40, + "height": 44, + "rawWidth": 40, + "rawHeight": 44, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, "hp_,.png": { "ver": "1.0.6", "uuid": "f1cb68b4-fc78-45bd-9786-d4e21fd02523", @@ -1307,8 +1537,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 661, + "trimX": 62, + "trimY": 1124, "width": 46, "height": 68, "rawWidth": 46, @@ -1327,11 +1557,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 112, - "trimY": 0, + "trimX": 38, + "trimY": 1880, "width": 66, "height": 29, "rawWidth": 66, @@ -1350,11 +1580,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 350, - "trimY": 115, + "trimX": 213, + "trimY": 1071, "width": 45, "height": 42, "rawWidth": 45, @@ -1375,11 +1605,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, - "trimX": 301, - "trimY": 753, + "offsetY": 1, + "trimX": 1, + "trimY": 596, "width": 97, - "height": 108, + "height": 104, "rawWidth": 97, "rawHeight": 108, "borderTop": 0, @@ -1398,11 +1628,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, - "trimX": 398, - "trimY": 753, - "width": 97, - "height": 108, + "offsetY": 1, + "trimX": 100, + "trimY": 92, + "width": 57, + "height": 104, "rawWidth": 97, "rawHeight": 108, "borderTop": 0, @@ -1422,10 +1652,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 861, - "width": 97, - "height": 108, + "trimX": 1, + "trimY": 808, + "width": 85, + "height": 104, "rawWidth": 97, "rawHeight": 108, "borderTop": 0, @@ -1444,11 +1674,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, - "trimX": 97, - "trimY": 861, - "width": 97, - "height": 108, + "offsetY": 1, + "trimX": 1, + "trimY": 1018, + "width": 81, + "height": 104, "rawWidth": 97, "rawHeight": 108, "borderTop": 0, @@ -1468,10 +1698,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 194, - "trimY": 861, - "width": 97, - "height": 108, + "trimX": 1, + "trimY": 702, + "width": 95, + "height": 104, "rawWidth": 97, "rawHeight": 108, "borderTop": 0, @@ -1491,10 +1721,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 291, - "trimY": 861, - "width": 97, - "height": 108, + "trimX": 1, + "trimY": 914, + "width": 85, + "height": 102, "rawWidth": 97, "rawHeight": 108, "borderTop": 0, @@ -1514,8 +1744,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 94, - "trimY": 970, + "trimX": 1, + "trimY": 228, "width": 98, "height": 128, "rawWidth": 98, @@ -1537,8 +1767,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 970, + "trimX": 1, + "trimY": 358, "width": 94, "height": 125, "rawWidth": 94, @@ -1560,8 +1790,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 288, - "trimY": 970, + "trimX": 1, + "trimY": 92, "width": 97, "height": 134, "rawWidth": 97, @@ -1583,8 +1813,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 192, - "trimY": 970, + "trimX": 159, + "trimY": 1, "width": 96, "height": 129, "rawWidth": 96, @@ -1606,8 +1836,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 388, - "trimY": 861, + "trimX": 1, + "trimY": 485, "width": 102, "height": 109, "rawWidth": 102, @@ -1629,8 +1859,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 104, - "trimY": 596, + "trimX": 101, + "trimY": 277, "width": 51, "height": 65, "rawWidth": 51, @@ -1652,8 +1882,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 470, - "trimY": 532, + "trimX": 88, + "trimY": 808, "width": 27, "height": 64, "rawWidth": 27, @@ -1672,11 +1902,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 155, - "trimY": 596, + "trimX": 159, + "trimY": 186, "width": 51, "height": 65, "rawWidth": 51, @@ -1698,8 +1928,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 206, - "trimY": 596, + "trimX": 105, + "trimY": 478, "width": 45, "height": 65, "rawWidth": 45, @@ -1721,8 +1951,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 251, - "trimY": 596, + "trimX": 97, + "trimY": 411, "width": 52, "height": 65, "rawWidth": 52, @@ -1744,8 +1974,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 303, - "trimY": 596, + "trimX": 152, + "trimY": 477, "width": 49, "height": 65, "rawWidth": 49, @@ -1767,8 +1997,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 352, - "trimY": 596, + "trimX": 100, + "trimY": 606, "width": 49, "height": 65, "rawWidth": 49, @@ -1790,8 +2020,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 596, + "trimX": 98, + "trimY": 718, "width": 46, "height": 64, "rawWidth": 46, @@ -1813,8 +2043,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 401, - "trimY": 596, + "trimX": 101, + "trimY": 344, "width": 51, "height": 65, "rawWidth": 51, @@ -1836,8 +2066,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 452, - "trimY": 596, + "trimX": 154, + "trimY": 544, "width": 49, "height": 65, "rawWidth": 49, @@ -1859,8 +2089,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 138, - "trimY": 301, + "trimX": 94, + "trimY": 1519, "width": 42, "height": 54, "rawWidth": 42, @@ -1879,12 +2109,12 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 180, - "trimY": 301, - "width": 42, + "trimX": 88, + "trimY": 1004, + "width": 30, "height": 54, "rawWidth": 42, "rawHeight": 54, @@ -1905,9 +2135,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 222, - "trimY": 301, - "width": 42, + "trimX": 138, + "trimY": 1635, + "width": 40, "height": 54, "rawWidth": 42, "rawHeight": 54, @@ -1928,9 +2158,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 264, - "trimY": 301, - "width": 42, + "trimX": 128, + "trimY": 1036, + "width": 38, "height": 54, "rawWidth": 42, "rawHeight": 54, @@ -1951,8 +2181,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 306, - "trimY": 301, + "trimX": 94, + "trimY": 1575, "width": 42, "height": 54, "rawWidth": 42, @@ -1974,9 +2204,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 348, - "trimY": 301, - "width": 42, + "trimX": 148, + "trimY": 1356, + "width": 40, "height": 54, "rawWidth": 42, "rawHeight": 54, @@ -1997,9 +2227,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 390, - "trimY": 301, - "width": 42, + "trimX": 149, + "trimY": 1412, + "width": 40, "height": 54, "rawWidth": 42, "rawHeight": 54, @@ -2020,8 +2250,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 432, - "trimY": 301, + "trimX": 94, + "trimY": 1631, "width": 42, "height": 54, "rawWidth": 42, @@ -2043,8 +2273,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 355, + "trimX": 84, + "trimY": 1036, "width": 42, "height": 54, "rawWidth": 42, @@ -2066,8 +2296,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 42, - "trimY": 355, + "trimX": 150, + "trimY": 1124, "width": 42, "height": 54, "rawWidth": 42, @@ -2086,11 +2316,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 199, - "trimY": 0, + "trimX": 98, + "trimY": 784, "width": 22, "height": 32, "rawWidth": 22, @@ -2109,11 +2339,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 221, - "trimY": 0, + "trimX": 96, + "trimY": 1847, "width": 17, "height": 32, "rawWidth": 17, @@ -2132,11 +2362,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 178, - "trimY": 0, + "trimX": 166, + "trimY": 785, "width": 21, "height": 31, "rawWidth": 21, @@ -2155,11 +2385,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 238, - "trimY": 0, + "trimX": 132, + "trimY": 785, "width": 21, "height": 32, "rawWidth": 21, @@ -2178,11 +2408,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 259, - "trimY": 0, + "trimX": 122, + "trimY": 2013, "width": 23, "height": 32, "rawWidth": 23, @@ -2201,11 +2431,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 282, - "trimY": 0, + "trimX": 118, + "trimY": 1951, "width": 21, "height": 32, "rawWidth": 21, @@ -2227,8 +2457,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 303, - "trimY": 0, + "trimX": 157, + "trimY": 1967, "width": 22, "height": 32, "rawWidth": 22, @@ -2250,8 +2480,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 325, - "trimY": 0, + "trimX": 181, + "trimY": 1952, "width": 22, "height": 32, "rawWidth": 22, @@ -2270,11 +2500,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 347, - "trimY": 0, + "trimX": 205, + "trimY": 1967, "width": 21, "height": 32, "rawWidth": 21, @@ -2296,8 +2526,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 368, - "trimY": 0, + "trimX": 181, + "trimY": 1986, "width": 22, "height": 32, "rawWidth": 22, @@ -2316,13 +2546,13 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 344, - "trimY": 161, + "trimX": 131, + "trimY": 1810, "width": 40, - "height": 46, + "height": 44, "rawWidth": 40, "rawHeight": 46, "borderTop": 0, @@ -2340,12 +2570,12 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -1, "offsetY": 0, - "trimX": 384, - "trimY": 161, - "width": 40, - "height": 46, + "trimX": 190, + "trimY": 1283, + "width": 26, + "height": 44, "rawWidth": 40, "rawHeight": 46, "borderTop": 0, @@ -2365,10 +2595,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 424, - "trimY": 161, - "width": 40, - "height": 46, + "trimX": 69, + "trimY": 1868, + "width": 38, + "height": 44, "rawWidth": 40, "rawHeight": 46, "borderTop": 0, @@ -2388,10 +2618,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 207, - "width": 40, - "height": 46, + "trimX": 221, + "trimY": 1168, + "width": 34, + "height": 44, "rawWidth": 40, "rawHeight": 46, "borderTop": 0, @@ -2411,8 +2641,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 40, - "trimY": 207, + "trimX": 179, + "trimY": 1235, "width": 40, "height": 46, "rawWidth": 40, @@ -2432,12 +2662,12 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -1, "offsetY": 0, - "trimX": 80, - "trimY": 207, - "width": 40, - "height": 46, + "trimX": 82, + "trimY": 1974, + "width": 38, + "height": 44, "rawWidth": 40, "rawHeight": 46, "borderTop": 0, @@ -2457,9 +2687,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 120, - "trimY": 207, - "width": 40, + "trimX": 217, + "trimY": 1374, + "width": 38, "height": 46, "rawWidth": 40, "rawHeight": 46, @@ -2480,10 +2710,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 160, - "trimY": 207, + "trimX": 177, + "trimY": 1810, "width": 40, - "height": 46, + "height": 44, "rawWidth": 40, "rawHeight": 46, "borderTop": 0, @@ -2503,8 +2733,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 200, - "trimY": 207, + "trimX": 203, + "trimY": 1514, "width": 40, "height": 46, "rawWidth": 40, @@ -2526,8 +2756,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 240, - "trimY": 207, + "trimX": 213, + "trimY": 1610, "width": 40, "height": 46, "rawWidth": 40, @@ -2549,8 +2779,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 414, - "trimY": 0, + "trimX": 96, + "trimY": 1808, "width": 33, "height": 37, "rawWidth": 33, @@ -2569,12 +2799,12 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, - "offsetX": 0, + "rotated": true, + "offsetX": -1, "offsetY": 0, - "trimX": 447, - "trimY": 0, - "width": 33, + "trimX": 205, + "trimY": 1864, + "width": 25, "height": 37, "rawWidth": 33, "rawHeight": 37, @@ -2595,8 +2825,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 46, - "trimY": 596, + "trimX": 154, + "trimY": 273, "width": 58, "height": 64, "rawWidth": 58, @@ -2618,8 +2848,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 37, + "trimX": 131, + "trimY": 1852, "width": 33, "height": 37, "rawWidth": 33, @@ -2638,12 +2868,12 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, - "offsetX": 0, + "rotated": true, + "offsetX": -1, "offsetY": 0, - "trimX": 33, - "trimY": 37, - "width": 33, + "trimX": 69, + "trimY": 1914, + "width": 31, "height": 37, "rawWidth": 33, "rawHeight": 37, @@ -2661,11 +2891,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 66, - "trimY": 37, + "trimX": 166, + "trimY": 1856, "width": 33, "height": 37, "rawWidth": 33, @@ -2687,10 +2917,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 99, - "trimY": 37, - "width": 33, - "height": 37, + "trimX": 211, + "trimY": 1891, + "width": 31, + "height": 35, "rawWidth": 33, "rawHeight": 37, "borderTop": 0, @@ -2707,11 +2937,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 132, - "trimY": 37, + "trimX": 131, + "trimY": 1916, "width": 33, "height": 37, "rawWidth": 33, @@ -2730,11 +2960,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 165, - "trimY": 37, + "trimX": 170, + "trimY": 1917, "width": 33, "height": 37, "rawWidth": 33, @@ -2756,8 +2986,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 198, - "trimY": 37, + "trimX": 209, + "trimY": 1928, "width": 33, "height": 37, "rawWidth": 33, @@ -2779,8 +3009,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 231, - "trimY": 37, + "trimX": 122, + "trimY": 1974, "width": 33, "height": 37, "rawWidth": 33, @@ -2802,8 +3032,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 753, + "trimX": 1, + "trimY": 1219, "width": 55, "height": 93, "rawWidth": 55, @@ -2825,8 +3055,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 266, - "trimY": 753, + "trimX": 1, + "trimY": 1880, "width": 35, "height": 97, "rawWidth": 35, @@ -2848,8 +3078,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 46, - "trimY": 661, + "trimX": 101, + "trimY": 198, "width": 50, "height": 77, "rawWidth": 50, @@ -2868,11 +3098,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 214, - "trimY": 753, + "trimX": 159, + "trimY": 132, "width": 52, "height": 96, "rawWidth": 52, @@ -2894,8 +3124,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 165, - "trimY": 753, + "trimX": 1, + "trimY": 1501, "width": 49, "height": 95, "rawWidth": 49, @@ -2917,8 +3147,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 55, - "trimY": 753, + "trimX": 1, + "trimY": 1124, "width": 59, "height": 93, "rawWidth": 59, @@ -2940,8 +3170,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 114, - "trimY": 753, + "trimX": 1, + "trimY": 1598, "width": 51, "height": 93, "rawWidth": 51, @@ -2963,8 +3193,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 358, - "trimY": 661, + "trimX": 1, + "trimY": 1314, "width": 56, "height": 92, "rawWidth": 56, @@ -2986,8 +3216,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 414, - "trimY": 661, + "trimX": 1, + "trimY": 1693, "width": 50, "height": 92, "rawWidth": 50, @@ -3009,8 +3239,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 252, - "trimY": 661, + "trimX": 1, + "trimY": 1408, "width": 55, "height": 91, "rawWidth": 55, @@ -3032,8 +3262,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 307, - "trimY": 661, + "trimX": 1, + "trimY": 1787, "width": 51, "height": 91, "rawWidth": 51, @@ -3055,8 +3285,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 431, - "trimY": 253, + "trimX": 168, + "trimY": 1519, "width": 33, "height": 48, "rawWidth": 33, @@ -3078,8 +3308,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 240, - "trimY": 253, + "trimX": 183, + "trimY": 895, "width": 27, "height": 47, "rawWidth": 27, @@ -3101,8 +3331,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 267, - "trimY": 253, + "trimX": 180, + "trimY": 1619, "width": 31, "height": 47, "rawWidth": 31, @@ -3121,11 +3351,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 298, - "trimY": 253, + "trimX": 84, + "trimY": 1092, "width": 30, "height": 47, "rawWidth": 30, @@ -3147,8 +3377,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 464, - "trimY": 253, + "trimX": 176, + "trimY": 1569, "width": 34, "height": 48, "rawWidth": 34, @@ -3167,11 +3397,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 328, - "trimY": 253, + "trimX": 133, + "trimY": 1092, "width": 30, "height": 47, "rawWidth": 30, @@ -3193,8 +3423,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 358, - "trimY": 253, + "trimX": 48, + "trimY": 1976, "width": 32, "height": 47, "rawWidth": 32, @@ -3216,8 +3446,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 106, - "trimY": 301, + "trimX": 153, + "trimY": 1468, "width": 32, "height": 49, "rawWidth": 32, @@ -3239,8 +3469,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 301, + "trimX": 183, + "trimY": 944, "width": 31, "height": 48, "rawWidth": 31, @@ -3262,8 +3492,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 31, - "trimY": 301, + "trimX": 168, + "trimY": 1036, "width": 32, "height": 48, "rawWidth": 32, @@ -3285,8 +3515,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 68, - "trimY": 0, + "trimX": 187, + "trimY": 1488, "width": 21, "height": 24, "rawWidth": 21, @@ -3308,8 +3538,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 0, + "trimX": 157, + "trimY": 2001, "width": 22, "height": 18, "rawWidth": 22, @@ -3331,8 +3561,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 200, - "trimY": 411, + "trimX": 58, + "trimY": 1240, "width": 45, "height": 57, "rawWidth": 45, @@ -3354,8 +3584,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 268, - "trimY": 469, + "trimX": 105, + "trimY": 1240, "width": 30, "height": 59, "rawWidth": 30, @@ -3377,8 +3607,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 44, - "trimY": 469, + "trimX": 59, + "trimY": 1299, "width": 43, "height": 58, "rawWidth": 43, @@ -3400,8 +3630,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 87, - "trimY": 469, + "trimX": 52, + "trimY": 1516, "width": 40, "height": 58, "rawWidth": 40, @@ -3423,8 +3653,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 245, - "trimY": 411, + "trimX": 205, + "trimY": 553, "width": 48, "height": 57, "rawWidth": 48, @@ -3446,8 +3676,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 293, - "trimY": 411, + "trimX": 213, + "trimY": 433, "width": 42, "height": 57, "rawWidth": 42, @@ -3466,11 +3696,11 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 84, - "trimY": 355, + "trimX": 199, + "trimY": 742, "width": 45, "height": 56, "rawWidth": 45, @@ -3492,8 +3722,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 129, - "trimY": 355, + "trimX": 214, + "trimY": 273, "width": 41, "height": 56, "rawWidth": 41, @@ -3515,8 +3745,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 170, - "trimY": 355, + "trimX": 59, + "trimY": 1359, "width": 45, "height": 56, "rawWidth": 45, @@ -3538,8 +3768,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 215, - "trimY": 355, + "trimX": 104, + "trimY": 1301, "width": 42, "height": 56, "rawWidth": 42, @@ -3561,8 +3791,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 390, - "trimY": 253, + "trimX": 214, + "trimY": 331, "width": 41, "height": 47, "rawWidth": 41, @@ -3581,13 +3811,13 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, - "offsetY": 0, - "trimX": 417, - "trimY": 469, + "offsetY": 1, + "trimX": 146, + "trimY": 736, "width": 47, - "height": 63, + "height": 51, "rawWidth": 47, "rawHeight": 63, "borderTop": 0, @@ -3607,9 +3837,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 376, - "trimY": 532, - "width": 47, + "trimX": 117, + "trimY": 808, + "width": 45, "height": 63, "rawWidth": 47, "rawHeight": 63, @@ -3630,10 +3860,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 532, - "width": 47, - "height": 63, + "trimX": 164, + "trimY": 1180, + "width": 25, + "height": 53, "rawWidth": 47, "rawHeight": 63, "borderTop": 0, @@ -3653,10 +3883,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 423, - "trimY": 532, - "width": 47, - "height": 63, + "trimX": 205, + "trimY": 1990, + "width": 21, + "height": 25, "rawWidth": 47, "rawHeight": 63, "borderTop": 0, @@ -3675,11 +3905,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, - "trimX": 47, - "trimY": 532, + "offsetY": 1, + "trimX": 58, + "trimY": 1417, "width": 47, - "height": 63, + "height": 53, "rawWidth": 47, "rawHeight": 63, "borderTop": 0, @@ -3699,8 +3929,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 94, - "trimY": 532, + "trimX": 151, + "trimY": 611, "width": 47, "height": 63, "rawWidth": 47, @@ -3722,8 +3952,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 141, - "trimY": 532, + "trimX": 200, + "trimY": 612, "width": 47, "height": 63, "rawWidth": 47, @@ -3743,11 +3973,11 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -1, "offsetY": 0, - "trimX": 188, - "trimY": 532, - "width": 47, + "trimX": 88, + "trimY": 874, + "width": 45, "height": 63, "rawWidth": 47, "rawHeight": 63, @@ -3768,8 +3998,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 235, - "trimY": 532, + "trimX": 200, + "trimY": 677, "width": 47, "height": 63, "rawWidth": 47, @@ -3789,12 +4019,12 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -1, "offsetY": 0, - "trimX": 282, - "trimY": 532, - "width": 47, - "height": 63, + "trimX": 135, + "trimY": 873, + "width": 45, + "height": 61, "rawWidth": 47, "rawHeight": 63, "borderTop": 0, @@ -3814,8 +4044,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 329, - "trimY": 532, + "trimX": 88, + "trimY": 939, "width": 47, "height": 63, "rawWidth": 47, @@ -3834,13 +4064,13 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 280, - "trimY": 207, + "trimX": 131, + "trimY": 1810, "width": 40, - "height": 46, + "height": 44, "rawWidth": 40, "rawHeight": 46, "borderTop": 0, @@ -3858,12 +4088,12 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -1, "offsetY": 0, - "trimX": 320, - "trimY": 207, - "width": 40, - "height": 46, + "trimX": 190, + "trimY": 1283, + "width": 26, + "height": 44, "rawWidth": 40, "rawHeight": 46, "borderTop": 0, @@ -3883,10 +4113,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 360, - "trimY": 207, - "width": 40, - "height": 46, + "trimX": 69, + "trimY": 1868, + "width": 38, + "height": 44, "rawWidth": 40, "rawHeight": 46, "borderTop": 0, @@ -3906,10 +4136,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 400, - "trimY": 207, - "width": 40, - "height": 46, + "trimX": 221, + "trimY": 1168, + "width": 34, + "height": 44, "rawWidth": 40, "rawHeight": 46, "borderTop": 0, @@ -3929,8 +4159,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 440, - "trimY": 207, + "trimX": 179, + "trimY": 1235, "width": 40, "height": 46, "rawWidth": 40, @@ -3950,12 +4180,12 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -1, "offsetY": 0, - "trimX": 0, - "trimY": 253, - "width": 40, - "height": 46, + "trimX": 82, + "trimY": 1974, + "width": 38, + "height": 44, "rawWidth": 40, "rawHeight": 46, "borderTop": 0, @@ -3975,9 +4205,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 40, - "trimY": 253, - "width": 40, + "trimX": 217, + "trimY": 1374, + "width": 38, "height": 46, "rawWidth": 40, "rawHeight": 46, @@ -3998,10 +4228,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 80, - "trimY": 253, + "trimX": 177, + "trimY": 1810, "width": 40, - "height": 46, + "height": 44, "rawWidth": 40, "rawHeight": 46, "borderTop": 0, @@ -4021,8 +4251,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 120, - "trimY": 253, + "trimX": 203, + "trimY": 1514, "width": 40, "height": 46, "rawWidth": 40, @@ -4044,8 +4274,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 160, - "trimY": 253, + "trimX": 213, + "trimY": 1610, "width": 40, "height": 46, "rawWidth": 40, @@ -4064,13 +4294,13 @@ "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b", "trimType": "auto", "trimThreshold": 1, - "rotated": false, - "offsetX": 0, + "rotated": true, + "offsetX": -1, "offsetY": 0, - "trimX": 200, - "trimY": 253, - "width": 40, - "height": 46, + "trimX": 82, + "trimY": 2020, + "width": 16, + "height": 32, "rawWidth": 40, "rawHeight": 46, "borderTop": 0, @@ -4090,8 +4320,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 257, - "trimY": 355, + "trimX": 106, + "trimY": 1359, "width": 40, "height": 56, "rawWidth": 40, @@ -4113,9 +4343,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 297, - "trimY": 355, - "width": 40, + "trimX": 138, + "trimY": 1519, + "width": 28, "height": 56, "rawWidth": 40, "rawHeight": 56, @@ -4136,10 +4366,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 160, - "trimY": 411, - "width": 40, - "height": 56, + "trimX": 237, + "trimY": 1118, + "width": 18, + "height": 48, "rawWidth": 40, "rawHeight": 56, "borderTop": 0, @@ -4159,9 +4389,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 337, - "trimY": 355, - "width": 40, + "trimX": 54, + "trimY": 1576, + "width": 38, "height": 56, "rawWidth": 40, "rawHeight": 56, @@ -4182,9 +4412,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 377, - "trimY": 355, - "width": 40, + "trimX": 138, + "trimY": 1577, + "width": 36, "height": 56, "rawWidth": 40, "rawHeight": 56, @@ -4205,8 +4435,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 417, - "trimY": 355, + "trimX": 107, + "trimY": 1417, "width": 40, "height": 56, "rawWidth": 40, @@ -4228,9 +4458,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 457, - "trimY": 355, - "width": 40, + "trimX": 54, + "trimY": 1634, + "width": 38, "height": 56, "rawWidth": 40, "rawHeight": 56, @@ -4251,9 +4481,9 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 411, - "width": 40, + "trimX": 110, + "trimY": 1124, + "width": 38, "height": 56, "rawWidth": 40, "rawHeight": 56, @@ -4274,8 +4504,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 40, - "trimY": 411, + "trimX": 122, + "trimY": 1182, "width": 40, "height": 56, "rawWidth": 40, @@ -4297,8 +4527,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 80, - "trimY": 411, + "trimX": 137, + "trimY": 1240, "width": 40, "height": 56, "rawWidth": 40, @@ -4320,8 +4550,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 120, - "trimY": 411, + "trimX": 148, + "trimY": 1298, "width": 40, "height": 56, "rawWidth": 40, @@ -4343,8 +4573,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 96, - "trimY": 661, + "trimX": 1, + "trimY": 1, "width": 156, "height": 89, "rawWidth": 156, @@ -4366,8 +4596,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 46, - "trimY": 0, + "trimX": 205, + "trimY": 2017, "width": 22, "height": 22, "rawWidth": 22, diff --git a/assets/res/font/font.png b/assets/res/font/font.png index eb74180..58a2ca7 100644 Binary files a/assets/res/font/font.png and b/assets/res/font/font.png differ diff --git a/assets/res/font/font.png.meta b/assets/res/font/font.png.meta index 0d8de9e..ab0e205 100644 --- a/assets/res/font/font.png.meta +++ b/assets/res/font/font.png.meta @@ -8,8 +8,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 503, - "height": 1104, + "width": 256, + "height": 2040, "platformSettings": {}, "subMetas": {} } \ No newline at end of file diff --git a/assets/shop/prefab/Revive.prefab b/assets/shop/prefab/Revive.prefab index 77ed75b..da628d5 100644 --- a/assets/shop/prefab/Revive.prefab +++ b/assets/shop/prefab/Revive.prefab @@ -635,8 +635,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 47, - "height": 63 + "width": 25, + "height": 53 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -745,7 +745,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 47, - "height": 63 + "height": 51 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -854,7 +854,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 47, - "height": 63 + "height": 51 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -963,7 +963,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 47, - "height": 63 + "height": 51 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1270,7 +1270,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 33, + "width": 25, "height": 37 }, "_anchorPoint": { @@ -1488,7 +1488,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 33, + "width": 25, "height": 37 }, "_anchorPoint": { @@ -1706,7 +1706,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 33, + "width": 25, "height": 37 }, "_anchorPoint": { @@ -1893,8 +1893,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 40, - "height": 46 + "width": 38, + "height": 44 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2003,7 +2003,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 40, - "height": 46 + "height": 44 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/shop/script/shop.ts b/assets/shop/script/shop.ts index e94d1c6..e028e69 100644 --- a/assets/shop/script/shop.ts +++ b/assets/shop/script/shop.ts @@ -57,15 +57,15 @@ export default class NewClass extends cc.Component { start() { this.btn_Touch = true; this.openShop(); - this.init(); } init() { this.onShowListener = null; + console.log("初始化"); if (cc.sys.platform === cc.sys.WECHAT_GAME) { // 定义监听函数 this.onShowListener = () => { - console.log("回到前台"); + console.log("回到前台shop"); this.onShow(); }; //@ts-ignore @@ -187,7 +187,7 @@ export default class NewClass extends cc.Component { } onShow() { - console.log("从后台进入前台 onShow"); + console.log("从后台进入前台 shop"); //如果月卡打开就return if (this.monthCard) { return; @@ -222,9 +222,10 @@ export default class NewClass extends cc.Component { cc.fx.GameTool.shushu_Track("payment", dataSuccess); let name = "购买金币道具:" + iosID; let version = cc.fx.GameTool.getWechatGameVersion(); - if (version == "正式版") { - MiniGameSdk.API.yinli_Pay(iosAmount, iosOutTradeNo, name) - } + // if (version == "正式版") { + console.log("引力付费透传", iosAmount, iosOutTradeNo, name); + MiniGameSdk.API.yinli_Pay(iosAmount, iosOutTradeNo, name) + // } Utils.setPayInfo( (res) => { @@ -546,10 +547,10 @@ export default class NewClass extends cc.Component { cc.fx.GameTool.shushu_Track("payment", dataSuccess); let name = "购买金币道具:" + productId; let version = cc.fx.GameTool.getWechatGameVersion(); - if (version == "正式版") { - MiniGameSdk.API.yinli_Pay(price, Utils.outTradeNo, name); - } - + // if (version == "正式版") { + console.log("引力付费透传", price, Utils.outTradeNo, name); + MiniGameSdk.API.yinli_Pay(price, Utils.outTradeNo, name); + // } console.log("7.14_______________充值成功，轮训成功，准备发货"); Utils.setPayInfo( (res) => {