1.切换 列表时候回到顶部

2.地图替换更小的分辨率
3.狗的位置调整

assets/Prefabs/Dog/DogContainer.prefab

@@ -60,8 +60,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -912.041,
-      "y": 659.774,
+      "x": -680.506,
+      "y": 722.593,
       "z": 0
     },
     "_scale": {
@@ -120,15 +120,15 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -253.696,
-      "y": -114.078,
+      "x": -6.909,
+      "y": 49.995,
       "z": 0
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 0.485,
-      "y": 0.485,
-      "z": 0.485
+      "x": 0.4,
+      "y": 0.4,
+      "z": 1
     },
     "_eulerAngles": {
       "__type__": "cc.Vec3",
@@ -223,14 +223,14 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -93.646,
-      "y": -100.085,
+      "x": -139.625,
+      "y": -83.506,
       "z": 0
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 0.8,
+      "y": 0.8,
       "z": 1
     },
     "_eulerAngles": {
@@ -326,8 +326,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -96.089,
-      "y": -156.137,
+      "x": -49.975,
+      "y": -76.133,
       "z": 0
     },
     "_scale": {
@@ -435,8 +435,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -172.086,
-      "y": 182.592,
+      "x": -150.209,
+      "y": 199.321,
       "z": 0
     },
     "_scale": {

assets/Scene/MyCityScene - 004.fire

@@ -619,7 +619,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 502.29473419497447
+      "z": 420.8883462392372
     },
     "_scale": {
       "__type__": "cc.Vec3",
@@ -763,7 +763,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 502.29473419497447
+      "z": 420.8883462392372
     },
     "_scale": {
       "__type__": "cc.Vec3",
@@ -2446,8 +2446,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -912.041,
-      "y": 659.774,
+      "x": -680.506,
+      "y": 722.593,
       "z": 0
     },
     "_scale": {
@@ -2506,15 +2506,15 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -253.696,
-      "y": -114.078,
+      "x": -6.909,
+      "y": 49.995,
       "z": 0
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 0.485,
-      "y": 0.485,
-      "z": 0.485
+      "x": 0.4,
+      "y": 0.4,
+      "z": 1
     },
     "_eulerAngles": {
       "__type__": "cc.Vec3",
@@ -2609,14 +2609,14 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -93.646,
-      "y": -100.085,
+      "x": -139.625,
+      "y": -83.506,
       "z": 0
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 0.8,
+      "y": 0.8,
       "z": 1
     },
     "_eulerAngles": {
@@ -2712,8 +2712,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -96.089,
-      "y": -156.137,
+      "x": -49.975,
+      "y": -76.133,
       "z": 0
     },
     "_scale": {
@@ -2821,8 +2821,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -172.086,
-      "y": 182.592,
+      "x": -150.209,
+      "y": 199.321,
       "z": 0
     },
     "_scale": {
@@ -31188,9 +31188,7 @@
     "_materials": [],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "c485efe8-9c20-4d04-aad1-b8d07aceb34d"
-    },
+    "_spriteFrame": null,
     "_type": 0,
     "_sizeMode": 1,
     "_fillType": 0,
@@ -40039,9 +40037,7 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "e55aaaa4-d461-4fe1-a9fb-1ab98afe4124"
-    },
+    "_spriteFrame": null,
     "_type": 0,
     "_sizeMode": 0,
     "_fillType": 0,
@@ -45709,9 +45705,7 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "e55aaaa4-d461-4fe1-a9fb-1ab98afe4124"
-    },
+    "_spriteFrame": null,
     "_type": 0,
     "_sizeMode": 0,
     "_fillType": 0,
@@ -47415,6 +47409,9 @@
       "__id__": 770
     },
     "_enabled": true,
+    "StoreScrollView": {
+      "__id__": 828
+    },
     "Seed": {
       "__id__": 833
     },
@@ -50642,6 +50639,9 @@
     "Fruit": {
       "__id__": 1259
     },
+    "warehouseScrollView": {
+      "__id__": 1253
+    },
     "EvnBtn": null,
     "LabourBtn": null,
     "ShopBtn": null,

