xujialiang 4 лет назад
Родитель
Сommit
5e1bf40021

+ 2 - 2
assets/res/mainPackage/scenes/Fighting.fire

@@ -171,7 +171,7 @@
       "array": [
         0,
         0,
-        428.67487583280007,
+        364.7996696972607,
         0,
         0,
         0,
@@ -244,7 +244,7 @@
       "height": 1334
     },
     "_fitWidth": false,
-    "_fitHeight": true,
+    "_fitHeight": false,
     "_id": "59Cd0ovbdF4byw5sbjJDx7"
   },
   {

+ 2 - 2
assets/res/mainPackage/scenes/Hall.fire

@@ -168,7 +168,7 @@
       "array": [
         0,
         0,
-        365.46272039703314,
+        364.7996696972607,
         0,
         0,
         0,
@@ -241,7 +241,7 @@
       "height": 1334
     },
     "_fitWidth": false,
-    "_fitHeight": true,
+    "_fitHeight": false,
     "_id": "59Cd0ovbdF4byw5sbjJDx7"
   },
   {

+ 4 - 4
assets/resources/PreloadingScene.fire

@@ -171,7 +171,7 @@
       "array": [
         0,
         0,
-        365.46272039703314,
+        364.7996696972607,
         0,
         0,
         0,
@@ -244,7 +244,7 @@
       "height": 1334
     },
     "_fitWidth": false,
-    "_fitHeight": true,
+    "_fitHeight": false,
     "_id": "caOSd7RHlLLL18JiaOSM34"
   },
   {
@@ -270,8 +270,8 @@
     "_isAbsBottom": true,
     "_isAbsHorizontalCenter": true,
     "_isAbsVerticalCenter": true,
-    "_originalWidth": 0,
-    "_originalHeight": 0,
+    "_originalWidth": 750,
+    "_originalHeight": 1334,
     "_id": "9bBXOGRotBaJ9AhQMbdqGm"
   },
   {

+ 1 - 0
assets/script/engines/loadingView/LoadingView.ts

@@ -23,6 +23,7 @@ export default class LoadingView{
      */
     Init(root:fgui.GComponent,progressBar:fgui.GProgressBar,label?:fgui.GLabel):void{
         this.root=root;
+        this.root.setSize(fgui.GRoot.inst.width,fgui.GRoot.inst.height);
         this.progressBar=progressBar;
         this.label=label;
         if(this.progressBar!=null){

+ 1 - 1
assets/script/engines/models/DataModel.ts

@@ -97,7 +97,7 @@ export default class DataModel extends EventDispatcher
      */
     ReadByLocal():void{
         let jsonStr:string=localStorage.getItem(this.gameName+"_"+this.userId);
-        if(jsonStr==null){
+        if(!jsonStr){
             this.isNewPlayer=true;
         }else{
             try {

+ 7 - 7
assets/script/game/modules/exports/WXS02Mediator.ts

@@ -17,7 +17,7 @@ export default class WXS02Mediator extends GUIMediator
     private __bannerTime:number;
     private __state:number=0;
 
-    private listA:ExportList;
+    // private listA:ExportList;
     private listB:ExportList;
     constructor(){
         super();
@@ -32,13 +32,13 @@ export default class WXS02Mediator extends GUIMediator
             this.view.m_btnBack.visible=false;
             this.view.m_btnContinue.visible=false;
         }
-        if(this.listA==null){
-            this.listA=new ExportList(this.view.m_listA01,0);
-        }
+        // if(this.listA==null){
+        //     this.listA=new ExportList(this.view.m_listA01,0);
+        // }
         if(this.listB==null){
-            this.listB=new ExportList(this.view.m_listB,1);
+            this.listB=new ExportList(this.view.m_listIcon,1);
         }
-        this.listA.Refresh();
+        // this.listA.Refresh();
         this.listB.Refresh();
     }
 
@@ -121,7 +121,7 @@ export default class WXS02Mediator extends GUIMediator
                 this.__state=2;
             }
         }
-        this.listA.Tick(dt);
+        // this.listA.Tick(dt);
         this.listB.Tick(dt);
     }
 

+ 0 - 1
settings/project.json

@@ -13,7 +13,6 @@
     ]
   ],
   "excluded-modules": [
-    "Spine Skeleton",
     "TiledMap",
     "VideoPlayer",
     "3D Physics/cannon.js",