From 3600a78b6b3cd1866dc5f81dfefb76dcf761c0b6 Mon Sep 17 00:00:00 2001 From: "COMPUTER\\EDY" <249929363@qq.com> Date: Sun, 20 Sep 2026 17:37:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=98=E4=BB=A4UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/common/passCheckFont.plist | 127 ++++++++++---- assets/common/passCheckFont.plist.meta | 213 ++++++++++++++++++------ assets/common/passCheckFont.png | Bin 7151 -> 9855 bytes assets/common/passCheckFont.png.meta | 4 +- assets/shop/prefab/passCheck.prefab | 5 + assets/shop/prefab/passCheckItem.prefab | 5 +- assets/shop/script/passCheckItem.ts | 110 +++++------- settings/project.json | 2 +- 8 files changed, 314 insertions(+), 152 deletions(-) diff --git a/assets/common/passCheckFont.plist b/assets/common/passCheckFont.plist index 6a957f9..dd3fb41 100644 --- a/assets/common/passCheckFont.plist +++ b/assets/common/passCheckFont.plist @@ -7,7 +7,7 @@ all_black_0.png frame - {{184,168},{45,48}} + {{206,156},{45,48}} offset {0,1} rotated @@ -20,11 +20,11 @@ all_black_1.png frame - {{137,220},{27,48}} + {{253,156},{27,48}} offset {-1,0} rotated - + sourceColorRect {{8,1},{27,48}} sourceSize @@ -33,7 +33,7 @@ all_black_2.png frame - {{196,2},{39,48}} + {{159,206},{39,48}} offset {0,1} rotated @@ -46,7 +46,7 @@ all_black_3.png frame - {{196,43},{37,48}} + {{104,215},{37,48}} offset {-1,1} rotated @@ -59,7 +59,7 @@ all_black_4.png frame - {{149,118},{45,48}} + {{159,156},{45,48}} offset {0,0} rotated @@ -72,11 +72,11 @@ all_black_5.png frame - {{155,2},{39,48}} + {{54,209},{39,48}} offset {0,1} rotated - + sourceColorRect {{3,0},{39,48}} sourceSize @@ -85,11 +85,11 @@ all_black_6.png frame - {{153,60},{41,48}} + {{53,166},{41,48}} offset {-1,0} rotated - + sourceColorRect {{1,1},{41,48}} sourceSize @@ -98,11 +98,11 @@ all_black_7.png frame - {{137,170},{45,48}} + {{213,109},{45,48}} offset {0,1} rotated - + sourceColorRect {{0,0},{45,48}} sourceSize @@ -111,7 +111,7 @@ all_black_8.png frame - {{106,118},{41,50}} + {{53,54},{41,50}} offset {0,0} rotated @@ -124,20 +124,46 @@ all_black_9.png frame - {{94,176},{41,50}} + {{2,212},{41,50}} offset {0,0} rotated - + sourceColorRect {{2,0},{41,50}} sourceSize {45,50} + cheng.png + + frame + {{247,206},{31,32}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{31,32}} + sourceSize + {31,32} + + fenzhong.png + + frame + {{2,2},{95,50}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{95,50}} + sourceSize + {95,50} + half_black_0.png frame - {{53,2},{53,56}} + {{104,157},{53,56}} offset {0,1} rotated @@ -150,11 +176,11 @@ half_black_1.png frame - {{57,176},{35,56}} + {{96,62},{35,56}} offset {-1,0} rotated - + sourceColorRect {{8,1},{35,56}} sourceSize @@ -163,11 +189,11 @@ half_black_2.png frame - {{104,60},{47,56}} + {{219,60},{47,56}} offset {0,1} rotated - + sourceColorRect {{3,0},{47,56}} sourceSize @@ -176,11 +202,11 @@ half_black_3.png frame - {{108,2},{45,56}} + {{155,109},{45,56}} offset {-1,1} rotated - + sourceColorRect {{3,0},{45,56}} sourceSize @@ -189,7 +215,7 @@ half_black_4.png frame - {{2,180},{53,56}} + {{216,2},{53,56}} offset {0,0} rotated @@ -202,11 +228,11 @@ half_black_5.png frame - {{57,118},{47,56}} + {{161,60},{47,56}} offset {0,1} rotated - + sourceColorRect {{3,0},{47,56}} sourceSize @@ -215,7 +241,7 @@ half_black_6.png frame - {{53,60},{49,56}} + {{104,99},{49,56}} offset {-1,0} rotated @@ -228,7 +254,7 @@ half_black_7.png frame - {{2,122},{53,56}} + {{161,2},{53,56}} offset {0,1} rotated @@ -241,7 +267,7 @@ half_black_8.png frame - {{2,62},{49,58}} + {{53,106},{49,58}} offset {0,0} rotated @@ -254,7 +280,7 @@ half_black_9.png frame - {{2,2},{49,58}} + {{2,152},{49,58}} offset {0,0} rotated @@ -264,6 +290,45 @@ sourceSize {53,58} + jia.png + + frame + {{209,206},{36,34}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{36,34}} + sourceSize + {36,34} + + xiaoshi.png + + frame + {{2,54},{96,49}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{96,49}} + sourceSize + {96,49} + + yuan.png + + frame + {{99,2},{60,58}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{60,58}} + sourceSize + {60,58} + metadata @@ -272,9 +337,9 @@ realTextureFileName passCheckFont.png size - {256,256} + {282,255} smartupdate - $TexturePacker:SmartUpdate:ad9874adc9c8a05a25ff74888c02441b$ + $TexturePacker:SmartUpdate:790c3e0d6ee5f49626d30984702c4557$ textureFileName passCheckFont.png diff --git a/assets/common/passCheckFont.plist.meta b/assets/common/passCheckFont.plist.meta index 0657998..b275d12 100644 --- a/assets/common/passCheckFont.plist.meta +++ b/assets/common/passCheckFont.plist.meta @@ -4,8 +4,8 @@ "importer": "asset", "rawTextureUuid": "7fe99da1-dbc0-4fd3-92fd-dba6725ae34c", "size": { - "width": 256, - "height": 256 + "width": 282, + "height": 255 }, "type": "Texture Packer", "subMetas": { @@ -19,8 +19,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 184, - "trimY": 168, + "trimX": 206, + "trimY": 156, "width": 45, "height": 48, "rawWidth": 45, @@ -39,11 +39,11 @@ "rawTextureUuid": "7fe99da1-dbc0-4fd3-92fd-dba6725ae34c", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 137, - "trimY": 220, + "trimX": 253, + "trimY": 156, "width": 27, "height": 48, "rawWidth": 45, @@ -65,8 +65,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 196, - "trimY": 2, + "trimX": 159, + "trimY": 206, "width": 39, "height": 48, "rawWidth": 45, @@ -88,8 +88,8 @@ "rotated": true, "offsetX": -1, "offsetY": 1, - "trimX": 196, - "trimY": 43, + "trimX": 104, + "trimY": 215, "width": 37, "height": 48, "rawWidth": 45, @@ -111,8 +111,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 149, - "trimY": 118, + "trimX": 159, + "trimY": 156, "width": 45, "height": 48, "rawWidth": 45, @@ -131,11 +131,11 @@ "rawTextureUuid": "7fe99da1-dbc0-4fd3-92fd-dba6725ae34c", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 155, - "trimY": 2, + "trimX": 54, + "trimY": 209, "width": 39, "height": 48, "rawWidth": 45, @@ -154,11 +154,11 @@ "rawTextureUuid": "7fe99da1-dbc0-4fd3-92fd-dba6725ae34c", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": 0, - "trimX": 153, - "trimY": 60, + "trimX": 53, + "trimY": 166, "width": 41, "height": 48, "rawWidth": 45, @@ -177,11 +177,11 @@ "rawTextureUuid": "7fe99da1-dbc0-4fd3-92fd-dba6725ae34c", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 137, - "trimY": 170, + "trimX": 213, + "trimY": 109, "width": 45, "height": 48, "rawWidth": 45, @@ -203,8 +203,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 106, - "trimY": 118, + "trimX": 53, + "trimY": 54, "width": 41, "height": 50, "rawWidth": 45, @@ -223,11 +223,11 @@ "rawTextureUuid": "7fe99da1-dbc0-4fd3-92fd-dba6725ae34c", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 94, - "trimY": 176, + "trimX": 2, + "trimY": 212, "width": 41, "height": 50, "rawWidth": 45, @@ -239,6 +239,52 @@ "spriteType": "normal", "subMetas": {} }, + "cheng.png": { + "ver": "1.0.6", + "uuid": "27b0449a-aa3d-4e4d-852e-35d1ab00cab3", + "importer": "sprite-frame", + "rawTextureUuid": "7fe99da1-dbc0-4fd3-92fd-dba6725ae34c", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 247, + "trimY": 206, + "width": 31, + "height": 32, + "rawWidth": 31, + "rawHeight": 32, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "fenzhong.png": { + "ver": "1.0.6", + "uuid": "ad0e6516-f4c0-4e14-bf45-ceb50e00ad87", + "importer": "sprite-frame", + "rawTextureUuid": "7fe99da1-dbc0-4fd3-92fd-dba6725ae34c", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 2, + "trimY": 2, + "width": 95, + "height": 50, + "rawWidth": 95, + "rawHeight": 50, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, "half_black_0.png": { "ver": "1.0.6", "uuid": "808b4bbc-92e1-4e77-bfc4-f32f4740272c", @@ -249,8 +295,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 53, - "trimY": 2, + "trimX": 104, + "trimY": 157, "width": 53, "height": 56, "rawWidth": 53, @@ -269,11 +315,11 @@ "rawTextureUuid": "7fe99da1-dbc0-4fd3-92fd-dba6725ae34c", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": 0, - "trimX": 57, - "trimY": 176, + "trimX": 96, + "trimY": 62, "width": 35, "height": 56, "rawWidth": 53, @@ -292,10 +338,10 @@ "rawTextureUuid": "7fe99da1-dbc0-4fd3-92fd-dba6725ae34c", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 104, + "trimX": 219, "trimY": 60, "width": 47, "height": 56, @@ -315,11 +361,11 @@ "rawTextureUuid": "7fe99da1-dbc0-4fd3-92fd-dba6725ae34c", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": 1, - "trimX": 108, - "trimY": 2, + "trimX": 155, + "trimY": 109, "width": 45, "height": 56, "rawWidth": 53, @@ -341,8 +387,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 2, - "trimY": 180, + "trimX": 216, + "trimY": 2, "width": 53, "height": 56, "rawWidth": 53, @@ -361,11 +407,11 @@ "rawTextureUuid": "7fe99da1-dbc0-4fd3-92fd-dba6725ae34c", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 57, - "trimY": 118, + "trimX": 161, + "trimY": 60, "width": 47, "height": 56, "rawWidth": 53, @@ -387,8 +433,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 53, - "trimY": 60, + "trimX": 104, + "trimY": 99, "width": 49, "height": 56, "rawWidth": 53, @@ -410,8 +456,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 2, - "trimY": 122, + "trimX": 161, + "trimY": 2, "width": 53, "height": 56, "rawWidth": 53, @@ -433,8 +479,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 2, - "trimY": 62, + "trimX": 53, + "trimY": 106, "width": 49, "height": 58, "rawWidth": 53, @@ -457,7 +503,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 2, - "trimY": 2, + "trimY": 152, "width": 49, "height": 58, "rawWidth": 53, @@ -468,6 +514,75 @@ "borderRight": 0, "spriteType": "normal", "subMetas": {} + }, + "jia.png": { + "ver": "1.0.6", + "uuid": "42aacbe2-db33-40d6-932b-445aa9e8479c", + "importer": "sprite-frame", + "rawTextureUuid": "7fe99da1-dbc0-4fd3-92fd-dba6725ae34c", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 209, + "trimY": 206, + "width": 36, + "height": 34, + "rawWidth": 36, + "rawHeight": 34, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "xiaoshi.png": { + "ver": "1.0.6", + "uuid": "18cbc723-0171-4fd1-bef6-4868bbb51e78", + "importer": "sprite-frame", + "rawTextureUuid": "7fe99da1-dbc0-4fd3-92fd-dba6725ae34c", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 2, + "trimY": 54, + "width": 96, + "height": 49, + "rawWidth": 96, + "rawHeight": 49, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "yuan.png": { + "ver": "1.0.6", + "uuid": "1375b028-68b3-484a-972b-32553c1269f6", + "importer": "sprite-frame", + "rawTextureUuid": "7fe99da1-dbc0-4fd3-92fd-dba6725ae34c", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 99, + "trimY": 2, + "width": 60, + "height": 58, + "rawWidth": 60, + "rawHeight": 58, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} } } } \ No newline at end of file diff --git a/assets/common/passCheckFont.png b/assets/common/passCheckFont.png index f343f4d12d6783b586541b130e18fad97bd9c7d7..f25544f0b3706898ce141574a37d9da04822399b 100644 GIT binary patch literal 9855 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 diff --git a/assets/common/passCheckFont.png.meta b/assets/common/passCheckFont.png.meta index 7426fa1..aefdee2 100644 --- a/assets/common/passCheckFont.png.meta +++ b/assets/common/passCheckFont.png.meta @@ -8,8 +8,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 256, - "height": 256, + "width": 282, + "height": 255, "platformSettings": {}, "subMetas": {} } \ No newline at end of file diff --git a/assets/shop/prefab/passCheck.prefab b/assets/shop/prefab/passCheck.prefab index a55c605..2f816ff 100644 --- a/assets/shop/prefab/passCheck.prefab +++ b/assets/shop/prefab/passCheck.prefab @@ -3368,12 +3368,17 @@ "texture_atlas": { "__uuid__": "88f4116d-72c2-46cc-9f06-d164a85a9275" }, + "passCheckFont": null, "newUserAtlas": { "__uuid__": "f5f8c4fd-b672-46fe-85a4-79bd8b1b0eb9" }, "uiAtlas": { "__uuid__": "56aacf5e-256b-4c72-b5d1-3982932775c9" }, + "skylineHealth": null, + "iceb": null, + "chuizi": null, + "starb": null, "_id": "" }, { diff --git a/assets/shop/prefab/passCheckItem.prefab b/assets/shop/prefab/passCheckItem.prefab index 6be3de5..a0fc5a6 100644 --- a/assets/shop/prefab/passCheckItem.prefab +++ b/assets/shop/prefab/passCheckItem.prefab @@ -2305,6 +2305,9 @@ "rightNum": { "__id__": 36 }, + "passCheckFont": { + "__uuid__": "4ed6cebc-e4de-4fe9-9f9b-502ecfa21a7b" + }, "texture_atlas": { "__uuid__": "88f4116d-72c2-46cc-9f06-d164a85a9275" }, @@ -2339,4 +2342,4 @@ "fileId": "", "sync": false } -] \ No newline at end of file +] diff --git a/assets/shop/script/passCheckItem.ts b/assets/shop/script/passCheckItem.ts index 9ff87db..972f650 100644 --- a/assets/shop/script/passCheckItem.ts +++ b/assets/shop/script/passCheckItem.ts @@ -19,6 +19,9 @@ export default class PassCheckItem extends cc.Component { @property(cc.SpriteAtlas) texture_atlas: cc.SpriteAtlas = null; + @property(cc.SpriteAtlas) + passCheckFont: cc.SpriteAtlas = null; + // 添加更多图集属性 @property(cc.SpriteAtlas) newUserAtlas: cc.SpriteAtlas = null; @@ -48,7 +51,6 @@ export default class PassCheckItem extends cc.Component { private itemIndex: number = 0; private isUIInitialized: boolean = false; private levelNode: cc.Node = null; - private numberPositions: { [name: string]: number[] } = {}; // 1001 金币 2001 锤子 2003 魔棒 3001 15分钟无限体力 3002 30分钟 3003 1小时 3004 2小时 3005 3小时 // 添加物品ID到图片名称的映射 private itemImageMap: { [key: number]: { imageName: string, atlas?: string } } = { @@ -61,11 +63,6 @@ export default class PassCheckItem extends cc.Component { 3003: { imageName: "skylineHealth" }, // 可以继续添加更多物品ID和对应图片的映射 }; - private numImgmap: { [key: number]: { imageName: string, atlas: string } } = { - 3001: { imageName: "15", atlas: "uiAtlas" }, - 3002: { imageName: "30min", atlas: "texture_atlas" }, - 3003: { imageName: "1h", atlas: "texture_atlas" }, - } init(data: any, index: number) { this.data = data; @@ -276,71 +273,48 @@ export default class PassCheckItem extends cc.Component { // 使用默认图片 } - let addTiem = node.getChildByName("addTiem"); - addTiem.active = false; - let num1 = node.getChildByName("num_1"); - let num_x = node.getChildByName("num_x"); - const origin = this.numberPositions[node.name] || (this.numberPositions[node.name] = [num1.x, num_x.x]); - num1.x = origin[0]; num_x.x = origin[1]; - num1.active = false; - num_x.active = false; - if ([3001, 3002, 3003].includes(itemID) && addTiem) { - addTiem.active = true; - const numImageInfo = this.numImgmap[itemID]; - if (numImageInfo) { - let targetAtlas: cc.SpriteAtlas = null; - switch (numImageInfo.atlas) { - case "texture_atlas": - targetAtlas = this.texture_atlas; - break; - case "uiAtlas": - targetAtlas = this.uiAtlas; - break; - default: - console.warn(`Unknown atlas for num image: ${numImageInfo.atlas}`); - break; - } + const addTime = node.getChildByName("addTiem"); + const numberNode = node.getChildByName("num_1"); + addTime.active = false; + node.getChildByName("num_x").active = false; + numberNode.active = true; + numberNode.setPosition(addTime.x, addTime.y - 20); + this.updateRewardText(itemID, itemNum, numberNode); + this.setNodeGray(numberNode, itemData === 0 ? cc.color(190, 190, 190, 255) : cc.Color.WHITE); + } - if (targetAtlas) { - const spriteFrame = targetAtlas.getSpriteFrame(numImageInfo.imageName); - if (spriteFrame) { - let numSprite = addTiem.getComponent(cc.Sprite); - if (numSprite) { - numSprite.spriteFrame = spriteFrame; - } - } else { - console.warn(`Sprite frame ${numImageInfo.imageName} not found in atlas ${numImageInfo.atlas}`); - } - } - } - } else { - num1.active = true; - num_x.active = true; - // NumberToImage.numberToImageNodes(itemNum, 50, 25, "pc_num_", num1, true); - // NumberToImage.numberToImageNodes(itemNum, 45, 48, "Black", num1, true); - NumberToImage.numberToImageNodesPassCheck(itemNum, 48, 50, "half_black_", num1, true); - if (itemData === 0) { - this.setNodeGray(num1) - this.setNodeGray(num_x) - } - // num1.scale = 0.8; - if (num_x && num1) { - // 计算数值的位数 - const digitCount = itemNum.toString().length; - const offset = Math.max(0, digitCount); - const num_xWidth = num_x.width; - if (digitCount == 4) { - num1.x = num1.x - 75; - num_x.x = num1.x - (offset - 1) * num_xWidth - 25; - } else if (digitCount == 3) { - num1.x = num1.x - 45; - num_x.x = num1.x - offset * num_xWidth - 15; - } else if (digitCount == 1) { - num_x.x = num1.x - 55; - } + private updateRewardText(itemID: number, itemNum: number, target: cc.Node) { + // 时长由物品 ID 决定,与实际发奖规则保持一致。 + const minutes = { 3001: 15, 3002: 30, 3003: 60 }[itemID]; + const value = minutes ? (minutes >= 60 ? minutes / 60 : minutes) : itemNum; + const frameNames: string[] = itemID === 1001 ? [] : [minutes ? "jia" : "cheng"]; + for (const digit of String(value)) frameNames.push("half_black_" + digit); + if (minutes) frameNames.push(minutes >= 60 ? "xiaoshi" : "fenzhong"); - } + target.destroyAllChildren(); + const glyphs: cc.Node[] = []; + const spacing = 2; + let width = 0; + let height = 0; + for (const name of frameNames) { + const glyph = new cc.Node(name); + const sprite = glyph.addComponent(cc.Sprite); + sprite.sizeMode = cc.Sprite.SizeMode.TRIMMED; + sprite.spriteFrame = this.passCheckFont.getSpriteFrame(name); + target.addChild(glyph); + glyphs.push(glyph); + width += glyph.width; + height = Math.max(height, glyph.height); } + width += spacing * (glyphs.length - 1); + let x = -width / 2; + for (const glyph of glyphs) { + glyph.x = x + glyph.width / 2; + x += glyph.width + spacing; + } + target.setContentSize(width, height); + // 保持原奖励文字约 50 高,长数量或时长限制在卡片内。 + target.scale = Math.min(50 / height, 218 / width, 1); } diff --git a/settings/project.json b/settings/project.json index 3c518e7..fd57f3e 100644 --- a/settings/project.json +++ b/settings/project.json @@ -1,5 +1,5 @@ { - "last-module-event-record-time": 1789116749030, + "last-module-event-record-time": 1789895712220, "group-list": [ "default", "Map"