greg 4 år sedan
förälder
incheckning
966d8a973a

+ 7 - 7
assets/d3d/gunFire/zhuodan.fbx.meta

@@ -80,12 +80,12 @@
         "events": []
       }
     },
-    "a55e7": {
+    "adacb": {
       "importer": "gltf-embeded-image",
-      "uuid": "7c735b05-1052-417a-bab4-49dbefdbb9fc@a55e7",
+      "uuid": "7c735b05-1052-417a-bab4-49dbefdbb9fc@adacb",
       "displayName": "",
-      "id": "a55e7",
-      "name": "5555.png.image",
+      "id": "adacb",
+      "name": "file2.image",
       "ver": "1.0.2",
       "imported": true,
       "files": [
@@ -118,7 +118,7 @@
         "premultiplyAlpha": false,
         "anisotropy": 1,
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "7c735b05-1052-417a-bab4-49dbefdbb9fc@a55e7"
+        "imageUuidOrDatabaseUri": "7c735b05-1052-417a-bab4-49dbefdbb9fc@adacb"
       }
     },
     "826f3": {
@@ -141,8 +141,8 @@
   "userData": {
     "imageMetas": [
       {
-        "name": "5555.png",
-        "uri": "7c735b05-1052-417a-bab4-49dbefdbb9fc@a55e7"
+        "name": "file2",
+        "uri": "7c735b05-1052-417a-bab4-49dbefdbb9fc@adacb"
       }
     ],
     "animationImportSettings": [

+ 5 - 2
assets/resources/ui/PrepareUI.prefab

@@ -381,7 +381,7 @@
       "__id__": 7
     },
     "_enabled": true,
-    "_alignFlags": 21,
+    "_alignFlags": 17,
     "_target": null,
     "_left": 0,
     "_right": 0,
@@ -1436,7 +1436,7 @@
       "__id__": 40
     },
     "_enabled": true,
-    "_alignFlags": 21,
+    "_alignFlags": 17,
     "_target": null,
     "_left": 0,
     "_right": 0,
@@ -8683,6 +8683,9 @@
     "levelLabel": {
       "__id__": 57
     },
+    "weaponInfoLabel": {
+      "__id__": 36
+    },
     "shopButton": {
       "__id__": 233
     },

+ 8 - 0
assets/scripts/games/ui/prepares/PrepareMediator.ts

@@ -57,6 +57,12 @@ export class PrepareMediator extends GUIMediator {
     })
     levelLabel: LabelComponent = null;
 
+
+    @property({
+        type: LabelComponent
+    })
+    weaponInfoLabel: LabelComponent = null;
+
     /**
      * 商城按钮
      */
@@ -218,6 +224,8 @@ export class PrepareMediator extends GUIMediator {
         if (this.gunNameLabel != null) {
             this.gunNameLabel.string = weaponConfig.name;
         }
+        //描述
+        this.weaponInfoLabel.string=weaponConfig.desc;
     }
 
     OnHide(): void {