Browse Source

修改作业

lan 1 year ago
parent
commit
2cb4da8f94

+ 8 - 8
assets/prefab/home/HomeWorkUI.prefab

@@ -941,8 +941,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 204,
-      "height": 80
+      "width": 184,
+      "height": 82
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1369,7 +1369,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 36,
+      "width": 150,
       "height": 25.2
     },
     "_anchorPoint": {
@@ -1425,7 +1425,7 @@
     "_N$string": "名字",
     "_fontSize": 18,
     "_lineHeight": 20,
-    "_enableWrapText": true,
+    "_enableWrapText": false,
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
@@ -1435,7 +1435,7 @@
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
+    "_N$overflow": 2,
     "_N$cacheMode": 0,
     "_id": ""
   },
@@ -1477,7 +1477,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 36,
+      "width": 150,
       "height": 25.2
     },
     "_anchorPoint": {
@@ -1533,7 +1533,7 @@
     "_N$string": "名字",
     "_fontSize": 18,
     "_lineHeight": 20,
-    "_enableWrapText": true,
+    "_enableWrapText": false,
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
@@ -1543,7 +1543,7 @@
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
+    "_N$overflow": 2,
     "_N$cacheMode": 0,
     "_id": ""
   },

+ 7 - 7
assets/prefab/home/HomeWorkUpdateUI.prefab

@@ -1262,7 +1262,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 36,
+      "width": 150,
       "height": 25.2
     },
     "_anchorPoint": {
@@ -1318,7 +1318,7 @@
     "_N$string": "名字",
     "_fontSize": 18,
     "_lineHeight": 20,
-    "_enableWrapText": true,
+    "_enableWrapText": false,
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
@@ -1328,7 +1328,7 @@
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
+    "_N$overflow": 2,
     "_N$cacheMode": 0,
     "_id": ""
   },
@@ -1370,7 +1370,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 36,
+      "width": 150,
       "height": 25.2
     },
     "_anchorPoint": {
@@ -1426,7 +1426,7 @@
     "_N$string": "名字",
     "_fontSize": 18,
     "_lineHeight": 20,
-    "_enableWrapText": true,
+    "_enableWrapText": false,
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
@@ -1436,7 +1436,7 @@
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
+    "_N$overflow": 2,
     "_N$cacheMode": 0,
     "_id": ""
   },
@@ -1583,7 +1583,7 @@
     "_N$paddingTop": 10,
     "_N$paddingBottom": 0,
     "_N$spacingX": 30,
-    "_N$spacingY": 50,
+    "_N$spacingY": 30,
     "_N$verticalDirection": 1,
     "_N$horizontalDirection": 0,
     "_N$affectedByScale": false,

+ 2 - 4
assets/script/ui/home/HomeWorkUI.ts

@@ -5,10 +5,8 @@ import {ccUtils} from '../../utils/ccUtils'
 import {Data, Mgr} from '../../GameControl'
 import List from '../../uiutils/List'
 import {UI} from '../../enums/UI'
-import {GAME_TYPE, HOME_ROLE_TYPE} from '../../enums/Enum'
-import {HttpUrl} from '../../config/HttpUrl'
+import {GAME_TYPE} from '../../enums/Enum'
 import {SemeGirdCfg} from '../../config/SemeGirdCfg'
-import {ChooseGameTypeCell} from './ChooseGameTypeCell'
 import {SemePartCfg} from '../../config/SemePartCfg'
 import {HomeWorkGames} from '../../config/GlobalConfig'
 
@@ -43,7 +41,7 @@ export class HomeWorkUI extends BaseUI {
                     if (curSemeInfo) {
                         indexSeme = +Data.global.semeType[curSemeInfo.yearRange]
                     }
-                    if (data.semeID == indexSeme) allSemeCfg.push(data)
+                    if (data.semeID == indexSeme || obj.gameType == GAME_TYPE.gamePinyin) allSemeCfg.push(data)
                 }
             }
         }