Merge branch 'v7' of https://github.com/mindustry-antigrief/mindustry…

…-client into foo-v7

core/assets/bundles/bundle_zh_CN.properties

@@ -1254,12 +1254,17 @@ ability.statusfield = 状态场
 ability.unitspawn = 单位工厂
 ability.shieldregenfield = 护盾再生场
 ability.movelightning = 闪电助推器
+ability.moveeffect = 移动效果
 ability.shieldarc = 弧形护盾
 ability.suppressionfield = 修复压制场
 ability.energyfield = 能量场：
 ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
 ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
 ability.regen = Regeneration
+ability.armorplate = 装甲
+ability.spawndeath = 死亡时生成
+ability.liquidregen = 从液体中再生
+ability.liquidexplode = 死亡时释放液体
 
 bar.onlycoredeposit = 仅核心可丢入资源
 bar.drilltierreq = 需要更高级的钻头
@@ -1463,7 +1468,7 @@ setting.drawselectionvanilla.description = 选择一块区域时绘制的轮廓
 setting.drawcursors.name = 绘制玩家光标
 setting.drawdisplayborder.name = 绘制逻辑显示屏和画板的边框
 setting.tracelogicunits.name = 追踪单位控制逻辑
-setting.tracelogicunits.description = 光标悬浮在处理器上时在其与受控单位之间绘制线条
+setting.tracelogicunits.description = 光标悬停在处理器上时在其与受控单位之间绘制线条
 setting.enemyunitranges.name = 当炮塔范围启用时显示敌人单位的范围
 setting.allyunitranges.name = 当己方炮塔范围启用时显示己方单位的范围
 setting.highlightselectedgraph.name = 高亮当前所选的电力图

core/src/mindustry/input/InputHandler.java

@@ -38,6 +38,7 @@
 import mindustry.net.Administration.*;
 import mindustry.net.*;
 import mindustry.type.*;
+import mindustry.ui.*;
 import mindustry.ui.fragments.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
@@ -1324,6 +1325,12 @@ protected void drawSelection(int x1, int y1, int x2, int y2, int maxLength, Colo
             Draw.color(col2, .3f);
             Fill.crect(result.x, result.y, result.x2 - result.x, result.y2 - result.y);
         }
+        Font font = Fonts.outline;
+        font.setColor(col2);
+        font.getData().setScale(1 / (4 * Scl.scl(1)));
+        font.draw((int)(result.x2 - result.x) / 8 + "x" + (int)(result.y2 - result.y) / 8, result.x2, result.y);
+        font.setColor(Color.white);
+        font.getData().setScale(1);
     }
 
     protected void flushSelectPlans(Seq<BuildPlan> plans){