|
|
@@ -245,16 +245,8 @@ export class new_frame extends Component {
|
|
|
this.m_data.rotation = up_frame?up_frame.rotation:0
|
|
|
this.m_data.anchor_point_x = up_frame?up_frame.anchor_point_x:att.anchor_x
|
|
|
this.m_data.anchor_point_y = up_frame?up_frame.anchor_point_y:att.anchor_y
|
|
|
-
|
|
|
- if(up_frame.scale_x==undefined) {
|
|
|
- up_frame.scale_x = 1
|
|
|
- }
|
|
|
- if(up_frame.scale_y==undefined) {
|
|
|
- up_frame.scale_y = 1
|
|
|
- }
|
|
|
-
|
|
|
- this.m_data.scale_x = up_frame.scale_x
|
|
|
- this.m_data.scale_y = up_frame.scale_y
|
|
|
+ this.m_data.scale_x = up_frame?up_frame.scale_x:1
|
|
|
+ this.m_data.scale_y = up_frame?up_frame.scale_y:1
|
|
|
this.lab_origin_pos.getComponent(Label).string = `(x:${Math.floor(att.x)},y:${Math.floor(att.y)})`
|
|
|
this.lab_origin_size.getComponent(Label).string = `(w:${att.width},h:${att.height})`
|
|
|
this.initAtt()
|
