Browse Source

[合并代码]

zhuzhou
陈鹏飞 4 years ago
parent
commit
358af31743
  1. 2
      src/app/ui/collection-tools-building/collection-tools.component.html
  2. 3
      src/app/ui/collection-tools-building/collection-tools.component.ts
  3. 2
      src/app/ui/collection-tools-plan/collection-tools.component.html
  4. 4
      src/app/ui/collection-tools-plan/collection-tools.component.ts
  5. 2
      src/app/ui/collection-tools/collection-tools.component.html
  6. 3
      src/app/ui/collection-tools/collection-tools.component.ts

2
src/app/ui/collection-tools-building/collection-tools.component.html

@ -318,7 +318,7 @@
</div> </div>
<!-- 框选多个素材属性 --> <!-- 框选多个素材属性 -->
<div class="assetsproperty" style="user-select: none" *ngIf="isMultipleAsset"> <div class="assetsproperty" style="user-select: none" *ngIf="isShowProperty && isMultipleAsset">
<div *ngIf="multipleAsset.InteractiveMode == 0"> <div *ngIf="multipleAsset.InteractiveMode == 0">
<p>宽度(像素)</p> <p>宽度(像素)</p>
<input type="number" class="biginput" [(ngModel)]="multipleAsset.Width" (input)="multipleAssetWidthInput()" [disabled]="!isEditPattern || (firstMultipleAssetData.assetData.GameMode == 0 && !pattern)"> <input type="number" class="biginput" [(ngModel)]="multipleAsset.Width" (input)="multipleAssetWidthInput()" [disabled]="!isEditPattern || (firstMultipleAssetData.assetData.GameMode == 0 && !pattern)">

3
src/app/ui/collection-tools-building/collection-tools.component.ts

@ -632,6 +632,7 @@ export class CollectionToolsBuildingComponent implements OnInit {
this.setAssetsProperty(this.canvas.selection.first().assetData) this.setAssetsProperty(this.canvas.selection.first().assetData)
}else if(this.canvas.selection.size()){ }else if(this.canvas.selection.size()){
// console.log('多选') // console.log('多选')
this.isShowProperty = true
this.multipleAssetData = this.canvas.selection.all() this.multipleAssetData = this.canvas.selection.all()
this.firstMultipleAssetData = this.canvas.selection.first() this.firstMultipleAssetData = this.canvas.selection.first()
this.multipleAsset = { this.multipleAsset = {
@ -668,6 +669,8 @@ export class CollectionToolsBuildingComponent implements OnInit {
}); });
}) })
}) })
}else if(this.canvas.selection.size() == 0){
this.isShowProperty = false
} }
}, this) }, this)

2
src/app/ui/collection-tools-plan/collection-tools.component.html

@ -296,7 +296,7 @@
</div> </div>
</div> </div>
<!-- 框选多个素材属性 --> <!-- 框选多个素材属性 -->
<div class="assetsproperty" style="user-select: none" *ngIf="isMultipleAsset"> <div class="assetsproperty" style="user-select: none" *ngIf="isShowProperty && isMultipleAsset">
<div *ngIf="multipleAsset.InteractiveMode == 0"> <div *ngIf="multipleAsset.InteractiveMode == 0">
<p>宽度(像素)</p> <p>宽度(像素)</p>
<input type="number" class="biginput" [(ngModel)]="multipleAsset.Width" (input)="multipleAssetWidthInput()" [disabled]="!isEditPattern || (firstMultipleAssetData.assetData.GameMode == 0 && !pattern)"> <input type="number" class="biginput" [(ngModel)]="multipleAsset.Width" (input)="multipleAssetWidthInput()" [disabled]="!isEditPattern || (firstMultipleAssetData.assetData.GameMode == 0 && !pattern)">

4
src/app/ui/collection-tools-plan/collection-tools.component.ts

@ -627,6 +627,7 @@ export class CollectionToolsPlanComponent implements OnInit {
firstMultipleAssetData:any//当前多选的第一个素材 firstMultipleAssetData:any//当前多选的第一个素材
ngOnInit(): void { ngOnInit(): void {
let _this = this let _this = this
AxMessageSystem.addListener('selectionChanged', ()=>{ AxMessageSystem.addListener('selectionChanged', ()=>{
if(this.canvas.selection.size() == 1){//如果是单选 if(this.canvas.selection.size() == 1){//如果是单选
this.isMultipleAsset = false this.isMultipleAsset = false
@ -634,6 +635,7 @@ export class CollectionToolsPlanComponent implements OnInit {
this.setAssetsProperty(this.canvas.selection.first().assetData) this.setAssetsProperty(this.canvas.selection.first().assetData)
}else if(this.canvas.selection.size()){ }else if(this.canvas.selection.size()){
// console.log('多选') // console.log('多选')
this.isShowProperty = true
this.multipleAssetData = this.canvas.selection.all() this.multipleAssetData = this.canvas.selection.all()
this.firstMultipleAssetData = this.canvas.selection.first() this.firstMultipleAssetData = this.canvas.selection.first()
this.multipleAsset = { this.multipleAsset = {
@ -671,6 +673,8 @@ export class CollectionToolsPlanComponent implements OnInit {
}) })
}) })
// console.log(666,_this.multipleAsset.PropertyInfos) // console.log(666,_this.multipleAsset.PropertyInfos)
}else if(this.canvas.selection.size() == 0){
this.isShowProperty = false
} }
}, this) }, this)

2
src/app/ui/collection-tools/collection-tools.component.html

@ -370,7 +370,7 @@
</div> </div>
</div> </div>
<!-- 框选多个素材属性 --> <!-- 框选多个素材属性 -->
<div class="assetsproperty" style="user-select: none" *ngIf="isMultipleAsset"> <div class="assetsproperty" style="user-select: none" *ngIf="isShowProperty && isMultipleAsset">
<div *ngIf="multipleAsset.InteractiveMode == 0"> <div *ngIf="multipleAsset.InteractiveMode == 0">
<p>宽度(像素)</p> <p>宽度(像素)</p>
<input type="number" class="biginput" [(ngModel)]="multipleAsset.Width" (input)="multipleAssetWidthInput()" [disabled]="!isEditPattern || (firstMultipleAssetData.assetData.GameMode == 0 && !pattern)"> <input type="number" class="biginput" [(ngModel)]="multipleAsset.Width" (input)="multipleAssetWidthInput()" [disabled]="!isEditPattern || (firstMultipleAssetData.assetData.GameMode == 0 && !pattern)">

3
src/app/ui/collection-tools/collection-tools.component.ts

@ -642,6 +642,7 @@ export class CollectionToolsComponent implements OnInit {
this.setAssetsProperty(this.canvas.selection.first().assetData) this.setAssetsProperty(this.canvas.selection.first().assetData)
}else if(this.canvas.selection.size()){ }else if(this.canvas.selection.size()){
// console.log('多选') // console.log('多选')
this.isShowProperty = true
this.multipleAssetData = this.canvas.selection.all() this.multipleAssetData = this.canvas.selection.all()
this.firstMultipleAssetData = this.canvas.selection.first() this.firstMultipleAssetData = this.canvas.selection.first()
this.multipleAsset = { this.multipleAsset = {
@ -678,6 +679,8 @@ export class CollectionToolsComponent implements OnInit {
}); });
}) })
}) })
}else if(this.canvas.selection.size() == 0){
this.isShowProperty = false
} }
}, this) }, this)

Loading…
Cancel
Save