456

assets/edit_game.scene

@@ -15204,7 +15204,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -99.674,
+      "y": -100,
       "z": 0
     },
     "_lrot": {
@@ -15410,7 +15410,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 12,
-      "height": 850
+      "height": 920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -15619,7 +15619,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 425,
+      "y": 460,
       "z": 0
     },
     "_lrot": {
@@ -15658,7 +15658,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 840,
-      "height": 850
+      "height": 920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -15743,7 +15743,7 @@
     "_verticalCenter": 0,
     "_isAbsLeft": true,
     "_isAbsRight": true,
-    "_isAbsTop": false,
+    "_isAbsTop": true,
     "_isAbsBottom": true,
     "_isAbsHorizontalCenter": true,
     "_isAbsVerticalCenter": true,
@@ -15975,7 +15975,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 224.297,
-      "y": 468.538,
+      "y": 480,
       "z": 0
     },
     "_lrot": {
@@ -16264,7 +16264,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 353.7,
-      "y": 468.538,
+      "y": 480,
       "z": 0
     },
     "_lrot": {
@@ -16537,7 +16537,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 840,
-      "height": 850
+      "height": 920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -173267,8 +173267,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1919.9999999999998,
-      "height": 1919.9999999999998
+      "width": 1920,
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -175072,8 +175072,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1919.9999999999998,
-      "height": 1919.9999999999998
+      "width": 1920,
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -175163,8 +175163,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1919.9999999999998,
-      "height": 1919.9999999999998
+      "width": 1920,
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/script/config.ts

@@ -6,7 +6,7 @@ const { ccclass, property } = _decorator;
 export class config {
     static debug = true;
     static domain = "https://zcapi.xwrun.com";
-    static is_MAC_edit = true; //目前临时处理
+    static is_MAC_edit = false; //目前临时处理
     static select_res_and_control_type = {
         RES_TYPE:0,
         CONTROL_TYPE:1,

assets/script/edit/animation/edit_animation.ts

@@ -137,8 +137,8 @@ export class edit_animation extends Component {
         bindTarget.opacity = up_frame.transparent;
         bindTarget.size = new Size(up_frame.size_width,up_frame.size_height)
         bindTarget.pos = new Vec3(up_frame.pos_x-origin_x,up_frame.pos_y-origin_y)
-        bindTarget.anchorPointX = up_frame.anchor_point_x
-        bindTarget.anchorPointY = up_frame.anchor_point_y
+        bindTarget.anchorPointX = up_frame.anchor_point_x==undefined?0.5:up_frame.anchor_point_x
+        bindTarget.anchorPointY = up_frame.anchor_point_y==undefined?0.5:up_frame.anchor_point_y
         let color_opactiy_tw_size = tween(bindTarget)
         .to( tweenDuration, { pos:n_pos,color: _color,opacity:frame.transparent,size:new Size(frame.size_width,frame.size_height),rotation:frame.rotation, anchorPointX:frame.anchor_point_x, anchorPointY:frame.anchor_point_y }, {
             onUpdate(tar:BindTarget){

assets/script/edit/animation/new_frame.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, Director, director, EditBox, Label, Node, Sprite, SpriteFrame, UITransform } from 'cc';
+import { _decorator, Component, Director, director, EditBox, Label, Node, ScrollView, Sprite, SpriteFrame, UITransform } from 'cc';
 import { tools } from '../../tools';
 import { ani_frame, bag_item_data } from '../../../data/data';
 import { Attributes } from '../Attributes';
@@ -8,6 +8,7 @@ const { ccclass, property } = _decorator;
 
 @ccclass('new_frame')
 export class new_frame extends Component {
+    @property(Node) scrollView:Node = null;
     @property(Node) btn_sure:Node = null;
     @property(Node) btn_cancle:Node = null;
 
@@ -128,6 +129,7 @@ export class new_frame extends Component {
     }
 
     public show(up_frame:ani_frame=null){
+        this.scrollView.getComponent(ScrollView).scrollToTop()
         this.edit_status = false;
         this.m_up_frame = up_frame;
         this.node.active = true;
@@ -170,6 +172,7 @@ export class new_frame extends Component {
     }
 
     public show_edit(item:frame_item,up_frame:ani_frame=null){
+        this.scrollView.getComponent(ScrollView).scrollToTop()
         this.m_up_frame = up_frame;
         this.node.active = true;
         this.m_data = item.getData();

assets/script/run/scene_page.ts

@@ -224,8 +224,8 @@ export class scene_page extends Component {
         this.bindTarget.opacity = up_frame.transparent;
         this.bindTarget.size = new Size(up_frame.size_width,up_frame.size_height)
         this.bindTarget.pos = new Vec3(up_frame.pos_x,up_frame.pos_y)
-        this.bindTarget.anchorPointX = up_frame.anchor_point_x
-        this.bindTarget.anchorPointY = up_frame.anchor_point_y
+        this.bindTarget.anchorPointX = up_frame.anchor_point_x==undefined?0.5:up_frame.anchor_point_x
+        this.bindTarget.anchorPointY = up_frame.anchor_point_y==undefined?0.5:up_frame.anchor_point_y
    
         let color_opactiy_tw_size = tween(this.bindTarget)
         .to( tweenDuration, { pos:n_pos,color: _color,opacity:frame.transparent,size:new Size(frame.size_width,frame.size_height),rotation:frame.rotation, anchorPointX:frame.anchor_point_x, anchorPointY:frame.anchor_point_y }, {

assets/script/run/widget/widget_base.ts

@@ -221,10 +221,8 @@ export class widget_base extends Component {
         this.bindTarget.opacity = up_frame.transparent;
         this.bindTarget.size = new Size(up_frame.size_width,up_frame.size_height)
         this.bindTarget.pos = new Vec3(up_frame.pos_x,up_frame.pos_y)
-        let anchor_point_x = up_frame.anchor_point_x == undefined?0.5:up_frame.anchor_point_x
-        this.bindTarget.anchorPointX = anchor_point_x
-        let anchor_point_y = up_frame.anchor_point_y == undefined?0.5:up_frame.anchor_point_y
-        this.bindTarget.anchorPointY = anchor_point_y
+        this.bindTarget.anchorPointX = up_frame.anchor_point_x==undefined?0.5:up_frame.anchor_point_x
+        this.bindTarget.anchorPointY = up_frame.anchor_point_y==undefined?0.5:up_frame.anchor_point_y
 
         let color_opactiy_tw_size = tween(this.bindTarget)
         .to( tweenDuration, { pos:n_pos,color: _color,opacity:frame.transparent,size:new Size(frame.size_width,frame.size_height),rotation:frame.rotation, anchorPointX:frame.anchor_point_x, anchorPointY:frame.anchor_point_y}, {