结算界面调整

assets/resources/ui/ads/SudokuOutput.prefab

@@ -33,13 +33,10 @@
       },
       {
         "__id__": 119
-      },
-      {
-        "__id__": 120
       }
     ],
     "_prefab": {
-      "__id__": 121
+      "__id__": 120
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -385,6 +382,9 @@
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 113
+      },
       {
         "__id__": 114
       },
@@ -460,13 +460,10 @@
       },
       {
         "__id__": 111
-      },
-      {
-        "__id__": 112
       }
     ],
     "_prefab": {
-      "__id__": 113
+      "__id__": 112
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -532,7 +529,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -220.5,
-      "y": 142,
+      "y": 141,
       "z": 0
     },
     "_lrot": {
@@ -1044,7 +1041,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -2.5,
-      "y": 142,
+      "y": 141,
       "z": 0
     },
     "_lrot": {
@@ -1556,7 +1553,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 215.5,
-      "y": 142,
+      "y": 141,
       "z": 0
     },
     "_lrot": {
@@ -2068,7 +2065,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -220.5,
-      "y": -140,
+      "y": -141,
       "z": 0
     },
     "_lrot": {
@@ -2580,7 +2577,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -2.5,
-      "y": -140,
+      "y": -141,
       "z": 0
     },
     "_lrot": {
@@ -3092,7 +3089,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 215.5,
-      "y": -140,
+      "y": -141,
       "z": 0
     },
     "_lrot": {
@@ -3580,7 +3577,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 679,
-      "height": 586
+      "height": 584
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3597,7 +3594,7 @@
       "__id__": 13
     },
     "_enabled": true,
-    "_resizeMode": 0,
+    "_resizeMode": 1,
     "_N$layoutType": 3,
     "_N$padding": 0,
     "_cellSize": {
@@ -3617,34 +3614,6 @@
     "_affectedByScale": false,
     "_id": ""
   },
-  {
-    "__type__": "cc.WidgetComponent",
-    "_name": "Layout<WidgetComponent>",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 13
-    },
-    "_enabled": true,
-    "_alignFlags": 45,
-    "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 100,
-    "_originalHeight": 665,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": ""
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -3671,8 +3640,8 @@
     "_priority": 0,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 679,
-      "height": 586
+      "width": 655,
+      "height": 562
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3714,10 +3683,10 @@
     "_enabled": true,
     "_alignFlags": 45,
     "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
+    "_left": 12,
+    "_right": 12,
+    "_top": 12,
+    "_bottom": 12,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -3732,6 +3701,29 @@
     "_lockFlags": 0,
     "_id": ""
   },
+  {
+    "__type__": "cc.MaskComponent",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 12
+    },
+    "_enabled": true,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_sharedMaterial": null,
+    "_type": 0,
+    "_inverted": false,
+    "_segments": 64,
+    "_id": ""
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -3768,29 +3760,6 @@
     },
     "_id": ""
   },
-  {
-    "__type__": "cc.MaskComponent",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_sharedMaterial": null,
-    "_type": 0,
-    "_inverted": false,
-    "_segments": 64,
-    "_id": ""
-  },
   {
     "__type__": "c0862GgEItM5YUlULTjLR6o",
     "_name": "",
@@ -3800,7 +3769,7 @@
     },
     "_enabled": true,
     "scrollView": {
-      "__id__": 115
+      "__id__": 114
     },
     "content": {
       "__id__": 13

assets/scripts/engines/gui/list/ExportList.ts

@@ -39,7 +39,7 @@ export class ExportList extends Component {
         type: CCBoolean,
         tooltip: "是否开启自动滚动"
     })
-    autoScroll:Boolean = true;
+    autoScroll:boolean = true;
     
     @property({
         type: CCInteger,
@@ -87,7 +87,7 @@ export class ExportList extends Component {
             this.content.addChild(itemNode);
             item.updateItem(data);
         }
-        this.scrollView.scheduleOnce(this.__scroll.bind(this), 0.1);
+        this.scrollView.scheduleOnce(this.__scroll.bind(this), 0.5);
     }
 
     /**

assets/scripts/games/ui/gameovers/GameOverMediator.ts

@@ -32,13 +32,17 @@ export class GameOverMediator extends GUIMediator {
         this.WinGroup.active=this.isWin;
         this.DefeatedGroup.active=!this.isWin;
         //胜利
-        if(data==true){
+        if(this.isWin==true){
+            this.WinGroup.active=true;
+            this.DefeatedGroup.active=false;
             let levelConfig:any=GameConfigManager.GetLevelConfig(GameModel.single.currentLevel-1);
             //关卡基础奖励
             this.award=levelConfig.awards+levelConfig.killAward*GameModel.single.killCount;
             this.WinAwardLabel.string=this.award.toString();
         }else{//失败
             //失败不算奖励
+            this.WinGroup.active=false;
+            this.DefeatedGroup.active=true;
         }
     }