浏览代码

1,替换调整主页内容。
2. 添加 服务器 gameSetting 配置
3. 限制租赁为10倍,
4. 修复获取可偷菜的列表bug,添加获得果实和损失果实提示
5. 添加体力值重置

slambb 3 年之前
父节点
当前提交
682135cabb

文件差异内容过多而无法显示
+ 211 - 180
assets/Scene/MyCityScene - 004.fire


+ 117 - 83
assets/Scene/New Scene.fire

@@ -41,18 +41,10 @@
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 0.6001708984375,
-      "y": 0.6001708984375,
-      "z": 0.6001708984375
-    },
-    "_quat": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
+      "x": 1,
+      "y": 1,
+      "z": 1
     },
-    "_zIndex": 0,
     "_is3DNode": true,
     "groupIndex": 0,
     "autoReleaseAssets": false,
@@ -123,18 +115,17 @@
       "y": 1,
       "z": 1
     },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_zIndex": 0,
-    "_is3DNode": false,
-    "groupIndex": 0,
-    "_id": "a17R8fG3tHEam1uw4blnm2",
     "_eulerAngles": {
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
       "z": 0
-    }
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "groupIndex": 0,
+    "_id": "a17R8fG3tHEam1uw4blnm2"
   },
   {
     "__type__": "cc.Node",
@@ -174,7 +165,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": 504.0267850025433
     },
     "_scale": {
       "__type__": "cc.Vec3",
@@ -182,18 +173,17 @@
       "y": 1,
       "z": 1
     },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_zIndex": 0,
-    "_is3DNode": false,
-    "groupIndex": 0,
-    "_id": "81HVsfbZdOJIk1dNMORZlZ",
     "_eulerAngles": {
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
       "z": 0
-    }
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "groupIndex": 0,
+    "_id": "81HVsfbZdOJIk1dNMORZlZ"
   },
   {
     "__type__": "cc.Camera",
@@ -227,6 +217,7 @@
       "width": 1,
       "height": 1
     },
+    "_renderStages": 1,
     "_id": "88ShQU9RhLPKZDM8ZNpGDN"
   },
   {
@@ -278,18 +269,17 @@
       "y": 1,
       "z": 1
     },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_zIndex": 0,
-    "_is3DNode": false,
-    "groupIndex": 0,
-    "_id": "fb7xRUe/pFbrRtCJKnAhAv",
     "_eulerAngles": {
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
       "z": 0
-    }
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "groupIndex": 0,
+    "_id": "fb7xRUe/pFbrRtCJKnAhAv"
   },
   {
     "__type__": "dragonBones.ArmatureDisplay",
@@ -299,11 +289,24 @@
       "__id__": 5
     },
     "_enabled": true,
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
     "_armatureName": "WithoutTricycl",
     "_animationName": "pickaxe_walk_back",
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
     "playTimes": -1,
+    "premultipliedAlpha": false,
+    "_armatureKey": "41f85241-0b66-4b38-920c-c6f05aea8b6d#70ebb2de-2515-45e7-9d98-7c31d5497548",
+    "_accTime": 0,
+    "_playCount": 0,
+    "_frameCache": null,
+    "_curFrame": null,
+    "_playing": false,
+    "_armatureCache": null,
     "_N$dragonAsset": {
       "__uuid__": "41f85241-0b66-4b38-920c-c6f05aea8b6d"
     },
@@ -312,8 +315,10 @@
     },
     "_N$_defaultArmatureIndex": 0,
     "_N$_animationIndex": 4,
+    "_N$_defaultCacheMode": 0,
     "_N$timeScale": 1,
     "_N$debugBones": false,
+    "_N$enableBatch": false,
     "_id": "97Fvln/o9GEbSBGqqlVxhq"
   },
   {
@@ -385,16 +390,14 @@
       "y": 1,
       "z": 1
     },
-    "_quat": {
-      "__type__": "cc.Quat",
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0,
-      "w": 1
+      "z": 0
     },
     "_skewX": 0,
     "_skewY": 0,
-    "_zIndex": 0,
     "_is3DNode": false,
     "groupIndex": 0,
     "_id": "ce9zm23L5K34hFqznEsBTp"
@@ -445,16 +448,14 @@
       "y": 1,
       "z": 1
     },
