@cc-component/cc-ex-component 2.1.1 → 2.1.3

package/assets/core/ViewModel.ts

@@ -21,6 +21,7 @@ import { SpriteFrame } from 'cc';
 import { tween } from 'cc';
 import { v3 } from 'cc';
 import { BaseReference } from '../core/BaseReference';
+import { Tween } from 'cc';
 
 
 interface IBindingData extends ITableViewEvents, IBindingDataEvents {
@@ -491,7 +492,11 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
                     tween(btn.node).to(btn.duration, { scale: v3(scale, scale, scale) }).start()
                 }
                 btn[this.touch_end_scale] = () => {
-                    tween(btn.node).to(btn.duration, { scale: v3(1, 1, 1) }).start()
+                    const obj = { time: scale }
+                    Tween.stopAllByTarget(btn.node)
+                    tween(obj).to(btn.duration, { time: 1 }, {
+                        onUpdate: (obj) => { if (btn.node?.isValid) { btn.node.scale = v3(obj.time, obj.time, obj.time) } }
+                    }).start()
                 }
                 btn.node.on(Node.EventType.TOUCH_START, btn[this.touch_start_scale])
                 btn.node.on(Node.EventType.TOUCH_END, btn[this.touch_end_scale])

package/assets/lib/collectView/lib_collect/yx-collection-view.ts

@@ -945,7 +945,13 @@ export class YXCollectionView extends Component {
             count = this.numberOfItems
         }
         const layout = (this.layout as any)
-        const size: math.Size = layout.itemSize
+
+        let size: math.Size;
+        if (layout.itemSize instanceof Function) {
+            size = layout.itemSize()
+        } else {
+            size = layout.itemSize
+        }
         const space = layout.horizontalSpacing
         const width = size.width
         const ut = this.node.getComponent(UITransform)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cc-component/cc-ex-component",
-    "version": "2.1.1",
+    "version": "2.1.3",
     "engine": ">=3.8.6",
     "description": "系统组件添加常用扩展方法",
     "main": "index.ts",