u

project/src/scenes/IndexScene.ts

@@ -31,13 +31,8 @@ export class IndexScene extends Scene {
     
     start() {
         super.start();
-<<<<<<< HEAD
         this.getIndex();
         // showPanel(SharePanel);
-=======
-
-        showPanel(PrizePanel);
->>>>>>> 4445b545174f45bdb5de86ca86be78b8f149ecec
         getObject(this,'index_sharetips').visible=false;
         this.initContainer();
         this.initmask();