diff --git a/assets/Scene/GameScene.fire b/assets/Scene/GameScene.fire
index 5549063..8af1f07 100644
--- a/assets/Scene/GameScene.fire
+++ b/assets/Scene/GameScene.fire
@@ -15,6 +15,9 @@
"_children": [
{
"__id__": 2
+ },
+ {
+ "__id__": 578
}
],
"_active": false,
@@ -1552,8 +1555,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 150,
- "height": 150
+ "width": 126,
+ "height": 132
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -2267,8 +2270,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 150,
- "height": 150
+ "width": 116,
+ "height": 120
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -3696,8 +3699,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 150,
- "height": 150
+ "width": 108,
+ "height": 130
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -27521,5 +27524,97 @@
},
"_enabled": true,
"_id": "58DM8oQ6lCUKVXb6q5XYvl"
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "stop",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 579
+ }
+ ],
+ "_prefab": null,
+ "_opacity": 255,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 154,
+ "height": 172
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_trs": {
+ "__type__": "TypedArray",
+ "ctor": "Float64Array",
+ "array": [
+ 192.639,
+ 296.447,
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ 1,
+ 1,
+ 1
+ ]
+ },
+ "_eulerAngles": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_skewX": 0,
+ "_skewY": 0,
+ "_is3DNode": false,
+ "_groupIndex": 0,
+ "groupIndex": 0,
+ "_id": "3eJ2YsxDRCtZGj/DKDc7/i"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "node": {
+ "__id__": 578
+ },
+ "_enabled": true,
+ "_materials": [
+ {
+ "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+ }
+ ],
+ "_srcBlendFactor": 770,
+ "_dstBlendFactor": 771,
+ "_spriteFrame": null,
+ "_type": 0,
+ "_sizeMode": 1,
+ "_fillType": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_atlas": null,
+ "_id": "95joh5iDZB1IGmJkAeXXrL"
}
]
\ No newline at end of file
diff --git a/assets/Script/GameManager.ts b/assets/Script/GameManager.ts
index ca29e80..7ff4483 100644
--- a/assets/Script/GameManager.ts
+++ b/assets/Script/GameManager.ts
@@ -687,7 +687,6 @@ export default class GameManager extends cc.Component {
MiniGameSdk.API.shushu_Login();
MiniGameSdk.API.yinli_Init();
MiniGameSdk.API.yinli_Login();
- const group = cc.fx.GameTool.setWechatGameGroup(2);
this.startGame();
}
}
diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts
index 9eab328..e03ed97 100644
--- a/assets/Script/JiaZai.ts
+++ b/assets/Script/JiaZai.ts
@@ -9,6 +9,7 @@ import GameManager from "./GameManager";
import NumberToImage from "./NumberToImage";
import { MiniGameSdk } from "./Sdk/MiniGameSdk";
import { LQCollideSystem } from "./lq_collide_system/lq_collide_system";
+import AudioManager from "./module/Music/AudioManager";
import Utils from "./module/Pay/Utils";
const { ccclass, property } = cc._decorator;
@@ -50,10 +51,10 @@ export default class JiaZai extends cc.Component {
@property(cc.Node)
Stamina: cc.Node = null;
scheduleCallback: any;
- private heath : any; // 用于存储heath预制体
+ private heath: any; // 用于存储heath预制体
private lastPauseClickTime: number = 0; // 用于记录上次点击的时间戳
-// 弹窗倒计时调度器
-private heathScheduleCallback: Function = null;
+ // 弹窗倒计时调度器
+ private heathScheduleCallback: Function = null;
@property(cc.Node)
setUi: cc.Node = null;
@@ -66,13 +67,13 @@ private heathScheduleCallback: Function = null;
// window.initMgr();
GameManager._instance.Block_Color = this.Block_Color;
let version = cc.fx.GameTool.getWechatGameVersion();
- if(version == "开发版" || version == "体验版"){
+ if (version == "开发版" || version == "体验版") {
this.node.getChildByName("Load").getChildByName("New EditBox").active = true;
}
- else if(version == "正式版"){
+ else if (version == "正式版") {
this.node.getChildByName("Load").getChildByName("New EditBox").active = false
}
- else{
+ else {
this.node.getChildByName("Load").getChildByName("New EditBox").active = true;
}
// 预加载 shop 预制体
@@ -95,14 +96,15 @@ private heathScheduleCallback: Function = null;
if (cc.fx.GameConfig.GM_INFO.first) {
console.log("————————准备注册事件", cc.fx.GameConfig.GM_INFO.openid);
+ const group = cc.fx.GameTool.setWechatGameGroup(2);
if (cc.fx.GameConfig.GM_INFO.openid != "") {
console.log("————————发送注册事件");
const time = cc.fx.GameTool.formatDate(new Date());
let data = {
register_time: time, // 注册时间
}
- cc.fx.GameTool.shushu_Track("register",data);
- MiniGameSdk.API.shushu_SetSuperProperties(time);
+ cc.fx.GameTool.shushu_Track("register", data);
+ MiniGameSdk.API.shushu_SetSuperProperties(time);
}
cc.fx.AudioManager._instance.playEffect("zhuan1", null);
this.node.getChildByName("zhuanchang").active = true;
@@ -113,6 +115,9 @@ private heathScheduleCallback: Function = null;
}, 1000);
}
+
+ console.log("音乐开关", cc.fx.GameConfig.GM_INFO.musicOpen);
+ AudioManager._instance.playMusicGame();
}
start() {
@@ -123,7 +128,7 @@ private heathScheduleCallback: Function = null;
cc.fx.GameTool.getHealth(null);
// cc.fx.GameConfig.LEVEL_INFO_init(false,0);s
setTimeout(() => {
- NumberToImage.numberToImageNodes((cc.fx.GameConfig.GM_INFO.level+1), 43, 15, "level_", this.level, true);
+ NumberToImage.numberToImageNodes((cc.fx.GameConfig.GM_INFO.level + 1), 43, 15, "level_", this.level, true);
NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.coin, 30, 15, "coin_", this.coin, true);
this.setHealthInfo();
}, 0);
@@ -152,103 +157,103 @@ private heathScheduleCallback: Function = null;
}
//打开heath弹窗,创建预制体
-// 打开heath弹窗，创建预制体并启动自己的倒计时
-openHeath() {
- let health = cc.instantiate(this.health);
- this.node.addChild(health);
- let heathPop = health.getComponent("heathnum").heatht;
- heathPop.scale = 0.7;
- this.heath = heathPop; // 保存heath预制体引用
- let swichs = health.getComponent("heathnum").switchNode;
- let timeNode = health.getComponent("heathnum").timeNode;
- let switchButtons = health.getComponent("heathnum").switchButtons;
- let coin = health.getComponent("heathnum").coin;
- // 启动弹窗自己的倒计时
- if( cc.fx.GameConfig.GM_INFO.hp < 5) {
- this.startHeathTimeCutDown(timeNode);
- }
- if (cc.fx.GameConfig.GM_INFO.hp == 0) {
- // 体力为0，显示spriteFrames[1]，只显示第二个按钮
-
- if (switchButtons[0]) {switchButtons[0].active = false;swichs[0].active = false;}
- if (switchButtons[1]){ switchButtons[1].active = true;swichs[1].active = true;}
- } else if (cc.fx.GameConfig.GM_INFO.hp < 5 && cc.fx.GameConfig.GM_INFO.hp > 0) {
- // 体力小于5但大于0，显示spriteFrames[1]，只显示第一个按钮
- if (switchButtons[0]) {switchButtons[0].active = true; swichs[0].active = false;}
- if (switchButtons[1]) {switchButtons[1].active = false;swichs[1].active = true;}
- } else if (cc.fx.GameConfig.GM_INFO.hp >= 5) {
-
- // 体力为5，显示spriteFrames[0]，只显示第一个按钮
- if (switchButtons[0]) {switchButtons[0].active = true;swichs[0].active = true;}
- if (switchButtons[1]) {switchButtons[1].active = false;swichs[1].active = false;}
- }
- NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 40, 20, "time_", heathPop, true);
- // 设置金币花费数
-
- // NumberToImage.numberToImageNodes(1000, 35, 15, "button_", coin, true);
-
-
-}
-
-// 弹窗倒计时
-startHeathTimeCutDown(timeLabelNode?: cc.Node) {
- this.stopHeathTimeCutDown();
- this.heathScheduleCallback = function () {
- if (cc.fx.GameConfig.GM_INFO.min_Time <= 0) {
- this.stopHeathTimeCutDown();
-
- let timeTemp = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time);
- console.log("健康值倒计时结束，当前时间：", timeTemp,cc.fx.GameConfig.GM_INFO.min_Time);
- if (timeLabelNode) {
- NumberToImage.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time, 50, "time_", timeLabelNode);
- }
- NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 40, 20, "time_", this.heath, true);
- } else {
- cc.fx.GameConfig.GM_INFO.min_Time -= 0;
- let timeTemp = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time);
- if (timeLabelNode) {
- NumberToImage.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time, 50, "time_", timeLabelNode);
- }
+ // 打开heath弹窗，创建预制体并启动自己的倒计时
+ openHeath() {
+ let health = cc.instantiate(this.health);
+ this.node.addChild(health);
+ let heathPop = health.getComponent("heathnum").heatht;
+ heathPop.scale = 0.7;
+ this.heath = heathPop; // 保存heath预制体引用
+ let swichs = health.getComponent("heathnum").switchNode;
+ let timeNode = health.getComponent("heathnum").timeNode;
+ let switchButtons = health.getComponent("heathnum").switchButtons;
+ let coin = health.getComponent("heathnum").coin;
+ // 启动弹窗自己的倒计时
+ if (cc.fx.GameConfig.GM_INFO.hp < 5) {
+ this.startHeathTimeCutDown(timeNode);
}
- }.bind(this);
- this.heathScheduleCallback();
- this.schedule(this.heathScheduleCallback, 1);
-}
+ if (cc.fx.GameConfig.GM_INFO.hp == 0) {
+ // 体力为0，显示spriteFrames[1]，只显示第二个按钮
+
+ if (switchButtons[0]) { switchButtons[0].active = false; swichs[0].active = false; }
+ if (switchButtons[1]) { switchButtons[1].active = true; swichs[1].active = true; }
+ } else if (cc.fx.GameConfig.GM_INFO.hp < 5 && cc.fx.GameConfig.GM_INFO.hp > 0) {
+ // 体力小于5但大于0，显示spriteFrames[1]，只显示第一个按钮
+ if (switchButtons[0]) { switchButtons[0].active = true; swichs[0].active = false; }
+ if (switchButtons[1]) { switchButtons[1].active = false; swichs[1].active = true; }
+ } else if (cc.fx.GameConfig.GM_INFO.hp >= 5) {
+
+ // 体力为5，显示spriteFrames[0]，只显示第一个按钮
+ if (switchButtons[0]) { switchButtons[0].active = true; swichs[0].active = true; }
+ if (switchButtons[1]) { switchButtons[1].active = false; swichs[1].active = false; }
+ }
+ NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 40, 20, "time_", heathPop, true);
+ // 设置金币花费数
+
+ // NumberToImage.numberToImageNodes(1000, 35, 15, "button_", coin, true);
+
-stopHeathTimeCutDown() {
- if (this.heathScheduleCallback) {
- this.unschedule(this.heathScheduleCallback);
- this.heathScheduleCallback = null;
}
-}
+
+ // 弹窗倒计时
+ startHeathTimeCutDown(timeLabelNode?: cc.Node) {
+ this.stopHeathTimeCutDown();
+ this.heathScheduleCallback = function () {
+ if (cc.fx.GameConfig.GM_INFO.min_Time <= 0) {
+ this.stopHeathTimeCutDown();
+
+ let timeTemp = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time);
+ console.log("健康值倒计时结束，当前时间：", timeTemp, cc.fx.GameConfig.GM_INFO.min_Time);
+ if (timeLabelNode) {
+ NumberToImage.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time, 50, "time_", timeLabelNode);
+ }
+ NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 40, 20, "time_", this.heath, true);
+ } else {
+ cc.fx.GameConfig.GM_INFO.min_Time -= 0;
+ let timeTemp = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time);
+ if (timeLabelNode) {
+ NumberToImage.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time, 50, "time_", timeLabelNode);
+ }
+ }
+ }.bind(this);
+ this.heathScheduleCallback();
+ this.schedule(this.heathScheduleCallback, 1);
+ }
+
+ stopHeathTimeCutDown() {
+ if (this.heathScheduleCallback) {
+ this.unschedule(this.heathScheduleCallback);
+ this.heathScheduleCallback = null;
+ }
+ }
//开始倒计时
- startTimeCutDown() {
- this.scheduleCallback = function () {
- if (this.pause) return;
- if (cc.fx.GameConfig.GM_INFO.min_Time <= 0) {
- this.stopTimeCutDown();
- var timeTemp = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time);
- // 同步显示
- if (this.Stamina && this.Stamina.getChildByName("time")) {
- this.Stamina.getChildByName("time").getComponent(cc.Label).string = timeTemp;
+ startTimeCutDown() {
+ this.scheduleCallback = function () {
+ if (this.pause) return;
+ if (cc.fx.GameConfig.GM_INFO.min_Time <= 0) {
+ this.stopTimeCutDown();
+ var timeTemp = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time);
+ // 同步显示
+ if (this.Stamina && this.Stamina.getChildByName("time")) {
+ this.Stamina.getChildByName("time").getComponent(cc.Label).string = timeTemp;
+ }
+ MiniGameSdk.API.showToast("恢复一点体力");
+ cc.fx.GameTool.setUserHealth(1, (data) => {
+ cc.fx.GameTool.getHealth(null);
+ this.setHealthInfo();
+ })
}
- MiniGameSdk.API.showToast("恢复一点体力");
- cc.fx.GameTool.setUserHealth(1, (data) => {
- cc.fx.GameTool.getHealth(null);
- this.setHealthInfo();
- })
- }
- else {
- cc.fx.GameConfig.GM_INFO.min_Time -= 1;
- var timeTemp = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time);
- // 同步显示
- if (this.Stamina && this.Stamina.getChildByName("time")) {
- this.Stamina.getChildByName("time").getComponent(cc.Label).string = timeTemp;
+ else {
+ cc.fx.GameConfig.GM_INFO.min_Time -= 1;
+ var timeTemp = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time);
+ // 同步显示
+ if (this.Stamina && this.Stamina.getChildByName("time")) {
+ this.Stamina.getChildByName("time").getComponent(cc.Label).string = timeTemp;
+ }
}
- }
- }.bind(this);
- this.schedule(this.scheduleCallback, 1);
-}
+ }.bind(this);
+ this.schedule(this.scheduleCallback, 1);
+ }
// 停止倒计时
stopTimeCutDown() {
if (this.scheduleCallback) {
@@ -292,32 +297,32 @@ stopHeathTimeCutDown() {
if (this.node.getChildByName("Load").getChildByName("startBtn").getComponent("btnControl")._touch) {
this.node.getChildByName("Load").getChildByName("startBtn").getComponent("btnControl").setTouch(false);
let version = cc.fx.GameTool.getWechatGameVersion();
- if(version == "开发版" || version == "体验版"){
- if(this.custom.string != ""){
+ if (version == "开发版" || version == "体验版") {
+ if (this.custom.string != "") {
cc.fx.GameConfig.GM_INFO.level = parseInt(this.custom.string) - 1;
// cc.fx.StorageMessage.setStorage("level",cc.fx.GameConfig.GM_INFO.level.toString());
cc.fx.GameConfig.LEVEL_INFO_init(true);
}
- else{
+ else {
cc.fx.AudioManager._instance.playEffect("zhuan1", null);
this.node.getChildByName("zhuanchang").active = true;
this.node.getChildByName("zhuanchang").getComponent(sp.Skeleton).setAnimation(1, "up", false);
cc.fx.GameConfig.LEVEL_INFO_init(true, 1000);
}
}
- else if(version == "正式版"){
+ else if (version == "正式版") {
cc.fx.AudioManager._instance.playEffect("zhuan1", null);
this.node.getChildByName("zhuanchang").active = true;
this.node.getChildByName("zhuanchang").getComponent(sp.Skeleton).setAnimation(1, "up", false);
cc.fx.GameConfig.LEVEL_INFO_init(true, 1000);
}
- else{
- if(this.custom.string != ""){
+ else {
+ if (this.custom.string != "") {
cc.fx.GameConfig.GM_INFO.level = parseInt(this.custom.string) - 1;
// cc.fx.StorageMessage.setStorage("level",cc.fx.GameConfig.GM_INFO.level.toString());
cc.fx.GameConfig.LEVEL_INFO_init(true);
}
- else{
+ else {
cc.fx.AudioManager._instance.playEffect("zhuan1", null);
this.node.getChildByName("zhuanchang").active = true;
this.node.getChildByName("zhuanchang").getComponent(sp.Skeleton).setAnimation(1, "up", false);
@@ -348,7 +353,7 @@ stopHeathTimeCutDown() {
// console.log("shopNode parent:", this.shopNode.parent);
}
- // 关闭商店
+ // 关闭商店
closeShop() {
if (this.shopNode) {
this.shopNode.active = false;
@@ -423,9 +428,9 @@ stopHeathTimeCutDown() {
closeStamina() {
this.node.getChildByName("Stamina").active = false;
}
-
- updateCoin(){
- console.log("主页更新金币",cc.fx.GameConfig.GM_INFO.coin);
+
+ updateCoin() {
+ console.log("主页更新金币", cc.fx.GameConfig.GM_INFO.coin);
NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.coin, 30, 15, "coin_", this.coin, true);
}
diff --git a/assets/Script/module/Music/AudioManager.ts b/assets/Script/module/Music/AudioManager.ts
index 65b42fa..c7e1092 100644
--- a/assets/Script/module/Music/AudioManager.ts
+++ b/assets/Script/module/Music/AudioManager.ts
@@ -126,8 +126,8 @@ export default class AudioManager extends cc.Component {
];
musics.forEach(function (path) {
})
- console.log("音乐开关", cc.fx.GameConfig.GM_INFO.musicOpen);
- this.playMusicGame();
+ // console.log("音乐开关", cc.fx.GameConfig.GM_INFO.musicOpen);
+ // this.playMusicGame();
}
getAudioMusicSwitch() {
diff --git a/assets/UI/UI/pop/gameui.plist b/assets/UI/UI/pop/gameui.plist
index 3d4611d..463c2a5 100644
--- a/assets/UI/UI/pop/gameui.plist
+++ b/assets/UI/UI/pop/gameui.plist
@@ -15,9 +15,9 @@
spriteSourceSize
{281,71}
textureRect
- {{0,300},{281,71}}
+ {{1338,830},{281,71}}
textureRotated
-
+
20miao.png
@@ -30,9 +30,9 @@
spriteSourceSize
{255,70}
textureRect
- {{1394,230},{255,70}}
+ {{1806,645},{255,70}}
textureRotated
-
+
30miao.png
@@ -45,7 +45,7 @@
spriteSourceSize
{255,70}
textureRect
- {{1649,230},{255,70}}
+ {{1533,1161},{255,70}}
textureRotated
@@ -60,7 +60,7 @@
spriteSourceSize
{76,82}
textureRect
- {{1118,300},{76,82}}
+ {{1493,59},{76,82}}
textureRotated
@@ -75,7 +75,7 @@
spriteSourceSize
{636,174}
textureRect
- {{616,968},{636,174}}
+ {{45,263},{636,174}}
textureRotated
@@ -90,9 +90,9 @@
spriteSourceSize
{348,66}
textureRect
- {{689,230},{348,66}}
+ {{1470,737},{348,66}}
textureRotated
-
+
bgl.png
@@ -105,9 +105,9 @@
spriteSourceSize
{154,172}
textureRect
- {{0,968},{154,172}}
+ {{613,1265},{154,172}}
textureRotated
-
+
chubuqule.png
@@ -120,22 +120,22 @@
spriteSourceSize
{281,64}
textureRect
- {{898,166},{281,64}}
+ {{1947,944},{281,64}}
textureRotated
-
+
chuizi.png
aliases
spriteOffset
- {0,0}
+ {-1,0}
spriteSize
- {316,316}
+ {306,316}
spriteSourceSize
{316,316}
textureRect
- {{646,1340},{316,316}}
+ {{740,506},{306,316}}
textureRotated
@@ -144,13 +144,13 @@
aliases
spriteOffset
- {0,0}
+ {0,1}
spriteSize
- {150,150}
+ {126,132}
spriteSourceSize
{150,150}
textureRect
- {{1736,654},{150,150}}
+ {{1295,1113},{126,132}}
textureRotated
@@ -159,13 +159,13 @@
aliases
spriteOffset
- {0,0}
+ {-1,0}
spriteSize
- {284,284}
+ {238,284}
spriteSourceSize
{284,284}
textureRect
- {{362,1340},{284,284}}
+ {{1394,451},{238,284}}
textureRotated
@@ -180,7 +180,7 @@
spriteSourceSize
{80,100}
textureRect
- {{0,398},{80,100}}
+ {{1738,1290},{80,100}}
textureRotated
@@ -195,9 +195,9 @@
spriteSourceSize
{264,104}
textureRect
- {{1007,398},{264,104}}
+ {{1700,646},{264,104}}
textureRotated
-
+
closet.png
@@ -210,7 +210,7 @@
spriteSourceSize
{66,66}
textureRect
- {{1037,230},{66,66}}
+ {{1820,1346},{66,66}}
textureRotated
@@ -225,9 +225,9 @@
spriteSourceSize
{312,62}
textureRect
- {{586,166},{312,62}}
+ {{1636,736},{312,62}}
textureRotated
-
+
coins.png
@@ -240,9 +240,9 @@
spriteSourceSize
{86,98}
textureRect
- {{1822,300},{86,98}}
+ {{1393,59},{86,98}}
textureRotated
-
+
coins4.png
@@ -255,7 +255,7 @@
spriteSourceSize
{171,191}
textureRect
- {{1272,1142},{171,191}}
+ {{1700,912},{171,191}}
textureRotated
@@ -270,7 +270,7 @@
spriteSourceSize
{58,64}
textureRect
- {{1179,166},{58,64}}
+ {{1888,1346},{58,64}}
textureRotated
@@ -285,9 +285,9 @@
spriteSourceSize
{234,36}
textureRect
- {{109,0},{234,36}}
+ {{1988,385},{234,36}}
textureRotated
-
+
dikuang.png
@@ -300,7 +300,7 @@
spriteSourceSize
{802,118}
textureRect
- {{314,514},{802,118}}
+ {{1,1},{802,118}}
textureRotated
@@ -309,13 +309,13 @@
aliases
spriteOffset
- {0,0}
+ {0,1}
spriteSize
- {616,100}
+ {616,96}
spriteSourceSize
{616,100}
textureRect
- {{80,398},{616,100}}
+ {{45,967},{616,96}}
textureRotated
@@ -330,9 +330,9 @@
spriteSourceSize
{322,64}
textureRect
- {{1237,166},{322,64}}
+ {{1328,506},{322,64}}
textureRotated
-
+
exit.png
@@ -345,7 +345,7 @@
spriteSourceSize
{144,164}
textureRect
- {{150,804},{144,164}}
+ {{1149,1092},{144,164}}
textureRotated
@@ -360,9 +360,9 @@
spriteSourceSize
{291,66}
textureRect
- {{1103,230},{291,66}}
+ {{1953,651},{291,66}}
textureRotated
-
+
fanhui.png
@@ -375,7 +375,7 @@
spriteSourceSize
{434,144}
textureRect
- {{0,654},{434,144}}
+ {{1,1265},{434,144}}
textureRotated
@@ -390,7 +390,7 @@
spriteSourceSize
{434,144}
textureRect
- {{434,654},{434,144}}
+ {{1573,1},{434,144}}
textureRotated
@@ -405,7 +405,7 @@
spriteSourceSize
{476,164}
textureRect
- {{294,804},{476,164}}
+ {{740,340},{476,164}}
textureRotated
@@ -420,7 +420,7 @@
spriteSourceSize
{174,236}
textureRect
- {{188,1340},{174,236}}
+ {{1846,147},{174,236}}
textureRotated
@@ -435,7 +435,7 @@
spriteSourceSize
{412,65}
textureRect
- {{0,230},{412,65}}
+ {{1432,147},{412,65}}
textureRotated
@@ -450,7 +450,7 @@
spriteSourceSize
{289,54}
textureRect
- {{1539,0},{289,54}}
+ {{1533,1105},{289,54}}
textureRotated
@@ -465,7 +465,7 @@
spriteSourceSize
{586,57}
textureRect
- {{766,109},{586,57}}
+ {{805,59},{586,57}}
textureRotated
@@ -480,7 +480,7 @@
spriteSourceSize
{561,54}
textureRect
- {{0,54},{561,54}}
+ {{805,118},{561,54}}
textureRotated
@@ -489,28 +489,28 @@
aliases
spriteOffset
- {0,0}
+ {0,1}
spriteSize
- {316,316}
+ {242,294}
spriteSourceSize
{316,316}
textureRect
- {{962,1340},{316,316}}
+ {{1042,848},{242,294}}
textureRotated
-
+
ices.png
aliases
spriteOffset
- {0,0}
+ {0,1}
spriteSize
- {150,150}
+ {108,130}
spriteSourceSize
{150,150}
textureRect
- {{1886,654},{150,150}}
+ {{1423,1102},{108,130}}
textureRotated
@@ -525,9 +525,9 @@
spriteSourceSize
{363,57}
textureRect
- {{1352,109},{363,57}}
+ {{1411,737},{363,57}}
textureRotated
-
+
jianshaohp.png
@@ -540,7 +540,7 @@
spriteSourceSize
{586,57}
textureRect
- {{0,166},{586,57}}
+ {{805,59},{586,57}}
textureRotated
@@ -555,7 +555,7 @@
spriteSourceSize
{516,164}
textureRect
- {{770,804},{516,164}}
+ {{740,174},{516,164}}
textureRotated
@@ -570,7 +570,7 @@
spriteSourceSize
{476,164}
textureRect
- {{1286,804},{476,164}}
+ {{740,340},{476,164}}
textureRotated
@@ -585,9 +585,9 @@
spriteSourceSize
{314,96}
textureRect
- {{1194,300},{314,96}}
+ {{1538,737},{314,96}}
textureRotated
-
+
lock.png
@@ -600,9 +600,9 @@
spriteSourceSize
{154,172}
textureRect
- {{154,968},{154,172}}
+ {{1258,174},{154,172}}
textureRotated
-
+
lockzi.png
@@ -615,9 +615,9 @@
spriteSourceSize
{109,32}
textureRect
- {{0,0},{109,32}}
+ {{695,121},{109,32}}
textureRotated
-
+
meijinbi.png
@@ -630,9 +630,9 @@
spriteSourceSize
{158,44}
textureRect
- {{1381,0},{158,44}}
+ {{683,847},{158,44}}
textureRotated
-
+
nali.png
@@ -645,9 +645,9 @@
spriteSourceSize
{582,55}
textureRect
- {{561,54},{582,55}}
+ {{683,263},{582,55}}
textureRotated
-
+
next.png
@@ -660,7 +660,7 @@
spriteSourceSize
{636,174}
textureRect
- {{1252,968},{636,174}}
+ {{45,439},{636,174}}
textureRotated
@@ -675,7 +675,7 @@
spriteSourceSize
{189,43}
textureRect
- {{1192,0},{189,43}}
+ {{1788,1234},{189,43}}
textureRotated
@@ -690,7 +690,7 @@
spriteSourceSize
{766,56}
textureRect
- {{0,109},{766,56}}
+ {{805,1},{766,56}}
textureRotated
@@ -705,9 +705,9 @@
spriteSourceSize
{154,172}
textureRect
- {{308,968},{154,172}}
+ {{1223,1258},{154,172}}
textureRotated
-
+
open.png
@@ -720,22 +720,22 @@
spriteSourceSize
{264,104}
textureRect
- {{1271,398},{264,104}}
+ {{1882,385},{264,104}}
textureRotated
-
+
pskuang.png
aliases
spriteOffset
- {0,0}
+ {-155.5,46.5}
spriteSize
- {314,96}
+ {3,3}
spriteSourceSize
{314,96}
textureRect
- {{1508,300},{314,96}}
+ {{1,1042},{3,3}}
textureRotated
@@ -750,7 +750,7 @@
spriteSourceSize
{434,144}
textureRect
- {{868,654},{434,144}}
+ {{713,1112},{434,144}}
textureRotated
@@ -765,9 +765,9 @@
spriteSourceSize
{154,174}
textureRect
- {{1888,968},{154,174}}
+ {{437,1265},{154,174}}
textureRotated
-
+
shijaijndaol.png
@@ -780,37 +780,37 @@
spriteSourceSize
{283,64}
textureRect
- {{1559,166},{283,64}}
+ {{1634,451},{283,64}}
textureRotated
-
+
starb.png
aliases
spriteOffset
- {0,0}
+ {8,-7}
spriteSize
- {316,316}
+ {286,300}
spriteSourceSize
{316,316}
textureRect
- {{1278,1340},{316,316}}
+ {{740,824},{286,300}}
textureRotated
-
+
stars.png
aliases
spriteOffset
- {0,0}
+ {-1,0}
spriteSize
- {150,150}
+ {116,120}
spriteSourceSize
{150,150}
textureRect
- {{0,804},{150,150}}
+ {{1553,1290},{116,120}}
textureRotated
@@ -825,7 +825,7 @@
spriteSourceSize
{520,198}
textureRect
- {{1443,1142},{520,198}}
+ {{1,1065},{520,198}}
textureRotated
@@ -840,9 +840,9 @@
spriteSourceSize
{258,78}
textureRect
- {{860,300},{258,78}}
+ {{1802,385},{258,78}}
textureRotated
-
+
stop.png
@@ -855,7 +855,7 @@
spriteSourceSize
{154,172}
textureRect
- {{462,968},{154,172}}
+ {{1397,1247},{154,172}}
textureRotated
@@ -870,7 +870,7 @@
spriteSourceSize
{150,65}
textureRect
- {{412,230},{150,65}}
+ {{1820,1279},{150,65}}
textureRotated
@@ -885,9 +885,9 @@
spriteSourceSize
{127,65}
textureRect
- {{562,230},{127,65}}
+ {{1671,1290},{127,65}}
textureRotated
-
+
tilibuman.png
@@ -900,9 +900,9 @@
spriteSourceSize
{290,73}
textureRect
- {{570,300},{290,73}}
+ {{1878,651},{290,73}}
textureRotated
-
+
tiliyiman.png
@@ -915,7 +915,7 @@
spriteSourceSize
{233,55}
textureRect
- {{1143,54},{233,55}}
+ {{1553,1233},{233,55}}
textureRotated
@@ -930,9 +930,9 @@
spriteSourceSize
{777,42}
textureRect
- {{415,0},{777,42}}
+ {{1,263},{777,42}}
textureRotated
-
+
touxiang.png
@@ -945,7 +945,7 @@
spriteSourceSize
{188,198}
textureRect
- {{0,1340},{188,198}}
+ {{523,1065},{188,198}}
textureRotated
@@ -960,7 +960,7 @@
spriteSourceSize
{636,174}
textureRect
- {{0,1142},{636,174}}
+ {{45,615},{636,174}}
textureRotated
@@ -975,7 +975,7 @@
spriteSourceSize
{144,164}
textureRect
- {{1762,804},{144,164}}
+ {{1218,340},{144,164}}
textureRotated
@@ -990,7 +990,7 @@
spriteSourceSize
{434,144}
textureRect
- {{1302,654},{434,144}}
+ {{787,1258},{434,144}}
textureRotated
@@ -1005,7 +1005,7 @@
spriteSourceSize
{636,174}
textureRect
- {{636,1142},{636,174}}
+ {{45,791},{636,174}}
textureRotated
@@ -1020,7 +1020,7 @@
spriteSourceSize
{692,140}
textureRect
- {{1116,514},{692,140}}
+ {{1,121},{692,140}}
textureRotated
@@ -1031,11 +1031,11 @@
spriteOffset
{0,0}
spriteSize
- {98,98}
+ {94,90}
spriteSourceSize
{98,98}
textureRect
- {{1908,300},{98,98}}
+ {{1748,214},{94,90}}
textureRotated
@@ -1046,13 +1046,13 @@
spriteOffset
{0,0}
spriteSize
- {340,340}
+ {340,278}
spriteSourceSize
{340,340}
textureRect
- {{1594,1340},{340,340}}
+ {{1048,506},{340,278}}
textureRotated
-
+
yichu.png
@@ -1065,9 +1065,9 @@
spriteSourceSize
{289,72}
textureRect
- {{281,300},{289,72}}
+ {{1873,943},{289,72}}
textureRotated
-
+
yiman.png
@@ -1080,7 +1080,7 @@
spriteSourceSize
{72,36}
textureRect
- {{343,0},{72,36}}
+ {{729,121},{72,36}}
textureRotated
@@ -1095,7 +1095,7 @@
spriteSourceSize
{311,116}
textureRect
- {{1535,398},{311,116}}
+ {{1364,333},{311,116}}
textureRotated
@@ -1110,9 +1110,9 @@
spriteSourceSize
{311,100}
textureRect
- {{696,398},{311,100}}
+ {{1700,333},{311,100}}
textureRotated
-
+
zhendong1.png
@@ -1125,7 +1125,7 @@
spriteSourceSize
{314,117}
textureRect
- {{0,514},{314,117}}
+ {{1432,214},{314,117}}
textureRotated
@@ -1141,9 +1141,9 @@
realTextureFileName
gameui.png
size
- {2042,1680}
+ {2025,1420}
smartupdate
- $TexturePacker:SmartUpdate:740d3c6571c7cd77c65d7ad2c2b27c90:1aebd3750f8f20dcee2b4ba501126681:13103c15d0108e7aab1316a48f90f5be$
+ $TexturePacker:SmartUpdate:97ddd2a2aba94f729ec1de8deae46fe5:1aebd3750f8f20dcee2b4ba501126681:13103c15d0108e7aab1316a48f90f5be$
textureFileName
gameui.png
diff --git a/assets/UI/UI/pop/gameui.plist.meta b/assets/UI/UI/pop/gameui.plist.meta
index dfa7b6e..e667ac2 100644
--- a/assets/UI/UI/pop/gameui.plist.meta
+++ b/assets/UI/UI/pop/gameui.plist.meta
@@ -4,8 +4,8 @@
"importer": "asset",
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"size": {
- "width": 2042,
- "height": 1680
+ "width": 2025,
+ "height": 1420
},
"type": "Texture Packer",
"subMetas": {
@@ -16,11 +16,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 0,
- "trimY": 300,
+ "trimX": 1338,
+ "trimY": 830,
"width": 281,
"height": 71,
"rawWidth": 281,
@@ -39,11 +39,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1394,
- "trimY": 230,
+ "trimX": 1806,
+ "trimY": 645,
"width": 255,
"height": 70,
"rawWidth": 255,
@@ -65,8 +65,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1649,
- "trimY": 230,
+ "trimX": 1533,
+ "trimY": 1161,
"width": 255,
"height": 70,
"rawWidth": 255,
@@ -88,8 +88,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1118,
- "trimY": 300,
+ "trimX": 1493,
+ "trimY": 59,
"width": 76,
"height": 82,
"rawWidth": 76,
@@ -111,8 +111,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 616,
- "trimY": 968,
+ "trimX": 45,
+ "trimY": 263,
"width": 636,
"height": 174,
"rawWidth": 636,
@@ -131,11 +131,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 689,
- "trimY": 230,
+ "trimX": 1470,
+ "trimY": 737,
"width": 348,
"height": 66,
"rawWidth": 348,
@@ -154,11 +154,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 0,
- "trimY": 968,
+ "trimX": 613,
+ "trimY": 1265,
"width": 154,
"height": 172,
"rawWidth": 154,
@@ -177,11 +177,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 898,
- "trimY": 166,
+ "trimX": 1947,
+ "trimY": 944,
"width": 281,
"height": 64,
"rawWidth": 281,
@@ -201,11 +201,11 @@
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
- "offsetX": 0,
+ "offsetX": -1,
"offsetY": 0,
- "trimX": 646,
- "trimY": 1340,
- "width": 316,
+ "trimX": 740,
+ "trimY": 506,
+ "width": 306,
"height": 316,
"rawWidth": 316,
"rawHeight": 316,
@@ -225,11 +225,11 @@
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
- "offsetY": 0,
- "trimX": 1736,
- "trimY": 654,
- "width": 150,
- "height": 150,
+ "offsetY": 1,
+ "trimX": 1295,
+ "trimY": 1113,
+ "width": 126,
+ "height": 132,
"rawWidth": 150,
"rawHeight": 150,
"borderTop": 0,
@@ -247,11 +247,11 @@
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
- "offsetX": 0,
+ "offsetX": -1,
"offsetY": 0,
- "trimX": 362,
- "trimY": 1340,
- "width": 284,
+ "trimX": 1394,
+ "trimY": 451,
+ "width": 238,
"height": 284,
"rawWidth": 284,
"rawHeight": 284,
@@ -272,8 +272,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 0,
- "trimY": 398,
+ "trimX": 1738,
+ "trimY": 1290,
"width": 80,
"height": 100,
"rawWidth": 80,
@@ -292,11 +292,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1007,
- "trimY": 398,
+ "trimX": 1700,
+ "trimY": 646,
"width": 264,
"height": 104,
"rawWidth": 264,
@@ -318,8 +318,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1037,
- "trimY": 230,
+ "trimX": 1820,
+ "trimY": 1346,
"width": 66,
"height": 66,
"rawWidth": 66,
@@ -338,11 +338,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 586,
- "trimY": 166,
+ "trimX": 1636,
+ "trimY": 736,
"width": 312,
"height": 62,
"rawWidth": 312,
@@ -361,11 +361,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1822,
- "trimY": 300,
+ "trimX": 1393,
+ "trimY": 59,
"width": 86,
"height": 98,
"rawWidth": 86,
@@ -387,8 +387,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1272,
- "trimY": 1142,
+ "trimX": 1700,
+ "trimY": 912,
"width": 171,
"height": 191,
"rawWidth": 171,
@@ -410,8 +410,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1179,
- "trimY": 166,
+ "trimX": 1888,
+ "trimY": 1346,
"width": 58,
"height": 64,
"rawWidth": 58,
@@ -430,11 +430,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 109,
- "trimY": 0,
+ "trimX": 1988,
+ "trimY": 385,
"width": 234,
"height": 36,
"rawWidth": 234,
@@ -456,8 +456,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 314,
- "trimY": 514,
+ "trimX": 1,
+ "trimY": 1,
"width": 802,
"height": 118,
"rawWidth": 802,
@@ -478,11 +478,11 @@
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
- "offsetY": 0,
- "trimX": 80,
- "trimY": 398,
+ "offsetY": 1,
+ "trimX": 45,
+ "trimY": 967,
"width": 616,
- "height": 100,
+ "height": 96,
"rawWidth": 616,
"rawHeight": 100,
"borderTop": 0,
@@ -499,11 +499,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1237,
- "trimY": 166,
+ "trimX": 1328,
+ "trimY": 506,
"width": 322,
"height": 64,
"rawWidth": 322,
@@ -525,8 +525,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 150,
- "trimY": 804,
+ "trimX": 1149,
+ "trimY": 1092,
"width": 144,
"height": 164,
"rawWidth": 144,
@@ -545,11 +545,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1103,
- "trimY": 230,
+ "trimX": 1953,
+ "trimY": 651,
"width": 291,
"height": 66,
"rawWidth": 291,
@@ -571,8 +571,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 0,
- "trimY": 654,
+ "trimX": 1,
+ "trimY": 1265,
"width": 434,
"height": 144,
"rawWidth": 434,
@@ -594,8 +594,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 434,
- "trimY": 654,
+ "trimX": 1573,
+ "trimY": 1,
"width": 434,
"height": 144,
"rawWidth": 434,
@@ -617,8 +617,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 294,
- "trimY": 804,
+ "trimX": 740,
+ "trimY": 340,
"width": 476,
"height": 164,
"rawWidth": 476,
@@ -640,8 +640,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 188,
- "trimY": 1340,
+ "trimX": 1846,
+ "trimY": 147,
"width": 174,
"height": 236,
"rawWidth": 174,
@@ -663,8 +663,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 0,
- "trimY": 230,
+ "trimX": 1432,
+ "trimY": 147,
"width": 412,
"height": 65,
"rawWidth": 412,
@@ -686,8 +686,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1539,
- "trimY": 0,
+ "trimX": 1533,
+ "trimY": 1105,
"width": 289,
"height": 54,
"rawWidth": 289,
@@ -709,8 +709,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 766,
- "trimY": 109,
+ "trimX": 805,
+ "trimY": 59,
"width": 586,
"height": 57,
"rawWidth": 586,
@@ -732,8 +732,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 0,
- "trimY": 54,
+ "trimX": 805,
+ "trimY": 118,
"width": 561,
"height": 54,
"rawWidth": 561,
@@ -752,13 +752,13 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
- "offsetY": 0,
- "trimX": 962,
- "trimY": 1340,
- "width": 316,
- "height": 316,
+ "offsetY": 1,
+ "trimX": 1042,
+ "trimY": 848,
+ "width": 242,
+ "height": 294,
"rawWidth": 316,
"rawHeight": 316,
"borderTop": 0,
@@ -777,11 +777,11 @@
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
- "offsetY": 0,
- "trimX": 1886,
- "trimY": 654,
- "width": 150,
- "height": 150,
+ "offsetY": 1,
+ "trimX": 1423,
+ "trimY": 1102,
+ "width": 108,
+ "height": 130,
"rawWidth": 150,
"rawHeight": 150,
"borderTop": 0,
@@ -798,11 +798,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1352,
- "trimY": 109,
+ "trimX": 1411,
+ "trimY": 737,
"width": 363,
"height": 57,
"rawWidth": 363,
@@ -824,8 +824,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 0,
- "trimY": 166,
+ "trimX": 805,
+ "trimY": 59,
"width": 586,
"height": 57,
"rawWidth": 586,
@@ -847,8 +847,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 770,
- "trimY": 804,
+ "trimX": 740,
+ "trimY": 174,
"width": 516,
"height": 164,
"rawWidth": 516,
@@ -870,8 +870,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1286,
- "trimY": 804,
+ "trimX": 740,
+ "trimY": 340,
"width": 476,
"height": 164,
"rawWidth": 476,
@@ -890,11 +890,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1194,
- "trimY": 300,
+ "trimX": 1538,
+ "trimY": 737,
"width": 314,
"height": 96,
"rawWidth": 314,
@@ -913,11 +913,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 154,
- "trimY": 968,
+ "trimX": 1258,
+ "trimY": 174,
"width": 154,
"height": 172,
"rawWidth": 154,
@@ -936,11 +936,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 0,
- "trimY": 0,
+ "trimX": 695,
+ "trimY": 121,
"width": 109,
"height": 32,
"rawWidth": 109,
@@ -959,11 +959,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1381,
- "trimY": 0,
+ "trimX": 683,
+ "trimY": 847,
"width": 158,
"height": 44,
"rawWidth": 158,
@@ -982,11 +982,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 561,
- "trimY": 54,
+ "trimX": 683,
+ "trimY": 263,
"width": 582,
"height": 55,
"rawWidth": 582,
@@ -1008,8 +1008,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1252,
- "trimY": 968,
+ "trimX": 45,
+ "trimY": 439,
"width": 636,
"height": 174,
"rawWidth": 636,
@@ -1031,8 +1031,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1192,
- "trimY": 0,
+ "trimX": 1788,
+ "trimY": 1234,
"width": 189,
"height": 43,
"rawWidth": 189,
@@ -1054,8 +1054,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 0,
- "trimY": 109,
+ "trimX": 805,
+ "trimY": 1,
"width": 766,
"height": 56,
"rawWidth": 766,
@@ -1074,11 +1074,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 308,
- "trimY": 968,
+ "trimX": 1223,
+ "trimY": 1258,
"width": 154,
"height": 172,
"rawWidth": 154,
@@ -1097,11 +1097,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1271,
- "trimY": 398,
+ "trimX": 1882,
+ "trimY": 385,
"width": 264,
"height": 104,
"rawWidth": 264,
@@ -1121,12 +1121,12 @@
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 1508,
- "trimY": 300,
- "width": 314,
- "height": 96,
+ "offsetX": -155.5,
+ "offsetY": 46.5,
+ "trimX": 1,
+ "trimY": 1042,
+ "width": 3,
+ "height": 3,
"rawWidth": 314,
"rawHeight": 96,
"borderTop": 0,
@@ -1146,8 +1146,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 868,
- "trimY": 654,
+ "trimX": 713,
+ "trimY": 1112,
"width": 434,
"height": 144,
"rawWidth": 434,
@@ -1166,11 +1166,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1888,
- "trimY": 968,
+ "trimX": 437,
+ "trimY": 1265,
"width": 154,
"height": 174,
"rawWidth": 154,
@@ -1189,11 +1189,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1559,
- "trimY": 166,
+ "trimX": 1634,
+ "trimY": 451,
"width": 283,
"height": 64,
"rawWidth": 283,
@@ -1212,13 +1212,13 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 1278,
- "trimY": 1340,
- "width": 316,
- "height": 316,
+ "rotated": true,
+ "offsetX": 8,
+ "offsetY": -7,
+ "trimX": 740,
+ "trimY": 824,
+ "width": 286,
+ "height": 300,
"rawWidth": 316,
"rawHeight": 316,
"borderTop": 0,
@@ -1236,12 +1236,12 @@
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
- "offsetX": 0,
+ "offsetX": -1,
"offsetY": 0,
- "trimX": 0,
- "trimY": 804,
- "width": 150,
- "height": 150,
+ "trimX": 1553,
+ "trimY": 1290,
+ "width": 116,
+ "height": 120,
"rawWidth": 150,
"rawHeight": 150,
"borderTop": 0,
@@ -1261,8 +1261,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1443,
- "trimY": 1142,
+ "trimX": 1,
+ "trimY": 1065,
"width": 520,
"height": 198,
"rawWidth": 520,
@@ -1281,11 +1281,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 860,
- "trimY": 300,
+ "trimX": 1802,
+ "trimY": 385,
"width": 258,
"height": 78,
"rawWidth": 258,
@@ -1307,8 +1307,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 462,
- "trimY": 968,
+ "trimX": 1397,
+ "trimY": 1247,
"width": 154,
"height": 172,
"rawWidth": 154,
@@ -1330,8 +1330,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 412,
- "trimY": 230,
+ "trimX": 1820,
+ "trimY": 1279,
"width": 150,
"height": 65,
"rawWidth": 150,
@@ -1350,11 +1350,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 562,
- "trimY": 230,
+ "trimX": 1671,
+ "trimY": 1290,
"width": 127,
"height": 65,
"rawWidth": 127,
@@ -1373,11 +1373,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 570,
- "trimY": 300,
+ "trimX": 1878,
+ "trimY": 651,
"width": 290,
"height": 73,
"rawWidth": 290,
@@ -1399,8 +1399,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1143,
- "trimY": 54,
+ "trimX": 1553,
+ "trimY": 1233,
"width": 233,
"height": 55,
"rawWidth": 233,
@@ -1419,11 +1419,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 415,
- "trimY": 0,
+ "trimX": 1,
+ "trimY": 263,
"width": 777,
"height": 42,
"rawWidth": 777,
@@ -1445,8 +1445,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 0,
- "trimY": 1340,
+ "trimX": 523,
+ "trimY": 1065,
"width": 188,
"height": 198,
"rawWidth": 188,
@@ -1468,8 +1468,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 0,
- "trimY": 1142,
+ "trimX": 45,
+ "trimY": 615,
"width": 636,
"height": 174,
"rawWidth": 636,
@@ -1491,8 +1491,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1762,
- "trimY": 804,
+ "trimX": 1218,
+ "trimY": 340,
"width": 144,
"height": 164,
"rawWidth": 144,
@@ -1514,8 +1514,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1302,
- "trimY": 654,
+ "trimX": 787,
+ "trimY": 1258,
"width": 434,
"height": 144,
"rawWidth": 434,
@@ -1537,8 +1537,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 636,
- "trimY": 1142,
+ "trimX": 45,
+ "trimY": 791,
"width": 636,
"height": 174,
"rawWidth": 636,
@@ -1560,8 +1560,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1116,
- "trimY": 514,
+ "trimX": 1,
+ "trimY": 121,
"width": 692,
"height": 140,
"rawWidth": 692,
@@ -1583,10 +1583,10 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1908,
- "trimY": 300,
- "width": 98,
- "height": 98,
+ "trimX": 1748,
+ "trimY": 214,
+ "width": 94,
+ "height": 90,
"rawWidth": 98,
"rawHeight": 98,
"borderTop": 0,
@@ -1603,13 +1603,13 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1594,
- "trimY": 1340,
+ "trimX": 1048,
+ "trimY": 506,
"width": 340,
- "height": 340,
+ "height": 278,
"rawWidth": 340,
"rawHeight": 340,
"borderTop": 0,
@@ -1626,11 +1626,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 281,
- "trimY": 300,
+ "trimX": 1873,
+ "trimY": 943,
"width": 289,
"height": 72,
"rawWidth": 289,
@@ -1652,8 +1652,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 343,
- "trimY": 0,
+ "trimX": 729,
+ "trimY": 121,
"width": 72,
"height": 36,
"rawWidth": 72,
@@ -1675,8 +1675,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1535,
- "trimY": 398,
+ "trimX": 1364,
+ "trimY": 333,
"width": 311,
"height": 116,
"rawWidth": 311,
@@ -1695,11 +1695,11 @@
"rawTextureUuid": "1f8faacb-88f6-4128-85d9-65adb5eeaa5d",
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 696,
- "trimY": 398,
+ "trimX": 1700,
+ "trimY": 333,
"width": 311,
"height": 100,
"rawWidth": 311,
@@ -1721,8 +1721,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 0,
- "trimY": 514,
+ "trimX": 1432,
+ "trimY": 214,
"width": 314,
"height": 117,
"rawWidth": 314,
diff --git a/assets/UI/UI/pop/gameui.png b/assets/UI/UI/pop/gameui.png
index 0718ba7..5f41129 100644
Binary files a/assets/UI/UI/pop/gameui.png and b/assets/UI/UI/pop/gameui.png differ