1

egret/src/mapScene/MapScene.ts

@@ -288,13 +288,8 @@ export default class MapScene extends Scene {
     updateScene() {
         this.updateHomeData();
     }
-<<<<<<< HEAD
-
-    addAvatar(level, data?) {
-=======
     
     addAvatar(level, ele) {
->>>>>>> 1b9d497733f7cbfe7761bf3b695a3c602abebc61
         const item = MapScene.starHash[level];
         const parent = item.parent;
         const avatar = new AvatarComp();
@@ -305,13 +300,6 @@ export default class MapScene extends Scene {
         avatar.y = item.y - avatar.height;
     }
 
-<<<<<<< HEAD
-    updateAvatars() {
-        // 4 70
-        this.addAvatar(4);
-        this.addAvatar(70);
-        this.addAvatar(71);
-=======
     updateFriends() {
         NetManager.ins.hc_mapRank(() => {
             const { data } = DataManager.ins.getData('hc_mapRank');
@@ -319,7 +307,6 @@ export default class MapScene extends Scene {
                 this.addAvatar(ele.levelNum,ele.rank[0]);
             });
         });
->>>>>>> 1b9d497733f7cbfe7761bf3b695a3c602abebc61
     }
 
     updateHomeData() {