更换游戏内弹窗UI

This commit is contained in:
huanghaipeng 2025-12-18 14:43:54 +08:00
parent 4c1c65bce8
commit bcb84717c9
27 changed files with 6032 additions and 6012 deletions

File diff suppressed because it is too large Load Diff

View File

@ -631,7 +631,6 @@ export default class JiaZai extends cc.Component {
let health = cc.instantiate(this.health);
this.node.addChild(health);
let heathPop = health.getComponent("heathnum").heatht;
heathPop.scale = 2;
this.heath = heathPop; // 保存heath预制体引用
let swichs = health.getComponent("heathnum").switchNode;
let timeNode = health.getComponent("heathnum").timeNode;
@ -670,7 +669,7 @@ export default class JiaZai extends cc.Component {
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(cc.fx.GameConfig.GM_INFO.hp, 40, 20, "tili_x_", heathPop, true);
// 设置金币花费数
// NumberToImage.numberToImageNodes(1000, 35, 15, "button_", coin, true);
@ -688,7 +687,7 @@ export default class JiaZai extends cc.Component {
if (timeLabelNode) {
NumberToImage.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time, 50, "month_", timeLabelNode);
}
NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 40, 20, "time_", this.heath, true);
NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 40, 20, "tili_x_", this.heath, true);
} else {
let timeTemp = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time);
if (timeLabelNode) {

View File

@ -39,7 +39,7 @@ export default class NewClass extends cc.Component {
openPop() {
// console.log("打开heath弹窗", cc.fx.GameConfig.GM_INFO.hp);
//NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 30, 15, "time_", this.coin, true);
//NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 30, 15, "tili_x_", this.coin, true);
}
startGame() {
// 获取场景中的 JiaZai 组件

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

@ -24,10 +24,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 316,
"height": 78,
"rawWidth": 316,
"rawHeight": 78,
"width": 255,
"height": 65,
"rawWidth": 255,
"rawHeight": 65,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@ -8,8 +8,8 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 582,
"height": 57,
"width": 558,
"height": 54,
"platformSettings": {},
"subMetas": {
"Revolving_icon": {
@ -24,10 +24,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 582,
"height": 57,
"rawWidth": 582,
"rawHeight": 57,
"width": 558,
"height": 54,
"rawWidth": 558,
"rawHeight": 54,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
assets/UI/UI/pop/closet.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

@ -0,0 +1,38 @@
{
"ver": "2.3.7",
"uuid": "dc04e292-62ee-44b6-92b5-3b92c4c506e7",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 114,
"height": 114,
"platformSettings": {},
"subMetas": {
"closet": {
"ver": "1.0.6",
"uuid": "24417002-6e72-4d4d-96e3-6117d8420e9b",
"importer": "sprite-frame",
"rawTextureUuid": "dc04e292-62ee-44b6-92b5-3b92c4c506e7",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 114,
"height": 114,
"rawWidth": 114,
"rawHeight": 114,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}

View File

@ -0,0 +1,594 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>frames</key>
<dict>
<key>20miao.png</key>
<dict>
<key>frame</key>
<string>{{1381,1157},{237,71}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{237,71}}</string>
<key>sourceSize</key>
<string>{237,71}</string>
</dict>
<key>Buy.png</key>
<dict>
<key>frame</key>
<string>{{1620,1226},{256,67}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{256,67}}</string>
<key>sourceSize</key>
<string>{256,67}</string>
</dict>
<key>anniu.png</key>
<dict>
<key>frame</key>
<string>{{493,642},{636,173}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<true/>
<key>sourceColorRect</key>
<string>{{0,0},{636,173}}</string>
<key>sourceSize</key>
<string>{636,173}</string>
</dict>
<key>btn_Buy.png</key>
<dict>
<key>frame</key>
<string>{{654,319},{636,173}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{636,173}}</string>
<key>sourceSize</key>
<string>{636,173}</string>
</dict>
<key>buy_x1.png</key>
<dict>
<key>frame</key>
<string>{{1878,1226},{131,102}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{131,102}}</string>
<key>sourceSize</key>
<string>{131,102}</string>
</dict>
<key>buy_x3.png</key>
<dict>
<key>frame</key>
<string>{{1512,1230},{145,103}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<true/>
<key>sourceColorRect</key>
<string>{{0,0},{145,103}}</string>
<key>sourceSize</key>
<string>{145,103}</string>
</dict>
<key>chubuqule.png</key>
<dict>
<key>frame</key>
<string>{{1698,1038},{281,64}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{281,64}}</string>
<key>sourceSize</key>
<string>{281,64}</string>
</dict>
<key>daojudamof.png</key>
<dict>
<key>frame</key>
<string>{{1422,479},{284,297}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{284,297}}</string>
<key>sourceSize</key>
<string>{284,297}</string>
</dict>
<key>doudakai.png</key>
<dict>
<key>frame</key>
<string>{{1620,1160},{322,64}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{322,64}}</string>
<key>sourceSize</key>
<string>{322,64}</string>
</dict>
<key>fangqi.png</key>
<dict>
<key>frame</key>
<string>{{1699,830},{291,66}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{291,66}}</string>
<key>sourceSize</key>
<string>{291,66}</string>
</dict>
<key>fenxianganniu.png</key>
<dict>
<key>frame</key>
<string>{{1348,2},{609,122}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{609,122}}</string>
<key>sourceSize</key>
<string>{609,122}</string>
</dict>
<key>freeze_Label.png</key>
<dict>
<key>frame</key>
<string>{{1292,394},{404,83}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{404,83}}</string>
<key>sourceSize</key>
<string>{404,83}</string>
</dict>
<key>freeze_Label_1.png</key>
<dict>
<key>frame</key>
<string>{{1292,187},{530,148}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{530,148}}</string>
<key>sourceSize</key>
<string>{530,148}</string>
</dict>
<key>giveup.png</key>
<dict>
<key>frame</key>
<string>{{1854,394},{434,144}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<true/>
<key>sourceColorRect</key>
<string>{{0,0},{434,144}}</string>
<key>sourceSize</key>
<string>{434,144}</string>
</dict>
<key>hammer_Label.png</key>
<dict>
<key>frame</key>
<string>{{1379,778},{318,84}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{318,84}}</string>
<key>sourceSize</key>
<string>{318,84}</string>
</dict>
<key>hammer_Label_1.png</key>
<dict>
<key>frame</key>
<string>{{143,1280},{456,54}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{456,54}}</string>
<key>sourceSize</key>
<string>{456,54}</string>
</dict>
<key>hammer_action.png</key>
<dict>
<key>frame</key>
<string>{{2,2},{650,638}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{650,638}}</string>
<key>sourceSize</key>
<string>{650,638}</string>
</dict>
<key>hammer_action_1.png</key>
<dict>
<key>frame</key>
<string>{{1071,593},{306,317}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{306,317}}</string>
<key>sourceSize</key>
<string>{306,317}</string>
</dict>
<key>haoyun.png</key>
<dict>
<key>frame</key>
<string>{{1009,971},{412,65}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<true/>
<key>sourceColorRect</key>
<string>{{0,0},{412,65}}</string>
<key>sourceSize</key>
<string>{412,65}</string>
</dict>
<key>houhuifu.png</key>
<dict>
<key>frame</key>
<string>{{1698,1104},{289,54}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{289,54}}</string>
<key>sourceSize</key>
<string>{289,54}</string>
</dict>
<key>jianshao.png</key>
<dict>
<key>frame</key>
<string>{{1962,2},{363,57}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<true/>
<key>sourceColorRect</key>
<string>{{0,0},{363,57}}</string>
<key>sourceSize</key>
<string>{363,57}</string>
</dict>
<key>jianshaohp.png</key>
<dict>
<key>frame</key>
<string>{{1348,126},{612,59}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{612,59}}</string>
<key>sourceSize</key>
<string>{612,59}</string>
</dict>
<key>magic_Label.png</key>
<dict>
<key>frame</key>
<string>{{1876,187},{194,84}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<true/>
<key>sourceColorRect</key>
<string>{{0,0},{194,84}}</string>
<key>sourceSize</key>
<string>{194,84}</string>
</dict>
<key>magic_Label_1.png</key>
<dict>
<key>frame</key>
<string>{{2,1343},{456,53}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{456,53}}</string>
<key>sourceSize</key>
<string>{456,53}</string>
</dict>
<key>nali.png</key>
<dict>
<key>frame</key>
<string>{{1292,337},{582,55}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{582,55}}</string>
<key>sourceSize</key>
<string>{582,55}</string>
</dict>
<key>nuliyixia.png</key>
<dict>
<key>frame</key>
<string>{{654,494},{766,56}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{766,56}}</string>
<key>sourceSize</key>
<string>{766,56}</string>
</dict>
<key>prop_freeze.png</key>
<dict>
<key>frame</key>
<string>{{1381,864},{240,291}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{240,291}}</string>
<key>sourceSize</key>
<string>{240,291}</string>
</dict>
<key>prop_hammer.png</key>
<dict>
<key>frame</key>
<string>{{1076,912},{303,316}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{303,316}}</string>
<key>sourceSize</key>
<string>{303,316}</string>
</dict>
<key>result_hp.png</key>
<dict>
<key>frame</key>
<string>{{668,971},{339,326}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{339,326}}</string>
<key>sourceSize</key>
<string>{339,326}</string>
</dict>
<key>return.png</key>
<dict>
<key>frame</key>
<string>{{1708,394},{434,144}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<true/>
<key>sourceColorRect</key>
<string>{{0,0},{434,144}}</string>
<key>sourceSize</key>
<string>{434,144}</string>
</dict>
<key>shijaijndaol.png</key>
<dict>
<key>frame</key>
<string>{{1698,972},{283,64}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{283,64}}</string>
<key>sourceSize</key>
<string>{283,64}</string>
</dict>
<key>start.png</key>
<dict>
<key>frame</key>
<string>{{318,642},{636,173}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<true/>
<key>sourceColorRect</key>
<string>{{0,0},{636,173}}</string>
<key>sourceSize</key>
<string>{636,173}</string>
</dict>
<key>tili.png</key>
<dict>
<key>frame</key>
<string>{{1852,1330},{127,65}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{127,65}}</string>
<key>sourceSize</key>
<string>{127,65}</string>
</dict>
<key>tilibuman.png</key>
<dict>
<key>frame</key>
<string>{{1623,864},{290,73}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<true/>
<key>sourceColorRect</key>
<string>{{0,0},{290,73}}</string>
<key>sourceSize</key>
<string>{290,73}</string>
</dict>
<key>tiliyiman.png</key>
<dict>
<key>frame</key>
<string>{{1617,1295},{233,55}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{233,55}}</string>
<key>sourceSize</key>
<string>{233,55}</string>
</dict>
<key>tishi.png</key>
<dict>
<key>frame</key>
<string>{{654,552},{713,39}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{713,39}}</string>
<key>sourceSize</key>
<string>{713,39}</string>
</dict>
<key>title_hammer.png</key>
<dict>
<key>frame</key>
<string>{{601,1299},{383,65}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{383,65}}</string>
<key>sourceSize</key>
<string>{383,65}</string>
</dict>
<key>title_tishi.png</key>
<dict>
<key>frame</key>
<string>{{2,642},{699,139}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<true/>
<key>sourceColorRect</key>
<string>{{0,0},{699,139}}</string>
<key>sourceSize</key>
<string>{699,139}</string>
</dict>
<key>try.png</key>
<dict>
<key>frame</key>
<string>{{654,144},{636,173}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{636,173}}</string>
<key>sourceSize</key>
<string>{636,173}</string>
</dict>
<key>tuichu.png</key>
<dict>
<key>frame</key>
<string>{{1076,1230},{434,144}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{434,144}}</string>
<key>sourceSize</key>
<string>{434,144}</string>
</dict>
<key>xiangxiang.png</key>
<dict>
<key>frame</key>
<string>{{143,642},{636,173}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<true/>
<key>sourceColorRect</key>
<string>{{0,0},{636,173}}</string>
<key>sourceSize</key>
<string>{636,173}</string>
</dict>
<key>ximie.png</key>
<dict>
<key>frame</key>
<string>{{654,2},{692,140}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{692,140}}</string>
<key>sourceSize</key>
<string>{692,140}</string>
</dict>
<key>yichu.png</key>
<dict>
<key>frame</key>
<string>{{1698,898},{289,72}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{289,72}}</string>
<key>sourceSize</key>
<string>{289,72}</string>
</dict>
<key>zd1.png</key>
<dict>
<key>frame</key>
<string>{{668,593},{401,376}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{401,376}}</string>
<key>sourceSize</key>
<string>{401,376}</string>
</dict>
</dict>
<key>metadata</key>
<dict>
<key>format</key>
<integer>2</integer>
<key>realTextureFileName</key>
<string>gameUI_new.png</string>
<key>size</key>
<string>{2021,1398}</string>
<key>smartupdate</key>
<string>$TexturePacker:SmartUpdate:5135585d330cd2bbbfb5d6b3ba7d4032$</string>
<key>textureFileName</key>
<string>gameUI_new.png</string>
</dict>
</dict>
</plist>

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 KiB

View File

@ -0,0 +1,15 @@
{
"ver": "2.3.7",
"uuid": "7d0923b8-ba11-43c8-867b-a17f6edcca6a",
"importer": "texture",
"type": "raw",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 2025,
"height": 1326,
"platformSettings": {},
"subMetas": {}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

View File

@ -8,8 +8,8 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 994,
"height": 1462,
"width": 1000,
"height": 1400,
"platformSettings": {},
"subMetas": {
"kuangt": {
@ -21,13 +21,13 @@
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"offsetY": 0.5,
"trimX": 1,
"trimY": 0,
"width": 994,
"height": 1462,
"rawWidth": 994,
"rawHeight": 1462,
"width": 998,
"height": 1399,
"rawWidth": 1000,
"rawHeight": 1400,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -24,10 +24,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 277,
"height": 272,
"rawWidth": 277,
"rawHeight": 272,
"width": 950,
"height": 1314,
"rawWidth": 950,
"rawHeight": 1314,
"borderTop": 60,
"borderBottom": 79,
"borderLeft": 59,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

View File

@ -22,12 +22,12 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimX": 1,
"trimY": 0,
"width": 285,
"height": 252,
"rawWidth": 285,
"rawHeight": 252,
"width": 287,
"height": 256,
"rawWidth": 289,
"rawHeight": 256,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 115 KiB

View File

@ -8,8 +8,8 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 1126,
"height": 511,
"width": 1347,
"height": 512,
"platformSettings": {},
"subMetas": {}
}

File diff suppressed because it is too large Load Diff