2 Commits fa66e79485 ... eef3e84112

Author SHA1 Message Date
  woso_javan eef3e84112 FFFF 4 days ago
  woso_javan 15fe167919 FFF 1 week ago

+ 11 - 8
assets/bundles/game/ShelveLocker.prefab

@@ -373,8 +373,8 @@
     },
     },
     "_lpos": {
     "_lpos": {
       "__type__": "cc.Vec3",
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 33,
+      "x": 2,
+      "y": 35.517,
       "z": 0
       "z": 0
     },
     },
     "_lrot": {
     "_lrot": {
@@ -414,8 +414,8 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 17.34765625,
-      "height": 36.76
+      "width": 21.89,
+      "height": 30
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "__type__": "cc.Vec2",
@@ -458,15 +458,18 @@
     "_fontFamily": "Arial",
     "_fontFamily": "Arial",
     "_lineHeight": 26,
     "_lineHeight": 26,
     "_overflow": 0,
     "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
+    "_enableWrapText": false,
+    "_font": {
+      "__uuid__": "b396e0a4-493d-4c5b-af06-66ba37f8dc1e",
+      "__expectedType__": "cc.TTFFont"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_spacingX": 0,
     "_isItalic": false,
     "_isItalic": false,
     "_isBold": false,
     "_isBold": false,
     "_isUnderline": false,
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_underlineHeight": 2,
-    "_cacheMode": 0,
+    "_cacheMode": 2,
     "_enableOutline": true,
     "_enableOutline": true,
     "_outlineColor": {
     "_outlineColor": {
       "__type__": "cc.Color",
       "__type__": "cc.Color",

+ 1 - 1
assets/bundles/game/Stage.prefab

@@ -4100,7 +4100,7 @@
         "__id__": 191
         "__id__": 191
       }
       }
     ],
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
     "_components": [
       {
       {
         "__id__": 209
         "__id__": 209

+ 3 - 3
assets/scripts/game/CommonShelve.ts

@@ -124,12 +124,12 @@ export class CommonShelve extends ShelveBase {
         const goods: Goods = goodsNode.getComponent(Goods)
         const goods: Goods = goodsNode.getComponent(Goods)
         const layerNode: Node = this.layers[layer]
         const layerNode: Node = this.layers[layer]
         const pos: Vec3 = v3()
         const pos: Vec3 = v3()
-        pos.x = (slotId - 1) * (this.uiTrans.width - 25) / 3
+        pos.x = (slotId - 1) * (this.uiTrans.width - 10) / 3
         // pos.y = layer * Global.Goods_Offset
         // pos.y = layer * Global.Goods_Offset
-        const baseY = layer * Global.Goods_Offset
+        const baseY = layer * Global.Goods_Offset - 20
         pos.y = slotId === 1 ? baseY + Global.Goods_Offset * 2 : baseY
         pos.y = slotId === 1 ? baseY + Global.Goods_Offset * 2 : baseY
         layerNode.addChild(goodsNode)
         layerNode.addChild(goodsNode)
-        goodsNode.setScale(0.7, 0.7, 0.7)
+        goodsNode.setScale(0.6, 0.6, 0.6)
         goodsNode.setPosition(pos)
         goodsNode.setPosition(pos)
         goods.Id = goodsId
         goods.Id = goodsId
         goods.Layer = layer
         goods.Layer = layer

+ 1 - 1
assets/scripts/game/SmallShelve.ts

@@ -70,7 +70,7 @@ export class SmallShelve extends ShelveBase {
         const goods: Goods = goodsNode.getComponent(Goods)
         const goods: Goods = goodsNode.getComponent(Goods)
         const layerNode: Node = this.layers[layer]
         const layerNode: Node = this.layers[layer]
         const pos: Vec3 = v3()
         const pos: Vec3 = v3()
-        pos.y = layer * Global.Goods_Offset
+        pos.y = layer * Global.Goods_Offset - 10
         layerNode.addChild(goodsNode)
         layerNode.addChild(goodsNode)
         goodsNode.setPosition(pos)
         goodsNode.setPosition(pos)
         goods.Id = goodsId
         goods.Id = goodsId