diff --git a/assets/Scene/HomeScene.fire b/assets/Scene/HomeScene.fire index 07f3eec..72f3b91 100644 --- a/assets/Scene/HomeScene.fire +++ b/assets/Scene/HomeScene.fire @@ -1775,7 +1775,7 @@ } ], "_prefab": null, - "_opacity": 255, + "_opacity": 0, "_color": { "__type__": "cc.Color", "r": 255, @@ -1952,7 +1952,7 @@ "ctor": "Float64Array", "array": [ 0, - 0, + -5, 0, 0, 0, diff --git a/assets/Script/Wall.ts b/assets/Script/Wall.ts index 291e8b0..440c5ff 100644 --- a/assets/Script/Wall.ts +++ b/assets/Script/Wall.ts @@ -518,6 +518,7 @@ export default class Wall extends cc.Component { initType() { switch (this.special) { case WallSpecial.星星门: + let star = cc.instantiate(MapConroler._instance.Block_Prop[this.special]); star.parent = this.node.parent; // console.log("门的方向",this.direction,"长度",this.wall_Info.length); @@ -530,7 +531,23 @@ export default class Wall extends cc.Component { star.children[this.wall_Info.length - 1].active = true; } } - star.setPosition(this.node.width / 2 + this.node.x, this.node.height / 2 + this.node.y); + let widget = 69; + let height = 69; + if (this.direction == "down" || this.direction == "up") { + height = 69; + if (this.wall_Info.length == 1) widget = 138; + else if (this.wall_Info.length == 2) widget = 138; + else if (this.wall_Info.length == 3) widget = 258; + } + else if (this.direction == "right" || this.direction == "left") { + widget = 69; + if (this.wall_Info.length == 1) height = 138; + else if (this.wall_Info.length == 2) height = 138; + else if (this.wall_Info.length == 3) height = 258; + } + star.setPosition(widget / 2 + this.node.x, height / 2 + this.node.y); + + break; case WallSpecial.开关门: let name = "open" + this.wall_Info.length; @@ -970,7 +987,7 @@ export default class Wall extends cc.Component { this.revolvingColorNode.active = true; this.revolvingColorNode.zIndex = 200; if (this.node.parent.getChildByName("star")) { - this.node.parent.getChildByName("star").opacity = 0; + this.node.parent.getChildByName("star").active = false; } this.initColor(this.wall_Info.length, this.color); this.revolvingColorNode.getChildByName("start").getComponent(cc.Sprite).spriteFrame = this.wall_SpriteFrames._spriteFrames["color" + this.baseColor]; @@ -997,7 +1014,7 @@ export default class Wall extends cc.Component { } this.revolvingColorNode.active = false; if (this.node.parent.getChildByName("star")) { - this.node.parent.getChildByName("star").opacity = 255; + this.node.parent.getChildByName("star").active = true; } } } diff --git a/assets/Script/module/RankList/ItemRender.ts b/assets/Script/module/RankList/ItemRender.ts index 17c6fc4..611be6a 100644 --- a/assets/Script/module/RankList/ItemRender.ts +++ b/assets/Script/module/RankList/ItemRender.ts @@ -86,6 +86,15 @@ export default class ItemRender extends cc.Component { || this.data.useravatar == "7" || this.data.useravatar == "8" || this.data.useravatar == "9" || this.data.useravatar == "10" || this.data.useravatar == "11" || this.data.useravatar == "12" || this.data.useravatar == "13" || this.data.useravatar == "14" || this.data.useravatar == "15" || this.data.useravatar == "16" || this.data.useravatar == "17" + || this.data.useravatar == "18" + || this.data.useravatar == "19" + || this.data.useravatar == "20" + || this.data.useravatar == "21" + || this.data.useravatar == "22" + || this.data.useravatar == "23" + || this.data.useravatar == "24" + || this.data.useravatar == "25" + || this.data.useravatar == "26" ) { this.node.getChildByName("pic").getChildByName("pic").active = false; this.node.getChildByName("pic").getChildByName("sp").active = true; diff --git a/assets/Script/ranking.ts b/assets/Script/ranking.ts index 078ba97..c241ba6 100644 --- a/assets/Script/ranking.ts +++ b/assets/Script/ranking.ts @@ -255,7 +255,24 @@ export default class ranking extends cc.Component { this.selfInfo = JSON.parse(JSON.stringify(this.wordRank[i])); if (this.selfInfo.useravatar == "0" || this.selfInfo.useravatar == "1" || this.selfInfo.useravatar == "2" || this.selfInfo.useravatar == "3" || this.selfInfo.useravatar == "4" || this.selfInfo.useravatar == "5" || this.selfInfo.useravatar == "6" - || this.selfInfo.useravatar == "7" || this.selfInfo.useravatar == "8" || this.selfInfo.useravatar == "9" || this.selfInfo.useravatar == "10") { + || this.selfInfo.useravatar == "7" || this.selfInfo.useravatar == "8" || this.selfInfo.useravatar == "9" || this.selfInfo.useravatar == "10" + || this.selfInfo.useravatar == "11" + || this.selfInfo.useravatar == "12" + || this.selfInfo.useravatar == "13" + || this.selfInfo.useravatar == "14" + || this.selfInfo.useravatar == "15" + || this.selfInfo.useravatar == "16" + || this.selfInfo.useravatar == "17" + || this.selfInfo.useravatar == "18" + || this.selfInfo.useravatar == "19" + || this.selfInfo.useravatar == "20" + || this.selfInfo.useravatar == "21" + || this.selfInfo.useravatar == "22" + || this.selfInfo.useravatar == "23" + || this.selfInfo.useravatar == "24" + || this.selfInfo.useravatar == "25" + || this.selfInfo.useravatar == "26" + ) { this.selfInfo.useravatar = "icon_" + this.selfInfo.useravatar; } this.selfInfo.useravatarIcon = "kuang_" + (parseInt(this.selfInfo.useravatarIcon) + 1); diff --git a/assets/career/prefab/careerRankItem.prefab b/assets/career/prefab/careerRankItem.prefab index e23f6c3..508f79e 100644 --- a/assets/career/prefab/careerRankItem.prefab +++ b/assets/career/prefab/careerRankItem.prefab @@ -122,8 +122,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 274, - "height": 316 + "width": 306, + "height": 355 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/career/prefab/rankGame.prefab b/assets/career/prefab/rankGame.prefab index bccfc75..1d511d3 100644 --- a/assets/career/prefab/rankGame.prefab +++ b/assets/career/prefab/rankGame.prefab @@ -4124,8 +4124,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 0, - "height": 0 + "width": 180, + "height": 200 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4175,9 +4175,9 @@ } ], "paused": false, - "defaultSkin": "", - "defaultAnimation": "", - "_preCacheMode": -1, + "defaultSkin": "default", + "defaultAnimation": "008", + "_preCacheMode": 0, "_cacheMode": 0, "loop": true, "premultipliedAlpha": false, @@ -4187,7 +4187,7 @@ "_frameCache": null, "_curFrame": null, "_skeletonCache": null, - "_animationName": "", + "_animationName": "008", "_animationQueue": [], "_headAniInfo": null, "_playTimes": 0, @@ -9080,8 +9080,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 0, - "height": 0 + "width": 180, + "height": 200 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -9093,14 +9093,14 @@ "ctor": "Float64Array", "array": [ 0, - -10, + 0, 0, 0, 0, 0, 1, - 1, - 1, + 1.05, + 1.05, 1 ] }, @@ -9125,11 +9125,15 @@ "__id__": 239 }, "_enabled": true, - "_materials": [], + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], "paused": false, - "defaultSkin": "", - "defaultAnimation": "", - "_preCacheMode": -1, + "defaultSkin": "default", + "defaultAnimation": "008", + "_preCacheMode": 0, "_cacheMode": 0, "loop": true, "premultipliedAlpha": false, @@ -9139,7 +9143,7 @@ "_frameCache": null, "_curFrame": null, "_skeletonCache": null, - "_animationName": "", + "_animationName": "008", "_animationQueue": [], "_headAniInfo": null, "_playTimes": 0, @@ -10382,14 +10386,14 @@ "ctor": "Float64Array", "array": [ 0, - -10, + 0, 0, 0, 0, 0, 1, - 1, - 1, + 1.05, + 1.05, 1 ] }, @@ -10414,7 +10418,11 @@ "__id__": 274 }, "_enabled": true, - "_materials": [], + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], "paused": false, "defaultSkin": "", "defaultAnimation": "", @@ -11668,14 +11676,14 @@ "ctor": "Float64Array", "array": [ 0, - -10, + 0, 0, 0, 0, 0, 1, - 1, - 1, + 1.05, + 1.05, 1 ] }, @@ -11700,7 +11708,11 @@ "__id__": 309 }, "_enabled": true, - "_materials": [], + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], "paused": false, "defaultSkin": "", "defaultAnimation": "", @@ -12845,14 +12857,14 @@ "ctor": "Float64Array", "array": [ 0, - -10, + 0, 0, 0, 0, 0, 1, - 1, - 1, + 1.05, + 1.05, 1 ] }, @@ -12877,7 +12889,11 @@ "__id__": 341 }, "_enabled": true, - "_materials": [], + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], "paused": false, "defaultSkin": "", "defaultAnimation": "", @@ -14022,14 +14038,14 @@ "ctor": "Float64Array", "array": [ 0, - -10, + 0, 0, 0, 0, 0, 1, - 1, - 1, + 1.05, + 1.05, 1 ] }, @@ -14054,7 +14070,11 @@ "__id__": 373 }, "_enabled": true, - "_materials": [], + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], "paused": false, "defaultSkin": "", "defaultAnimation": "", @@ -15199,14 +15219,14 @@ "ctor": "Float64Array", "array": [ 0, - -10, + 0, 0, 0, 0, 0, 1, - 1, - 1, + 1.05, + 1.05, 1 ] }, @@ -15231,7 +15251,11 @@ "__id__": 405 }, "_enabled": true, - "_materials": [], + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], "paused": false, "defaultSkin": "", "defaultAnimation": "", @@ -16376,14 +16400,14 @@ "ctor": "Float64Array", "array": [ 0, - -10, + 0, 0, 0, 0, 0, 1, - 1, - 1, + 1.05, + 1.05, 1 ] }, @@ -16408,7 +16432,11 @@ "__id__": 437 }, "_enabled": true, - "_materials": [], + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], "paused": false, "defaultSkin": "", "defaultAnimation": "", @@ -17553,14 +17581,14 @@ "ctor": "Float64Array", "array": [ 0, - -10, + 0, 0, 0, 0, 0, 1, - 1, - 1, + 1.05, + 1.05, 1 ] }, @@ -17585,7 +17613,11 @@ "__id__": 469 }, "_enabled": true, - "_materials": [], + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], "paused": false, "defaultSkin": "", "defaultAnimation": "", diff --git a/assets/career/script/CareerItem.ts b/assets/career/script/CareerItem.ts index 60a4018..f5ff09e 100644 --- a/assets/career/script/CareerItem.ts +++ b/assets/career/script/CareerItem.ts @@ -92,6 +92,15 @@ export default class CareerItem extends cc.Component { || this.data.rankingData[i - 4].useravatar == "7" || this.data.rankingData[i - 4].useravatar == "8" || this.data.rankingData[i - 4].useravatar == "9" || this.data.rankingData[i - 4].useravatar == "10" || this.data.rankingData[i - 4].useravatar == "11" || this.data.rankingData[i - 4].useravatar == "12" || this.data.rankingData[i - 4].useravatar == "13" || this.data.rankingData[i - 4].useravatar == "14" || this.data.rankingData[i - 4].useravatar == "15" || this.data.rankingData[i - 4].useravatar == "16" || this.data.rankingData[i - 4].useravatar == "17" + || this.data.rankingData[i - 4].useravatar == "18" + || this.data.rankingData[i - 4].useravatar == "19" + || this.data.rankingData[i - 4].useravatar == "20" + || this.data.rankingData[i - 4].useravatar == "21" + || this.data.rankingData[i - 4].useravatar == "22" + || this.data.rankingData[i - 4].useravatar == "23" + || this.data.rankingData[i - 4].useravatar == "24" + || this.data.rankingData[i - 4].useravatar == "25" + || this.data.rankingData[i - 4].useravatar == "26" ) { this.node.children[i].getChildByName("mask").getChildByName("icon").active = false; this.node.children[i].getChildByName("mask").getChildByName("sp").active = true; diff --git a/assets/career/script/CareerList.ts b/assets/career/script/CareerList.ts index eb8834b..08d11a3 100644 --- a/assets/career/script/CareerList.ts +++ b/assets/career/script/CareerList.ts @@ -495,6 +495,15 @@ export default class CareerList extends cc.Component { || this.topData[i - 3].useravatar == "7" || this.topData[i - 3].useravatar == "8" || this.topData[i - 3].useravatar == "9" || this.topData[i - 3].useravatar == "10" || this.topData[i - 3].useravatar == "11" || this.topData[i - 3].useravatar == "12" || this.topData[i - 3].useravatar == "13" || this.topData[i - 3].useravatar == "14" || this.topData[i - 3].useravatar == "15" || this.topData[i - 3].useravatar == "16" || this.topData[i - 3].useravatar == "17" + || this.topData[i - 3].useravatar == "18" + || this.topData[i - 3].useravatar == "19" + || this.topData[i - 3].useravatar == "20" + || this.topData[i - 3].useravatar == "21" + || this.topData[i - 3].useravatar == "22" + || this.topData[i - 3].useravatar == "23" + || this.topData[i - 3].useravatar == "24" + || this.topData[i - 3].useravatar == "25" + || this.topData[i - 3].useravatar == "26" ) { let useravatar = this.topData[i - 3].useravatar; diff --git a/assets/career/script/Item.ts b/assets/career/script/Item.ts index de96c37..088cdeb 100644 --- a/assets/career/script/Item.ts +++ b/assets/career/script/Item.ts @@ -67,7 +67,17 @@ export default class Item extends cc.Component { || this.data.useravatar == "6" || this.data.useravatar == "7" || this.data.useravatar == "8" || this.data.useravatar == "9" || this.data.useravatar == "10" || this.data.useravatar == "11" || this.data.useravatar == "12" || this.data.useravatar == "13" || this.data.useravatar == "14" - || this.data.useravatar == "15" || this.data.useravatar == "16" || this.data.useravatar == "17") { + || this.data.useravatar == "15" || this.data.useravatar == "16" || this.data.useravatar == "17" + || this.data.useravatar == "18" + || this.data.useravatar == "19" + || this.data.useravatar == "20" + || this.data.useravatar == "21" + || this.data.useravatar == "22" + || this.data.useravatar == "23" + || this.data.useravatar == "24" + || this.data.useravatar == "25" + || this.data.useravatar == "26" + ) { let useravatar = this.data.useravatar; let useravatarTemp = "icon_" + useravatar; console.log("用户头像:", useravatarTemp); diff --git a/assets/shop/img/passCheck/bg.jpg b/assets/shop/img/passCheck/bg.jpg index 64d89e6..f1ce274 100644 Binary files a/assets/shop/img/passCheck/bg.jpg and b/assets/shop/img/passCheck/bg.jpg differ diff --git a/assets/shop/img/passCheck/description_2.png b/assets/shop/img/passCheck/description_2.png new file mode 100644 index 0000000..f60ccda Binary files /dev/null and b/assets/shop/img/passCheck/description_2.png differ diff --git a/assets/shop/img/passCheck/description_2.png.meta b/assets/shop/img/passCheck/description_2.png.meta new file mode 100644 index 0000000..b674677 --- /dev/null +++ b/assets/shop/img/passCheck/description_2.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "e7dc1af9-e04c-4c48-8e67-5795a8b61dad", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 300, + "height": 460, + "platformSettings": {}, + "subMetas": { + "description_2": { + "ver": "1.0.6", + "uuid": "90eaac0d-aa2e-43f4-b2d5-ac63e4a96f91", + "importer": "sprite-frame", + "rawTextureUuid": "e7dc1af9-e04c-4c48-8e67-5795a8b61dad", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 300, + "height": 460, + "rawWidth": 300, + "rawHeight": 460, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/shop/img/passCheck/passCheck.plist b/assets/shop/img/passCheck/passCheck.plist index a9a8b41..e1f8da6 100644 --- a/assets/shop/img/passCheck/passCheck.plist +++ b/assets/shop/img/passCheck/passCheck.plist @@ -7,11 +7,11 @@ 15.png frame - {{1105,1434},{141,37}} + {{458,739},{141,37}} offset {0,0} rotated - + sourceColorRect {{0,0},{141,37}} sourceSize @@ -20,7 +20,7 @@ 18yuan.png frame - {{233,1911},{182,63}} + {{570,680},{182,63}} offset {0,0} rotated @@ -33,11 +33,11 @@ activate_btn.png frame - {{889,774},{394,160}} + {{2,571},{394,160}} offset {0,0} rotated - + sourceColorRect {{0,0},{394,160}} sourceSize @@ -46,24 +46,24 @@ bright_bg.png frame - {{976,1805},{116,124}} + {{133,415},{142,129}} offset {0,0} rotated sourceColorRect - {{0,0},{116,124}} + {{0,0},{142,129}} sourceSize - {116,124} + {142,129} buy_btn.png frame - {{1051,774},{516,164}} + {{505,745},{516,164}} offset {0,0} rotated - + sourceColorRect {{0,0},{516,164}} sourceSize @@ -72,7 +72,7 @@ description_1.png frame - {{2,802},{1079,126}} + {{24,745},{1079,126}} offset {0,0} rotated @@ -85,7 +85,7 @@ description_2.png frame - {{466,1235},{300,460}} + {{505,1031},{300,460}} offset {0,0} rotated @@ -98,11 +98,11 @@ description_3.png frame - {{1105,1292},{136,140}} + {{682,1333},{136,140}} offset {0,0} rotated - + sourceColorRect {{0,0},{136,140}} sourceSize @@ -111,7 +111,7 @@ description_5.png frame - {{466,1537},{501,214}} + {{2,1827},{501,214}} offset {0,0} rotated @@ -124,11 +124,11 @@ description_6.png frame - {{466,802},{421,431}} + {{152,1397},{421,431}} offset {0,0} rotated - + sourceColorRect {{0,0},{421,431}} sourceSize @@ -137,11 +137,11 @@ description_7.png frame - {{862,2},{770,270}} + {{2,143},{770,270}} offset {0,0} rotated - + sourceColorRect {{0,0},{770,270}} sourceSize @@ -150,11 +150,11 @@ description_8.png frame - {{458,1813},{426,70}} + {{774,143},{426,70}} offset {0,0} rotated - + sourceColorRect {{0,0},{426,70}} sourceSize @@ -163,7 +163,7 @@ free.png frame - {{1134,727},{84,44}} + {{398,693},{84,44}} offset {0,0} rotated @@ -176,7 +176,7 @@ get.png frame - {{293,1545},{124,95}} + {{264,415},{124,95}} offset {0,0} rotated @@ -189,11 +189,11 @@ get_btn.png frame - {{1134,505},{220,88}} + {{626,571},{220,88}} offset {0,0} rotated - + sourceColorRect {{0,0},{220,88}} sourceSize @@ -202,7 +202,7 @@ left_bg.png frame - {{152,1648},{304,261}} + {{152,1004},{304,261}} offset {0,0} rotated @@ -215,7 +215,7 @@ line.png frame - {{130,802},{1080,20}} + {{2,745},{1080,20}} offset {0,0} rotated @@ -228,7 +228,7 @@ lock.png frame - {{886,1813},{66,88}} + {{754,661},{66,88}} offset {0,0} rotated @@ -241,11 +241,11 @@ miaoshu.png frame - {{152,802},{844,139}} + {{2,2},{844,139}} offset {0,0} rotated - + sourceColorRect {{0,0},{844,139}} sourceSize @@ -254,20 +254,20 @@ no_bright_bg.png frame - {{2,1883},{116,124}} + {{2,415},{142,129}} offset {0,0} rotated sourceColorRect - {{0,0},{116,124}} + {{0,0},{142,129}} sourceSize - {116,124} + {142,129} num_xg.png frame - {{1217,773},{29,41}} + {{264,512},{29,41}} offset {0,0} rotated @@ -280,7 +280,7 @@ progress_bar_1.png frame - {{458,1885},{372,60}} + {{398,415},{372,60}} offset {0,0} rotated @@ -293,7 +293,7 @@ progress_bar_2.png frame - {{1194,2},{364,52}} + {{967,1031},{364,52}} offset {0,0} rotated @@ -306,7 +306,7 @@ progress_bar_3.png frame - {{458,1753},{58,501}} + {{505,971},{58,501}} offset {0,0} rotated @@ -319,11 +319,11 @@ progress_bar_4.png frame - {{1134,2},{58,501}} + {{505,911},{58,501}} offset {0,0} rotated - + sourceColorRect {{0,0},{58,501}} sourceSize @@ -332,7 +332,7 @@ quit.png frame - {{832,1885},{102,119}} + {{398,572},{102,119}} offset {0,0} rotated @@ -345,11 +345,11 @@ right_bg.png frame - {{969,1499},{304,263}} + {{152,739},{304,263}} offset {0,0} rotated - + sourceColorRect {{0,0},{304,263}} sourceSize @@ -358,11 +358,11 @@ skylineHealth.png frame - {{928,1170},{137,121}} + {{152,1267},{137,121}} offset {0,0} rotated - + sourceColorRect {{0,0},{137,121}} sourceSize @@ -371,11 +371,11 @@ tongpaizi.png frame - {{1194,368},{84,43}} + {{484,693},{84,43}} offset {0,0} rotated - + sourceColorRect {{0,0},{84,43}} sourceSize @@ -384,7 +384,7 @@ tongpiao.png frame - {{928,1309},{188,175}} + {{505,1820},{188,175}} offset {0,0} rotated @@ -397,7 +397,7 @@ tongpiaozi.png frame - {{293,802},{741,171}} + {{848,2},{741,171}} offset {0,0} rotated @@ -407,23 +407,10 @@ sourceSize {741,171} - tu.png - - frame - {{2,2},{858,798}} - offset - {-1,0} - rotated - - sourceColorRect - {{0,31},{858,798}} - sourceSize - {860,860} - wenhao.png frame - {{128,1911},{93,103}} + {{398,477},{93,103}} offset {0,0} rotated @@ -436,7 +423,7 @@ yaoshi.png frame - {{1102,1805},{106,122}} + {{502,572},{106,122}} offset {0,0} rotated @@ -454,9 +441,9 @@ realTextureFileName passCheck.png size - {1248,2006} + {1024,2048} smartupdate - $TexturePacker:SmartUpdate:fdb4f0da991b07b39fc13bb4ed4a399d$ + $TexturePacker:SmartUpdate:cf739516af57762cd0ed61d9689e4449$ textureFileName passCheck.png diff --git a/assets/shop/img/passCheck/passCheck.plist.meta b/assets/shop/img/passCheck/passCheck.plist.meta index ac894d5..6173332 100644 --- a/assets/shop/img/passCheck/passCheck.plist.meta +++ b/assets/shop/img/passCheck/passCheck.plist.meta @@ -4,8 +4,8 @@ "importer": "asset", "rawTextureUuid": "975e92ea-9360-41e9-a282-065297f61fea", "size": { - "width": 1248, - "height": 2006 + "width": 1024, + "height": 2048 }, "type": "Texture Packer", "subMetas": { @@ -16,11 +16,11 @@ "rawTextureUuid": "975e92ea-9360-41e9-a282-065297f61fea", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1105, - "trimY": 1434, + "trimX": 458, + "trimY": 739, "width": 141, "height": 37, "rawWidth": 141, @@ -42,8 +42,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 233, - "trimY": 1911, + "trimX": 570, + "trimY": 680, "width": 182, "height": 63, "rawWidth": 182, @@ -62,11 +62,11 @@ "rawTextureUuid": "975e92ea-9360-41e9-a282-065297f61fea", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 889, - "trimY": 774, + "trimX": 2, + "trimY": 571, "width": 394, "height": 160, "rawWidth": 394, @@ -88,12 +88,12 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 976, - "trimY": 1805, - "width": 116, - "height": 124, - "rawWidth": 116, - "rawHeight": 124, + "trimX": 133, + "trimY": 415, + "width": 142, + "height": 129, + "rawWidth": 142, + "rawHeight": 129, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -108,11 +108,11 @@ "rawTextureUuid": "975e92ea-9360-41e9-a282-065297f61fea", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1051, - "trimY": 774, + "trimX": 505, + "trimY": 745, "width": 516, "height": 164, "rawWidth": 516, @@ -134,8 +134,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 2, - "trimY": 802, + "trimX": 24, + "trimY": 745, "width": 1079, "height": 126, "rawWidth": 1079, @@ -157,8 +157,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 466, - "trimY": 1235, + "trimX": 505, + "trimY": 1031, "width": 300, "height": 460, "rawWidth": 300, @@ -177,11 +177,11 @@ "rawTextureUuid": "975e92ea-9360-41e9-a282-065297f61fea", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1105, - "trimY": 1292, + "trimX": 682, + "trimY": 1333, "width": 136, "height": 140, "rawWidth": 136, @@ -203,8 +203,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 466, - "trimY": 1537, + "trimX": 2, + "trimY": 1827, "width": 501, "height": 214, "rawWidth": 501, @@ -223,11 +223,11 @@ "rawTextureUuid": "975e92ea-9360-41e9-a282-065297f61fea", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 466, - "trimY": 802, + "trimX": 152, + "trimY": 1397, "width": 421, "height": 431, "rawWidth": 421, @@ -246,11 +246,11 @@ "rawTextureUuid": "975e92ea-9360-41e9-a282-065297f61fea", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 862, - "trimY": 2, + "trimX": 2, + "trimY": 143, "width": 770, "height": 270, "rawWidth": 770, @@ -269,11 +269,11 @@ "rawTextureUuid": "975e92ea-9360-41e9-a282-065297f61fea", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 458, - "trimY": 1813, + "trimX": 774, + "trimY": 143, "width": 426, "height": 70, "rawWidth": 426, @@ -295,8 +295,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1134, - "trimY": 727, + "trimX": 398, + "trimY": 693, "width": 84, "height": 44, "rawWidth": 84, @@ -318,8 +318,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 293, - "trimY": 1545, + "trimX": 264, + "trimY": 415, "width": 124, "height": 95, "rawWidth": 124, @@ -338,11 +338,11 @@ "rawTextureUuid": "975e92ea-9360-41e9-a282-065297f61fea", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1134, - "trimY": 505, + "trimX": 626, + "trimY": 571, "width": 220, "height": 88, "rawWidth": 220, @@ -365,7 +365,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 152, - "trimY": 1648, + "trimY": 1004, "width": 304, "height": 261, "rawWidth": 304, @@ -387,8 +387,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 130, - "trimY": 802, + "trimX": 2, + "trimY": 745, "width": 1080, "height": 20, "rawWidth": 1080, @@ -410,8 +410,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 886, - "trimY": 1813, + "trimX": 754, + "trimY": 661, "width": 66, "height": 88, "rawWidth": 66, @@ -430,11 +430,11 @@ "rawTextureUuid": "975e92ea-9360-41e9-a282-065297f61fea", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 152, - "trimY": 802, + "trimX": 2, + "trimY": 2, "width": 844, "height": 139, "rawWidth": 844, @@ -457,11 +457,11 @@ "offsetX": 0, "offsetY": 0, "trimX": 2, - "trimY": 1883, - "width": 116, - "height": 124, - "rawWidth": 116, - "rawHeight": 124, + "trimY": 415, + "width": 142, + "height": 129, + "rawWidth": 142, + "rawHeight": 129, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -479,8 +479,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1217, - "trimY": 773, + "trimX": 264, + "trimY": 512, "width": 29, "height": 41, "rawWidth": 29, @@ -502,8 +502,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 458, - "trimY": 1885, + "trimX": 398, + "trimY": 415, "width": 372, "height": 60, "rawWidth": 372, @@ -525,8 +525,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1194, - "trimY": 2, + "trimX": 967, + "trimY": 1031, "width": 364, "height": 52, "rawWidth": 372, @@ -548,8 +548,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 458, - "trimY": 1753, + "trimX": 505, + "trimY": 971, "width": 58, "height": 501, "rawWidth": 58, @@ -568,11 +568,11 @@ "rawTextureUuid": "975e92ea-9360-41e9-a282-065297f61fea", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1134, - "trimY": 2, + "trimX": 505, + "trimY": 911, "width": 58, "height": 501, "rawWidth": 58, @@ -594,8 +594,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 832, - "trimY": 1885, + "trimX": 398, + "trimY": 572, "width": 102, "height": 119, "rawWidth": 102, @@ -614,11 +614,11 @@ "rawTextureUuid": "975e92ea-9360-41e9-a282-065297f61fea", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 969, - "trimY": 1499, + "trimX": 152, + "trimY": 739, "width": 304, "height": 263, "rawWidth": 304, @@ -637,11 +637,11 @@ "rawTextureUuid": "975e92ea-9360-41e9-a282-065297f61fea", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 928, - "trimY": 1170, + "trimX": 152, + "trimY": 1267, "width": 137, "height": 121, "rawWidth": 137, @@ -660,11 +660,11 @@ "rawTextureUuid": "975e92ea-9360-41e9-a282-065297f61fea", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1194, - "trimY": 368, + "trimX": 484, + "trimY": 693, "width": 84, "height": 43, "rawWidth": 84, @@ -686,8 +686,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 928, - "trimY": 1309, + "trimX": 505, + "trimY": 1820, "width": 188, "height": 175, "rawWidth": 188, @@ -709,8 +709,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 293, - "trimY": 802, + "trimX": 848, + "trimY": 2, "width": 741, "height": 171, "rawWidth": 741, @@ -722,29 +722,6 @@ "spriteType": "normal", "subMetas": {} }, - "tu.png": { - "ver": "1.0.6", - "uuid": "8dec2d4a-c422-472f-a958-4a0b86cd2275", - "importer": "sprite-frame", - "rawTextureUuid": "975e92ea-9360-41e9-a282-065297f61fea", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": -1, - "offsetY": 0, - "trimX": 2, - "trimY": 2, - "width": 858, - "height": 798, - "rawWidth": 860, - "rawHeight": 860, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "spriteType": "normal", - "subMetas": {} - }, "wenhao.png": { "ver": "1.0.6", "uuid": "50328b00-d080-400d-aa19-5c8639c078c1", @@ -755,8 +732,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 128, - "trimY": 1911, + "trimX": 398, + "trimY": 477, "width": 93, "height": 103, "rawWidth": 93, @@ -778,8 +755,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1102, - "trimY": 1805, + "trimX": 502, + "trimY": 572, "width": 106, "height": 122, "rawWidth": 106, diff --git a/assets/shop/img/passCheck/passCheck.png b/assets/shop/img/passCheck/passCheck.png index 292ae40..ae61561 100644 Binary files a/assets/shop/img/passCheck/passCheck.png and b/assets/shop/img/passCheck/passCheck.png differ diff --git a/assets/shop/img/passCheck/passCheck.png.meta b/assets/shop/img/passCheck/passCheck.png.meta index 0712bed..6859426 100644 --- a/assets/shop/img/passCheck/passCheck.png.meta +++ b/assets/shop/img/passCheck/passCheck.png.meta @@ -8,8 +8,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 1248, - "height": 2006, + "width": 1024, + "height": 2048, "platformSettings": {}, "subMetas": {} } \ No newline at end of file diff --git a/assets/shop/prefab/buyActivate.prefab b/assets/shop/prefab/buyActivate.prefab index 22b6236..2bf9d2b 100644 --- a/assets/shop/prefab/buyActivate.prefab +++ b/assets/shop/prefab/buyActivate.prefab @@ -775,8 +775,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 858, - "height": 798 + "width": 300, + "height": 460 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -828,7 +828,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "8dec2d4a-c422-472f-a958-4a0b86cd2275" + "__uuid__": "90eaac0d-aa2e-43f4-b2d5-ac63e4a96f91" }, "_type": 0, "_sizeMode": 1, @@ -841,9 +841,7 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "56aacf5e-256b-4c72-b5d1-3982932775c9" - }, + "_atlas": null, "_id": "" }, { diff --git a/assets/shop/prefab/passCheck.prefab b/assets/shop/prefab/passCheck.prefab index fa08119..2997b3f 100644 --- a/assets/shop/prefab/passCheck.prefab +++ b/assets/shop/prefab/passCheck.prefab @@ -3893,7 +3893,7 @@ "ctor": "Float64Array", "array": [ -395, - 750, + 511.671, 0, 0, 0, @@ -4100,7 +4100,7 @@ "ctor": "Float64Array", "array": [ 410, - 750, + 511.671, 0, 0, 0, @@ -5440,8 +5440,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 116, - "height": 124 + "width": 142, + "height": 129 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/shop/prefab/shop.prefab b/assets/shop/prefab/shop.prefab index 144afd7..f7a4a18 100644 --- a/assets/shop/prefab/shop.prefab +++ b/assets/shop/prefab/shop.prefab @@ -15951,7 +15951,7 @@ "ctor": "Float64Array", "array": [ 0, - 0, + -5, 0, 0, 0,