首页修改

assets/bundle/FGUI/Home/Home_atlas0.png.meta

@@ -20,12 +20,12 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -57.5,
-      "offsetY": 2,
+      "offsetX": -0.5,
+      "offsetY": 0,
       "trimX": 1,
       "trimY": 1,
-      "width": 907,
-      "height": 506,
+      "width": 1021,
+      "height": 510,
       "rawWidth": 1024,
       "rawHeight": 512,
       "borderTop": 0,

assets/bundle/gridMap/UEMergeTipItem.prefab

@@ -461,7 +461,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 55.15,
+      "width": 60.27,
       "height": 41.8
     },
     "_anchorPoint": {
@@ -474,7 +474,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -32,
+        -36.994,
         0,
         0,
         0,
@@ -515,7 +515,7 @@
     "_dstBlendFactor": 771,
     "_string": "100%",
     "_N$string": "100%",
-    "_fontSize": 20,
+    "_fontSize": 22,
     "_lineHeight": 30,
     "_enableWrapText": true,
     "_N$file": null,

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 {
-    xlsEquipInfo: xlsEquipInfo[]
+    xlsAttrAttr: xlsAttrAttr[]
     xlsKaiqiInfo: xlsKaiqiInfo[]
+    xlsItemKind: xlsItemKind[]
+    xlsItemInfo: xlsItemInfo[]
+    xlsEmitterInfo: xlsEmitterInfo[]
+    xlsEquipInfo: xlsEquipInfo[]
+    xlsLanguageClientText: xlsLanguageClientText[]
+    xlsLevelLevel: xlsLevelLevel[]
+    xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
     xlsChapterInfo: xlsChapterInfo[]
     xlsChapterLayout: xlsChapterLayout[]
-    xlsLanguageClientText: xlsLanguageClientText[]
     xlsAudioInfo: xlsAudioInfo[]
-    xlsPingbiciInfo: xlsPingbiciInfo[]
-    xlsNameName: xlsNameName[]
-    xlsMergeInfo: xlsMergeInfo[]
-    xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
-    xlsAttrAttr: xlsAttrAttr[]
+    xlsGuideInfo: xlsGuideInfo[]
     xlsMathInfo: xlsMathInfo[]
-    xlsItemKind: xlsItemKind[]
-    xlsItemInfo: xlsItemInfo[]
-    xlsEmitterInfo: xlsEmitterInfo[]
-    xlsPackageInfo: xlsPackageInfo[]
     xlsTaskDesc: xlsTaskDesc[]
     xlsTaskMain: xlsTaskMain[]
+    xlsMergeInfo: xlsMergeInfo[]
+    xlsNameName: xlsNameName[]
     xlsMergePropInfo: xlsMergePropInfo[]
-    xlsLevelLevel: xlsLevelLevel[]
-    xlsGuideInfo: xlsGuideInfo[]
+    xlsPackageInfo: xlsPackageInfo[]
+    xlsPingbiciInfo: xlsPingbiciInfo[]
     xlsLanguageLang: xlsLanguageLang[]
 
     constructor(bundleName:string, callback: Function, progressCallback?: Function) {

assets/script/logic/gridMap/UEGridMap.ts

@@ -217,7 +217,9 @@ export default class UEGridMap extends UEBase {
             const targetCell = this.GetCellByPos(touchPos);
             this.lastMoveCell?.SetSelect(false);
             this.lastMoveCell = targetCell;
-            targetCell?.SetSelect(true);
+            if (targetCell && !targetCell.IsLock()) {
+                targetCell?.SetSelect(true);
+            }
             if (targetCell && targetCell != this.selectedCell) {
                 if (!targetCell.IsEmpty() && GameDataCenter.gridMap.CellCanPut(this.selectedCell, targetCell)) {
                     this.ueMergeTip.node.setPosition(targetCell.node.getPosition());
@@ -255,11 +257,12 @@ export default class UEGridMap extends UEBase {
             }
         } else {
             if (!this.isDragging) return;
-            if (targetCell && targetCell != this.selectedCell) {
+            if (targetCell && targetCell != this.selectedCell && !targetCell.IsLock()) {
                 GameDataCenter.gridMap.TryMergeItems(this.selectedCell, targetCell);
                 this.selectedCell.SetSelect(false);
                 targetCell.SetSelect(true);
             } else {
+                this.CheckSell();
                 this.selectedCell.GetCube().BackToOriginalPos(true);
             }
             this.isDragging = false;
@@ -268,6 +271,17 @@ export default class UEGridMap extends UEBase {
 
     }
 
+    /** 检测物品是否拖动到售卖区域售卖 */
+    private CheckSell() {
+        let sellPos = cc.v2(0, 0);
+        let sellSize = cc.size(GridConstant.CELL_WIDTH, GridConstant.CELL_WIDTH);
+        let sellRect = cc.rect(sellPos.x, sellPos.y, sellSize.width, sellSize.height);
+        let cubePos = this.selectedCell.GetCube().node.getPosition();
+        // if (cc.rectContainsPoint(sellRect, cubePos)) {
+        //     this.selectedCell.GetCube().PlayJellyAnim();
+        // }
+    }
+
     /** 根据像素坐标获取格子 */
     private GetCellByPos(pos: cc.Vec2): UECell | null {
         const startX = -(GridConstant.ROW * GridConstant.CELL_WIDTH) / 2;

assets/script/shared/admin/PtlroleData.ts

@@ -0,0 +1,22 @@
+
+
+/**
+* 请求接口
+*/
+export interface ReqroleData {
+    uuid: string;
+}
+
+/**
+* 返回信息
+*/
+export interface ResroleData {
+    order10Back: any
+}
+
+export const conf = {
+    connet: "admin"
+}
+
+
+

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

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "ef2d1034-8700-4af1-9ebe-b823207a6963",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/hc/PtlHcInfo.ts

@@ -27,6 +27,10 @@ export interface HcInfoGeziInfo {
     type:HcType   //具体物品类型 0:无物品 1:发射器 2:怪物 3:装备 4:材料
     unlock:HcUnlock  //解锁状态
     correlationId:number  //物品ID
+    emitter?:{
+        unlock:HcUnlock  //解锁状态
+        
+    }
 }
 //具体物品类型
 export enum HcType {

assets/script/shared/hc/PtlHcSell.ts

@@ -0,0 +1,26 @@
+import { HcInfoGeziInfo } from "./PtlHcInfo";
+
+
+/**
+* 请求接口 出售
+*/
+export interface ReqHcSell {
+    gzid:string
+}
+
+/**
+* 返回信息
+*/
+export interface ResHcSell {
+    list:{
+        [gzid: string]: HcInfoGeziInfo;
+    },
+    items:number[][]
+}
+
+export const conf = {
+    connet: "ws"
+}
+
+
+

assets/script/shared/hc/PtlHcSell.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "38fb59f6-61c8-4f09-b4e3-a7a263ac5f1a",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/serviceProto.ts

@@ -18,6 +18,7 @@ import { ReqhuodongAdd, ReshuodongAdd } from './admin/PtlhuodongAdd';
 import { ReqhuodongDelete, ReshuodongDelete } from './admin/PtlhuodongDelete';
 import { ReqhuodongEdit, ReshuodongEdit } from './admin/PtlhuodongEdit';
 import { ReqhuodongFind, ReshuodongFind } from './admin/PtlhuodongFind';
+import { ReqroleData, ResroleData } from './admin/PtlroleData';
 import { RequpdateMail, ResupdateMail } from './admin/PtlupdateMail';
 import { RequpdateQuFu, ResupdateQuFu } from './admin/PtlupdateQuFu';
 import { RequpdateSetting, ResupdateSetting } from './admin/PtlupdateSetting';
@@ -33,6 +34,7 @@ import { ReqFightTest, ResFightTest } from './fight/PtlFightTest';
 import { ReqHcEmit, ResHcEmit } from './hc/PtlHcEmit';
 import { ReqHcInfo, ResHcInfo } from './hc/PtlHcInfo';
 import { ReqHcMerge, ResHcMerge } from './hc/PtlHcMerge';
+import { ReqHcSell, ResHcSell } from './hc/PtlHcSell';
 import { MsgHcTili_s } from './hc/server/MsgHcTili_s';
 import { ReqItemInfo, ResItemInfo } from './item/PtlItemInfo';
 import { MsgItemChange_s } from './item/server/MsgItemChange_s';
@@ -131,6 +133,10 @@ export interface ServiceType {
             req: ReqhuodongFind,
             res: ReshuodongFind
         },
+        "admin/roleData": {
+            req: ReqroleData,
+            res: ResroleData
+        },
         "admin/updateMail": {
             req: RequpdateMail,
             res: ResupdateMail
@@ -175,6 +181,10 @@ export interface ServiceType {
             req: ReqHcMerge,
             res: ResHcMerge
         },
+        "hc/HcSell": {
+            req: ReqHcSell,
+            res: ResHcSell
+        },
         "item/ItemInfo": {
             req: ReqItemInfo,
             res: ResItemInfo
@@ -246,7 +256,7 @@ export interface ServiceType {
 }
 
 export const serviceProto: ServiceProto<ServiceType> = {
-    "version": 63,
+    "version": 64,
     "services": [
         {
             "id": 39,
@@ -401,6 +411,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
             }
         },
         {
+            "id": 92,
+            "name": "admin/roleData",
+            "type": "api",
+            "conf": {
+                "connet": "admin"
+            }
+        },
+        {
             "id": 44,
             "name": "admin/updateMail",
             "type": "api",
@@ -509,6 +527,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
             }
         },
         {
+            "id": 92,
+            "name": "hc/HcSell",
+            "type": "api",
+            "conf": {
+                "connet": "ws"
+            }
+        },
+        {
             "id": 91,
             "name": "hc/server/HcTili_s",
             "type": "msg"
@@ -1079,6 +1105,30 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
+        "admin/PtlroleData/ReqroleData": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "uuid",
+                    "type": {
+                        "type": "String"
+                    }
+                }
+            ]
+        },
+        "admin/PtlroleData/ResroleData": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "order10Back",
+                    "type": {
+                        "type": "Any"
+                    }
+                }
+            ]
+        },
         "admin/PtlupdateMail/RequpdateMail": {
             "type": "Interface",
             "properties": [
@@ -1709,6 +1759,24 @@ export const serviceProto: ServiceProto<ServiceType> = {
                     "type": {
                         "type": "Number"
                     }
+                },
+                {
+                    "id": 3,
+                    "name": "emitter",
+                    "type": {
+                        "type": "Interface",
+                        "properties": [
+                            {
+                                "id": 0,
+                                "name": "unlock",
+                                "type": {
+                                    "type": "Reference",
+                                    "target": "hc/PtlHcInfo/HcUnlock"
+                                }
+                            }
+                        ]
+                    },
+                    "optional": true
                 }
             ]
         },
@@ -1896,6 +1964,50 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
+        "hc/PtlHcSell/ReqHcSell": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "gzid",
+                    "type": {
+                        "type": "String"
+                    }
+                }
+            ]
+        },
+        "hc/PtlHcSell/ResHcSell": {
+            "type": "Interface",
+            "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"
+                            }
+                        }
+                    }
+                }
+            ]
+        },
         "hc/server/MsgHcTili_s/MsgHcTili_s": {
             "type": "Interface",
             "properties": [

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

@@ -1,16 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="750,302" designImage="ui://1xjqm8v2f6x03f" designImageOffsetY="-1032" designImageAlpha="0" designImageLayer="1">
+<component size="750,302" designImage="ui://1xjqm8v2j5c83l" designImageOffsetY="-1032" designImageAlpha="0" designImageLayer="1">
+  <controller name="TypeCtr" pages="0,,1," selected="1">
+    <remark page="0" value="合成提示"/>
+    <remark page="1" value="售卖提示"/>
+  </controller>
   <displayList>
     <image id="n36_f6x0" name="n36" src="rnf91l" fileName="Images/home/Img_zjm_shuxingdi01.jpg" xy="375,302" pivot="0.5,1" anchor="true" size="750,264" group="n31_tt6a"/>
     <image id="n30_tt6a" name="n30" src="f6x03e" fileName="Images/home/Img_zjm_xiangqingdi.png" xy="375,288" pivot="0.5,1" anchor="true" size="730,208" group="n31_tt6a">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </image>
-    <list id="n35_tt6a" name="MergeList" xy="378,203" pivot="0.5,0.5" anchor="true" size="664,167" group="n31_tt6a" layout="row" overflow="scroll" scroll="horizontal" colGap="2" defaultItem="ui://1xjqm8v2tt6aj" align="center" vAlign="middle" autoClearItems="true">
+    <list id="n35_tt6a" name="MergeList" xy="415,206" pivot="0.5,0.5" anchor="true" size="664,167" group="n31_tt6a" layout="row" overflow="scroll" scroll="horizontal" colGap="2" defaultItem="ui://1xjqm8v2tt6aj" align="center" vAlign="middle" autoClearItems="true">
+      <gearDisplay controller="TypeCtr" pages="0"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
+    <loader id="n37_j5c8" name="QualityLoad" xy="98,183" pivot="0.5,0.5" anchor="true" size="169,195" group="n40_j5c8" url="ui://1xjqm8v2j5c83h"/>
+    <text id="n38_j5c8" name="NameLabel" xy="312,111" pivot="0.5,0.5" anchor="true" size="186,36" group="n40_j5c8" fontSize="26" color="#83cf6a" strokeColor="#000000" autoClearText="true" text="木头块【材料】"/>
+    <image id="n39_j5c8" name="n39" src="j5c83m" fileName="Images/home/Img_zjm_xiangqingdi00.png" xy="192,205" pivot="0,0.5" anchor="true" size="524,129" group="n40_j5c8"/>
+    <text id="n41_j5c8" name="DescLabel" xy="218,152" size="351,62" group="n40_j5c8" fontSize="22" color="#383044" autoSize="none" text="从家具中从家具中从家具中从从家从家具中"/>
+    <component id="n42_j5c8" name="SellBtn" src="j5c83n" fileName="Components/MergeYellowBtn.xml" xy="652,208" pivot="0.5,0.5" anchor="true" group="n40_j5c8"/>
+    <loader id="n43_j5c8" name="IconLoad" xy="100,175" pivot="0.5,0.5" anchor="true" size="50,50" group="n40_j5c8"/>
+    <text id="n44_j5c8" name="LvLabel" xy="94,233" pivot="0.5,0.5" anchor="true" size="75,36" group="n40_j5c8" fontSize="26" color="#ffffff" strokeColor="#000000" strokeSize="2" text="300级"/>
+    <image id="n45_j5c8" name="n45" src="j5c83p" fileName="Images/home/Img_zjm_pinjiedi.png" xy="144,112" pivot="0.5,0.5" anchor="true" group="n47_j5c8"/>
+    <text id="n46_j5c8" name="QualityLabel" xy="144,111" pivot="0.5,0.5" anchor="true" size="33,34" group="n47_j5c8" fontSize="24" color="#fffca3" strokeColor="#000000" strokeSize="2" text="T3"/>
+    <group id="n47_j5c8" name="QualityGroup" xy="116,94" size="56,34" group="n40_j5c8" advanced="true"/>
+    <group id="n40_j5c8" name="n40" xy="13,85" size="702,195" group="n31_tt6a" advanced="true">
+      <gearDisplay controller="TypeCtr" pages="1"/>
+    </group>
     <group id="n31_tt6a" name="mergeGroup" xy="0,38" size="750,264" visible="false" advanced="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="110,110" extention="Button" designImage="ui://1xjqm8v2j5c83l" designImageOffsetX="-597" designImageOffsetY="-1185" designImageLayer="1">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_j5c8" name="n0" src="rnf915" fileName="Images/home/Btn_zjm_anniuhuang.png" xy="0,0" size="110,110">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n2_j5c8" name="icon" src="j5c83o" fileName="Images/home/Btn_zjm_chushou.png" xy="56,56" pivot="0.5,0.5" anchor="true">
+      <relation target="" sidePair="bottom-bottom"/>
+    </image>
+    <text id="n1_j5c8" name="title" xy="65,-4" size="38,42" fontSize="30" color="#73f241" align="center" vAlign="middle" strokeColor="#000000" strokeSize="2" singleLine="true" text="20">
+      <relation target="" sidePair="right-right,top-top"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

fgui-project/assets/Home/package.xml

@@ -30,7 +30,7 @@
     <image id="rnf912" name="Btn_zjm_wanfa.png" path="/Images/home/"/>
     <image id="rnf913" name="HdLiBao.png" path="/Images/hdIcon/"/>
     <image id="rnf914" name="Btn_zjm_shenyin.png" path="/Images/home/"/>
-    <image id="rnf915" name="Btn_zjm_anniuhuang.png" path="/Images/home/"/>
+    <image id="rnf915" name="Btn_zjm_anniuhuang.png" path="/Images/home/" scale="9grid" scale9grid="28,20,24,5"/>
     <image id="rnf916" name="HdTeHui.png" path="/Images/hdIcon/"/>
     <image id="rnf917" name="Img_zjm_tili.png" path="/Images/home/" exported="true"/>
     <image id="rnf919" name="Img_zjm_fengexian.jpg" path="/Images/home/"/>
@@ -112,6 +112,16 @@
     <component id="ul8q3e" name="PbSpTop.xml" path="/Components/"/>
     <image id="f6x03e" name="Img_zjm_xiangqingdi.png" path="/Images/home/" scale="9grid" scale9grid="44,57,11,15"/>
     <image id="f6x03f" name="主界面013.jpg" path="/NoExports/"/>
+    <image id="j5c83g" name="Img_zjm_xqpinzhi00.png" path="/Images/home/"/>
+    <image id="j5c83h" name="Img_zjm_xqpinzhi01.png" path="/Images/home/"/>
+    <image id="j5c83i" name="Img_zjm_xqpinzhi02.png" path="/Images/home/"/>
+    <image id="j5c83j" name="Img_zjm_xqpinzhi03.png" path="/Images/home/"/>
+    <image id="j5c83k" name="Img_zjm_xqpinzhi04.png" path="/Images/home/"/>
+    <image id="j5c83l" name="主界面02.jpg" path="/NoExports/"/>
+    <image id="j5c83m" name="Img_zjm_xiangqingdi00.png" path="/Images/home/" scale="9grid" scale9grid="24,32,5,64"/>
+    <component id="j5c83n" name="MergeYellowBtn.xml" path="/Components/"/>
+    <image id="j5c83o" name="Btn_zjm_chushou.png" path="/Images/home/"/>
+    <image id="j5c83p" name="Img_zjm_pinjiedi.png" path="/Images/home/"/>
   </resources>
   <publish name="" genCode="true"/>
 </packageDescription>