diff --git a/assets/Scene/GameScene.fire b/assets/Scene/GameScene.fire index 4c534c0..5172eff 100644 --- a/assets/Scene/GameScene.fire +++ b/assets/Scene/GameScene.fire @@ -5598,6 +5598,9 @@ "CityName": { "__uuid__": "31c8dada-9be1-4349-9739-e7855688ae59" }, + "CityName2": { + "__uuid__": "942f9428-8f09-459b-b880-ebbc3691b604" + }, "timeBtn": { "__id__": 93 }, @@ -17857,8 +17860,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 217, - "height": 49 + "width": 126, + "height": 42 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -17910,7 +17913,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "733f4a92-fe1c-4288-a057-01e62afc15bc" + "__uuid__": "44a5f1c3-9782-4a68-9d1c-f481670fce0c" }, "_type": 0, "_sizeMode": 1, @@ -17924,7 +17927,7 @@ "_fillRange": 0, "_isTrimmedMode": true, "_atlas": { - "__uuid__": "31c8dada-9be1-4349-9739-e7855688ae59" + "__uuid__": "942f9428-8f09-459b-b880-ebbc3691b604" }, "_id": "b4XcEkbjlOG4ferjwgpnCm" }, diff --git a/assets/Script/Avatar.ts b/assets/Script/Avatar.ts index affa037..aaed495 100644 --- a/assets/Script/Avatar.ts +++ b/assets/Script/Avatar.ts @@ -158,7 +158,7 @@ export default class Avatar extends cc.Component { const jiazaiComp = jiazaiNode.getComponent(JiaZai); if (jiazaiComp) { console.log("获取到JiaZai组件", jiazaiComp); - jiazaiComp.closeAvatar(); + jiazaiComp.closeAvatar(true); } else { console.log("无法获取JiaZai组件"); diff --git a/assets/Script/GameManager.ts b/assets/Script/GameManager.ts index 730d8e4..0637f4b 100644 --- a/assets/Script/GameManager.ts +++ b/assets/Script/GameManager.ts @@ -276,7 +276,7 @@ export default class GameManager extends cc.Component { } } - // console.log("abTests:", cc.fx.GameConfig.GM_INFO.abTests); + console.log("abTests:", cc.fx.GameConfig.GM_INFO.abTests); } readUserData(retryCount = 0) { //@ts-ignore diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts index 9573e20..93f475c 100644 --- a/assets/Script/JiaZai.ts +++ b/assets/Script/JiaZai.ts @@ -91,6 +91,7 @@ export default class JiaZai extends cc.Component { isShow: boolean = true; private heath: any; // 用于存储heath预制体 private lastPauseClickTime: number = 0; // 用于记录上次点击的时间戳 + private _sRankRequestId: number = 0; // 弹窗倒计时调度器 private heathScheduleCallback: Function = null; @property(cc.Node) @@ -1122,7 +1123,7 @@ export default class JiaZai extends cc.Component { // 何时调用：玩家关闭头像弹窗时调用 // 主要功能：从父节点移除并销毁头像节点 // ============================================ - closeAvatar() { + closeAvatar(shouldOpenPosition: boolean = false) { // console.log("最终头像:", cc.fx.GameConfig.GM_INFO.useravatarIcon); // console.log("最终头像框:", cc.fx.GameConfig.GM_INFO.useravaterkuang); let top = this.node.getChildByName("Load").getChildByName("Top"); @@ -1155,7 +1156,22 @@ export default class JiaZai extends cc.Component { top.getChildByName("kuang").getComponent(cc.Sprite).spriteFrame = this.avatarUI.getSpriteFrame(cc.fx.GameConfig.GM_INFO.useravaterkuang); top.getChildByName("kuang").opacity = 255; - cc.fx.GameTool.setUserAvatar(); + + let hasStartedRankRefresh = false; + const refreshRankAndLocate = () => { + if (hasStartedRankRefresh) { + return; + } + this.unschedule(refreshRankAndLocate); + hasStartedRankRefresh = true; + this.getSRank(true, () => { + if (shouldOpenPosition) { + this.openPosition(); + } + }); + }; + this.scheduleOnce(refreshRankAndLocate, 3); + cc.fx.GameTool.setUserAvatar(refreshRankAndLocate); } @@ -3885,79 +3901,103 @@ export default class JiaZai extends cc.Component { // 何时调用：需要显示排行榜时调用 // 参数说明：isShow是否显示排行榜 // ============================================ - getSRank(isShow: boolean = true) { - - // console.log("_________________________重新获取排行"); - if (this.RankNode == null && this.RankNode == undefined) { - this.LoadCareer(() => { - Utils.getSRank(res => { - if (res.data) { - let data = JSON.parse(res.data); - if (data != null && data != undefined) { - if (data.role) { - let role = data.role; - let sortedArray = []; - console.log("_________________________得到接口返回", data); - sortedArray = Object.entries(role) - //@ts-ignore - .sort((a, b) => b[1] - a[1]) // 按数值从大到小排序 - .map((item, index) => ({ - rank: index + 1, // 排名 - name: item[0], // 省份名称 - count: item[1] // 数值 - })); - // 排序后的结果 - // console.log("sortedArray", sortedArray); - let city = JSON.parse(JSON.stringify(cc.fx.GameConfig.CITY)); - let rankData = []; - if (sortedArray) { - for (let i = 0; i < sortedArray.length; i++) { - // 检查sortedArray中的省份名称是否存在于原始data.role数据中 - if (data && data[sortedArray[i].name] !== undefined) { - // 如果存在，则将data中对应的键值对放入rankData - if (data.role && data.role[sortedArray[i].name] !== undefined) { - rankData.push({ - rank: sortedArray[i].rank, - name: sortedArray[i].name, - count: sortedArray[i].count, - // 可以添加data2中对应的数据 - rankingData: data[sortedArray[i].name] - }); - delete city[sortedArray[i].name]; - } + getSRank(isShow: boolean = true, onRendered?: () => void) { + const requestId = ++this._sRankRequestId; + const loadRankData = () => { + Utils.getSRank(res => { + if (requestId !== this._sRankRequestId) { + return; + } + if (res.data) { + let data = JSON.parse(res.data); + if (data != null && data != undefined) { + if (data.role) { + let role = data.role; + let sortedArray = []; + console.log("_________________________得到接口返回", data); + sortedArray = Object.entries(role) + //@ts-ignore + .sort((a, b) => b[1] - a[1]) // 按数值从大到小排序 + .map((item, index) => ({ + rank: index + 1, // 排名 + name: item[0], // 省份名称 + count: item[1] // 数值 + })); + // 排序后的结果 + // console.log("sortedArray", sortedArray); + let city = JSON.parse(JSON.stringify(cc.fx.GameConfig.CITY)); + let rankData = []; + if (sortedArray) { + for (let i = 0; i < sortedArray.length; i++) { + // 检查sortedArray中的省份名称是否存在于原始data.role数据中 + if (data && data[sortedArray[i].name] !== undefined) { + // 如果存在，则将data中对应的键值对放入rankData + if (data.role && data.role[sortedArray[i].name] !== undefined) { + rankData.push({ + rank: sortedArray[i].rank, + name: sortedArray[i].name, + count: sortedArray[i].count, + // 可以添加data2中对应的数据 + rankingData: data[sortedArray[i].name] + }); + delete city[sortedArray[i].name]; } } - // 循环完成后，将CITY中剩下的城市按顺序添加到rankData中 - let nextRank = rankData.length + 1; // 获取下一个排名 - for (let cityName in city) { - rankData.push({ - rank: nextRank++, - name: cityName, - count: 0, - rankingData: [] - }); + } + // 循环完成后，将CITY中剩下的城市按顺序添加到rankData中 + let nextRank = rankData.length + 1; // 获取下一个排名 + for (let cityName in city) { + rankData.push({ + rank: nextRank++, + name: cityName, + count: 0, + rankingData: [] + }); + } + let otherIndex = rankData.findIndex(item => item.name === "其他"); + if (otherIndex !== -1) { + let otherItem = rankData.splice(otherIndex, 1)[0]; + rankData.push(otherItem); + } + let topData = data.all ? data.all : []; + this.careerRank = { + rankData: JSON.parse(JSON.stringify(rankData)), + topData: JSON.parse(JSON.stringify(topData)) + } + // console.log("自己的addLevel", cc.fx.GameConfig.GM_INFO.addLevel); + if (cc.fx.GameConfig.GM_INFO.addLevel > 4) { + // console.log("______________自己入职了"); + this.addSelfToRank(rankData); + } + for (let i = 0; i < rankData.length; i++) { + rankData[i].rank = i + 1; + } + if (this.RankNode != null && this.RankNode != undefined) { + // console.log("_________________________预制体已经加载好了，准备渲染", this.RankNode); + const careerNode = this.node.getChildByName("Career"); + if (this.RankNode.parent !== careerNode) { + careerNode.addChild(this.RankNode); } - let otherIndex = rankData.findIndex(item => item.name === "其他"); - if (otherIndex !== -1) { - let otherItem = rankData.splice(otherIndex, 1)[0]; - rankData.push(otherItem); - } - let topData = data.all ? data.all : []; - this.careerRank = { - rankData: JSON.parse(JSON.stringify(rankData)), - topData: JSON.parse(JSON.stringify(topData)) - } - // console.log("自己的addLevel", cc.fx.GameConfig.GM_INFO.addLevel); - if (cc.fx.GameConfig.GM_INFO.addLevel > 4) { - // console.log("______________自己入职了"); - this.addSelfToRank(rankData); - } - for (let i = 0; i < rankData.length; i++) { - rankData[i].rank = i + 1; - } - if (this.RankNode != null && this.RankNode != undefined) { - // console.log("_________________________预制体已经加载好了，准备渲染", this.RankNode); - this.node.getChildByName("Career").addChild(this.RankNode); + // this.node.getChildByName("Career").getChildByName("bg").parent = this.RankNode; + this.RankNode.opacity = 0; + this.RankNode.zIndex = 3; + this.RankNode.getComponent("CareerManager2").init(rankData, topData); + cc.tween(this.RankNode) + .to(0.3, { opacity: 255 }) + .delay(0.2) + .call(() => { + // console.log("_________________________渲染完成"); + // this.node.getChildByName("Snow").active = true; + if (onRendered) onRendered(); + }) + .start() + } else { + // console.log("_________________________预制体已经加载好了，准备渲染"); + this.LoadCareer(() => { + const careerNode = this.node.getChildByName("Career"); + if (this.RankNode.parent !== careerNode) { + careerNode.addChild(this.RankNode); + } // this.node.getChildByName("Career").getChildByName("bg").parent = this.RankNode; this.RankNode.opacity = 0; this.RankNode.zIndex = 3; @@ -3968,36 +4008,24 @@ export default class JiaZai extends cc.Component { .call(() => { // console.log("_________________________渲染完成"); // this.node.getChildByName("Snow").active = true; + if (onRendered) onRendered(); }) .start() - } else { - // console.log("_________________________预制体已经加载好了，准备渲染"); - this.LoadCareer(() => { - this.node.getChildByName("Career").addChild(this.RankNode); - // this.node.getChildByName("Career").getChildByName("bg").parent = this.RankNode; - this.RankNode.opacity = 0; - this.RankNode.zIndex = 3; - this.RankNode.getComponent("CareerManager2").init(rankData, topData); - cc.tween(this.RankNode) - .to(0.3, { opacity: 255 }) - .delay(0.2) - .call(() => { - // console.log("_________________________渲染完成"); - // this.node.getChildByName("Snow").active = true; - }) - .start() - }, true) - } + }, true) } - // console.log("rankingData_________", rankData); } + // console.log("rankingData_________", rankData); } - } + } + }); + }; - }); - }, isShow); + if (this.RankNode == null || this.RankNode == undefined) { + this.LoadCareer(loadRankData, isShow); + } else { + loadRankData(); } } diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index b350d20..782b46d 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -50,6 +50,9 @@ export default class MapConroler extends cc.Component { @property(cc.SpriteAtlas) CityName: cc.SpriteAtlas = null; + @property(cc.SpriteAtlas) + CityName2: cc.SpriteAtlas = null; + @property(cc.Button) timeBtn: cc.Button = null; @property(cc.Button) @@ -6336,7 +6339,7 @@ export default class MapConroler extends cc.Component { rank.getChildByName("addLevel").children[i].color = cc.Color.WHITE; } - rank.getChildByName("cityName").getComponent(cc.Sprite).spriteFrame = this.CityName.getSpriteFrame(cc.fx.GameConfig.GM_INFO.address); + rank.getChildByName("cityName").getComponent(cc.Sprite).spriteFrame = this.CityName2.getSpriteFrame(cc.fx.GameConfig.GM_INFO.address); let rankNumber = this.cityRank; // console.log("排名", this.cityRank); diff --git a/assets/Script/module/Tool/GameTool.ts b/assets/Script/module/Tool/GameTool.ts index c322fbf..872a998 100644 --- a/assets/Script/module/Tool/GameTool.ts +++ b/assets/Script/module/Tool/GameTool.ts @@ -1719,7 +1719,7 @@ var GameTool = { }, // 设置用户信息 - setUserAvatar(callback: Function) { + setUserAvatar(callback?: Function) { //@ts-ignore if ((typeof wx !== 'undefined' && wx !== null) || (typeof tt !== 'undefined' && tt !== null)) { let useravatar = cc.fx.GameConfig.GM_INFO.useravatarIcon; @@ -1750,7 +1750,10 @@ var GameTool = { } console.log("上传头像昵称", userInfo); Utils.setUserData(userInfo, (data) => { + if (callback) callback(data); }) + } else if (callback) { + callback(null); } }, diff --git a/assets/UI/UI/pop/city.plist b/assets/UI/UI/pop/city.plist new file mode 100644 index 0000000..eb7612f --- /dev/null +++ b/assets/UI/UI/pop/city.plist @@ -0,0 +1,451 @@ + + + + + frames + + 上海.png + + frame + {{129,478},{125,42}} + offset + {0,0} + rotated + + sourceColorRect + {{4,4},{125,42}} + sourceSize + {133,50} + + 云南省.png + + frame + {{211,650},{124,41}} + offset + {0,0} + rotated + + sourceColorRect + {{4,4},{124,41}} + sourceSize + {132,49} + + 其他.png + + frame + {{2,607},{125,41}} + offset + {0,-2} + rotated + + sourceColorRect + {{4,4},{125,41}} + sourceSize + {133,45} + + 内蒙古.png + + frame + {{2,89},{166,41}} + offset + {0,-2} + rotated + + sourceColorRect + {{4,4},{166,41}} + sourceSize + {174,45} + + 北京.png + + frame + {{2,132},{126,42}} + offset + {0,0} + rotated + + sourceColorRect + {{4,4},{126,42}} + sourceSize + {134,50} + + 吉林省.png + + frame + {{129,565},{125,41}} + offset + {0,2} + rotated + + sourceColorRect + {{4,0},{125,41}} + sourceSize + {133,45} + + 四川省.png + + frame + {{84,650},{125,39}} + offset + {0,0} + rotated + + sourceColorRect + {{4,5},{125,39}} + sourceSize + {133,49} + + 天津.png + + frame + {{2,477},{125,42}} + offset + {0,0} + rotated + + sourceColorRect + {{4,4},{125,42}} + sourceSize + {133,50} + + 宁夏.png + + frame + {{168,650},{124,41}} + offset + {0,-2} + rotated + + sourceColorRect + {{4,4},{124,41}} + sourceSize + {132,45} + + 安徽省.png + + frame + {{129,434},{125,42}} + offset + {0,0} + rotated + + sourceColorRect + {{4,4},{125,42}} + sourceSize + {133,50} + + 山东省.png + + frame + {{2,433},{125,42}} + offset + {0,1} + rotated + + sourceColorRect + {{4,3},{125,42}} + sourceSize + {133,50} + + 山西省.png + + frame + {{43,650},{125,39}} + offset + {0,2} + rotated + + sourceColorRect + {{4,1},{125,39}} + sourceSize + {133,45} + + 广东省.png + + frame + {{2,348},{126,41}} + offset + {0,0} + rotated + + sourceColorRect + {{4,4},{126,41}} + sourceSize + {134,49} + + 广西.png + + frame + {{2,564},{125,41}} + offset + {0,-1} + rotated + + sourceColorRect + {{4,3},{125,41}} + sourceSize + {133,45} + + 新疆.png + + frame + {{2,305},{126,41}} + offset + {0,-2} + rotated + + sourceColorRect + {{4,4},{126,41}} + sourceSize + {134,45} + + 江苏省.png + + frame + {{129,522},{125,41}} + offset + {0,2} + rotated + + sourceColorRect + {{4,0},{125,41}} + sourceSize + {133,45} + + 江西省.png + + frame + {{2,391},{126,40}} + offset + {0,1} + rotated + + sourceColorRect + {{4,4},{126,40}} + sourceSize + {134,50} + + 河北省.png + + frame + {{2,650},{125,39}} + offset + {-2,2} + rotated + + sourceColorRect + {{0,1},{125,39}} + sourceSize + {129,45} + + 河南省.png + + frame + {{170,131},{126,42}} + offset + {0,1} + rotated + + sourceColorRect + {{4,3},{126,42}} + sourceSize + {134,50} + + 浙江省.png + + frame + {{214,131},{126,40}} + offset + {0,0} + rotated + + sourceColorRect + {{4,5},{126,40}} + sourceSize + {134,50} + + 海南省.png + + frame + {{2,262},{126,41}} + offset + {0,0} + rotated + + sourceColorRect + {{4,4},{126,41}} + sourceSize + {134,49} + + 港澳台.png + + frame + {{2,2},{168,42}} + offset + {0,0} + rotated + + sourceColorRect + {{4,4},{168,42}} + sourceSize + {176,50} + + 湖北省.png + + frame + {{129,608},{125,40}} + offset + {0,1} + rotated + + sourceColorRect + {{4,4},{125,40}} + sourceSize + {133,50} + + 湖南省.png + + frame + {{2,219},{126,41}} + offset + {0,0} + rotated + + sourceColorRect + {{4,4},{126,41}} + sourceSize + {134,49} + + 甘肃省.png + + frame + {{130,347},{124,42}} + offset + {0,0} + rotated + + sourceColorRect + {{4,4},{124,42}} + sourceSize + {132,50} + + 福建省.png + + frame + {{172,2},{127,42}} + offset + {0,1} + rotated + + sourceColorRect + {{4,3},{127,42}} + sourceSize + {135,50} + + 西藏.png + + frame + {{125,650},{124,41}} + offset + {0,-2} + rotated + + sourceColorRect + {{4,4},{124,41}} + sourceSize + {132,45} + + 贵州省.png + + frame + {{130,391},{124,41}} + offset + {0,0} + rotated + + sourceColorRect + {{4,4},{124,41}} + sourceSize + {132,49} + + 辽宁省.png + + frame + {{2,176},{126,41}} + offset + {0,2} + rotated + + sourceColorRect + {{4,0},{126,41}} + sourceSize + {134,45} + + 重庆.png + + frame + {{130,303},{124,42}} + offset + {2,0} + rotated + + sourceColorRect + {{4,4},{124,42}} + sourceSize + {128,50} + + 陕西省.png + + frame + {{2,521},{125,41}} + offset + {0,0} + rotated + + sourceColorRect + {{4,4},{125,41}} + sourceSize + {133,49} + + 青海省.png + + frame + {{130,259},{124,42}} + offset + {0,0} + rotated + + sourceColorRect + {{4,4},{124,42}} + sourceSize + {132,50} + + 黑龙江省.png + + frame + {{2,46},{167,41}} + offset + {0,2} + rotated + + sourceColorRect + {{4,0},{167,41}} + sourceSize + {175,45} + + + metadata + + format + 2 + realTextureFileName + city.png + size + {256,777} + smartupdate + $TexturePacker:SmartUpdate:e5eb502b8ae8edb142b024cccc0b2ccc$ + textureFileName + city.png + + + diff --git a/assets/UI/UI/pop/city.plist.meta b/assets/UI/UI/pop/city.plist.meta new file mode 100644 index 0000000..bebb2f8 --- /dev/null +++ b/assets/UI/UI/pop/city.plist.meta @@ -0,0 +1,772 @@ +{ + "ver": "1.2.6", + "uuid": "942f9428-8f09-459b-b880-ebbc3691b604", + "importer": "asset", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "size": { + "width": 256, + "height": 777 + }, + "type": "Texture Packer", + "subMetas": { + "上海.png": { + "ver": "1.0.6", + "uuid": "a3c2e820-12b6-4797-bd14-6bd5a53defc1", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 129, + "trimY": 478, + "width": 125, + "height": 42, + "rawWidth": 133, + "rawHeight": 50, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "云南省.png": { + "ver": "1.0.6", + "uuid": "71706c7b-190a-4342-b43c-4fd4e6c8e7a9", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 211, + "trimY": 650, + "width": 124, + "height": 41, + "rawWidth": 132, + "rawHeight": 49, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "其他.png": { + "ver": "1.0.6", + "uuid": "b5299477-ce95-4c8d-b2e2-72649c2dab0c", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": -2, + "trimX": 2, + "trimY": 607, + "width": 125, + "height": 41, + "rawWidth": 133, + "rawHeight": 45, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "内蒙古.png": { + "ver": "1.0.6", + "uuid": "666a00c7-ffdd-4cef-99cb-b5326e03012f", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": -2, + "trimX": 2, + "trimY": 89, + "width": 166, + "height": 41, + "rawWidth": 174, + "rawHeight": 45, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "北京.png": { + "ver": "1.0.6", + "uuid": "44a5f1c3-9782-4a68-9d1c-f481670fce0c", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 2, + "trimY": 132, + "width": 126, + "height": 42, + "rawWidth": 134, + "rawHeight": 50, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "吉林省.png": { + "ver": "1.0.6", + "uuid": "84f15d9c-ac0d-4e45-9b10-91034177a518", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 2, + "trimX": 129, + "trimY": 565, + "width": 125, + "height": 41, + "rawWidth": 133, + "rawHeight": 45, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "四川省.png": { + "ver": "1.0.6", + "uuid": "3cbf3354-9b16-42fe-9e66-d8c5d81aa439", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 84, + "trimY": 650, + "width": 125, + "height": 39, + "rawWidth": 133, + "rawHeight": 49, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "天津.png": { + "ver": "1.0.6", + "uuid": "37f82e3b-eec8-4ddf-9611-cbe8c94b14d8", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 2, + "trimY": 477, + "width": 125, + "height": 42, + "rawWidth": 133, + "rawHeight": 50, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "宁夏.png": { + "ver": "1.0.6", + "uuid": "9b58df38-cca6-4ea2-ab8b-acce88366b62", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": -2, + "trimX": 168, + "trimY": 650, + "width": 124, + "height": 41, + "rawWidth": 132, + "rawHeight": 45, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "安徽省.png": { + "ver": "1.0.6", + "uuid": "ab3ca937-0951-4345-90d3-d981af72934a", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 129, + "trimY": 434, + "width": 125, + "height": 42, + "rawWidth": 133, + "rawHeight": 50, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "山东省.png": { + "ver": "1.0.6", + "uuid": "68c7bf37-c784-4eff-954b-61d661b9d465", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 1, + "trimX": 2, + "trimY": 433, + "width": 125, + "height": 42, + "rawWidth": 133, + "rawHeight": 50, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "山西省.png": { + "ver": "1.0.6", + "uuid": "3a26e6d6-3263-40b3-86dc-de313eba73eb", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 2, + "trimX": 43, + "trimY": 650, + "width": 125, + "height": 39, + "rawWidth": 133, + "rawHeight": 45, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "广东省.png": { + "ver": "1.0.6", + "uuid": "1d76daa4-48e5-48c1-ab4b-b3bac93f198b", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 2, + "trimY": 348, + "width": 126, + "height": 41, + "rawWidth": 134, + "rawHeight": 49, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "广西.png": { + "ver": "1.0.6", + "uuid": "05814ecf-4822-4294-857e-5df5382f5329", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": -1, + "trimX": 2, + "trimY": 564, + "width": 125, + "height": 41, + "rawWidth": 133, + "rawHeight": 45, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "新疆.png": { + "ver": "1.0.6", + "uuid": "a1564292-d95b-40f5-a5a8-15ab5dadeb28", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": -2, + "trimX": 2, + "trimY": 305, + "width": 126, + "height": 41, + "rawWidth": 134, + "rawHeight": 45, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "江苏省.png": { + "ver": "1.0.6", + "uuid": "e75159b3-ff18-4df5-9719-8c462b689ac0", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 2, + "trimX": 129, + "trimY": 522, + "width": 125, + "height": 41, + "rawWidth": 133, + "rawHeight": 45, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "江西省.png": { + "ver": "1.0.6", + "uuid": "df41676d-1587-4acf-81ce-ca33e3d9f323", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 1, + "trimX": 2, + "trimY": 391, + "width": 126, + "height": 40, + "rawWidth": 134, + "rawHeight": 50, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "河北省.png": { + "ver": "1.0.6", + "uuid": "6364f187-7ad4-4987-befa-0fbfbd1df938", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": -2, + "offsetY": 2, + "trimX": 2, + "trimY": 650, + "width": 125, + "height": 39, + "rawWidth": 129, + "rawHeight": 45, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "河南省.png": { + "ver": "1.0.6", + "uuid": "e64a49a0-542b-451e-8702-10ce23a11515", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 1, + "trimX": 170, + "trimY": 131, + "width": 126, + "height": 42, + "rawWidth": 134, + "rawHeight": 50, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "浙江省.png": { + "ver": "1.0.6", + "uuid": "d21428c5-391a-4676-9e9d-53303456b024", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 214, + "trimY": 131, + "width": 126, + "height": 40, + "rawWidth": 134, + "rawHeight": 50, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "海南省.png": { + "ver": "1.0.6", + "uuid": "634e7516-2ad3-4e87-987f-69c08745e000", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 2, + "trimY": 262, + "width": 126, + "height": 41, + "rawWidth": 134, + "rawHeight": 49, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "港澳台.png": { + "ver": "1.0.6", + "uuid": "24ab36a4-292f-4803-9ed4-def8ecbbe8ca", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 2, + "trimY": 2, + "width": 168, + "height": 42, + "rawWidth": 176, + "rawHeight": 50, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "湖北省.png": { + "ver": "1.0.6", + "uuid": "d5942d1b-141e-45d3-aed0-a86d0c030722", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 1, + "trimX": 129, + "trimY": 608, + "width": 125, + "height": 40, + "rawWidth": 133, + "rawHeight": 50, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "湖南省.png": { + "ver": "1.0.6", + "uuid": "0bd9adde-500e-4f7d-abc9-724b9698bf51", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 2, + "trimY": 219, + "width": 126, + "height": 41, + "rawWidth": 134, + "rawHeight": 49, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "甘肃省.png": { + "ver": "1.0.6", + "uuid": "4a4323fa-733d-4559-bc18-4ee266f53880", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 130, + "trimY": 347, + "width": 124, + "height": 42, + "rawWidth": 132, + "rawHeight": 50, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "福建省.png": { + "ver": "1.0.6", + "uuid": "e2fc49dc-2fe9-485f-9808-bb113d13dd40", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 1, + "trimX": 172, + "trimY": 2, + "width": 127, + "height": 42, + "rawWidth": 135, + "rawHeight": 50, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "西藏.png": { + "ver": "1.0.6", + "uuid": "209ded25-bd63-4ad3-a8ab-a054ff87f58e", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": -2, + "trimX": 125, + "trimY": 650, + "width": 124, + "height": 41, + "rawWidth": 132, + "rawHeight": 45, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "贵州省.png": { + "ver": "1.0.6", + "uuid": "919f797f-dcbb-4fb0-8468-544f403a501d", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 130, + "trimY": 391, + "width": 124, + "height": 41, + "rawWidth": 132, + "rawHeight": 49, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "辽宁省.png": { + "ver": "1.0.6", + "uuid": "78aa0bd0-d1ce-4c5f-9a9b-3968f10b83fd", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 2, + "trimX": 2, + "trimY": 176, + "width": 126, + "height": 41, + "rawWidth": 134, + "rawHeight": 45, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "重庆.png": { + "ver": "1.0.6", + "uuid": "6ee5b5ec-3667-4b03-a8cd-29b6fdbe4cfa", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 2, + "offsetY": 0, + "trimX": 130, + "trimY": 303, + "width": 124, + "height": 42, + "rawWidth": 128, + "rawHeight": 50, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "陕西省.png": { + "ver": "1.0.6", + "uuid": "f589c0a2-31a7-458c-8484-890fd1df77b6", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 2, + "trimY": 521, + "width": 125, + "height": 41, + "rawWidth": 133, + "rawHeight": 49, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "青海省.png": { + "ver": "1.0.6", + "uuid": "50138d1d-edb3-4222-b86e-6f70ba808f65", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 130, + "trimY": 259, + "width": 124, + "height": 42, + "rawWidth": 132, + "rawHeight": 50, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "黑龙江省.png": { + "ver": "1.0.6", + "uuid": "4a41928f-a239-4381-81d4-27127c25f947", + "importer": "sprite-frame", + "rawTextureUuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 2, + "trimX": 2, + "trimY": 46, + "width": 167, + "height": 41, + "rawWidth": 175, + "rawHeight": 45, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/UI/UI/pop/city.png b/assets/UI/UI/pop/city.png new file mode 100644 index 0000000..e127e3a Binary files /dev/null and b/assets/UI/UI/pop/city.png differ diff --git a/assets/UI/UI/pop/city.png.meta b/assets/UI/UI/pop/city.png.meta new file mode 100644 index 0000000..a1f5122 --- /dev/null +++ b/assets/UI/UI/pop/city.png.meta @@ -0,0 +1,15 @@ +{ + "ver": "2.3.7", + "uuid": "e99e715a-5138-4bc0-84bc-f4d669721770", + "importer": "texture", + "type": "raw", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 256, + "height": 777, + "platformSettings": {}, + "subMetas": {} +} \ No newline at end of file