assets/Script/Network/dapp.js

@@ -54,7 +54,7 @@ cc.Class({
                     GlobalD.Dapp.UserInfo = res;
 
                     //测试
-                    // GlobalD.Dapp.UserInfo.agent_level = 0;
+                    // GlobalD.Dapp.UserInfo.agent_level = 2;
 
                     // GameNet.getInstance().init(res.id, (data) => {
                     //     console.log('GameNet:' + data);

assets/Script/UI/BuildingView.js

@@ -26,6 +26,12 @@ cc.Class({
       default: null,
       type: cc.Node,
     },
+
+    warehouseScrollView: {
+      default: null,
+      type: cc.ScrollView
+    },
+
     EvnBtn: {
       default: null,
       type: cc.Node,
@@ -107,6 +113,11 @@ cc.Class({
     // if (this.SpeBuilding.active) this.SpeBuilding.active = false
     if (this.Seed.active) this.Seed.active = false
     if (this.Fruit.active) this.Fruit.active = false
+
+    if (this.warehouseScrollView) {
+      this.warehouseScrollView.stopAutoScroll();
+      this.warehouseScrollView.scrollToTop();
+    }
   },
   start() {
     //默认设置第一个节点为 最上面
@@ -376,7 +387,7 @@ cc.Class({
     //   this.SpeBuildingBtn.setSiblingIndex(10)
     //   this.SpeBuildingBtn.setContentSize(110, 100)
     // }else 
-     //种子
+    //种子
     if ('4' == index) {
       //   this.SeedBtn.y = -20
       this.SeedBtn.getComponent(cc.Sprite).spriteFrame =
@@ -404,7 +415,7 @@ cc.Class({
       //   this.FruitBtn.y = -20
       this.FruitBtn.getComponent(cc.Sprite).spriteFrame =
         this.Selecteded_Fruit_Sprite
-      this.Fruit.active = true
+      this.Fruit.active = true;
 
       if (this.myFruitList.length > 0) {
         let Synopsis = this.myFruitList[0].fruitDescribe;

assets/Script/UI/ScrollView_custom.js

@@ -0,0 +1,32 @@
+// Learn cc.Class:
+//  - [Chinese] https://docs.cocos.com/creator/manual/zh/scripting/class.html
+//  - [English] http://docs.cocos2d-x.org/creator/manual/en/scripting/class.html
+// Learn Attribute:
+//  - [Chinese] https://docs.cocos.com/creator/manual/zh/scripting/reference/attributes.html
+//  - [English] http://docs.cocos2d-x.org/creator/manual/en/scripting/reference/attributes.html
+// Learn life-cycle callbacks:
+//  - [Chinese] https://docs.cocos.com/creator/manual/zh/scripting/life-cycle-callbacks.html
+//  - [English] https://www.cocos2d-x.org/docs/creator/manual/en/scripting/life-cycle-callbacks.html
+
+cc.Class({
+    extends: cc.Component,
+
+    properties: {
+      
+    },
+
+    // LIFE-CYCLE CALLBACKS:
+
+    // onLoad () {},
+
+    start() {
+        this.scrollView = this.getComponent(cc.ScrollView);
+    },
+
+    onStopAndGotoTop() {
+        this.scrollView.stopAutoScroll();
+        this.scrollView.scrollToTop();
+    }
+
+    // update (dt) {},
+});

assets/Script/UI/ScrollView_custom.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "6b95859e-b483-4d60-af61-560e85fb3bc2",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/Script/UI/StoreView.js

@@ -2,6 +2,10 @@ cc.Class({
   extends: cc.Component,
 
   properties: {
+    StoreScrollView: {
+      default: null,
+      type: cc.ScrollView
+    },
     Seed: {
       default: null,
       type: cc.Node,
@@ -174,6 +178,11 @@ cc.Class({
     if (this.Seed.active) this.Seed.active = false
     if (this.Exchange.active) this.Exchange.active = false
     if (this.EquipmentCotainer.active) this.EquipmentCotainer.active = false;
+
+    if (this.StoreScrollView) {
+      this.StoreScrollView.stopAutoScroll();
+      this.StoreScrollView.scrollToTop();
+    }
   },
   start() {
     //获取到仓库列表的脚本

assets/Script/adpp/dappListInfo.js

@@ -237,5 +237,12 @@ cc.Class({
     openOutPannel() {
         this.outPanelContainer.active = true;
         this.outPanelContainer.getComponent("CntInfo").setInfo();
+    },
+
+    /**
+     * 返回顶部
+     */
+    onGotoTop(){
+        this.listContainer.y = 0;
     }
 });

assets/res/resUI/farmer/farmer_DownLeft.jpg.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 3349,
-      "height": 2513,
-      "rawWidth": 3349,
-      "rawHeight": 2513,
+      "width": 2048,
+      "height": 1537,
+      "rawWidth": 2048,
+      "rawHeight": 1537,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/res/resUI/farmer/farmer_DownRight.jpg.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 3349,
-      "height": 2513,
-      "rawWidth": 3349,
-      "rawHeight": 2513,
+      "width": 2048,
+      "height": 1537,
+      "rawWidth": 2048,
+      "rawHeight": 1537,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/res/resUI/farmer/farmer_UpLeft.jpg.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 3349,
-      "height": 2513,
-      "rawWidth": 3349,
-      "rawHeight": 2513,
+      "width": 2048,
+      "height": 1537,
+      "rawWidth": 2048,
+      "rawHeight": 1537,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/res/resUI/farmer/farmer_UpRight.jpg.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 3349,
-      "height": 2513,
-      "rawWidth": 3349,
-      "rawHeight": 2513,
+      "width": 2048,
+      "height": 1537,
+      "rawWidth": 2048,
+      "rawHeight": 1537,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/res/resUI/mayor/mayor_DownLeft.jpg.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 3349,
-      "height": 2513,
-      "rawWidth": 3349,
-      "rawHeight": 2513,
+      "width": 2048,
+      "height": 1537,
+      "rawWidth": 2048,
+      "rawHeight": 1537,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/res/resUI/mayor/mayor_DownRight.jpg.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 3349,
-      "height": 2513,
-      "rawWidth": 3349,
-      "rawHeight": 2513,
+      "width": 2048,
+      "height": 1537,
+      "rawWidth": 2048,
+      "rawHeight": 1537,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/res/resUI/mayor/mayor_UpLeft.jpg.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 3349,
-      "height": 2513,
-      "rawWidth": 3349,
-      "rawHeight": 2513,
+      "width": 2048,
+      "height": 1537,
+      "rawWidth": 2048,
+      "rawHeight": 1537,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/res/resUI/mayor/mayor_UpRight.jpg.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 3349,
-      "height": 2513,
-      "rawWidth": 3349,
-      "rawHeight": 2513,
+      "width": 2048,
+      "height": 1537,
+      "rawWidth": 2048,
+      "rawHeight": 1537,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/res/resUI/vallage/vallage_DownLeft.jpg.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 3349,
-      "height": 2513,
-      "rawWidth": 3349,
-      "rawHeight": 2513,
+      "width": 2048,
+      "height": 1537,
+      "rawWidth": 2048,
+      "rawHeight": 1537,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/res/resUI/vallage/vallage_DownRight.jpg.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 3349,
-      "height": 2513,
-      "rawWidth": 3349,
-      "rawHeight": 2513,
+      "width": 2048,
+      "height": 1537,
+      "rawWidth": 2048,
+      "rawHeight": 1537,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/res/resUI/vallage/vallage_UpLeft.jpg.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 3349,
-      "height": 2513,
-      "rawWidth": 3349,
-      "rawHeight": 2513,
+      "width": 2048,
+      "height": 1537,
+      "rawWidth": 2048,
+      "rawHeight": 1537,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/res/resUI/vallage/vallage_UpRight.jpg.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 3349,
-      "height": 2513,
-      "rawWidth": 3349,
-      "rawHeight": 2513,
+      "width": 2048,
+      "height": 1537,
+      "rawWidth": 2048,
+      "rawHeight": 1537,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,