修复:现在拽拖应用材质可以修改面域和复合实体

src/DatabaseServices/Entity/Region.ts

@@ -382,13 +382,10 @@ export class Region extends Entity
                 }
             }
         }
-        else
+        else if (type === RenderType.Physical)
         {
-            for (let m of obj.children)
-            {
-                let mesh = m as Mesh;
-                mesh.material = this.MeshMaterial;
-            }
+            let mesh = obj as Mesh;
+            mesh.material = this.MeshMaterial;
         }
     }
 

src/UI/Components/SourceManage/MaterialList.tsx

@@ -10,6 +10,7 @@ import { inflate, MaterialIn, MaterialInAndAppendAppData } from '../../../Common
 import { DuplicateRecordCloning } from '../../../Common/Status';
 import { GetEntity, getFileSize } from '../../../Common/Utils';
 import { Board } from '../../../DatabaseServices/Entity/Board';
+import { CompositeEntity } from '../../../DatabaseServices/Entity/CompositeEntity';
 import { Region } from '../../../DatabaseServices/Entity/Region';
 import { PhysicalMaterialRecord } from '../../../DatabaseServices/PhysicalMaterialRecord';
 import { CommandWrap } from '../../../Editor/CommandMachine';
@@ -135,7 +136,7 @@ export class MaterialList extends React.Component<IImgListProps, {}> {
                     for (let o of selectObj)
                     {
                         let en = GetEntity(o);
-                        if (en instanceof Board || en instanceof Region)
+                        if (en instanceof Board || en instanceof Region || en instanceof CompositeEntity)
                             en.Material = mtl.Id;
                         if (en instanceof Board)
                         {

src/UI/Components/ToolBar/ResourceLibrary/Resource_ResourceList.tsx

@@ -10,9 +10,7 @@ import { PostJson } from '../../../../Common/Request';
 import { Hole } from '../../../../DatabaseServices/3DSolid/Hole';
 import { Board } from '../../../../DatabaseServices/Entity/Board';
 import { CommandWrap } from '../../../../Editor/CommandMachine';
-import { userConfig } from '../../../../Editor/UserConfig';
 import { VisualSpaceBox } from '../../../../Editor/VisualSpaceBox';
-import { ApplyGoodInfo } from '../../Asset';
 import { AppToaster } from '../../Toaster';
 import ModuleReport from './ModuleReport';
 import { MyRadio, MyRadio2 } from './MyRadio';
@@ -478,8 +476,8 @@ export class ResourceItem extends Component<{ module: ModuleData; }, {}>
                             en.Material = material.Id;
                             if (en instanceof Board)
                             {
-                                if (userConfig.isModifyMaterial)
-                                    ApplyGoodInfo(en, material);
+                                // if (userConfig.isModifyMaterial) //因为这个材质没有板材 所以我们不改它.
+                                //     ApplyGoodInfo(en, material);
                                 brCount++;
                             }
                             count++;

src/UI/Components/ToolBar/ResourceLibrary/RsourceStore.ts

@@ -13,6 +13,7 @@ import { UpdateDraw } from "../../../../Common/Status";
 import { GetEntity } from "../../../../Common/Utils";
 import { Board } from "../../../../DatabaseServices/Entity/Board";
 import { GetBoxGeoBufferGeometry } from "../../../../DatabaseServices/Entity/BoxSolid";
+import { CompositeEntity } from "../../../../DatabaseServices/Entity/CompositeEntity";
 import { EntityRef } from "../../../../DatabaseServices/Entity/EntityRef";
 import { Region } from "../../../../DatabaseServices/Entity/Region";
 import { PhysicalMaterialRecord } from "../../../../DatabaseServices/PhysicalMaterialRecord";
@@ -91,7 +92,7 @@ export default class ResourceStore
                 for (let o of selectObj)
                 {
                     let en = GetEntity(o);
-                    if (en instanceof Board || en instanceof Region)
+                    if (en instanceof Board || en instanceof Region || en instanceof CompositeEntity)
                         en.Material = mtl.Id;
                 }