Merge branch 'master' of http://git.mokasz.com/zouyong/tower_sanguo

tower_sanguo/assets/resources/data/db_data.json

@@ -5,7 +5,7 @@
         "yb": 0,
         "redbag": 0,
         "barrack": 15,
-        "mission_arrive": 1,
+        "mission_arrive": 40,
         "mission_passed": 0,
         "prestige": 10000,
         "useserver": 0
@@ -22,7 +22,7 @@
         },
         {
             "id": 113015,
-            "pos": 1,
+            "pos": -1,
             "exp": 0,
             "lv": 1,
             "star": 3,
@@ -40,7 +40,7 @@
         },
         {
             "id": 113013,
-            "pos": 3,
+            "pos": -1,
             "exp": 0,
             "lv": 1,
             "star": 7,

tower_sanguo/assets/resources/module/fight/prefab/general_game.prefab

@@ -113,8 +113,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 443.56,
-      "height": 443.56
+      "width": 227,
+      "height": 226
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -132,8 +132,8 @@
         0,
         0,
         1,
-        0.8,
-        0.8,
+        0.7,
+        0.7,
         1
       ]
     },
@@ -320,7 +320,7 @@
       "ctor": "Float64Array",
       "array": [
         1,
-        179,
+        140,
         0,
         0,
         0,
@@ -1198,7 +1198,7 @@
       "__id__": 5
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 33

tower_sanguo/assets/resources/module/fight/prefab_texture/jy.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "c4e8727f-a40f-47f1-96dd-d918fb81eb10",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 88,
+  "height": 118,
+  "platformSettings": {},
+  "subMetas": {
+    "jy": {
+      "ver": "1.0.4",
+      "uuid": "b7c9e88a-8abd-4d6c-a8a4-32c54fc434f2",
+      "rawTextureUuid": "c4e8727f-a40f-47f1-96dd-d918fb81eb10",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 88,
+      "height": 118,
+      "rawWidth": 88,
+      "rawHeight": 118,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/scripts/data/GameData.ts

@@ -75,7 +75,7 @@ export default class GameData {
         'star', 'help', 'turntable', 'taskActive', 'task', 'commanderskill', 'openfun'];
 
     /** 是否使用本地资源，不使用oss资源 */
-    private useLocal: boolean = false;
+    private useLocal: boolean = true;
 
     async initLocalConfigs() {
         console.log('initLocalConfigs');

tower_sanguo/assets/scripts/module/fight/model/generals/General.ts

@@ -124,9 +124,9 @@ export default class General extends FightModel implements IPool {
     init(pos, v) {
         this.pos = pos;
         if (pos == 4) {
-            this.scaleRate = 0.8;
+            this.scaleRate = 0.7;
             this.skeleton.node.scaleX = this.skeleton.node.scaleY = this.scaleRate;
-            this.bar_lv.y = 180;
+            this.bar_lv.y = 140;
             this.bar_lv.scale = 1.2;
             this.img_belong.node.x = -83;
             this.img_belong.node.y = -18;
@@ -134,9 +134,9 @@ export default class General extends FightModel implements IPool {
             this.lbl_name.fontSize = 30;
         }
         else {
-            this.scaleRate = 0.65;
+            this.scaleRate = 0.57;
             this.skeleton.node.scaleX = this.skeleton.node.scaleY = this.scaleRate;
-            this.bar_lv.y = 142;
+            this.bar_lv.y = 110;
             this.bar_lv.scale = 1;
             this.img_belong.node.x = -61;
             this.img_belong.node.y = -16;

tower_sanguo/assets/scripts/module/main/MainUI.ts

@@ -262,7 +262,7 @@ export default class MainUI extends BaseUI {
                 this.task_red.active = TaskModel.checkMainRed();
                 break;
             case PLAYERPROP.FOODRECOVER:
-                this.lbl_foodAdd.string = value + "/s";
+                this.lbl_foodAdd.string = value + "点/秒";
                 this.showBtnExpUpOrLcBtn();
                 break;
             case PLAYERPROP.FOODCONSUME: