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

assets/script/game/data/GameData.ts

@@ -135,7 +135,7 @@ export class GameData {
         this.gameData.initPiggyBank(res_data.piggyBank);
         this.gameData.piggyBankCashTimes = res_data.piggyBankCashTimes;
         this.gameData.redMoney = res_data.redMoney == null ? 0 : res_data.redMoney;
-        this.gameData.signInDay = res_data.signInDay;
+        this.gameData.signInDay = 8;//res_data.signInDay;
         this.gameData.totalPiggyBankCashTimes = res_data.totalPiggyBankCashTimes;
         this.gameData.turntableTimes = res_data.turntableTimes;
         this.gameData.userTuCaoInfo = res_data.userTuCaoInfo;

assets/script/game/game/Farmer.ts

@@ -41,7 +41,7 @@ export class Farmer extends cc.Component {
                 this.forwardMask.node.active = !(this.backMask.node.active = false);
             }
         }
-
+return;
         if(this.refreshTime >=0)
         {
             this.refreshTime -= dt;

assets/script/game/module/sign/Sign.ts

@@ -46,9 +46,10 @@ export default class Sign extends cc.Component {
         if (index > 0)
             index -= 1;
         //index = 4;
-        this.tableview.contentMoveByIndex(index, 0.01);
-        this.scroll_view.vertical = false;
-        cc.tween(this.node).delay(0.2).call(()=>{
+        this.tableview.contentMoveByIndex(index, 0.01);    
+        cc.tween(this.node).delay(0.1).call(()=>{
+            this.scroll_view.vertical = false;
+        }).delay(0.1).call(()=>{
             let allItem = this.tableview.getItemByIndexAndCount(index, 3);
             allItem && allItem.sort((a, b)=>{
 
@@ -58,8 +59,9 @@ export default class Sign extends cc.Component {
             for(let i = 0; i != len; ++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}).start();
             }
             console.log("---");
         }).delay(0.7).call(()=>{