|
|
@@ -592,9 +592,9 @@ export default class Game extends cc.Component {
|
|
|
public doFlyExpAni(exp: number, startPos: cc.Node, data) {
|
|
|
let pos = this.lbl_farmLevel.node.parent.convertToWorldSpaceAR(this.lbl_farmLevel.node.getPosition());
|
|
|
let num = 3;
|
|
|
- if (gData.harvestData.isMatchOrder) {
|
|
|
- num = 1;
|
|
|
- }
|
|
|
+ // if (gData.harvestData.isMatchOrder) {
|
|
|
+ // num = 3;
|
|
|
+ // }
|
|
|
mk.fly.PlayCoinAnim(2, num, startPos, pos, () => {
|
|
|
if (gData.gameData.playerProp.gradeLevel < data.farmLevel) {
|
|
|
gData.gameData.playerProp.gradeLevel = data.farmLevel;
|
|
|
@@ -1033,6 +1033,7 @@ export default class Game extends cc.Component {
|
|
|
mk.tip.pop("订单未完成");
|
|
|
} else {
|
|
|
this.getOrderReward();
|
|
|
+ mk.data.sendDataEvent(DataEventId.button_click, "订单领奖按钮");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1072,12 +1073,12 @@ export default class Game extends cc.Component {
|
|
|
}
|
|
|
await this.updataOrderProgress(this.orderPicIdArray[i].ID);
|
|
|
//await mk.time.WaitForSeconds(1);
|
|
|
- for (let index = 0; index != 3; ++index) {
|
|
|
+ for (let index = 0; index != 5; ++index) {
|
|
|
let crop = await mk.pool.getPrefab('game/prefab/crop');
|
|
|
let sf = await mk.loader.load(plantPath + plantId, cc.SpriteFrame);
|
|
|
crop.getComponent(cc.Sprite).spriteFrame = sf;
|
|
|
mk.fly.playFlyAniExtra(farmNode, this.sp_cropIcon[i].node, crop, 0.6, index * 0.2, () => {
|
|
|
- if (index == 1) {
|
|
|
+ if (index == 2) {
|
|
|
this.doFlyOrderAni(i);
|
|
|
}
|
|
|
});
|