-    "_quat": {
-      "__type__": "cc.Quat",
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0,
-      "w": 1
+      "z": 0
     },
     "_skewX": 0,
     "_skewY": 0,
-    "_zIndex": 0,
     "_is3DNode": false,
     "groupIndex": 0,
     "_id": "27Oi5sK8RBzLThfRaYoG4d"
@@ -467,8 +468,11 @@
       "__id__": 9
     },
     "_enabled": true,
-    "_srcBlendFactor": 1,
-    "_dstBlendFactor": 771,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
     "_useOriginalSize": false,
     "_string": "切换动画",
     "_N$string": "切换动画",
@@ -478,10 +482,12 @@
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
+    "_batchAsBitmap": false,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 1,
+    "_N$cacheMode": 0,
     "_id": "7cQrCyGttNAaB/CQG5uWYn"
   },
   {
@@ -492,6 +498,11 @@
       "__id__": 8
     },
     "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
@@ -508,7 +519,6 @@
     "_fillStart": 0,
     "_fillRange": 0,
     "_isTrimmedMode": true,
-    "_state": 0,
     "_atlas": null,
     "_id": "81fx79CjVM1Kze/MPITsY/"
   },
@@ -659,16 +669,14 @@
       "y": 1,
       "z": 1
     },
-    "_quat": {
-      "__type__": "cc.Quat",
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0,
-      "w": 1
+      "z": 0
     },
     "_skewX": 0,
     "_skewY": 0,
-    "_zIndex": 0,
     "_is3DNode": false,
     "groupIndex": 0,
     "_id": "f2TehAxmdKGLoJu9M3gKH0"
@@ -719,16 +727,14 @@
       "y": 1,
       "z": 1
     },
-    "_quat": {
-      "__type__": "cc.Quat",
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0,
-      "w": 1
+      "z": 0
     },
     "_skewX": 0,
     "_skewY": 0,
-    "_zIndex": 0,
     "_is3DNode": false,
     "groupIndex": 0,
     "_id": "a5aBNm3KFH7Z/3pfDtikmT"
@@ -741,8 +747,11 @@
       "__id__": 15
     },
     "_enabled": true,
-    "_srcBlendFactor": 1,
-    "_dstBlendFactor": 771,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
     "_useOriginalSize": false,
     "_string": "改变方向",
     "_N$string": "改变方向",
@@ -752,10 +761,12 @@
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
+    "_batchAsBitmap": false,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 1,
+    "_N$cacheMode": 0,
     "_id": "b5mWQC34tNrpgrhj0y8gim"
   },
   {
@@ -766,6 +777,11 @@
       "__id__": 14
     },
     "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
@@ -782,7 +798,6 @@
     "_fillStart": 0,
     "_fillRange": 0,
     "_isTrimmedMode": true,
-    "_state": 0,
     "_atlas": null,
     "_id": "b5Gw9E9A9DY5/Yw2qk0V1W"
   },
@@ -933,16 +948,14 @@
       "y": 1,
       "z": 1
     },
-    "_quat": {
-      "__type__": "cc.Quat",
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0,
-      "w": 1
+      "z": 0
     },
     "_skewX": 0,
     "_skewY": 0,
-    "_zIndex": 0,
     "_is3DNode": false,
     "groupIndex": 0,
     "_id": "bbtigalQ9C4p6DHYX38Jyi"
@@ -993,16 +1006,14 @@
       "y": 1,
       "z": 1
     },
-    "_quat": {
-      "__type__": "cc.Quat",
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0,
-      "w": 1
+      "z": 0
     },
     "_skewX": 0,
     "_skewY": 0,
-    "_zIndex": 0,
     "_is3DNode": false,
     "groupIndex": 0,
     "_id": "d5750CXdpP5ondTKYcdvzg"
@@ -1015,8 +1026,11 @@
       "__id__": 21
     },
     "_enabled": true,
-    "_srcBlendFactor": 1,
-    "_dstBlendFactor": 771,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
     "_useOriginalSize": false,
     "_string": "切换骨架",
     "_N$string": "切换骨架",
@@ -1026,10 +1040,12 @@
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
+    "_batchAsBitmap": false,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 1,
+    "_N$cacheMode": 0,
     "_id": "8bAShUKSBCRKnD/+VlMGOH"
   },
   {
@@ -1040,6 +1056,11 @@
       "__id__": 20
     },
     "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
