Merge branch 'feature/equip'

shared/resource/jsons/dic_army_developmentConsume.json

@@ -19,7 +19,7 @@
         "max": 2,
         "honourConsume": "40005&60",
         "fundConsume": 19000,
-        "timeConsume": 1200
+        "timeConsume": 20
     },
     {
         "id": 3,
@@ -30,7 +30,7 @@
         "max": 3,
         "honourConsume": "40005&50",
         "fundConsume": 27000,
-        "timeConsume": 1800
+        "timeConsume": 30
     },
     {
         "id": 4,
@@ -41,7 +41,7 @@
         "max": 1,
         "honourConsume": "40005&70",
         "fundConsume": 40000,
-        "timeConsume": 2700
+        "timeConsume": 40
     },
     {
         "id": 5,
@@ -52,7 +52,7 @@
         "max": 2,
         "honourConsume": "40005&60",
         "fundConsume": 40000,
-        "timeConsume": 2700
+        "timeConsume": 50
     },
     {
         "id": 6,
@@ -63,7 +63,7 @@
         "max": 3,
         "honourConsume": "40005&50",
         "fundConsume": 31000,
-        "timeConsume": 2700
+        "timeConsume": 60
     },
     {
         "id": 7,
@@ -74,7 +74,7 @@
         "max": 1,
         "honourConsume": "40005&70",
         "fundConsume": 45000,
-        "timeConsume": 4800
+        "timeConsume": 70
     },
     {
         "id": 8,
@@ -85,7 +85,7 @@
         "max": 2,
         "honourConsume": "40005&60",
         "fundConsume": 60000,
-        "timeConsume": 7200
+        "timeConsume": 80
     },
     {
         "id": 9,
@@ -96,7 +96,7 @@
         "max": 3,
         "honourConsume": "40005&50",
         "fundConsume": 40000,
-        "timeConsume": 2700
+        "timeConsume": 90
     },
     {
         "id": 10,
@@ -107,7 +107,7 @@
         "max": 1,
         "honourConsume": "40005&70",
         "fundConsume": 48000,
-        "timeConsume": 5400
+        "timeConsume": 100
     },
     {
         "id": 11,
@@ -118,7 +118,7 @@
         "max": 2,
         "honourConsume": "40005&60",
         "fundConsume": 66000,
-        "timeConsume": 8400
+        "timeConsume": 110
     },
     {
         "id": 12,
@@ -129,7 +129,7 @@
         "max": 3,
         "honourConsume": "40005&50",
         "fundConsume": 86000,
-        "timeConsume": 10800
+        "timeConsume": 120
     },
     {
         "id": 13,
@@ -140,7 +140,7 @@
         "max": 1,
         "honourConsume": "40005&70",
         "fundConsume": 40000,
-        "timeConsume": 2700
+        "timeConsume": 130
     },
     {
         "id": 14,
@@ -151,7 +151,7 @@
         "max": 2,
         "honourConsume": "40005&60",
         "fundConsume": 84000,
-        "timeConsume": 10800
+        "timeConsume": 140
     },
     {
         "id": 15,
@@ -162,6 +162,6 @@
         "max": 3,
         "honourConsume": "40005&50",
         "fundConsume": 115000,
-        "timeConsume": 16800
+        "timeConsume": 150
     }
 ]

shared/resource/jsons/dic_zyz_shoptype.json

@@ -37,22 +37,22 @@
     },
     {
         "typeid": 11,
-        "name": "二星套装"
+        "name": "蓝品图纸"
     },
     {
         "typeid": 12,
-        "name": "三星套装"
+        "name": "紫品图纸"
     },
     {
         "typeid": 13,
-        "name": "四星套装"
+        "name": "橙品图纸"
     },
     {
         "typeid": 14,
-        "name": "五星套装"
+        "name": "红品图纸"
     },
     {
         "typeid": 15,
-        "name": "六星套装"
+        "name": "金品图纸"
     }
 ]