Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

src/app/babylon/model/info/mark/model-info-mark.ts

@@ -262,18 +262,13 @@ export class ModelInfo_mark extends ModelInfo {
         if (this.markData.property.taskType != MarkTask.None) {
             this.uiNumber.text = this.markData.property.getInstitutionNum();
             this.uiTask.text = this.markData.property.task;
-            this.uiNumber
+            if (this.markData.property.isMainCharacter) {
-            let instance = this;
+                this.uiFollowHeadBg.background = BabylonUIStyleTool.c_color_3d_redBg;
-            // setTimeout(() => {
+            }
-            //     if (instance.uiNumber == null) {
+            else {
-            //         return;
+                this.uiFollowHeadBg.background = BabylonUIStyleTool.c_color_3d_blueBg;
-            //     }
+            }
-            //     let numWidth = instance.uiNumber.widthInPixels;
+
-            //     let taskWidth = instance.uiTask.widthInPixels;
-            //     let maxWidth = Math.max(numWidth, taskWidth, this.c_uiDefaultWidth);
-            //     instance.uiFollowHead.widthInPixels = maxWidth;
-            //     // instance.uiFollowHeadBg.widthInPixels = maxWidth;
-            // }, (100));
 
             // console.log("喷水", this.taskNeedWaterParticle());
             if (this.taskNeedWaterParticle()) {

src/app/babylon/tool/babylon-ui-style-tool.ts

@@ -24,6 +24,8 @@ export class BabylonUIStyleTool {
     static c_color_3d_blue: string = "#47E0FF";//蓝， 框体
     static c_color_3d_blueBg: string = "#122F49";//蓝黑，背景
 
+    static c_color_3d_redBg: string = "#990000";//红黑，背景
+
     static c_shadow_blur_button = 2;//按钮的阴影模糊
     static c_shadow_blur_window = 20; //界面的阴影模糊