1

2c5c539e · 邱旭 · f52edc3f · 2c5c539e
Commit 2c5c539e authored Oct 11, 2019 by 邱旭
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 8 deletions

MapScene.ts egret/src/mapScene/MapScene.ts +3 -8

No files found.
--- a/egret/src/mapScene/MapScene.ts
+++ b/egret/src/mapScene/MapScene.ts
@@ -358,18 +358,13 @@ export default class MapScene extends Scene {
    onTap_taskBtn() {
        PanelCtrl.instance.show('task');
    }
-<<<<<<< HEAD
-    onTap_inviteBtn(){
-        NetManager.ins.getInvateInfo((success, res)=>{
-            if(!success || !res.data){
+    onTap_inviteBtn() {
+        NetManager.ins.getInvateInfo((success, res) => {
+            if(!success || !res.data) {
                return;
            }
            PanelCtrl.instance.show('invite', res.data);
        });
-=======
-    onTap_inviteBtn() {
-        PanelCtrl.instance.show('invite');
->>>>>>> 0a4b334dc0c6f0151f4a6f5714102d247466ff04
    }
    onTap_friendBtn() {
        PanelCtrl.instance.show('friend');