更新头像更改地址

assets/Script/Avatar.ts

@@ -1,6 +1,7 @@
 import CollisionDetection from "./CollisionDetection";
 import JiaZai from "./JiaZai";
 import MapConroler from "./Map";
+import Utils from "./module/Pay/Utils";
 
 const { ccclass, property } = cc._decorator;
 
@@ -23,7 +24,7 @@ export default class Avatar extends cc.Component {
     ui: cc.SpriteAtlas = null;
 
     avatar: any;  //正在使用中的头像
-
+    address: string = "";
     avatarNow: any// 选中的头像
     avatarKuang: any;
 
@@ -38,13 +39,46 @@ export default class Avatar extends cc.Component {
     init() {
         this.avatar = cc.fx.GameConfig.GM_INFO.useravatarIcon;
         this.avatarKuang = cc.fx.GameConfig.GM_INFO.useravaterkuang;
+        this.address = cc.fx.GameConfig.GM_INFO.address;
         this.changeBtnState("avatar");
         this.changeAvatar(null, this.avatar);
         this.getSelfAvatar();
+
+        let Info = this.node.getChildByName("Info");
+        //用户ID
+        Info.getChildByName("Id").getComponent(cc.Label).string = cc.fx.GameConfig.GM_INFO.userId + "";
+        //用户名称
+        let username = cc.fx.GameConfig.GM_INFO.username;
+        if (username.length > 12) username = cc.fx.GameTool.subName(username, 12);
+        else if (username == "user") username = "匿名玩家";
+        Info.getChildByName("Name").getComponent(cc.Label).string = username;
+        //用户城市
+        let city = cc.fx.GameConfig.GM_INFO.address;
+        if (city == "北京" || city == "上海" || city == "重庆" || city == "天津") {
+            city = city + "市";
+        }
+        Info.getChildByName("Address").getComponent(cc.Label).string = city + "";
+        //用户注册时间
+        let time = cc.fx.GameConfig.GM_INFO.firstTime;
+        let formattedDate = "";
+        if (time != 0) {
+            let date = new Date(time);
+            console.log("原始时间:", time, date);
+            // 格式化年月日
+            let year = date.getFullYear();
+            let month = date.getMonth() + 1; // 月份从0开始，需要+1
+            let day = date.getDate();
+
+            formattedDate = `${year}年${month}月${day}日`;
+        }
+
+        Info.getChildByName("FirstTime").getComponent(cc.Label).string = formattedDate;
+
+
     }
 
     getSelfAvatar() {
-        this.content2.getChildByName(this.avatarKuang).getChildByName("select").active = true;
+        // this.content2.getChildByName(this.avatarKuang).getChildByName("select").active = true;
         if (this.avatar.length > 10) {
             this.setSelfAvatar(true);
         }
@@ -52,8 +86,8 @@ export default class Avatar extends cc.Component {
             this.node.getChildByName("self").getChildByName("icon").getComponent(cc.Sprite).spriteFrame =
                 this.ui.getSpriteFrame(this.avatar);
         }
-        this.node.getChildByName("self").getChildByName("kuang").getComponent(cc.Sprite).spriteFrame =
+        // this.node.getChildByName("self").getChildByName("kuang").getComponent(cc.Sprite).spriteFrame =
-            this.ui.getSpriteFrame(this.avatarKuang);
+        //     this.ui.getSpriteFrame(this.avatarKuang);
         cc.fx.GameTool.getUserAvatar((data) => {
             if (data == true) {
                 this.avatar = cc.fx.GameConfig.GM_INFO.useravatar;
@@ -90,18 +124,18 @@ export default class Avatar extends cc.Component {
                 this.changeBtnState("avatar");
             }
         }
-        else if (state == 'kuang') {
+        // else if (state == 'kuang') {
-            if (this.node.getChildByName("kuang").opacity == 255) {
+        //     if (this.node.getChildByName("kuang").opacity == 255) {
-                return;
+        //         return;
-            }
+        //     }
-            else {
+        //     else {
-                this.node.getChildByName("tou").opacity = 0;
+        //         this.node.getChildByName("tou").opacity = 0;
-                this.node.getChildByName("kuang").opacity = 255;
+        //         this.node.getChildByName("kuang").opacity = 255;
-                this.node.getChildByName("avatar").active = false;
+        //         this.node.getChildByName("avatar").active = false;
-                this.node.getChildByName("avatarKuang").active = true;
+        //         this.node.getChildByName("avatarKuang").active = true;
-                this.changeBtnState("kuang");
+        //         this.changeBtnState("kuang");
-            }
+        //     }
-        }
+        // }
     }
 
     // 判断按钮状态，切换按钮状态
@@ -213,8 +247,8 @@ export default class Avatar extends cc.Component {
         }
         else {
             cc.fx.GameConfig.GM_INFO.useravaterkuang = this.avatarKuang;
-            this.node.getChildByName("self").getChildByName("kuang").getComponent(cc.Sprite).spriteFrame =
+            // this.node.getChildByName("self").getChildByName("kuang").getComponent(cc.Sprite).spriteFrame =
-                this.ui.getSpriteFrame(this.avatarKuang);
+            //     this.ui.getSpriteFrame(this.avatarKuang);
         }
         this.node.getChildByName("btn").active = false;
         this.node.getChildByName("btnUse").active = true;
@@ -224,7 +258,7 @@ export default class Avatar extends cc.Component {
     changeKuang(event, kuang) {
         this.closeSelectKuang();
         this.avatarKuang = kuang;
-        this.content2.getChildByName(kuang).getChildByName("select").active = true;
+        // this.content2.getChildByName(kuang).getChildByName("select").active = true;
         this.changeBtnState("kuang");
     }
 
@@ -240,9 +274,56 @@ export default class Avatar extends cc.Component {
         }
     }
 
+    switchAddress(event, address) {
+        this.address = address;
+        cc.fx.GameConfig.GM_INFO.address = this.address;
+        let node = this.content2.getChildByName(this.address);
+        if (node) {
+            this.content2.getChildByName("choice").active = true;
+            this.content2.getChildByName("choice").x = node.x;
+            this.content2.getChildByName("choice").y = node.y;
+            let name = this.address;
+            if (name != "北京" && name != "天津" && name != "上海" && name != "重庆" && name != "广西" && name != "新疆" && name != "西藏" && name != "宁夏" && name != "港澳台" && name != "内蒙古") {
+                name = name.substring(0, name.length - 1);
+            }
+            this.content2.getChildByName("choice").getChildByName("cityName").getComponent(cc.Label).string = name;
+        }
+    }
 
-
+    openAddress() {
+        this.node.getChildByName("address").active = true;
+        this.content2.getChildByName("choice").active = false;
+        this.address = cc.fx.GameConfig.GM_INFO.address;
+        if (cc.fx.GameConfig.GM_INFO.address != "" && cc.fx.GameConfig.GM_INFO.address != null && cc.fx.GameConfig.GM_INFO.address != "其他") {
+            let node = this.content2.getChildByName(this.address);
+            if (node) {
+                this.content2.getChildByName("choice").active = true;
+                this.content2.getChildByName("choice").x = node.x;
+                this.content2.getChildByName("choice").y = node.y;
+                this.content2.getChildByName("choice").getChildByName("cityName").getComponent(cc.Label).string = this.address;
+            }
+        }
 
     }
 
+    closeAddress() {
+        let Info = this.node.getChildByName("Info");
+        //用户城市
+        let city = cc.fx.GameConfig.GM_INFO.address;
+        if (city == "北京" || city == "上海" || city == "重庆" || city == "天津") {
+            city = city + "市";
+        }
+        Info.getChildByName("Address").getComponent(cc.Label).string = city + "";
+        this.node.getChildByName("address").active = false;
+        let nowTime = Math.floor(Date.now() / 1000);
+        let addressInfo = {
+            address: cc.fx.GameConfig.GM_INFO.address,
+            time: nowTime,
+            authorize: false
+        }
+        cc.fx.StorageMessage.setStorage("address", addressInfo);
+        Utils.setCityInfo(null, cc.fx.GameConfig.GM_INFO.address, true);
+    }
+}
+
 

assets/Script/GameManager.ts

@@ -255,6 +255,11 @@ export default class GameManager extends cc.Component {
                             cc.fx.GameConfig.GM_INFO.useravaterkuang = "kuang_" + (parseInt(cc.fx.GameConfig.GM_INFO.useravaterkuang) + 1);
                         }
 
+                        if (data.data.register_time) {
+                            cc.fx.GameConfig.GM_INFO.firstTime = data.data.register_time;
+                            console.log("注册时间:", cc.fx.GameConfig.GM_INFO.firstTime);
+                        }
+
                         if (data.data.task) {
                             let task = JSON.parse(data.data.task);
                             cc.fx.GameConfig.GM_INFO.tasks.levelPass = task["levelPass"];
@@ -395,7 +400,7 @@ export default class GameManager extends cc.Component {
             data.coinAmount = 0;
         }
         if (levelInfo.level > data.levelAmount) {
-            cc.fx.GameConfig.GM_INFO.level = levelInfo.level;
+            if (levelInfo.level != 690) cc.fx.GameConfig.GM_INFO.level = levelInfo.level;
             cc.fx.GameConfig.GM_INFO.coin = coinInfo.coin;
             cc.fx.GameConfig.GM_INFO.freezeAmount = propInfo.freezeAmount;
             cc.fx.GameConfig.GM_INFO.hammerAmount = propInfo.hammerAmount;

assets/Script/JiaZai.ts

@@ -89,6 +89,7 @@ export default class JiaZai extends cc.Component {
     newbieGift: any; // 用于存储heath预制体
     dailyQuestsShow: boolean = false;  // 每日任务加载
     winStreakShow: boolean = false;  // 连胜活动是否展示
+    careerRank: any;
     // //月卡
     // @property(cc.Node)
     // monthCardBtn: cc.Node = null;
@@ -116,6 +117,7 @@ export default class JiaZai extends cc.Component {
         initProvinceLocator();
         console.log("最新版本___________");
         this.node.getChildByName("zhuanchang").zIndex = 1000;
+        this.careerRank = null;
         this.closeLoad();
         this.checkShare();
         this.closeAvatar();
@@ -137,6 +139,11 @@ export default class JiaZai extends cc.Component {
         //每日任务
         this.dailyQuestsShow = false;
 
+        // 获取CareerList组件实例
+        if (cc.fx.GameConfig.GM_INFO.address == "" || cc.fx.GameConfig.GM_INFO.address == "其他") {
+            let top = this.node.getChildByName("Load").getChildByName("Top");
+            top.getChildByName("posBtn").getChildByName("red").active = true;
+        }
         // //console.log("加载关卡配置2");
         // window.initMgr();
         GameManager._instance.Block_Color = this.Block_Color;
@@ -860,7 +867,6 @@ export default class JiaZai extends cc.Component {
                 cc.fx.GameTool.requestSubscribe();
                 return;
             }
-
         }
 
         let power = cc.fx.GameTool.getUserPowerTime();
@@ -2408,7 +2414,6 @@ export default class JiaZai extends cc.Component {
     getSRank() {
         this.LoadCareer(null);
         Utils.getSRank(res => {
-
             let data = JSON.parse(res.data);
             let role = data.role;
             let sortedArray = [];
@@ -2456,6 +2461,14 @@ export default class JiaZai extends cc.Component {
                 rankData.push(otherItem);
             }
             let topData = data.all ? data.all : [];
+            this.careerRank = {
+                rankData: JSON.parse(JSON.stringify(rankData)),
+                topData: JSON.parse(JSON.stringify(topData))
+            }
+
+            if (cc.fx.GameConfig.GM_INFO.addLevel > 4) {
+                this.addSelfToRank(rankData);
+            }
             if (this.RankNode != null && this.RankNode != undefined) {
                 this.node.getChildByName("Career").addChild(this.RankNode);
                 // this.node.getChildByName("Career").getChildByName("bg").parent = this.RankNode;
@@ -2477,10 +2490,75 @@ export default class JiaZai extends cc.Component {
                         .start()
                 })
             }
-            // console.log("rankData", rankData);
+            console.log("rankData", rankData);
         });
     }
 
+    addSelfToRank(rankData) {
+        let rankingData = null;
+        let self = false;
+        let name = cc.fx.GameConfig.GM_INFO.useravatarIcon;
+        if (name.startsWith("icon_")) {
+            if (name == "icon_0") {
+                name = "icon_11";
+            }
+            name = name.split("_")[1];
+        } else {
+            // 如果不是以"icon_"开头，保持原值
+            name = name;
+        }
+        let selfData = {
+            username: cc.fx.GameConfig.GM_INFO.username,
+            addLevel: cc.fx.GameConfig.GM_INFO.addLevel,
+            useravatar: name,
+            useravatarIcon: "0",
+        }
+        rankData.forEach(item => {
+            if (item.name == cc.fx.GameConfig.GM_INFO.address) {
+                rankingData = item.rankingData;
+            }
+        })
+
+        if (rankingData.length >= 8) {
+            for (let i = 0; i < rankingData.length; i++) {
+                if (rankingData[i].addLevel < selfData.addLevel) {
+                    rankingData.splice(i, 0, selfData);
+                    self = true
+                    break;
+                }
+            }
+            if (!self) rankingData[7] = selfData
+        }
+        else {
+            rankingData.push(selfData)
+        }
+        // console.log("修改后", rankData);
+    }
+
+    setRankData() {
+        if (cc.fx.GameConfig.GM_INFO.addLevel > 4) {
+            this.addSelfToRank(this.careerRank.rankData);
+        }
+        if (this.RankNode != null && this.RankNode != undefined) {
+            this.RankNode.opacity = 0;
+            this.RankNode.zIndex = 3;
+            this.RankNode.getComponent("CareerManager").init(this.careerRank.rankData, this.careerRank.topData);
+            cc.tween(this.RankNode)
+                .to(0.2, { opacity: 255 })
+                .start()
+        } else {
+            this.LoadCareer(() => {
+                this.RankNode.opacity = 0;
+                this.RankNode.zIndex = 3;
+                this.RankNode.getComponent("CareerManager").init(this.careerRank.rankData, this.careerRank.topData);
+                cc.tween(this.RankNode)
+                    .to(0.2, { opacity: 255 })
+                    .start()
+            })
+        }
+        // console.log("rankData更新!!!!!!!!", this.careerRank.rankData);
+    }
+
 
     LoadCareer(callback: () => void) {
         cc.assetManager.loadBundle('career', (err: Error, bundle: cc.AssetManager.Bundle) => {
@@ -2513,7 +2591,7 @@ export default class JiaZai extends cc.Component {
             this.runAuthorize();
         }
         //缓存，但是没有授权
-        else if (address.authorize == false || address.authorize == undefined) {
+        else if (address.authorize == false || address.authorize == undefined || address.address == "其他") {
             let nowTime = Math.floor(Date.now() / 1000);
             if (nowTime - address.time > 60 * 60 * 24) {
                 this.runAuthorize();
@@ -2565,7 +2643,6 @@ export default class JiaZai extends cc.Component {
                 careerList.scrollToCity(cc.fx.GameConfig.GM_INFO.address, 1.0, 0.5); // 1秒动画，屏幕30%位置
             }
             else {
-                // cc.fx.StorageMessage.setStorage("address", cc.fx.GameConfig.GM_INFO.address);
                 cc.fx.GameConfig.GM_INFO.address = "其他";
                 let nowTime = Math.floor(Date.now() / 1000);
                 let addressInfo = {
@@ -2579,6 +2656,7 @@ export default class JiaZai extends cc.Component {
                 top.getChildByName("topBtn").active = true;
                 Utils.setFailCityInfo();
             }
+            this.setRankData();
         }, true); // 第二个参数设为true启用逆解析
     }
 

assets/Script/Map.ts

@@ -2142,7 +2142,7 @@ export default class MapConroler extends cc.Component {
 
             }
             if (cc.fx.GameTool.maxLevel()) {
-                MiniGameSdk.API.showToast("关卡每周更新，敬请期待！");
+                MiniGameSdk.API.showToast("关卡每周更新，敬请期待。");
                 cc.fx.GameTool.requestSubscribe();
                 return;
             }
@@ -2150,6 +2150,7 @@ export default class MapConroler extends cc.Component {
             this.node.parent.parent.parent.getChildByName("zhuanchang").active = true;
             this.node.parent.parent.parent.getChildByName("zhuanchang").getComponent(sp.Skeleton).setAnimation(1, "up", false);
             setTimeout(() => {
+                console.log("不该从这里进入关卡_____________________");
                 cc.fx.GameConfig.LEVEL_INFO_init(true, 0, false);
             }, 1200);
         }
@@ -4407,7 +4408,6 @@ export default class MapConroler extends cc.Component {
                 }
             }
             else {
-                // cc.fx.StorageMessage.setStorage("address", cc.fx.GameConfig.GM_INFO.address);
                 cc.fx.GameConfig.GM_INFO.address = "其他";
                 let nowTime = Math.floor(Date.now() / 1000);
                 let addressInfo = {

assets/Script/Sdk/MiniGameSdk.ts

@@ -1617,6 +1617,9 @@ export namespace MiniGameSdk {
                     current_level: (cc.fx.GameConfig.GM_INFO.level + 1), //当前关卡等级  number
                     current_health: cc.fx.GameConfig.GM_INFO.hp,        //当前体力值
                     tmp_coin: cc.fx.GameConfig.GM_INFO.coin,//当前金币
+                    freeze_amount: cc.fx.GameConfig.GM_INFO.freeze_amount,//当前道具
+                    hammer_amount: cc.fx.GameConfig.GM_INFO.hammer_amount,//当前道具
+                    magic_amount: cc.fx.GameConfig.GM_INFO.magic_amount,//当前道具
                     version: cc.fx.GameConfig.GM_INFO.version.toString(),//当前版本号
                     user_id: cc.fx.GameConfig.GM_INFO.userId //用户id
                 };
@@ -1626,6 +1629,9 @@ export namespace MiniGameSdk {
                         current_level: (cc.fx.GameConfig.GM_INFO.level + 1), //当前关卡等级  number
                         current_health: cc.fx.GameConfig.GM_INFO.hp,        //当前体力值
                         tmp_coin: cc.fx.GameConfig.GM_INFO.coin,//当前金币
+                        freeze_amount: cc.fx.GameConfig.GM_INFO.freeze_amount,//当前道具
+                        hammer_amount: cc.fx.GameConfig.GM_INFO.hammer_amount,//当前道具
+                        magic_amount: cc.fx.GameConfig.GM_INFO.magic_amount,//当前道具
                         version: cc.fx.GameConfig.GM_INFO.version.toString(),
                         register_time: register_time,
                         user_id: cc.fx.GameConfig.GM_INFO.userId, //用户id
@@ -1638,6 +1644,9 @@ export namespace MiniGameSdk {
                         current_level: (cc.fx.GameConfig.GM_INFO.level + 1), //当前关卡等级  number
                         current_health: cc.fx.GameConfig.GM_INFO.hp,        //当前体力值
                         tmp_coin: cc.fx.GameConfig.GM_INFO.coin,//当前金币 
+                        freeze_amount: cc.fx.GameConfig.GM_INFO.freeze_amount,//当前道具
+                        hammer_amount: cc.fx.GameConfig.GM_INFO.hammer_amount,//当前道具
+                        magic_amount: cc.fx.GameConfig.GM_INFO.magic_amount,//当前道具
                         version: cc.fx.GameConfig.GM_INFO.version.toString(),
                         user_id: cc.fx.GameConfig.GM_INFO.userId, //用户id
                         pay_user: pay_user

assets/Script/Wall.ts

@@ -722,6 +722,10 @@ export default class Wall extends cc.Component {
             over = null;
             end = null;
         }
+        if (MapConroler._instance.teamDoors[0].wall_Info.longAndShort[0] == 1 && MapConroler._instance.teamDoors[0].order == true) {
+            var temp = this.wall_Info;
+            debugger;
+        }
         if (MapConroler._instance.teamDoors[0].order == false) {
             //上来是开满的
             if (MapConroler._instance.teamDoors[0].longAndShort[0] > MapConroler._instance.teamDoors[0].longAndShort[1]) {

assets/Script/module/Config/GameConfig.ts

@@ -132,7 +132,9 @@ export class GameConfig {
         getProgress: number; //获取进度
         getItemType: number; popPassCheck: boolean; // 弹窗通行证
         passCheckActivate: boolean; winStreak: number; //连胜
-        tasks: { levelPass: { value: number; target: number; state: number; }; share: { value: number; target: number; state: number; }; useEnergy: { value: number; target: number; state: number; }; useProp: { value: number; target: number; state: number; }; }; addLevel: number; address: string;
+        tasks: { levelPass: { value: number; target: number; state: number; }; share: { value: number; target: number; state: number; }; useEnergy: { value: number; target: number; state: number; }; useProp: { value: number; target: number; state: number; }; }; addLevel: number; //每日过关数
+        address: string; //用户城市信息
+        firstTime: number;
     };
 
 
@@ -142,6 +144,7 @@ export class GameConfig {
 
 
 
+
     //游戏内信息
 
     static get Instance() {
@@ -303,8 +306,9 @@ export class GameConfig {
             passCheckActivate: false,
             winStreak: 0, //连胜
             tasks: { levelPass: { value: 0, target: 0, state: 0 }, share: { value: 0, target: 0, state: 0 }, useEnergy: { value: 0, target: 0, state: 0 }, useProp: { value: 0, target: 0, state: 0 } },
-            addLevel: 0,
+            addLevel: 0,    //每日过关数
-            address: "",
+            address: "",    //用户城市信息
+            firstTime: 0,   //用户注册时间
         };
         // this.setCode(this.getKey("scode"));
         // this.GM_INFO.level = 0;
@@ -352,7 +356,7 @@ export class GameConfig {
 
 
         if (cc.fx.GameTool.maxLevel() && otherLevel == false) {
-            MiniGameSdk.API.showToast("关卡每周更新，敬请期待！");
+            MiniGameSdk.API.showToast("关卡每周更新，敬请期待");
             cc.fx.GameTool.requestSubscribe();
             return;
         }
@@ -369,7 +373,7 @@ export class GameConfig {
             }
             bundle.load(name, cc.JsonAsset, (err: Error, res: cc.JsonAsset) => {
                 if (err) {
-                    console.log("没有这个关卡:", name);
+                    console.log("______________没有这个关卡:", name);
                     cc.fx.GameTool.addLevel(null, null);
                     self.LEVEL_INFO_init(type, time, false);
                     return;

assets/UI/UI/newUI.plist

@@ -7,15 +7,15 @@
             <key>beginBtn.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{1704,553},{570,176}}</string>
+                <string>{{888,794},{571,176}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
-                <true/>
+                <false/>
                 <key>sourceColorRect</key>
-                <string>{{0,0},{570,176}}</string>
+                <string>{{0,0},{571,176}}</string>
                 <key>sourceSize</key>
-                <string>{570,176}</string>
+                <string>{571,176}</string>
             </dict>
             <key>beijing.png</key>
             <dict>
@@ -33,11 +33,11 @@
             <key>customDi.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{2,755},{352,89}}</string>
+                <string>{{1461,911},{352,89}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
-                <true/>
+                <false/>
                 <key>sourceColorRect</key>
                 <string>{{0,0},{352,89}}</string>
                 <key>sourceSize</key>
@@ -46,7 +46,7 @@
             <key>customTitle.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{1704,323},{230,32}}</string>
+                <string>{{1704,557},{230,32}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -59,11 +59,11 @@
             <key>didi.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{2,1267},{731,456}}</string>
+                <string>{{2,755},{731,456}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
-                <true/>
+                <false/>
                 <key>sourceColorRect</key>
                 <string>{{0,0},{731,456}}</string>
                 <key>sourceSize</key>
@@ -72,7 +72,7 @@
             <key>fanhuizhujiem.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{93,916},{144,164}}</string>
+                <string>{{1898,681},{144,164}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -111,7 +111,7 @@
             <key>jia.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{1977,478},{38,38}}</string>
+                <string>{{1815,911},{38,38}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -137,7 +137,7 @@
             <key>man.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{1936,323},{74,38}}</string>
+                <string>{{1898,591},{74,38}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -160,15 +160,28 @@
                 <key>sourceSize</key>
                 <string>{236,62}</string>
             </dict>
-            <key>nextBtn.png</key>
+            <key>meitirw.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{1882,556},{556,164}}</string>
+                <string>{{1778,1002},{150,156}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
                 <true/>
                 <key>sourceColorRect</key>
+                <string>{{0,0},{150,156}}</string>
+                <key>sourceSize</key>
+                <string>{150,156}</string>
+            </dict>
+            <key>nextBtn.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{888,972},{556,164}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <false/>
+                <key>sourceColorRect</key>
                 <string>{{0,0},{556,164}}</string>
                 <key>sourceSize</key>
                 <string>{556,164}</string>
@@ -176,15 +189,15 @@
             <key>topBtn.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{399,755},{141,147}}</string>
+                <string>{{735,1090},{151,157}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
-                <true/>
+                <false/>
                 <key>sourceColorRect</key>
-                <string>{{0,0},{141,147}}</string>
+                <string>{{0,0},{151,157}}</string>
                 <key>sourceSize</key>
-                <string>{141,147}</string>
+                <string>{151,157}</string>
             </dict>
             <key>touxiangk.png</key>
             <dict>
@@ -202,7 +215,7 @@
             <key>tu01.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{595,755},{159,172}}</string>
+                <string>{{1446,1002},{159,172}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -215,72 +228,72 @@
             <key>tu02.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{150,1125},{140,146}}</string>
+                <string>{{1620,1002},{150,156}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
                 <true/>
                 <key>sourceColorRect</key>
-                <string>{{0,0},{140,146}}</string>
+                <string>{{0,0},{150,156}}</string>
                 <key>sourceSize</key>
-                <string>{140,146}</string>
+                <string>{150,156}</string>
             </dict>
             <key>tu03.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{2,1125},{140,146}}</string>
+                <string>{{1778,1002},{150,156}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
                 <true/>
                 <key>sourceColorRect</key>
-                <string>{{0,0},{140,146}}</string>
+                <string>{{0,0},{150,156}}</string>
                 <key>sourceSize</key>
-                <string>{140,146}</string>
+                <string>{150,156}</string>
             </dict>
             <key>tu04.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{1704,357},{223,194}}</string>
+                <string>{{1704,323},{267,232}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
                 <false/>
                 <key>sourceColorRect</key>
-                <string>{{0,0},{223,194}}</string>
+                <string>{{0,0},{267,232}}</string>
                 <key>sourceSize</key>
-                <string>{223,194}</string>
+                <string>{267,232}</string>
             </dict>
             <key>tu05.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{239,916},{160,131}}</string>
+                <string>{{1704,591},{192,157}}</string>
-                <key>offset</key>
-                <string>{0,0}</string>
-                <key>rotated</key>
-                <true/>
-                <key>sourceColorRect</key>
-                <string>{{0,0},{160,131}}</string>
-                <key>sourceSize</key>
-                <string>{160,131}</string>
-            </dict>
-            <key>tu06.png</key>
-            <dict>
-                <key>frame</key>
-                <string>{{445,1125},{148,133}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
                 <false/>
                 <key>sourceColorRect</key>
-                <string>{{0,0},{148,133}}</string>
+                <string>{{0,0},{192,157}}</string>
                 <key>sourceSize</key>
-                <string>{148,133}</string>
+                <string>{192,157}</string>
+            </dict>
+            <key>tu06.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{1704,750},{178,159}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <false/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{178,159}}</string>
+                <key>sourceSize</key>
+                <string>{178,159}</string>
             </dict>
             <key>tu07.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{93,755},{153,161}}</string>
+                <string>{{1884,847},{153,161}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -293,54 +306,54 @@
             <key>tutut.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{1929,399},{155,46}}</string>
+                <string>{{1973,478},{201,54}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
                 <true/>
                 <key>sourceColorRect</key>
-                <string>{{0,0},{155,46}}</string>
+                <string>{{0,0},{201,54}}</string>
                 <key>sourceSize</key>
-                <string>{155,46}</string>
+                <string>{201,54}</string>
             </dict>
             <key>tututt.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{1882,1114},{151,164}}</string>
+                <string>{{735,755},{151,174}}</string>
-                <key>offset</key>
-                <string>{0,0}</string>
-                <key>rotated</key>
-                <true/>
-                <key>sourceColorRect</key>
-                <string>{{0,0},{151,164}}</string>
-                <key>sourceSize</key>
-                <string>{151,164}</string>
-            </dict>
-            <key>tututtt.png</key>
-            <dict>
-                <key>frame</key>
-                <string>{{256,755},{141,147}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
                 <false/>
                 <key>sourceColorRect</key>
-                <string>{{0,0},{141,147}}</string>
+                <string>{{0,0},{151,174}}</string>
                 <key>sourceSize</key>
-                <string>{141,147}</string>
+                <string>{151,174}</string>
+            </dict>
+            <key>tututtt.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{735,931},{151,157}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <false/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{151,157}}</string>
+                <key>sourceSize</key>
+                <string>{151,157}</string>
             </dict>
             <key>tutututu.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{298,1125},{139,145}}</string>
+                <string>{{1620,1154},{149,155}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
                 <true/>
                 <key>sourceColorRect</key>
-                <string>{{0,0},{139,145}}</string>
+                <string>{{0,0},{149,155}}</string>
                 <key>sourceSize</key>
-                <string>{139,145}</string>
+                <string>{149,155}</string>
             </dict>
         </dict>
         <key>metadata</key>
@@ -352,7 +365,7 @@
             <key>size</key>
             <string>{2048,2048}</string>
             <key>smartupdate</key>
-            <string>$TexturePacker:SmartUpdate:e370c7a256d8a72f063f5af041ad85fa$</string>
+            <string>$TexturePacker:SmartUpdate:37c4198e97b6081859cff2d3d847f349$</string>
             <key>textureFileName</key>
             <string>newUI.png</string>
         </dict>

assets/UI/UI/newUI.plist.meta

@@ -16,14 +16,14 @@
       "rawTextureUuid": "a151e332-9c6e-46d8-818a-d3ed01b5ba61",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1704,
+      "trimX": 888,
-      "trimY": 553,
+      "trimY": 794,
-      "width": 570,
+      "width": 571,
       "height": 176,
-      "rawWidth": 570,
+      "rawWidth": 571,
       "rawHeight": 176,
       "borderTop": 0,
       "borderBottom": 0,
@@ -62,11 +62,11 @@
       "rawTextureUuid": "a151e332-9c6e-46d8-818a-d3ed01b5ba61",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 2,
+      "trimX": 1461,
-      "trimY": 755,
+      "trimY": 911,
       "width": 352,
       "height": 89,
       "rawWidth": 352,
@@ -89,7 +89,7 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 1704,
-      "trimY": 323,
+      "trimY": 557,
       "width": 230,
       "height": 32,
       "rawWidth": 230,
@@ -108,11 +108,11 @@
       "rawTextureUuid": "a151e332-9c6e-46d8-818a-d3ed01b5ba61",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 2,
-      "trimY": 1267,
+      "trimY": 755,
       "width": 731,
       "height": 456,
       "rawWidth": 731,
@@ -134,8 +134,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 93,
+      "trimX": 1898,
-      "trimY": 916,
+      "trimY": 681,
       "width": 144,
       "height": 164,
       "rawWidth": 144,
@@ -203,8 +203,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1977,
+      "trimX": 1815,
-      "trimY": 478,
+      "trimY": 911,
       "width": 38,
       "height": 38,
       "rawWidth": 38,
@@ -249,8 +249,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1936,
+      "trimX": 1898,
-      "trimY": 323,
+      "trimY": 591,
       "width": 74,
       "height": 38,
       "rawWidth": 74,
@@ -285,9 +285,9 @@
       "spriteType": "normal",
       "subMetas": {}
     },
-    "nextBtn.png": {
+    "meitirw.png": {
       "ver": "1.0.6",
-      "uuid": "7c8c5738-96e1-4bc6-8090-af7279f62af5",
+      "uuid": "2bb77d3c-fe01-4159-9982-2038bf91770e",
       "importer": "sprite-frame",
       "rawTextureUuid": "a151e332-9c6e-46d8-818a-d3ed01b5ba61",
       "trimType": "auto",
@@ -295,8 +295,31 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1882,
+      "trimX": 1778,
-      "trimY": 556,
+      "trimY": 1002,
+      "width": 150,
+      "height": 156,
+      "rawWidth": 150,
+      "rawHeight": 156,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "nextBtn.png": {
+      "ver": "1.0.6",
+      "uuid": "7c8c5738-96e1-4bc6-8090-af7279f62af5",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "a151e332-9c6e-46d8-818a-d3ed01b5ba61",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 888,
+      "trimY": 972,
       "width": 556,
       "height": 164,
       "rawWidth": 556,
@@ -315,15 +338,15 @@
       "rawTextureUuid": "a151e332-9c6e-46d8-818a-d3ed01b5ba61",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 399,
+      "trimX": 735,
-      "trimY": 755,
+      "trimY": 1090,
-      "width": 141,
+      "width": 151,
-      "height": 147,
+      "height": 157,
-      "rawWidth": 141,
+      "rawWidth": 151,
-      "rawHeight": 147,
+      "rawHeight": 157,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -364,8 +387,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 595,
+      "trimX": 1446,
-      "trimY": 755,
+      "trimY": 1002,
       "width": 159,
       "height": 172,
       "rawWidth": 159,
@@ -387,12 +410,12 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 150,
+      "trimX": 1620,
-      "trimY": 1125,
+      "trimY": 1002,
-      "width": 140,
+      "width": 150,
-      "height": 146,
+      "height": 156,
-      "rawWidth": 140,
+      "rawWidth": 150,
-      "rawHeight": 146,
+      "rawHeight": 156,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -410,12 +433,12 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 2,
+      "trimX": 1778,
-      "trimY": 1125,
+      "trimY": 1002,
-      "width": 140,
+      "width": 150,
-      "height": 146,
+      "height": 156,
-      "rawWidth": 140,
+      "rawWidth": 150,
-      "rawHeight": 146,
+      "rawHeight": 156,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -434,11 +457,11 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 1704,
-      "trimY": 357,
+      "trimY": 323,
-      "width": 223,
+      "width": 267,
-      "height": 194,
+      "height": 232,
-      "rawWidth": 223,
+      "rawWidth": 267,
-      "rawHeight": 194,
+      "rawHeight": 232,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -453,15 +476,15 @@
       "rawTextureUuid": "a151e332-9c6e-46d8-818a-d3ed01b5ba61",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 239,
+      "trimX": 1704,
-      "trimY": 916,
+      "trimY": 591,
-      "width": 160,
+      "width": 192,
-      "height": 131,
+      "height": 157,
-      "rawWidth": 160,
+      "rawWidth": 192,
-      "rawHeight": 131,
+      "rawHeight": 157,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -479,12 +502,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 445,
+      "trimX": 1704,
-      "trimY": 1125,
+      "trimY": 750,
-      "width": 148,
+      "width": 178,
-      "height": 133,
+      "height": 159,
-      "rawWidth": 148,
+      "rawWidth": 178,
-      "rawHeight": 133,
+      "rawHeight": 159,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -502,8 +525,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 93,
+      "trimX": 1884,
-      "trimY": 755,
+      "trimY": 847,
       "width": 153,
       "height": 161,
       "rawWidth": 153,
@@ -525,12 +548,12 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1929,
+      "trimX": 1973,
-      "trimY": 399,
+      "trimY": 478,
-      "width": 155,
+      "width": 201,
-      "height": 46,
+      "height": 54,
-      "rawWidth": 155,
+      "rawWidth": 201,
-      "rawHeight": 46,
+      "rawHeight": 54,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -545,15 +568,15 @@
       "rawTextureUuid": "a151e332-9c6e-46d8-818a-d3ed01b5ba61",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1882,
+      "trimX": 735,
-      "trimY": 1114,
+      "trimY": 755,
       "width": 151,
-      "height": 164,
+      "height": 174,
       "rawWidth": 151,
-      "rawHeight": 164,
+      "rawHeight": 174,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -571,12 +594,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 256,
+      "trimX": 735,
-      "trimY": 755,
+      "trimY": 931,
-      "width": 141,
+      "width": 151,
-      "height": 147,
+      "height": 157,
-      "rawWidth": 141,
+      "rawWidth": 151,
-      "rawHeight": 147,
+      "rawHeight": 157,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -594,12 +617,12 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 298,
+      "trimX": 1620,
-      "trimY": 1125,
+      "trimY": 1154,
-      "width": 139,
+      "width": 149,
-      "height": 145,
+      "height": 155,
-      "rawWidth": 139,
+      "rawWidth": 149,
-      "rawHeight": 145,
+      "rawHeight": 155,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/action_bundle/Avatar/avatar.plist

@@ -7,7 +7,7 @@
             <key>bg.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{864,426},{646,104}}</string>
+                <string>{{1923,868},{646,104}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -20,25 +20,51 @@
             <key>bg2.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{480,560},{320,99}}</string>
+                <string>{{267,991},{320,99}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
-                <false/>
+                <true/>
                 <key>sourceColorRect</key>
                 <string>{{0,0},{320,99}}</string>
                 <key>sourceSize</key>
                 <string>{320,99}</string>
             </dict>
-            <key>btn.png</key>
+            <key>bianku.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{2,560},{476,164}}</string>
+                <string>{{1176,1516},{186,186}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
                 <false/>
                 <key>sourceColorRect</key>
+                <string>{{0,0},{186,186}}</string>
+                <key>sourceSize</key>
+                <string>{186,186}</string>
+            </dict>
+            <key>biaotitou.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{167,991},{458,98}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <true/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{458,98}}</string>
+                <key>sourceSize</key>
+                <string>{458,98}</string>
+            </dict>
+            <key>btn.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{2,1516},{476,164}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <true/>
+                <key>sourceColorRect</key>
                 <string>{{0,0},{476,164}}</string>
                 <key>sourceSize</key>
                 <string>{476,164}</string>
@@ -46,7 +72,7 @@
             <key>daxiao.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{864,154},{150,150}}</string>
+                <string>{{1694,991},{150,150}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -56,10 +82,62 @@
                 <key>sourceSize</key>
                 <string>{150,150}</string>
             </dict>
+            <key>dikuan00.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{2,2},{1000,551}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <false/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{1000,551}}</string>
+                <key>sourceSize</key>
+                <string>{1000,551}</string>
+            </dict>
+            <key>guanbianniu.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{1956,2},{88,88}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <false/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{88,88}}</string>
+                <key>sourceSize</key>
+                <string>{88,88}</string>
+            </dict>
+            <key>huang.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{562,1243},{62,62}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <false/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{62,62}}</string>
+                <key>sourceSize</key>
+                <string>{62,62}</string>
+            </dict>
+            <key>huang0.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{498,1243},{62,62}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <false/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{62,62}}</string>
+                <key>sourceSize</key>
+                <string>{62,62}</string>
+            </dict>
             <key>icon.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{864,2},{150,150}}</string>
+                <string>{{1542,843},{150,150}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -72,7 +150,7 @@
             <key>icon_0.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{454,1485},{250,250}}</string>
+                <string>{{924,1516},{250,250}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -85,7 +163,7 @@
             <key>icon_1.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{706,1326},{250,250}}</string>
+                <string>{{672,1768},{250,250}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -98,7 +176,7 @@
             <key>icon_10.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{2,1734},{250,250}}</string>
+                <string>{{938,991},{250,250}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -111,7 +189,7 @@
             <key>icon_2.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{2,1482},{250,250}}</string>
+                <string>{{775,1243},{250,250}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -124,7 +202,7 @@
             <key>icon_3.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{454,1233},{250,250}}</string>
+                <string>{{672,1516},{250,250}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -137,7 +215,7 @@
             <key>icon_4.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{706,1074},{250,250}}</string>
+                <string>{{686,991},{250,250}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -150,7 +228,7 @@
             <key>icon_5.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{2,1230},{250,250}}</string>
+                <string>{{420,1768},{250,250}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -163,7 +241,7 @@
             <key>icon_6.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{454,981},{250,250}}</string>
+                <string>{{420,1516},{250,250}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -176,7 +254,7 @@
             <key>icon_7.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{2,978},{250,250}}</string>
+                <string>{{168,1768},{250,250}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -189,7 +267,7 @@
             <key>icon_8.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{454,729},{250,250}}</string>
+                <string>{{168,1516},{250,250}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -202,7 +280,7 @@
             <key>icon_9.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{2,726},{250,250}}</string>
+                <string>{{434,991},{250,250}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -212,27 +290,40 @@
                 <key>sourceSize</key>
                 <string>{250,250}</string>
             </dict>
-            <key>kuang.png</key>
+            <key>kongbai.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{2,2},{860,556}}</string>
+                <string>{{345,1411},{238,96}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
                 <false/>
                 <key>sourceColorRect</key>
-                <string>{{0,0},{860,556}}</string>
+                <string>{{0,0},{238,96}}</string>
                 <key>sourceSize</key>
-                <string>{860,556}</string>
+                <string>{238,96}</string>
+            </dict>
+            <key>kuang.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{1004,2},{950,797}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <false/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{950,797}}</string>
+                <key>sourceSize</key>
+                <string>{950,797}</string>
             </dict>
             <key>kuang1.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{799,734},{176,62}}</string>
+                <string>{{167,1451},{176,62}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
-                <true/>
+                <false/>
                 <key>sourceColorRect</key>
                 <string>{{0,0},{176,62}}</string>
                 <key>sourceSize</key>
@@ -241,24 +332,37 @@
             <key>kuang2.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{743,661},{168,54}}</string>
+                <string>{{176,932},{168,54}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
-                <true/>
+                <false/>
                 <key>sourceColorRect</key>
                 <string>{{0,0},{168,54}}</string>
                 <key>sourceSize</key>
                 <string>{168,54}</string>
             </dict>
-            <key>kuang_1.png</key>
+            <key>kuang3.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{254,1676},{188,198}}</string>
+                <string>{{2,555},{906,375}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
-                <true/>
+                <false/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{906,375}}</string>
+                <key>sourceSize</key>
+                <string>{906,375}</string>
+            </dict>
+            <key>kuang_1.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{1114,1768},{188,198}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <false/>
                 <key>sourceColorRect</key>
                 <string>{{0,0},{188,198}}</string>
                 <key>sourceSize</key>
@@ -267,11 +371,11 @@
             <key>kuang_2.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{254,1486},{188,198}}</string>
+                <string>{{924,1768},{188,198}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
-                <true/>
+                <false/>
                 <key>sourceColorRect</key>
                 <string>{{0,0},{188,198}}</string>
                 <key>sourceSize</key>
@@ -280,11 +384,11 @@
             <key>kuang_3.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{254,1296},{188,198}}</string>
+                <string>{{1190,991},{188,198}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
-                <true/>
+                <false/>
                 <key>sourceColorRect</key>
                 <string>{{0,0},{188,198}}</string>
                 <key>sourceSize</key>
@@ -293,11 +397,11 @@
             <key>kuang_4.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{254,1106},{188,198}}</string>
+                <string>{{1027,1243},{188,198}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
-                <true/>
+                <false/>
                 <key>sourceColorRect</key>
                 <string>{{0,0},{188,198}}</string>
                 <key>sourceSize</key>
@@ -306,11 +410,11 @@
             <key>kuang_5.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{254,916},{188,198}}</string>
+                <string>{{585,1307},{188,198}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
-                <true/>
+                <false/>
                 <key>sourceColorRect</key>
                 <string>{{0,0},{188,198}}</string>
                 <key>sourceSize</key>
@@ -319,7 +423,7 @@
             <key>kuang_6.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{254,726},{188,198}}</string>
+                <string>{{1723,801},{188,198}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -332,7 +436,7 @@
             <key>selcet2.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{706,831},{66,66}}</string>
+                <string>{{910,555},{66,66}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -345,7 +449,7 @@
             <key>select.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{254,1866},{176,176}}</string>
+                <string>{{1217,1191},{176,176}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -355,14 +459,40 @@
                 <key>sourceSize</key>
                 <string>{176,176}</string>
             </dict>
-            <key>title.png</key>
+            <key>shiyong.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{480,661},{261,66}}</string>
+                <string>{{2,991},{475,163}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
-                <false/>
+                <true/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{475,163}}</string>
+                <key>sourceSize</key>
+                <string>{475,163}</string>
+            </dict>
+            <key>tiao.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{1956,92},{382,73}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <true/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{382,73}}</string>
+                <key>sourceSize</key>
+                <string>{382,73}</string>
+            </dict>
+            <key>title.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{1956,537},{261,66}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <true/>
                 <key>sourceColorRect</key>
                 <string>{{0,0},{261,66}}</string>
                 <key>sourceSize</key>
@@ -371,11 +501,11 @@
             <key>tou1.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{864,306},{120,62}}</string>
+                <string>{{267,1313},{120,62}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
-                <false/>
+                <true/>
                 <key>sourceColorRect</key>
                 <string>{{0,0},{120,62}}</string>
                 <key>sourceSize</key>
@@ -384,7 +514,7 @@
             <key>tou2.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{864,370},{112,54}}</string>
+                <string>{{346,932},{112,54}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -394,10 +524,23 @@
                 <key>sourceSize</key>
                 <string>{112,54}</string>
             </dict>
+            <key>touxiangk1.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{1380,991},{160,160}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <false/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{160,160}}</string>
+                <key>sourceSize</key>
+                <string>{160,160}</string>
+            </dict>
             <key>update.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{706,899},{62,62}}</string>
+                <string>{{434,1243},{62,62}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
@@ -410,15 +553,119 @@
             <key>useing.png</key>
             <dict>
                 <key>frame</key>
-                <string>{{802,560},{172,54}}</string>
+                <string>{{2,932},{172,54}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <false/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{172,54}}</string>
+                <key>sourceSize</key>
+                <string>{172,54}</string>
+            </dict>
+            <key>wanjiaxinzizi.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{910,623},{261,65}}</string>
                 <key>offset</key>
                 <string>{0,0}</string>
                 <key>rotated</key>
                 <true/>
                 <key>sourceColorRect</key>
-                <string>{{0,0},{172,54}}</string>
+                <string>{{0,0},{261,65}}</string>
                 <key>sourceSize</key>
-                <string>{172,54}</string>
+                <string>{261,65}</string>
+            </dict>
+            <key>xiugai.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{2,1994},{48,48}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <false/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{48,48}}</string>
+                <key>sourceSize</key>
+                <string>{48,48}</string>
+            </dict>
+            <key>xuanzefen.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{368,991},{315,64}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <true/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{315,64}}</string>
+                <key>sourceSize</key>
+                <string>{315,64}</string>
+            </dict>
+            <key>xuanzhong.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{1956,800},{66,66}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <false/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{66,66}}</string>
+                <key>sourceSize</key>
+                <string>{66,66}</string>
+            </dict>
+            <key>xuanzhong2.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{331,1313},{238,96}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <false/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{238,96}}</string>
+                <key>sourceSize</key>
+                <string>{238,96}</string>
+            </dict>
+            <key>xuxian.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{2031,92},{828,6}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <true/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{828,6}}</string>
+                <key>sourceSize</key>
+                <string>{828,6}</string>
+            </dict>
+            <key>zhuangsh.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{977,801},{744,40}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <false/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{744,40}}</string>
+                <key>sourceSize</key>
+                <string>{744,40}</string>
+            </dict>
+            <key>zuobiao.png</key>
+            <dict>
+                <key>frame</key>
+                <string>{{1956,476},{59,73}}</string>
+                <key>offset</key>
+                <string>{0,0}</string>
+                <key>rotated</key>
+                <true/>
+                <key>sourceColorRect</key>
+                <string>{{0,0},{59,73}}</string>
+                <key>sourceSize</key>
+                <string>{59,73}</string>
             </dict>
         </dict>
         <key>metadata</key>
@@ -428,9 +675,9 @@
             <key>realTextureFileName</key>
             <string>avatar.png</string>
             <key>size</key>
-            <string>{1024,2048}</string>
+            <string>{2048,2048}</string>
             <key>smartupdate</key>
-            <string>$TexturePacker:SmartUpdate:eab02cc2f058f4eeba0da101bbd009e6$</string>
+            <string>$TexturePacker:SmartUpdate:27c89008abce4aa81711ec5507d83d84$</string>
             <key>textureFileName</key>
             <string>avatar.png</string>
         </dict>

assets/action_bundle/Avatar/avatar.plist.meta

@@ -4,7 +4,7 @@
   "importer": "asset",
   "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
   "size": {
-    "width": 1024,
+    "width": 2048,
     "height": 2048
   },
   "type": "Texture Packer",
@@ -19,8 +19,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 864,
+      "trimX": 1923,
-      "trimY": 426,
+      "trimY": 868,
       "width": 646,
       "height": 104,
       "rawWidth": 646,
@@ -39,11 +39,11 @@
       "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 480,
+      "trimX": 267,
-      "trimY": 560,
+      "trimY": 991,
       "width": 320,
       "height": 99,
       "rawWidth": 320,
@@ -55,6 +55,52 @@
       "spriteType": "normal",
       "subMetas": {}
     },
+    "bianku.png": {
+      "ver": "1.0.6",
+      "uuid": "3db3c0f2-f6ba-4a82-a417-84123bac992f",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1176,
+      "trimY": 1516,
+      "width": 186,
+      "height": 186,
+      "rawWidth": 186,
+      "rawHeight": 186,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "biaotitou.png": {
+      "ver": "1.0.6",
+      "uuid": "50855d8f-8880-425f-9f1d-4864e6dc2831",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 167,
+      "trimY": 991,
+      "width": 458,
+      "height": 98,
+      "rawWidth": 458,
+      "rawHeight": 98,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
     "btn.png": {
       "ver": "1.0.6",
       "uuid": "5031805f-72fc-44a3-9616-1ebdc8ef6440",
@@ -62,11 +108,11 @@
       "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 2,
-      "trimY": 560,
+      "trimY": 1516,
       "width": 476,
       "height": 164,
       "rawWidth": 476,
@@ -88,8 +134,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 864,
+      "trimX": 1694,
-      "trimY": 154,
+      "trimY": 991,
       "width": 150,
       "height": 150,
       "rawWidth": 150,
@@ -101,6 +147,98 @@
       "spriteType": "normal",
       "subMetas": {}
     },
+    "dikuan00.png": {
+      "ver": "1.0.6",
+      "uuid": "16dec173-a0c1-4e30-b79c-761c45a6d6d4",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 1000,
+      "height": 551,
+      "rawWidth": 1000,
+      "rawHeight": 551,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "guanbianniu.png": {
+      "ver": "1.0.6",
+      "uuid": "de34478d-639e-4737-bd4c-1c4888469b4e",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1956,
+      "trimY": 2,
+      "width": 88,
+      "height": 88,
+      "rawWidth": 88,
+      "rawHeight": 88,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "huang.png": {
+      "ver": "1.0.6",
+      "uuid": "75a83c50-4d7b-4fd9-9d8c-e01095440ece",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 562,
+      "trimY": 1243,
+      "width": 62,
+      "height": 62,
+      "rawWidth": 62,
+      "rawHeight": 62,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "huang0.png": {
+      "ver": "1.0.6",
+      "uuid": "cd2459c8-e24b-48c9-9c93-67aeaf3f0a17",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 498,
+      "trimY": 1243,
+      "width": 62,
+      "height": 62,
+      "rawWidth": 62,
+      "rawHeight": 62,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
     "icon.png": {
       "ver": "1.0.6",
       "uuid": "f9022ff6-96af-4763-abe4-c047e8ef4a41",
@@ -111,8 +249,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 864,
+      "trimX": 1542,
-      "trimY": 2,
+      "trimY": 843,
       "width": 150,
       "height": 150,
       "rawWidth": 150,
@@ -134,8 +272,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 454,
+      "trimX": 924,
-      "trimY": 1485,
+      "trimY": 1516,
       "width": 250,
       "height": 250,
       "rawWidth": 250,
@@ -157,8 +295,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 706,
+      "trimX": 672,
-      "trimY": 1326,
+      "trimY": 1768,
       "width": 250,
       "height": 250,
       "rawWidth": 250,
@@ -180,8 +318,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 2,
+      "trimX": 938,
-      "trimY": 1734,
+      "trimY": 991,
       "width": 250,
       "height": 250,
       "rawWidth": 250,
@@ -203,8 +341,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 2,
+      "trimX": 775,
-      "trimY": 1482,
+      "trimY": 1243,
       "width": 250,
       "height": 250,
       "rawWidth": 250,
@@ -226,8 +364,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 454,
+      "trimX": 672,
-      "trimY": 1233,
+      "trimY": 1516,
       "width": 250,
       "height": 250,
       "rawWidth": 250,
@@ -249,8 +387,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 706,
+      "trimX": 686,
-      "trimY": 1074,
+      "trimY": 991,
       "width": 250,
       "height": 250,
       "rawWidth": 250,
@@ -272,8 +410,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 2,
+      "trimX": 420,
-      "trimY": 1230,
+      "trimY": 1768,
       "width": 250,
       "height": 250,
       "rawWidth": 250,
@@ -295,8 +433,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 454,
+      "trimX": 420,
-      "trimY": 981,
+      "trimY": 1516,
       "width": 250,
       "height": 250,
       "rawWidth": 250,
@@ -318,8 +456,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 2,
+      "trimX": 168,
-      "trimY": 978,
+      "trimY": 1768,
       "width": 250,
       "height": 250,
       "rawWidth": 250,
@@ -341,8 +479,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 454,
+      "trimX": 168,
-      "trimY": 729,
+      "trimY": 1516,
       "width": 250,
       "height": 250,
       "rawWidth": 250,
@@ -364,8 +502,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 2,
+      "trimX": 434,
-      "trimY": 726,
+      "trimY": 991,
       "width": 250,
       "height": 250,
       "rawWidth": 250,
@@ -377,6 +515,29 @@
       "spriteType": "normal",
       "subMetas": {}
     },
+    "kongbai.png": {
+      "ver": "1.0.6",
+      "uuid": "42fa0d28-c2f6-4abd-9330-8164945d399e",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 345,
+      "trimY": 1411,
+      "width": 238,
+      "height": 96,
+      "rawWidth": 238,
+      "rawHeight": 96,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
     "kuang.png": {
       "ver": "1.0.6",
       "uuid": "0eb0ed79-0553-4a3e-9d4d-2274af436f4f",
@@ -387,12 +548,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 2,
+      "trimX": 1004,
       "trimY": 2,
-      "width": 860,
+      "width": 950,
-      "height": 556,
+      "height": 797,
-      "rawWidth": 860,
+      "rawWidth": 950,
-      "rawHeight": 556,
+      "rawHeight": 797,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -407,11 +568,11 @@
       "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 799,
+      "trimX": 167,
-      "trimY": 734,
+      "trimY": 1451,
       "width": 176,
       "height": 62,
       "rawWidth": 176,
@@ -430,11 +591,11 @@
       "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 743,
+      "trimX": 176,
-      "trimY": 661,
+      "trimY": 932,
       "width": 168,
       "height": 54,
       "rawWidth": 168,
@@ -446,6 +607,29 @@
       "spriteType": "normal",
       "subMetas": {}
     },
+    "kuang3.png": {
+      "ver": "1.0.6",
+      "uuid": "14394942-5078-4cbf-9cf3-eea50a4d86b8",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 555,
+      "width": 906,
+      "height": 375,
+      "rawWidth": 906,
+      "rawHeight": 375,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
     "kuang_1.png": {
       "ver": "1.0.6",
       "uuid": "c2b141f2-de71-4481-b9ee-440c893c28b3",
@@ -453,11 +637,11 @@
       "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 254,
+      "trimX": 1114,
-      "trimY": 1676,
+      "trimY": 1768,
       "width": 188,
       "height": 198,
       "rawWidth": 188,
@@ -476,11 +660,11 @@
       "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 254,
+      "trimX": 924,
-      "trimY": 1486,
+      "trimY": 1768,
       "width": 188,
       "height": 198,
       "rawWidth": 188,
@@ -499,11 +683,11 @@
       "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 254,
+      "trimX": 1190,
-      "trimY": 1296,
+      "trimY": 991,
       "width": 188,
       "height": 198,
       "rawWidth": 188,
@@ -522,11 +706,11 @@
       "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 254,
+      "trimX": 1027,
-      "trimY": 1106,
+      "trimY": 1243,
       "width": 188,
       "height": 198,
       "rawWidth": 188,
@@ -545,11 +729,11 @@
       "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 254,
+      "trimX": 585,
-      "trimY": 916,
+      "trimY": 1307,
       "width": 188,
       "height": 198,
       "rawWidth": 188,
@@ -571,8 +755,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 254,
+      "trimX": 1723,
-      "trimY": 726,
+      "trimY": 801,
       "width": 188,
       "height": 198,
       "rawWidth": 188,
@@ -594,8 +778,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 706,
+      "trimX": 910,
-      "trimY": 831,
+      "trimY": 555,
       "width": 66,
       "height": 66,
       "rawWidth": 66,
@@ -617,8 +801,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 254,
+      "trimX": 1217,
-      "trimY": 1866,
+      "trimY": 1191,
       "width": 176,
       "height": 176,
       "rawWidth": 176,
@@ -630,6 +814,52 @@
       "spriteType": "normal",
       "subMetas": {}
     },
+    "shiyong.png": {
+      "ver": "1.0.6",
+      "uuid": "a81bd733-7bfe-4ac0-80c4-0c478628b26c",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 991,
+      "width": 475,
+      "height": 163,
+      "rawWidth": 475,
+      "rawHeight": 163,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "tiao.png": {
+      "ver": "1.0.6",
+      "uuid": "45416d97-237b-4cc7-a40c-def9b49b729a",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1956,
+      "trimY": 92,
+      "width": 382,
+      "height": 73,
+      "rawWidth": 382,
+      "rawHeight": 73,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
     "title.png": {
       "ver": "1.0.6",
       "uuid": "c186e62d-c82b-490a-a6c4-c2dbdb2b7f74",
@@ -637,11 +867,11 @@
       "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 480,
+      "trimX": 1956,
-      "trimY": 661,
+      "trimY": 537,
       "width": 261,
       "height": 66,
       "rawWidth": 261,
@@ -660,11 +890,11 @@
       "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 864,
+      "trimX": 267,
-      "trimY": 306,
+      "trimY": 1313,
       "width": 120,
       "height": 62,
       "rawWidth": 120,
@@ -686,8 +916,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 864,
+      "trimX": 346,
-      "trimY": 370,
+      "trimY": 932,
       "width": 112,
       "height": 54,
       "rawWidth": 112,
@@ -699,6 +929,29 @@
       "spriteType": "normal",
       "subMetas": {}
     },
+    "touxiangk1.png": {
+      "ver": "1.0.6",
+      "uuid": "ac4e30ec-821f-4d6b-9752-0145f3d309d3",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1380,
+      "trimY": 991,
+      "width": 160,
+      "height": 160,
+      "rawWidth": 160,
+      "rawHeight": 160,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
     "update.png": {
       "ver": "1.0.6",
       "uuid": "24dfd852-5bc5-4582-9483-f1ba90dae78d",
@@ -709,8 +962,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 706,
+      "trimX": 434,
-      "trimY": 899,
+      "trimY": 1243,
       "width": 62,
       "height": 62,
       "rawWidth": 62,
@@ -729,11 +982,11 @@
       "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 802,
+      "trimX": 2,
-      "trimY": 560,
+      "trimY": 932,
       "width": 172,
       "height": 54,
       "rawWidth": 172,
@@ -744,6 +997,190 @@
       "borderRight": 0,
       "spriteType": "normal",
       "subMetas": {}
+    },
+    "wanjiaxinzizi.png": {
+      "ver": "1.0.6",
+      "uuid": "681f625d-4c69-4cc9-9295-c3f1baf9c4e4",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 910,
+      "trimY": 623,
+      "width": 261,
+      "height": 65,
+      "rawWidth": 261,
+      "rawHeight": 65,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "xiugai.png": {
+      "ver": "1.0.6",
+      "uuid": "fc743876-aeda-4a9c-9c1d-0b09a0347550",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 1994,
+      "width": 48,
+      "height": 48,
+      "rawWidth": 48,
+      "rawHeight": 48,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "xuanzefen.png": {
+      "ver": "1.0.6",
+      "uuid": "04221362-3c93-4ce4-8f41-00704fbef61d",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 368,
+      "trimY": 991,
+      "width": 315,
+      "height": 64,
+      "rawWidth": 315,
+      "rawHeight": 64,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "xuanzhong.png": {
+      "ver": "1.0.6",
+      "uuid": "ad8e47a1-625d-4601-8c4e-05dd7b2902b9",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1956,
+      "trimY": 800,
+      "width": 66,
+      "height": 66,
+      "rawWidth": 66,
+      "rawHeight": 66,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "xuanzhong2.png": {
+      "ver": "1.0.6",
+      "uuid": "80d68b63-7734-43f3-9d53-6195182dc0fa",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 331,
+      "trimY": 1313,
+      "width": 238,
+      "height": 96,
+      "rawWidth": 238,
+      "rawHeight": 96,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "xuxian.png": {
+      "ver": "1.0.6",
+      "uuid": "cb6616ff-b034-4155-8110-d6bade5a5a10",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2031,
+      "trimY": 92,
+      "width": 828,
+      "height": 6,
+      "rawWidth": 828,
+      "rawHeight": 6,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "zhuangsh.png": {
+      "ver": "1.0.6",
+      "uuid": "855b62bb-f1c9-42ad-972a-e9fed29661ae",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 977,
+      "trimY": 801,
+      "width": 744,
+      "height": 40,
+      "rawWidth": 744,
+      "rawHeight": 40,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "zuobiao.png": {
+      "ver": "1.0.6",
+      "uuid": "764fd3e0-9974-4f25-8833-abbcaccaa933",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ee292f53-ebf0-44c5-8d2b-6fdb1e6f468d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1956,
+      "trimY": 476,
+      "width": 59,
+      "height": 73,
+      "rawWidth": 59,
+      "rawHeight": 73,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
     }
   }
 }

assets/action_bundle/Avatar/avatar.png.meta

@@ -8,8 +8,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 1192,
+  "width": 1024,
-  "height": 1018,
+  "height": 2048,
   "platformSettings": {},
   "subMetas": {}
 }

assets/action_bundle/Avatar/avatarAdressBg.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "99ff1f69-4215-46e9-8a46-d35b3ffd49db",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 950,
+  "height": 1309,
+  "platformSettings": {},
+  "subMetas": {
+    "avatarAdressBg": {
+      "ver": "1.0.6",
+      "uuid": "7cbcd9f0-3be0-45c5-8d9b-f158318cc3a1",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "99ff1f69-4215-46e9-8a46-d35b3ffd49db",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 950,
+      "height": 1309,
+      "rawWidth": 950,
+      "rawHeight": 1309,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/career/prefab/rankGame.prefab

@@ -731,7 +731,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 10000
+      "height": 25000
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -743,7 +743,7 @@
       "ctor": "Float64Array",
       "array": [
         540,
-        210,
+        0,
         0,
         0,
         0,
@@ -812,7 +812,7 @@
     "_alignFlags": 41,
     "_left": 0,
     "_right": 0,
-    "_top": -210,
+    "_top": 0,
     "_bottom": -210,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
@@ -1638,7 +1638,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -1746,7 +1746,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -2480,7 +2480,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -2588,7 +2588,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -3322,7 +3322,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -3430,7 +3430,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -4164,7 +4164,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -4272,7 +4272,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -5006,7 +5006,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -5114,7 +5114,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -5848,7 +5848,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -5956,7 +5956,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -6360,7 +6360,7 @@
         "__id__": 347
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 370
@@ -6654,9 +6654,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 250,
+      "r": 255,
-      "g": 232,
+      "g": 255,
-      "b": 195,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
@@ -6674,7 +6674,7 @@
       "ctor": "Float64Array",
       "array": [
         351.158,
-        277.127,
+        269.019,
         0,
         0,
         0,
@@ -6725,7 +6725,7 @@
     "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 2,
-    "_N$verticalAlign": 1,
+    "_N$verticalAlign": 2,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
@@ -6762,9 +6762,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 250,
+      "r": 255,
-      "g": 232,
+      "g": 255,
-      "b": 195,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
@@ -6782,7 +6782,7 @@
       "ctor": "Float64Array",
       "array": [
         407.043,
-        277.127,
+        271.968,
         0,
         0,
         0,
@@ -6833,7 +6833,7 @@
     "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
-    "_N$verticalAlign": 1,
+    "_N$verticalAlign": 2,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
@@ -7552,7 +7552,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -7660,7 +7660,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -8393,7 +8393,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -8501,7 +8501,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -9234,7 +9234,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -9342,7 +9342,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -10078,7 +10078,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -10186,7 +10186,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -11024,7 +11024,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -11132,7 +11132,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -11865,7 +11865,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -11973,7 +11973,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -12706,7 +12706,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -12814,7 +12814,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -13547,7 +13547,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -13655,7 +13655,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -13926,7 +13926,7 @@
     },
     "_enabled": true,
     "phone": null,
-    "_id": "45r+ulHaFN/7dD+23ACtCZ"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",

assets/career/script/CareerItem.ts

@@ -52,6 +52,7 @@ export default class CareerItem extends cc.Component {
                     this.randerChildren.push(this.node.children[i]);
                     let username = cc.fx.GameTool.subName(this.data.rankingData[i - 4].username, 7);
                     if (username == "user") username = "匿名玩家";
+                    // console.log("用户名字:", username);
                     this.node.children[i].getChildByName("kong").active = false;
                     this.node.children[i].getChildByName("name").getComponent(cc.Label).string = username + "";
                     this.node.children[i].getChildByName("level").getComponent(cc.Label).string = this.data.rankingData[i - 4].addLevel;
@@ -65,6 +66,7 @@ export default class CareerItem extends cc.Component {
                         this.data.rankingData[i - 4].useravatar == "10") {
                         let useravatar = this.data.rankingData[i - 4].useravatar;
                         let useravatarTemp = "icon_" + useravatar;
+                        // console.log("头像名称", useravatarTemp, "用户名字:", username);
                         this.node.children[i].getChildByName("mask").getChildByName("icon").getComponent(cc.Sprite).spriteFrame = this.UI.getSpriteFrame(useravatarTemp);
                     }
                     else this.setPic(this.data.rankingData[i - 4].useravatar, this.node.children[i].getChildByName("mask").getChildByName("icon"));