Merge branch 'master' of http://git.mokasz.com/zouyong/team1_nc

# Conflicts:
#	build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser

assets/script/game/module/blessingBag/BlessingBag.ts

@@ -171,8 +171,9 @@ export default class BlessingBag extends cc.Component {
 
                 for (let i = 0; i != allItem.length; ++i) {
                     //allItem[i].active = true;
-                    allItem[i].setPosition(allItem[i].position.x, allItem[i].position.y - 600);
-                    cc.tween(allItem[i]).delay(i * 0.1).by(0.3, { y: 600 }, cc.easeSineOut()).start();
+                    let posY = allItem[i].position.y
+                    allItem[i].y = posY - 600;
+                    cc.tween(allItem[i]).delay(i * 0.1).to(0.3, { y: posY }, cc.easeSineOut()).start();
                 }
             }).start();
         } else {

build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -4783,9 +4783,10 @@ this.scroll_view = this.itemContent.getComponent(cc.ScrollView);
 this.scroll_view.vertical = !1;
 cc.tween(this.node).delay(.1).call(function() {
 for (var e = t.tableview.getFrontPositionItemByCount(5), o = 0; o != e.length; ++o) {
-e[o].setPosition(e[o].position.x, e[o].position.y - 600);
-cc.tween(e[o]).delay(.1 * o).by(.3, {
-y: 600
+var n = e[o].position.y;
+e[o].y = n - 600;
+cc.tween(e[o]).delay(.1 * o).to(.3, {
+y: n
 }, cc.easeSineOut()).start();
 }
 }).start();

packages-hot-update/cfg.json

@@ -9,7 +9,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/"
     ],
-    "buildTime": 1631524885294,
-    "genTime": 1631524885294,
+    "buildTime": 1631525284180,
+    "genTime": 1631525284180,
     "genVersion": null
 }