@@ -1056,7 +1077,6 @@
     "_fillStart": 0,
     "_fillRange": 0,
     "_isTrimmedMode": true,
-    "_state": 0,
     "_atlas": null,
     "_id": "beeEQy/HpJF7mv4+8UCAhX"
   },
@@ -1200,18 +1220,17 @@
       "y": 1,
       "z": 1
     },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_zIndex": 0,
-    "_is3DNode": false,
-    "groupIndex": 0,
-    "_id": "89TepPv1hN9bd8pEvzsqo2",
     "_eulerAngles": {
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
       "z": 0
-    }
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "groupIndex": 0,
+    "_id": "89TepPv1hN9bd8pEvzsqo2"
   },
   {
     "__type__": "dragonBones.ArmatureDisplay",
@@ -1221,11 +1240,24 @@
       "__id__": 26
     },
     "_enabled": true,
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
     "_armatureName": "Tourist2",
     "_animationName": "front",
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
     "playTimes": -1,
+    "premultipliedAlpha": false,
+    "_armatureKey": "ab2b5f1e-4a7d-445d-bbf2-6503b74bfb7c#31070209-a57c-4cdf-8a4c-407499a3e303",
+    "_accTime": 0,
+    "_playCount": 0,
+    "_frameCache": null,
+    "_curFrame": null,
+    "_playing": false,
+    "_armatureCache": null,
     "_N$dragonAsset": {
       "__uuid__": "ab2b5f1e-4a7d-445d-bbf2-6503b74bfb7c"
     },
@@ -1234,8 +1266,10 @@
     },
     "_N$_defaultArmatureIndex": 3,
     "_N$_animationIndex": 1,
+    "_N$_defaultCacheMode": 0,
     "_N$timeScale": 1,
     "_N$debugBones": false,
