[合并]合并代码冲突

angular.json

@@ -34,7 +34,9 @@
             ],
             "scripts": [
               "node_modules/echarts/dist/echarts.js",
-              "./node_modules/swiper/js/swiper.min.js"
+              "./node_modules/swiper/js/swiper.min.js",
+              "src/assets/unityAppliction/Build/UnityLoader.js",
+              "src/assets/unityAppliction/TemplateData/UnityProgress.js"
             ]
           },
           "configurations": {
@@ -72,7 +74,7 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
             "browserTarget": "anxin119:build",
-			"proxyConfig": "proxy.config.json"
+            "proxyConfig": "proxy.config.json"
           },
           "configurations": {
             "production": {
@@ -129,6 +131,10 @@
           }
         }
       }
-    }},
-  "defaultProject": "anxin119"
+    }
+  },
+  "defaultProject": "anxin119",
+  "cli": {
+    "analytics": false
+  }
 }

src/app/ui/plan/plan.component.html

@@ -0,0 +1 @@
+<app-unity></app-unity>

src/app/ui/ui.module.ts

@@ -94,9 +94,10 @@ import { ImagesData } from './fire-fighting-device/imagesdata.component';
 import { ImgsDataDetail } from './fire-fighting-device/imgsdatadetail.component';
 import { KeySiteImgs } from './key-site/keysiteimgs.component';
 import { KeyImgDetail } from './key-site/keyimgdetail.component';
+import { UnityComponent} from './unity/unity.component';
 
 @NgModule({
-  declarations: [UiComponent, CardComponent, StepperComponent, TabgroupComponent, ProgressComponent, SnackbarComponent,PersonaldataComponent, UserdataComponent, ChangepasswordComponent, OrganizationComponent, UnittypeComponent, AuthorityComponent, RoleComponent, UsermanagementComponent,IsnoPipe,ConfirmpswDirective,DialogOverviewExampleDialog,CreateAuthority,CreateRole,EditRole,TimePipe,CreateNewUser,EditNewUser,allRoles,SharePower,CreateOrganization,EditOrganization,seeInformation,EditUser,editorialUnit,FireProtectionElementsComponent,Establish,EditingFireControl,FireFightingTemplateComponent, NavmenusComponent,CreateMenus,EditMenus,NewFireFighting,EditFireClassification, MaterialBankComponent, UnitInformationComponent,AddMatLibrary,EditMatLibrary,attributeComponent,AddOriginalCopy,addAttributeComponent,editAttribute,EditOriginalCopy,SelectOriginalCopy,EditUnitInfo,AddUnitInfo,AddGroups,EditGroup, BasicinfoComponent, PlanComponent, AllaroundComponent, FireFightingDeviceComponent, KeySiteComponent, FunctionDivisionComponent, RealisticPictureComponent, UploadingCADComponent,AddHouseInfo,ImgDetails,ImagesData,ImgsDataDetail,KeySiteImgs,KeyImgDetail,addPartition,addPartitionAttribute,previewImg,addRealPicture,editRealPicture
+  declarations: [UiComponent, CardComponent, StepperComponent, TabgroupComponent, ProgressComponent, SnackbarComponent,PersonaldataComponent, UserdataComponent, ChangepasswordComponent, OrganizationComponent, UnittypeComponent, AuthorityComponent, RoleComponent, UsermanagementComponent,IsnoPipe,ConfirmpswDirective,DialogOverviewExampleDialog,CreateAuthority,CreateRole,EditRole,TimePipe,CreateNewUser,EditNewUser,allRoles,SharePower,CreateOrganization,EditOrganization,seeInformation,EditUser,editorialUnit,FireProtectionElementsComponent,Establish,EditingFireControl,FireFightingTemplateComponent, NavmenusComponent,CreateMenus,EditMenus,NewFireFighting,EditFireClassification, MaterialBankComponent, UnitInformationComponent,AddMatLibrary,EditMatLibrary,attributeComponent,AddOriginalCopy,addAttributeComponent,editAttribute,EditOriginalCopy,SelectOriginalCopy,EditUnitInfo,AddUnitInfo,AddGroups,EditGroup, BasicinfoComponent, PlanComponent, AllaroundComponent, FireFightingDeviceComponent, KeySiteComponent, FunctionDivisionComponent, RealisticPictureComponent, UploadingCADComponent,AddHouseInfo,ImgDetails,ImagesData,ImgsDataDetail,KeySiteImgs,KeyImgDetail,addPartition,addPartitionAttribute,previewImg,addRealPicture,editRealPicture,UnityComponent
   ],
 
   imports: [

src/app/ui/unity/unity.component.html

@@ -0,0 +1,3 @@
+<div class="webgl-content">
+    <div id="unityContainer"></div>
+  </div>

src/app/ui/unity/unity.component.scss

@@ -0,0 +1,4 @@
+#unityContainer{
+    width: 100%; 
+    height: 100%; 
+}

src/app/ui/unity/unity.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UnityComponent } from './unity.component';
+
+describe('UnityComponent', () => {
+  let component: UnityComponent;
+  let fixture: ComponentFixture<UnityComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ UnityComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UnityComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/ui/unity/unity.component.ts

@@ -0,0 +1,19 @@
+import { Component, OnInit } from '@angular/core';
+
+declare var UnityLoader: any;
+declare var UnityProgress: any;
+
+@Component({
+  selector: 'app-unity',
+  templateUrl: './unity.component.html',
+  styleUrls: ['./unity.component.scss']
+})
+export class UnityComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+    UnityLoader.instantiate('unityContainer', 'assets/unityAppliction/Build/build.json', {onProgress: UnityProgress});
+  }
+
+}

tsconfig.json

@@ -1,6 +1,7 @@
 {
   "compileOnSave": false,
   "compilerOptions": {
+    "allowJs": true,
     "baseUrl": "./",
     "outDir": "./dist/out-tsc",
     "sourceMap": true,

typing.d.ts

@@ -0,0 +1 @@
+declare var UnityLoader : any;