调整主界面

assets/bundle/gridMap/images/EXP.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "a97daa83-11e3-4555-be70-f579e88eca4a",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 47,
+  "height": 49,
+  "platformSettings": {},
+  "subMetas": {
+    "EXP": {
+      "ver": "1.0.6",
+      "uuid": "a21c64a3-201b-4902-96e5-4992ec2a975e",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "a97daa83-11e3-4555-be70-f579e88eca4a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 47,
+      "height": 49,
+      "rawWidth": 47,
+      "rawHeight": 49,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/script/common/xlsConfig.ts

@@ -50,27 +50,27 @@ export type xlsTaskMain = {id:string,nextid:string,kind:string,need:number,item:
 // type for wing.excel
 
 export class XlsConfig {
-    xlsAudioInfo: xlsAudioInfo[]
-    xlsEquipInfo: xlsEquipInfo[]
-    xlsEmitterInfo: xlsEmitterInfo[]
-    xlsAttrAttr: xlsAttrAttr[]
-    xlsLanguageClientText: xlsLanguageClientText[]
-    xlsPingbiciInfo: xlsPingbiciInfo[]
+    xlsItemKind: xlsItemKind[]
+    xlsItemInfo: xlsItemInfo[]
     xlsKaiqiInfo: xlsKaiqiInfo[]
+    xlsPackageInfo: xlsPackageInfo[]
+    xlsMergeInfo: xlsMergeInfo[]
+    xlsLevelLevel: xlsLevelLevel[]
+    xlsEquipInfo: xlsEquipInfo[]
+    xlsAudioInfo: xlsAudioInfo[]
     xlsChapterInfo: xlsChapterInfo[]
     xlsChapterLayout: xlsChapterLayout[]
-    xlsItemKind: xlsItemKind[]
-    xlsItemInfo: xlsItemInfo[]
+    xlsEmitterInfo: xlsEmitterInfo[]
+    xlsPingbiciInfo: xlsPingbiciInfo[]
+    xlsNameName: xlsNameName[]
     xlsMergePropInfo: xlsMergePropInfo[]
-    xlsLevelLevel: xlsLevelLevel[]
     xlsTaskDesc: xlsTaskDesc[]
     xlsTaskMain: xlsTaskMain[]
-    xlsNameName: xlsNameName[]
+    xlsAttrAttr: xlsAttrAttr[]
+    xlsLanguageClientText: xlsLanguageClientText[]
     xlsGuideInfo: xlsGuideInfo[]
-    xlsMathInfo: xlsMathInfo[]
-    xlsMergeInfo: xlsMergeInfo[]
-    xlsPackageInfo: xlsPackageInfo[]
     xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
+    xlsMathInfo: xlsMathInfo[]
     xlsLanguageLang: xlsLanguageLang[]
 
     constructor(bundleName:string, callback: Function, progressCallback?: Function) {

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

@@ -98,8 +98,8 @@ export default class GridMapModel extends GridMapModelData {
         if (toCell.IsEmpty() || toCell.GetCube().CanDrag()) {
             let ret = await this.sendHcMerge({ gzid1: fromCell.GetZIndex().toString(), gzid2: toCell.GetZIndex().toString() })
             if (ret && ret.res) {
-                let fCube = ret.res[fromCell.GetZIndex()];
-                let tCube = ret.res[toCell.GetZIndex()];
+                let fCube = ret.res?.list[fromCell.GetZIndex()];
+                let tCube = ret.res.list[toCell.GetZIndex()];
                 if (toCell.IsEmpty()) {
                     //格子上没有物品
                     fromCell.MoveCubeToCell(toCell);

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

@@ -22,6 +22,7 @@ import UEGridMap from "../../../gridMap/UEGridMap";
 import UEMergeTip from "../../../gridMap/UEMergeTip";
 import { BattleMainView } from "../../Battle/BattleMain/BattleMainView";
 import HomeEpsCom from "./HomeEpsCom";
+import HomeMergeTipCom from "./HomeMergeTipCom";
 import HomeMergeTipItem from "./HomeMergeTipItem";
 import HomeTaskCom from "./HomeTaskCom";
 import { HomeVM } from "./HomeVM";
@@ -32,7 +33,7 @@ export class HomeCtrl extends FguiViewCtrl<HomeVM> {
     HeadTopCom: UIHeadTopView;
     HomeEpsCom: HomeEpsCom;
     HomeTaskCom: HomeTaskCom;
-    MergeListUtil: ListUtil;
+    HomeMergeTipCom: HomeMergeTipCom;
     onCollectRes(resCollector: ResCollector, param: any): void {
         resCollector.AddUEClass([UEGridMap, UEMergeTip])
     }
@@ -43,8 +44,8 @@ export class HomeCtrl extends FguiViewCtrl<HomeVM> {
         this.HeadTopCom = new UIHeadTopView(this.VM.HeadTopCom);
         this.HomeEpsCom = new HomeEpsCom(this.VM.EpsCom);
         this.HomeTaskCom = new HomeTaskCom(this.VM.BtnTask);
+        this.HomeMergeTipCom = new HomeMergeTipCom(this.VM.HomeMergeTip);
         this.ueGridMap.Init();
-        this.MergeListUtil = new ListUtil(this.VM.MergeList, HomeMergeTipItem);
 
     }
     async OnShow(intent?: any): Promise<void> {
@@ -52,6 +53,7 @@ export class HomeCtrl extends FguiViewCtrl<HomeVM> {
         this.HeadTopCom.onEnable();
         this.HomeEpsCom.onEnable();
         this.HomeTaskCom.onEnable();
+        this.HomeMergeTipCom.onEnable();
         let bgResSprite = this.VM.BgRoot.node.getComponent(ResSprite);
         if (!bgResSprite) {
             bgResSprite = this.VM.BgRoot.node.addComponent(ResSprite);
@@ -65,12 +67,13 @@ export class HomeCtrl extends FguiViewCtrl<HomeVM> {
         this.HeadTopCom.onDisable();
         this.HomeEpsCom.onDisable();
         this.HomeTaskCom.onDisable();
+        this.HomeMergeTipCom.onDisable();
     }
     //#region UI事件
     private AddListeners(): void {
         this.RegisterClick(this.VM.BtnPlays, this.OnClickBtnPlays);
         this.RegisterClick(this.VM.BtnWing, this.OnClickBtnWing);
-        this.initEvent(GridEvent.HC_MERGE_TIP, this.OnHcMergeTip);
+        this.initEvent(GridEvent.HC_MERGE_RSP, this.OnHcMergeRsp);
     }
     private RemoveListeners(): void {
         // <#UIEventsRemoveArea>
@@ -89,10 +92,23 @@ export class HomeCtrl extends FguiViewCtrl<HomeVM> {
     }
     //#endregion
 
-    private OnHcMergeTip(data: { isShow: boolean, mergeArr: MergeItem[] }): void {
-        this.VM.MergeGroup.visible = data.isShow;
-        if (data.isShow) {
-            this.MergeListUtil.refreshItems(data.mergeArr);
-        }
+
+    /** 播放经验飞行效果 */
+    private OnHcMergeRsp() {
+
+    }
+
+
+    private CreateExpItem() {
+        // let tipsItem = fgui.UIPackage.createObject("Home", "ExpItem", ShowTipsItem) as ShowTipsItem;;
+        // this.showTipsList.push(tipsItem);
+        // if (gameMethod.isEmpty(this.VM.Panel) || gameMethod.isEmpty(tipsItem)) {
+        //     //还未初始化完成
+        //     return null
+        // }
+        // this.VM.Panel.addChild(tipsItem);
+        // tipsItem.x = this.VM.Panel.width / 2;
+        // tipsItem.touchable = false;
+        // return tipsItem;
     }
 }

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

@@ -0,0 +1,42 @@
+import Gamecfg from "../../../../common/gameCfg";
+import { gameMethod } from "../../../../common/gameMethod";
+import { UserEvent } from "../../../../data/const/EventConst";
+import GameDataCenter from "../../../../data/GameDataCenter";
+import { MergeItem } from "../../../../data/model/GridMap/GridMapModel";
+import { ListUtil } from "../../../../frameWork/fgui/ListUtil";
+import EventMng from "../../../../manager/EventMng";
+import { GridEvent } from "../../../gridMap/GridEvent";
+import HomeMergeTipItem from "./HomeMergeTipItem";
+
+export default class HomeMergeTipCom {
+    private _vm: fairygui.GComponent;
+    private MergeList: fgui.GList;
+    private mergeGroup: fgui.GGroup;
+    MergeListUtil: ListUtil;
+
+    public constructor(vm: fgui.GComponent) {
+        this._vm = vm;
+        this.MergeList = vm.getChild('MergeList').asList;
+        this.mergeGroup = vm.getChild('mergeGroup').asGroup;
+        this.MergeListUtil = new ListUtil(this.MergeList, HomeMergeTipItem);
+
+    }
+
+    public onEnable(): void {
+        EventMng.on(GridEvent.HC_MERGE_TIP, this.OnHcMergeTip, this);
+    }
+
+
+    public onDisable(): void {
+        EventMng.off(GridEvent.HC_MERGE_TIP, this.OnHcMergeTip, this);
+
+    }
+
+
+    private OnHcMergeTip(data: { isShow: boolean, mergeArr: MergeItem[] }): void {
+        this.mergeGroup.visible = data.isShow;
+        if (data.isShow) {
+            this.MergeListUtil.refreshItems(data.mergeArr);
+        }
+    }
+}

assets/script/logic/fgui/Home/Home/HomeMergeTipCom.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "520da91b-e3f2-465a-8d68-28c33600cc9a",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

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

@@ -35,8 +35,8 @@ export class HomeVM extends FguiViewModel {
     readonly HeadTopCom: fgui.GComponent;
     readonly HdList: fgui.GList;
     readonly Top: fgui.GGroup;
-    readonly MergeList: fgui.GList;
-    readonly MergeGroup: fgui.GGroup;
+    readonly HomeMergeTip: fgui.GComponent;
+    readonly EffectComp: fgui.GComponent;
 
     constructor(panel: fgui.GComponent) {
         super(panel);
@@ -66,8 +66,8 @@ export class HomeVM extends FguiViewModel {
         this.HeadTopCom = panel.getChild("HeadTopCom") as fgui.GComponent;
         this.HdList = panel.getChild("hdList") as fgui.GList;
         this.Top = panel.getChild("top") as fgui.GGroup;
-        this.MergeList = panel.getChild("MergeList") as fgui.GList;
-        this.MergeGroup = panel.getChild("mergeGroup") as fgui.GGroup;
+        this.HomeMergeTip = panel.getChild("HomeMergeTip") as fgui.GComponent;
+        this.EffectComp = panel.getChild("EffectComp") as fgui.GComponent;
 
     }
 }

assets/script/logic/gridMap/UEGridMap.ts

@@ -109,27 +109,8 @@ export default class UEGridMap extends UEBase {
             unlock: 0
         });
         data.cell.SetCube(mergeCube);
-        // if (toCell.IsEmpty()) {
-        //     //格子上没有物品
-        //     fromCell.MoveCubeToCell(toCell);
-        //     toCell.SetCube(fromCell.GetCube());
-        //     fromCell.SetCube(null);
-        // } else if (this.CanMergeItems(fromCell, toCell)) {
-        //     toCell.GetCube().PlayMergeAnim();
-        //     fromCell.ClearCube();
-        //     toCell.ClearCube();
-        //     let vec = this.TranIdxToPos(toCell.GetZIndex());
-        //     let mergeCube = this.CreateCube(vec.y, vec.x);
-        //     mergeCube.Init({
-        //         type: 3,
-        //         id: 10022,
-        //         zIndex: toCell.GetZIndex(),
-        //         unlock: 0
-        //     });
-        //     toCell.SetCube(mergeCube);
-        // } else {
-        //     this.SwitchCell(fromCell, toCell);
-        // }
+        //播放经验爆炸飞行动画
+
     }
 
     /** 根据索引获取实际像素坐标 */
@@ -403,12 +384,6 @@ export default class UEGridMap extends UEBase {
         return cc.v2(x, y);
     }
 
-    /** 设置物品在圆上的位置 */
-    private SetItemsPosition(mergeArr: any[]) {
-        mergeArr.forEach((item, index) => {
-            const pos = this.GetCirclePosition(index, mergeArr.length);
-            item.node.setPosition(pos);
-        });
-    }
+
 
 }

assets/script/shared/admin/PtlDeleteSetting.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "6e637c21-6dea-4e77-b38c-3e5929271340",
+  "uuid": "78b4b778-2aa2-477c-91ea-c626fdf00ec1",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/admin/PtlGetSetting.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "55e587a4-eecd-4c8f-ba82-cfd73120b94d",
+  "uuid": "c6cd6754-c8aa-4129-a4d2-73a61783756f",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/admin/PtlGetVer.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "187c1865-5b67-4736-8c59-b14cded36ccd",
+  "uuid": "69945e31-5445-43e1-8593-cc4f4e6c4edc",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/admin/PtlHuodongFind.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "b6954a91-c996-4cc9-869f-e794720aad79",
+  "uuid": "6a518063-7272-4b1c-a619-a4d00f6b0f12",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/admin/PtlUpdateSetting.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "b87314b3-8e04-453f-893a-fc5a2e9ce6fb",
+  "uuid": "a547d909-1103-41af-a637-458c8e3441a1",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/hc/PtlHcMerge.ts

@@ -13,7 +13,10 @@ export interface ReqHcMerge {
  * 返回合成信息
  */
 export interface ResHcMerge {
-    [gzid: string]: HcInfoGeziInfo;
+    list:{
+        [gzid: string]: HcInfoGeziInfo;
+    },
+    items:number[][]
 }
 
 export const conf = {

assets/script/shared/serviceProto.ts

@@ -232,7 +232,7 @@ export interface ServiceType {
 }
 
 export const serviceProto: ServiceProto<ServiceType> = {
-    "version": 57,
+    "version": 58,
     "services": [
         {
             "id": 39,
@@ -1594,13 +1594,35 @@ export const serviceProto: ServiceProto<ServiceType> = {
         },
         "hc/PtlHcMerge/ResHcMerge": {
             "type": "Interface",
-            "indexSignature": {
-                "keyType": "String",
-                "type": {
-                    "type": "Reference",
-                    "target": "hc/PtlHcInfo/HcInfoGeziInfo"
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "list",
+                    "type": {
+                        "type": "Interface",
+                        "indexSignature": {
+                            "keyType": "String",
+                            "type": {
+                                "type": "Reference",
+                                "target": "hc/PtlHcInfo/HcInfoGeziInfo"
+                            }
+                        }
+                    }
+                },
+                {
+                    "id": 1,
+                    "name": "items",
+                    "type": {
+                        "type": "Array",
+                        "elementType": {
+                            "type": "Array",
+                            "elementType": {
+                                "type": "Number"
+                            }
+                        }
+                    }
                 }
-            }
+            ]
         },
         "item/PtlItemInfo/ReqItemInfo": {
             "type": "Interface"

fgui-project/assets/Home/Components/HomeMertip.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="750,302">
+  <displayList>
+    <image id="n30_tt6a" name="n30" src="miq99" fileName="Images/NeiRongDi.png" xy="375,151" pivot="0.5,0.5" anchor="true" size="750,302" group="n31_tt6a">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </image>
+    <list id="n35_tt6a" name="MergeList" xy="375,151" pivot="0.5,0.5" anchor="true" size="664,132" group="n31_tt6a" layout="row" overflow="scroll" scroll="horizontal" colGap="10" defaultItem="ui://1xjqm8v2tt6aj" align="center" vAlign="middle" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <group id="n31_tt6a" name="mergeGroup" xy="0,0" size="750,302" visible="false" advanced="true">
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
+  </displayList>
+</component>

fgui-project/assets/Home/Home.xml

@@ -59,18 +59,12 @@
     <group id="n26_miq9" name="top" xy="0,0" size="750,203" advanced="true">
       <relation target="" sidePair="top-top"/>
     </group>
-    <image id="n30_tt6a" name="n30" src="miq99" fileName="Images/NeiRongDi.png" xy="375,1183" pivot="0.5,0.5" anchor="true" size="750,302" group="n31_tt6a">
+    <component id="n30_tt6a" name="HomeMergeTip" src="tt6am" fileName="Components/HomeMertip.xml" xy="375,1183" pivot="0.5,0.5" anchor="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
-    </image>
-    <list id="n35_tt6a" name="MergeList" xy="375,1184" pivot="0.5,0.5" anchor="true" size="664,132" group="n31_tt6a" layout="row" overflow="scroll" scroll="horizontal" colGap="10" defaultItem="ui://1xjqm8v2tt6aj" align="center" vAlign="middle" autoClearItems="true">
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <group id="n31_tt6a" name="mergeGroup" xy="0,1032" size="750,302" visible="false" advanced="true">
-      <relation target="" sidePair="bottom-bottom"/>
-    </group>
+    </component>
+    <component id="n37_tt6a" name="EffectComp" src="e0jk8c" fileName="Components/EmptyCom.xml" pkg="rd135cfr" xy="375,667" pivot="0.5,0.5" anchor="true" size="750,1334" touchable="false">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
   </displayList>
   <scriptData gencodez3qm0="1"/>
 </component>

fgui-project/assets/Home/package.xml

@@ -18,6 +18,7 @@
     <image id="sp2xh" name="ZhanLiBot.png" path="/Images/"/>
     <component id="sp2xi" name="PbTop.xml" path="/Components/"/>
     <component id="tt6aj" name="HomeMergeTipItem.xml" path="/Components/"/>
+    <component id="tt6am" name="HomeMertip.xml" path="/Components/"/>
   </resources>
   <publish name="" genCode="true"/>
 </packageDescription>