+    "_N$enableBatch": false,
     "_id": "9cKqkcYQ9GF6A3dEvU+LjI"
   },
   {

+ 10 - 5
assets/Script/Lease/LeaseInfo.js

@@ -98,12 +98,17 @@ cc.Class({
     inputLeaseValue(value, e) {
 
         var numberTemp = new RegExp("^[A-Za-z0-9]+$");
+        let limitValue = 100;
+        if (GlobalD.GameSetting && GlobalD.GameSetting.maxLeaseMulti) {
+            limitValue = GlobalD.GameSetting.maxLeaseMulti;
+            console.log("配置的数据limitValue:",limitValue);
+        }
         if (numberTemp.test(value)) {
-            if (Number(value) >= 1 && Number(value) <= 100) {
+            if (Number(value) >= 1 && Number(value) <= limitValue) {
                 this.inputInviteValue = Number(value);
-            } else if (Number(value) > 100) {
+            } else if (Number(value) > limitValue) {
                 //限制只能输入100
-                this.inputInviteValue = 100;
+                this.inputInviteValue = limitValue;
                 this.inputContainer.getComponent(cc.EditBox).string = this.inputInviteValue;
             } else {
                 this.inputInviteValue = 1;
@@ -194,7 +199,7 @@ cc.Class({
                                     // console.log("轮询到土地购买成功!");
                                     GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "土地购买成功!", 2);
                                     //解锁土地操作
-                                    _leaseFarmlandInfo.setLeaseLandInfo(_landData,true);
+                                    _leaseFarmlandInfo.setLeaseLandInfo(_landData, true);
                                     this.onClose();
                                 } else {
                                     //根据update时间判断
@@ -213,7 +218,7 @@ cc.Class({
                                             updateTime: _landData.updateTime
                                         });
                                         // console.log("续租之后的信息:", _landData, _leaseLandInfo, _oldLeaseLandInfo);
-                                        _leaseFarmlandInfo.setLeaseLandInfo(_oldLeaseLandInfo,true);
+                                        _leaseFarmlandInfo.setLeaseLandInfo(_oldLeaseLandInfo, true);
                                         this.onClose();
                                     }
                                 }

+ 4 - 4
assets/Script/ManagerControl.js

@@ -236,10 +236,10 @@ cc.Class({
                 // cc.log(Math.abs(delta.x),'Math.abs(delta.y)',Math.abs(delta.y));
                 // 控制节点移不出屏幕; 
                 //Constants.MoveX 2700
-                var minX = -(Constants.MoveX + 1000 * self.MainCamera.zoomRatio);//;//最小X坐标;
-                var maxX = Constants.MoveX + 1000 * self.MainCamera.zoomRatio;//Constants.MoveMaxX;
-                var minY = -(Constants.MoveY + 1550 * self.MainCamera.zoomRatio); //最小Y坐标;
-                var maxY = Constants.MoveY + 1550 * self.MainCamera.zoomRatio;
+                var minX = -(Constants.MoveLeftX + 1000 * self.MainCamera.zoomRatio);//;//最小X坐标;
+                var maxX = Constants.MoveRightX + 1000 * self.MainCamera.zoomRatio;//Constants.MoveMaxX;
+                var minY = -(Constants.MoveDownY + 1550 * self.MainCamera.zoomRatio); //最小Y坐标;
+                var maxY = Constants.MoveUpY + 1550 * self.MainCamera.zoomRatio;
                 var nPos = self.MainCamera.node.position; //节点实时坐标;
                 if (nPos.x < minX) {
                     nPos.x = minX;

+ 2 - 0
assets/Script/Network/dapp.js

@@ -79,6 +79,8 @@ cc.Class({
                         if (flag && 0 === value.code) {
                             /** 登录成功获取token */
                             utils.setToken(value.data.token);
+                            /** 获取一个游戏的设置数据 */
+                            GlobalD.GameSetting = value.data.gameSetting;
                             /** 登录时候会获取一次游戏端的 userInfo ,后续可以通过userInfo接口获取 */
                             GlobalD.UserInfo = value.data.userInfo;
                             /** 新增userInto 的 attribute */

+ 13 - 2
assets/Script/build/LeaseFarmlandInfo.js

@@ -211,7 +211,13 @@ cc.Class({
                     //更新仓库列表
                     this._buildingView.onUpdateList();
                     // "收获成功!"
-                    GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "收获成功!", 1);
+                    if(value.data.lossAmount>0){
+                        console.log("loss amount:"+value.data.lossAmount);
+                        GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "收获成功!损失了"+ value.data.lossAmount+"个果实", 2);
+                    }else{
+                        GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "收获成功!", 2);
+                    }
+                   
 
                     this.isShowHarvest = false;
                     this.isShowIndex = 0;
@@ -264,7 +270,12 @@ cc.Class({
             leasePanelScript.onInitLeaseInfo(1);
         } else {
             //多倍土地,可以自己输入
-            leasePanelScript.onInitLeaseInfo(this.configLandInfo.initMultiple);
+            let limitValue = this.configLandInfo.initMultiple;
+            if (GlobalD.GameSetting && GlobalD.GameSetting.maxLeaseMulti) {
+                limitValue = GlobalD.GameSetting.maxLeaseMulti;
+                console.log("LeaseFarmland:如果配置 maxLeaseMulti:", limitValue);
+            }
+            leasePanelScript.onInitLeaseInfo(limitValue);
         }
 
 

+ 14 - 2
assets/Script/public/Constants.js

@@ -8,8 +8,14 @@ const EditorOffset = 1100;
 const MapNodeX = 4140;
 const MapNodeY = 5000;
 
-const MoveX = 1500;//2700;
-const MoveY = -600;//250;
+const MoveX = 1800//1500;//2700;
+const MoveY = 0//-600;//250;
+
+const MoveLeftX = 2000;
+const MoveRightX = 1700;
+
+const MoveUpY = 300;
+const MoveDownY = -50;
 
 //TileMap的长和宽是 32 ,Astar
 const TileMapWith = 32;
@@ -18,5 +24,11 @@ module.exports = {
     EditorOffset: EditorOffset,
     MoveY: MoveY,//移动边界设置
     MoveX: MoveX,
+
+    MoveLeftX: MoveLeftX,//移动边界设置
+    MoveRightX: MoveRightX,
+    MoveUpY: MoveUpY,//移动边界设置
+    MoveDownY: MoveDownY,
+
     TileMapWith: TileMapWith,
 }

+ 3 - 0
assets/Script/public/Globals.js

@@ -37,6 +37,9 @@ window.GlobalD = {
     //新手引导
     ManageTask: null,
 
+    //游戏设置
+    GameSetting:null,
+
 
     /**
      * DApp 相关信息操作

+ 26 - 23
assets/Script/public/ManageUI.js

@@ -1229,34 +1229,37 @@ cc.Class({
       console.log(value);
 
       if (0 === value.code) {
-        if (this.StealViewSuccessPrefab) {
-          let _TipView = cc.instantiate(this.StealViewSuccessPrefab)
-          _TipView.parent = this.TipView
-          _TipView.setPosition(cc.v2(0, 0))
-          _TipView
-            .getComponent('StealViewSuccess')
-            .setInfo({ amount: value.data.stealSum });
-        }
+        if (0 !== value.data.stealSum) {
+          if (this.StealViewSuccessPrefab) {
+            let _TipView = cc.instantiate(this.StealViewSuccessPrefab)
+            _TipView.parent = this.TipView
+            _TipView.setPosition(cc.v2(0, 0))
+            _TipView
+              .getComponent('StealViewSuccess')
+              .setInfo({ amount: value.data.stealSum });
+          }
 
-        let BuildingView = cc.find('Canvas/UICamera/BuildingContainer/BuildingView').getComponent('BuildingView');
-        BuildingView.onUpdateList();
-
-        //偷取成功后,关闭对应土地的提示图标
-        let _landBuildingsInfo = cc.find("Canvas/MyMapNode").children;
-        let _stealList = value.data.steals;
-        for (let j = 0; j < _stealList.length; j++) {
-          for (let i = _landBuildingsInfo.length - 1; i >= 0; i--) {
-            let resetLandInfo = _landBuildingsInfo[i];
-            if (resetLandInfo.name == "Labour_205_Holy_Farmland") {
-              let leaseFarmlandInfoScript = resetLandInfo.getComponent("LeaseFarmlandInfo");
-              if (leaseFarmlandInfoScript.leaseLandInfo && leaseFarmlandInfoScript.leaseLandInfo.configLandId == _stealList[j].landId) {
-                leaseFarmlandInfoScript.onHideStealHarvest();
+          let BuildingView = cc.find('Canvas/UICamera/BuildingContainer/BuildingView').getComponent('BuildingView');
+          BuildingView.onUpdateList();
+
+          //偷取成功后,关闭对应土地的提示图标
+          let _landBuildingsInfo = cc.find("Canvas/MyMapNode").children;
+          let _stealList = value.data.steals;
+          for (let j = 0; j < _stealList.length; j++) {
+            for (let i = _landBuildingsInfo.length - 1; i >= 0; i--) {
+              let resetLandInfo = _landBuildingsInfo[i];
+              if (resetLandInfo.name == "Labour_205_Holy_Farmland") {
+                let leaseFarmlandInfoScript = resetLandInfo.getComponent("LeaseFarmlandInfo");
+                if (leaseFarmlandInfoScript.leaseLandInfo && leaseFarmlandInfoScript.leaseLandInfo.configLandId == _stealList[j].landId) {
+                  leaseFarmlandInfoScript.onHideStealHarvest();
+                }
               }
-            }
 
+            }
           }
+        } else {
+          GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "未偷取到果实!", 1);
         }
-
       } else {
         GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), value.msg, 1);
       }

二进制
assets/UI/NSetting/settting_1.png


+ 4 - 4
assets/UI/NSetting/settting_1.png.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 240,
-      "height": 120,
-      "rawWidth": 240,
-      "rawHeight": 120,
+      "width": 147,
+      "height": 74,
+      "rawWidth": 147,
+      "rawHeight": 74,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

二进制
assets/UI/NSetting/settting_2.png


+ 4 - 4
assets/UI/NSetting/settting_2.png.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 240,
-      "height": 120,
-      "rawWidth": 240,
-      "rawHeight": 120,
+      "width": 147,
+      "height": 74,
+      "rawWidth": 147,
+      "rawHeight": 74,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

二进制
assets/res/resUI/BG_DownLeft.jpg


二进制
assets/res/resUI/BG_DownLeft.png


+ 7 - 7
assets/res/resUI/BG_DownLeft.jpg.meta → assets/res/resUI/BG_DownLeft.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.3",
-  "uuid": "7252a2c8-3ead-434f-8543-332f9d2df267",
+  "uuid": "766925ac-7430-4b97-9780-56ac12a56644",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -11,8 +11,8 @@
   "subMetas": {
     "BG_DownLeft": {
       "ver": "1.0.4",
-      "uuid": "eee34e33-5484-491f-a391-d1b7c24d341d",
-      "rawTextureUuid": "7252a2c8-3ead-434f-8543-332f9d2df267",
+      "uuid": "1b91bf03-2db9-47ac-a01c-8f48aa428e92",
+      "rawTextureUuid": "766925ac-7430-4b97-9780-56ac12a56644",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 2010,
-      "height": 1280,
-      "rawWidth": 2010,
-      "rawHeight": 1280,
+      "width": 3349,
+      "height": 2513,
+      "rawWidth": 3349,
+      "rawHeight": 2513,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

二进制
assets/res/resUI/BG_DownRight.jpg


二进制
assets/res/resUI/BG_DownRight.png


+ 7 - 7
assets/res/resUI/BG_DownRight.jpg.meta → assets/res/resUI/BG_DownRight.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.3",
-  "uuid": "da19d084-b4ca-4d07-a2c8-b5d5a55cdfeb",
+  "uuid": "3d5d9199-40fb-4f4f-aba9-6511ff72cd2b",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -11,8 +11,8 @@
   "subMetas": {
     "BG_DownRight": {
       "ver": "1.0.4",
-      "uuid": "6af8bc43-92ca-45eb-986c-96ad120264ba",
-      "rawTextureUuid": "da19d084-b4ca-4d07-a2c8-b5d5a55cdfeb",
+      "uuid": "0417b856-742a-47e7-aca9-895877968d6d",
+      "rawTextureUuid": "3d5d9199-40fb-4f4f-aba9-6511ff72cd2b",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 2010,
-      "height": 1280,
-      "rawWidth": 2010,
-      "rawHeight": 1280,
+      "width": 3349,
+      "height": 2513,
+      "rawWidth": 3349,
+      "rawHeight": 2513,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

二进制
assets/res/resUI/BG_UpLeft.jpg


二进制
assets/res/resUI/BG_UpLeft.png


+ 7 - 7
assets/res/resUI/BG_UpLeft.jpg.meta → assets/res/resUI/BG_UpLeft.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.3",
-  "uuid": "c5ba60d1-a9aa-4fcd-bb0f-b11dea5d8b18",
+  "uuid": "9fcce8cf-1628-4748-b63b-59412341f733",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -11,8 +11,8 @@
   "subMetas": {
     "BG_UpLeft": {
       "ver": "1.0.4",
-      "uuid": "63a4d307-6d94-497e-9c50-314797e350d8",
-      "rawTextureUuid": "c5ba60d1-a9aa-4fcd-bb0f-b11dea5d8b18",
+      "uuid": "a61aa124-3616-4bd3-a550-e266b7cf8473",
+      "rawTextureUuid": "9fcce8cf-1628-4748-b63b-59412341f733",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 2010,
-      "height": 1280,
-      "rawWidth": 2010,
-      "rawHeight": 1280,
+      "width": 3349,
+      "height": 2513,
+      "rawWidth": 3349,
+      "rawHeight": 2513,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

二进制
assets/res/resUI/BG_UpRight.jpg


二进制
assets/res/resUI/BG_UpRight.png


+ 7 - 7
assets/res/resUI/BG_UpRight.jpg.meta → assets/res/resUI/BG_UpRight.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.3",
-  "uuid": "1aed3fbf-f4f2-4647-b46d-2f12a368252c",
+  "uuid": "5a47c932-c6ef-438e-9da4-d72db7f70914",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -11,8 +11,8 @@
   "subMetas": {
     "BG_UpRight": {
       "ver": "1.0.4",
-      "uuid": "a64b6c72-d839-4911-bba8-89e518fa0640",
-      "rawTextureUuid": "1aed3fbf-f4f2-4647-b46d-2f12a368252c",
+      "uuid": "0136c567-1067-4e3a-83e4-d029559b8ebe",
+      "rawTextureUuid": "5a47c932-c6ef-438e-9da4-d72db7f70914",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 2010,
-      "height": 1280,
-      "rawWidth": 2010,
-      "rawHeight": 1280,
+      "width": 3349,
+      "height": 2513,
+      "rawWidth": 3349,
+      "rawHeight": 2513,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

部分文件因为文件数量过多而无法显示