补充合成动画

assets/script/data/model/GridMap/GridMapModel.ts

@@ -134,10 +134,10 @@ export default class GridMapModel extends GridMapModelData {
                     toCell.SetCube(fromCell.GetCube());
                     fromCell.SetCube(null);
                 } else if (this.CanMergeItems(fromCell, toCell)) {
-                    toCell.GetCube().PlayMergeAnim();
                     fromCell.ClearCube();
                     toCell.ClearCube();
-                    EventMng.emit(GridEvent.HC_MERGE_RSP, { cell: toCell, cube: tCube });
+                    let cube = toCell.CreateCube(tCube);
+                    cube.PlayMergeAnim();
                 } else {
                     this.SwitchCell(fromCell, toCell);
                 }

assets/script/logic/fgui/Home/Home/HomeCtrl.ts

@@ -77,7 +77,6 @@ export class HomeCtrl extends FguiViewCtrl<HomeVM> {
     private AddListeners(): void {
         this.RegisterClick(this.VM.BtnPlays, this.OnClickBtnPlays);
         this.RegisterClick(this.VM.BtnWing, this.OnClickBtnWing);
-        this.initEvent(GridEvent.HC_MERGE_RSP, this.OnHcMergeRsp);
     }
     private RemoveListeners(): void {
         // <#UIEventsRemoveArea>

assets/script/logic/gridMap/GridEvent.ts

@@ -2,7 +2,6 @@
 
 export class GridEvent {
     static readonly HC_INFO_RSP = "HC_INFO_RSP";//接收棋盘信息
-    static readonly HC_MERGE_RSP = "HC_MERGE_RSP";//接收棋盘合成结果
     static readonly TRIGGER_EMITTER = "TRIGGER_EMITTER";//触发发射器生成道具
     static readonly HC_SP_UP = "HC_SP_UP";//体力刷新
     static readonly HC_MERGE_TIP = "HC_MERGE_TIP";//合成提示

assets/script/logic/gridMap/UECube.ts

@@ -146,8 +146,8 @@ export default class UECube extends UEBase {
     /** 播放合成动画 */
     PlayMergeAnim() {
         cc.tween(this.itemNode)
-            .by(0.1, { position: cc.v3(0, 40) })
-            .by(0.1, { position: cc.v3(0, -40) })
+            .by(0.15, { position: cc.v3(0, 60) })
+            .by(0.13, { position: cc.v3(0, -60) })
             .by(0.1, { position: cc.v3(0, 10) })
             .by(0.1, { position: cc.v3(0, -10) })
             .start();

assets/script/logic/gridMap/UEGridMap.ts

@@ -78,7 +78,6 @@ export default class UEGridMap extends UEBase {
         this.gridLayer.on(cc.Node.EventType.TOUCH_CANCEL, this.OnTouchEnd, this);
         this.initEvent(GridEvent.TRIGGER_EMITTER, this.TriggerEmitter);
         this.initEvent(GridEvent.HC_INFO_RSP, this.LoadMapData);
-        this.initEvent(GridEvent.HC_MERGE_RSP, this.OnHcMergeRsp);
         this.initEvent(GridEvent.HC_FIGHT_OVER, this.OnHcFightOver);
         this.initEvent(GridEvent.HC_CELL_SELECT, this.OnHcCellSelect);
     }
@@ -146,16 +145,6 @@ export default class UEGridMap extends UEBase {
         }
     }
 
-    private OnHcMergeRsp(data: { cell: UECell, cube: HcInfoGeziInfo }) {
-        let mergeCube = data.cell.CreateCube(data.cube);
-        mergeCube.Init({
-            type: data.cube.type,
-            id: data.cube.correlationId,
-            idx: data.cell.GetIdx(),
-        });
-        //播放经验爆炸飞行动画
-
-    }