甘艺伟 2 روز پیش
والد
کامیت
0382f7477d
28فایلهای تغییر یافته به همراه240 افزوده شده و 413 حذف شده
  1. 6 6
      assets/bundle/gridMap/UECell.prefab
  2. BIN
      assets/bundle/gridMap/qualityBg/Img_zjm_diban00.jpg
  3. 9 9
      assets/bundle/gridMap/qualityBg/Img_zjm_diban00.jpg.meta
  4. BIN
      assets/bundle/gridMap/qualityBg/Img_zjm_diban01.jpg
  5. 9 9
      assets/bundle/gridMap/qualityBg/Img_zjm_diban01.jpg.meta
  6. BIN
      assets/bundle/gridMap/qualityBg/Img_zjm_diban02.jpg
  7. 9 9
      assets/bundle/gridMap/qualityBg/Img_zjm_diban02.jpg.meta
  8. BIN
      assets/bundle/gridMap/qualityBg/Img_zjm_diban03.jpg
  9. 9 9
      assets/bundle/gridMap/qualityBg/Img_zjm_diban03.jpg.meta
  10. BIN
      assets/bundle/gridMap/qualityBg/Img_zjm_diban04.jpg
  11. 9 9
      assets/bundle/gridMap/qualityBg/Img_zjm_diban04.jpg.meta
  12. BIN
      assets/bundle/gridMap/qualityBg/Img_zjm_diban05.jpg
  13. 9 9
      assets/bundle/gridMap/qualityBg/Img_zjm_diban05.jpg.meta
  14. 1 261
      assets/loadJson/mathInfo.json
  15. 15 15
      assets/script/common/xlsConfig.ts
  16. 16 16
      assets/script/data/model/Battle/BattleModel.ts
  17. 5 10
      assets/script/data/model/GridMap/GridMapModel.ts
  18. 14 5
      assets/script/logic/fgui/Battle/BattleMain/BattleMainCtrl.ts
  19. 30 10
      assets/script/logic/fgui/Home/Home/HomeMergeTipItem.ts
  20. 2 2
      assets/script/logic/gridMap/GridConstant.ts
  21. 5 0
      assets/script/logic/gridMap/UECell.ts
  22. 2 2
      assets/script/logic/gridMap/UECube.ts
  23. 14 31
      assets/script/logic/gridMap/UEGridMap.ts
  24. 1 0
      assets/script/shared/hc/PtlHcInfo.ts
  25. 13 0
      assets/script/shared/hc/server.meta
  26. 11 0
      assets/script/shared/hc/server/MsgHcTili_s.ts
  27. 10 0
      assets/script/shared/hc/server/MsgHcTili_s.ts.meta
  28. 41 1
      assets/script/shared/serviceProto.ts

+ 6 - 6
assets/bundle/gridMap/UECell.prefab

@@ -46,8 +46,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 79,
+      "height": 79
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -116,8 +116,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 79,
+      "height": 79
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -169,7 +169,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "dd0d29f2-669b-4115-b24b-3262caa2f605"
+      "__uuid__": "b04b09db-20fa-4605-aa45-79a5bdc4dc82"
     },
     "_type": 0,
     "_sizeMode": 0,
@@ -181,7 +181,7 @@
     },
     "_fillStart": 0,
     "_fillRange": 0,
-    "_isTrimmedMode": true,
+    "_isTrimmedMode": false,
     "_atlas": null,
     "_id": ""
   },

BIN
assets/bundle/gridMap/qualityBg/Img_zjm_diban00.jpg


+ 9 - 9
assets/bundle/gridMap/qualityBg/Img_zjm_diban00.jpg.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.7",
-  "uuid": "633012b9-fcdd-4f54-86fb-41159748903d",
+  "uuid": "96f0ce1f-ec60-4f24-b590-1f7b55ec68bc",
   "importer": "texture",
   "type": "sprite",
   "wrapMode": "clamp",
@@ -8,15 +8,15 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 84,
-  "height": 84,
+  "width": 93,
+  "height": 93,
   "platformSettings": {},
   "subMetas": {
     "Img_zjm_diban00": {
       "ver": "1.0.6",
-      "uuid": "dd0d29f2-669b-4115-b24b-3262caa2f605",
+      "uuid": "b04b09db-20fa-4605-aa45-79a5bdc4dc82",
       "importer": "sprite-frame",
-      "rawTextureUuid": "633012b9-fcdd-4f54-86fb-41159748903d",
+      "rawTextureUuid": "96f0ce1f-ec60-4f24-b590-1f7b55ec68bc",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -24,10 +24,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 84,
-      "height": 84,
-      "rawWidth": 84,
-      "rawHeight": 84,
+      "width": 93,
+      "height": 93,
+      "rawWidth": 93,
+      "rawHeight": 93,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/bundle/gridMap/qualityBg/Img_zjm_diban01.jpg


+ 9 - 9
assets/bundle/gridMap/qualityBg/Img_zjm_diban01.jpg.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.7",
-  "uuid": "1a98e554-90e2-431b-8e30-1026d16ae34c",
+  "uuid": "ec405db1-22fc-422f-9cc1-21f0ad984c9b",
   "importer": "texture",
   "type": "sprite",
   "wrapMode": "clamp",
@@ -8,15 +8,15 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 84,
-  "height": 84,
+  "width": 93,
+  "height": 93,
   "platformSettings": {},
   "subMetas": {
     "Img_zjm_diban01": {
       "ver": "1.0.6",
-      "uuid": "e33421da-0442-4508-b8d5-ebb85f0e3b6e",
+      "uuid": "26f2232a-9355-4dd9-8a70-c8444023fa14",
       "importer": "sprite-frame",
-      "rawTextureUuid": "1a98e554-90e2-431b-8e30-1026d16ae34c",
+      "rawTextureUuid": "ec405db1-22fc-422f-9cc1-21f0ad984c9b",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -24,10 +24,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 84,
-      "height": 84,
-      "rawWidth": 84,
-      "rawHeight": 84,
+      "width": 93,
+      "height": 93,
+      "rawWidth": 93,
+      "rawHeight": 93,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/bundle/gridMap/qualityBg/Img_zjm_diban02.jpg


+ 9 - 9
assets/bundle/gridMap/qualityBg/Img_zjm_diban02.jpg.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.7",
-  "uuid": "07d5c54c-c08d-4b04-8dfc-a66da0adde8e",
+  "uuid": "7bb27401-ca24-4a6e-9f40-8db9623a2ffc",
   "importer": "texture",
   "type": "sprite",
   "wrapMode": "clamp",
@@ -8,15 +8,15 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 84,
-  "height": 84,
+  "width": 93,
+  "height": 93,
   "platformSettings": {},
   "subMetas": {
     "Img_zjm_diban02": {
       "ver": "1.0.6",
-      "uuid": "76810f52-a016-4a08-bc10-c3829e443282",
+      "uuid": "bda8c6cf-1cf5-4f0c-ab74-b3dfad877ae4",
       "importer": "sprite-frame",
-      "rawTextureUuid": "07d5c54c-c08d-4b04-8dfc-a66da0adde8e",
+      "rawTextureUuid": "7bb27401-ca24-4a6e-9f40-8db9623a2ffc",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -24,10 +24,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 84,
-      "height": 84,
-      "rawWidth": 84,
-      "rawHeight": 84,
+      "width": 93,
+      "height": 93,
+      "rawWidth": 93,
+      "rawHeight": 93,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/bundle/gridMap/qualityBg/Img_zjm_diban03.jpg


+ 9 - 9
assets/bundle/gridMap/qualityBg/Img_zjm_diban03.jpg.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.7",
-  "uuid": "c1aaebc3-01db-4de5-b255-892d37b931fc",
+  "uuid": "d11299c1-b6d3-4dbf-80ac-9125619bd081",
   "importer": "texture",
   "type": "sprite",
   "wrapMode": "clamp",
@@ -8,15 +8,15 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 84,
-  "height": 84,
+  "width": 93,
+  "height": 93,
   "platformSettings": {},
   "subMetas": {
     "Img_zjm_diban03": {
       "ver": "1.0.6",
-      "uuid": "d751da50-7534-4fe9-9eda-caa7e19b5c76",
+      "uuid": "2940e8df-05e9-46d9-b277-b1adad1e73ff",
       "importer": "sprite-frame",
-      "rawTextureUuid": "c1aaebc3-01db-4de5-b255-892d37b931fc",
+      "rawTextureUuid": "d11299c1-b6d3-4dbf-80ac-9125619bd081",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -24,10 +24,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 84,
-      "height": 84,
-      "rawWidth": 84,
-      "rawHeight": 84,
+      "width": 93,
+      "height": 93,
+      "rawWidth": 93,
+      "rawHeight": 93,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/bundle/gridMap/qualityBg/Img_zjm_diban04.jpg


+ 9 - 9
assets/bundle/gridMap/qualityBg/Img_zjm_diban04.jpg.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.7",
-  "uuid": "9f54aced-0d5e-44c5-b349-0250d1079a9e",
+  "uuid": "f1ef0b2a-4137-4447-8c0f-7dcc25aaaf8f",
   "importer": "texture",
   "type": "sprite",
   "wrapMode": "clamp",
@@ -8,15 +8,15 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 84,
-  "height": 84,
+  "width": 93,
+  "height": 93,
   "platformSettings": {},
   "subMetas": {
     "Img_zjm_diban04": {
       "ver": "1.0.6",
-      "uuid": "a7558189-e5f7-4c2c-910a-aa8cf20259ca",
+      "uuid": "24a370f8-30fe-49cc-9836-582eb2d31897",
       "importer": "sprite-frame",
-      "rawTextureUuid": "9f54aced-0d5e-44c5-b349-0250d1079a9e",
+      "rawTextureUuid": "f1ef0b2a-4137-4447-8c0f-7dcc25aaaf8f",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -24,10 +24,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 84,
-      "height": 84,
-      "rawWidth": 84,
-      "rawHeight": 84,
+      "width": 93,
+      "height": 93,
+      "rawWidth": 93,
+      "rawHeight": 93,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/bundle/gridMap/qualityBg/Img_zjm_diban05.jpg


+ 9 - 9
assets/bundle/gridMap/qualityBg/Img_zjm_diban05.jpg.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.7",
-  "uuid": "ab7ff7b3-1f59-4e31-92cc-02af586bd422",
+  "uuid": "816a152a-a503-4154-9d79-db299aa19e51",
   "importer": "texture",
   "type": "sprite",
   "wrapMode": "clamp",
@@ -8,15 +8,15 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 84,
-  "height": 84,
+  "width": 93,
+  "height": 93,
   "platformSettings": {},
   "subMetas": {
     "Img_zjm_diban05": {
       "ver": "1.0.6",
-      "uuid": "762fba63-0886-45ca-b4c2-67fa36413932",
+      "uuid": "713cd218-6f70-490b-a42d-ae16b538c000",
       "importer": "sprite-frame",
-      "rawTextureUuid": "ab7ff7b3-1f59-4e31-92cc-02af586bd422",
+      "rawTextureUuid": "816a152a-a503-4154-9d79-db299aa19e51",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -24,10 +24,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 84,
-      "height": 84,
-      "rawWidth": 84,
-      "rawHeight": 84,
+      "width": 93,
+      "height": 93,
+      "rawWidth": 93,
+      "rawHeight": 93,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

+ 1 - 261
assets/loadJson/mathInfo.json

@@ -1,263 +1,3 @@
 [
-  {"key":"daowen_change_item","pram":{"item":[1,1311]}},
-  {"key":"daowen_fushuxing_up","pram":{"count":5}},
-  {"key":"daowen_xiaohao","pram":{"count":1,"item":[1,2,200]}},
-  {"key":"daowen_xilian","pram":{"count":20}},
-  {"key":"daowen_jifengbaoxiang_open_item","pram":{"count":5000,"count1":10}},
-  {"key":"daowen_cangku_num","pram":{"count":200,"count1":250}},
-  {"key":"daowen_aimunlock_cost_item","pram":{"item":[1,158,1]}},
-  {"key":"daowen_aimunlock_cost_item2","pram":{"item":[1,1,10]}},
-  {"key":"daowen_aimunlock_cost_item3","pram":{"items":[[1,158,2],[1,1,20]]}},
-  {"key":"daoyou_item","pram":{"items":[[1,111,1],[1,110,1],[1,109,1]]}},
-  {"key":"digong_hf","pram":{"count":60,"count1":200}},
-  {"key":"digong_hp","pram":{"item":[1,129,1],"kv":{"hp":3000}}},
-  {"key":"digong_strong","pram":{"item":[1,128,1],"kv":{"atk_per":250},"count":2}},
-  {"key":"digong_no_challenge","pram":{"count":85800}},
-  {"key":"digong_sweep_video_rwd","pram":{"item":[1,128,3],"count":2}},
-  {"key":"digong_max_rwd","pram":{"items":[[1,130,3067],[1,2,150000]]}},
-  {"key":"digong_sweep_limit","pram":{"count":10}},
-  {"key":"digong_sweepMax","pram":{"count":5}},
-  {"key":"pata_buffMaxLv","pram":{"count":25}},
-  {"key":"pata_sweep","pram":{"count":30}},
-  {"key":"pata_max_rwd","pram":{"items":[[1,116,50],[1,117,20],[1,118,6],[1,2,200000]]}},
-  {"key":"pata_sweepMax","pram":{"count":20}},
-  {"key":"dongtian_carMax","pram":{"count":5}},
-  {"key":"dongtian_tiliHuiFu","pram":{"item":[1,144,1]}},
-  {"key":"dongtian_enemy","pram":{"count":15,"count1":3}},
-  {"key":"dongtian_flushed","pram":{"items":[[1,1,20],[1,1,20],[1,1,20],[1,1,20],[1,1,20],[1,1,40],[1,1,60],[1,1,80],[1,1,100],[1,1,100],[1,1,100],[1,1,100],[1,1,100],[1,1,100],[1,1,100],[1,1,100],[1,1,100],[1,1,100],[1,1,100],[1,1,100]]}},
-  {"key":"dongtian_boxMax","pram":{"count":3000}},
-  {"key":"dongtian_lixianAutoCd","pram":{"count":300}},
-  {"key":"dongtian_auto","pram":{"count":300}},
-  {"key":"dongtian_kind11_tili","pram":{"count":2,"count1":10}},
-  {"key":"dongtian_kind11","pram":{"count":2,"count1":5}},
-  {"key":"dongtian_dayMax","pram":{"count":200}},
-  {"key":"dongtian_tryCard","pram":{"count":10800,"count1":21600}},
-  {"key":"dongtian_tiliMax","pram":{"count":60}},
-  {"key":"dongtian_nearsMax","pram":{"count":5}},
-  {"key":"dongtian_rnearsCd","pram":{"count":300}},
-  {"key":"dongtian_wkVel","pram":{"count":10}},
-  {"key":"dongtian_carCd","pram":{"count":600}},
-  {"key":"dongtian_lock","pram":{"item":[1,157,80]}},
-  {"key":"dongtian_lacheNum","pram":{"count":10,"count1":1}},
-  {"key":"dongtian_lacheNum_near","pram":{"count":5}},
-  {"key":"yaotian_toucai","pram":{"kv":{"151":600,"152":1200},"count":10}},
-  {"key":"yaotian_shuaxin","pram":{"item":[1,156,1]}},
-  {"key":"yaotian_autoNeed","pram":{"count":4,"count1":4}},
-  {"key":"yaotian_autoTime","pram":{"count":300}},
-  {"key":"yaotian_zhongzi","pram":{"item":[148,149,150]}},
-  {"key":"yaotian_lingcao","pram":{"item":[151,152]}},
-  {"key":"yaotian_feiliao","pram":{"item":[153,154]}},
-  {"key":"yaotian_toucai_item","pram":{"count":1000}},
-  {"key":"yaotian_rnearsCd","pram":{"count":300}},
-  {"key":"yaotian_chongzhi","pram":{"item":[1,155,1],"count":1}},
-  {"key":"yaotian_kind11","pram":{"item":[1,154,2],"count":3}},
-  {"key":"yaotian_zhuli","pram":{"count":600}},
-  {"key":"yaotian_nears","pram":{"item":[10000,8500,7000,5500,4000,2500,1500,500,200,100]}},
-  {"key":"yaotian_item","pram":{"kv":{"148":8,"149":0,"150":0}}},
-  {"key":"yaotian_dingdan","pram":{"item":[10238,30239,20238]}},
-  {"key":"doufa_win","pram":{"items":[[1,2,2000],[1,106,2]]}},
-  {"key":"doufa_baohu","pram":{"count":150}},
-  {"key":"doufa_box_max","pram":{"count":5}},
-  {"key":"doufa_day_time","pram":{"count":85800}},
-  {"key":"doufa_week_time","pram":{"item":[604200,604800]}},
-  {"key":"doufa_battle_item","pram":{"item":[1,105,1]}},
-  {"key":"doufa_map","pram":{"str":"bg2"}},
-  {"key":"player_gm_item","pram":{"items":[[1,1,100]]}},
-  {"key":"dadiguzi_canwu","pram":{"item":[1,133,20],"count":100,"items":[[101,80],[102,20]]}},
-  {"key":"dadiguzi_zhaomu_daily_limit","pram":{"count":100000}},
-  {"key":"dadiguzi_chou","pram":{"count":1,"item":[1,130,1]}},
-  {"key":"dadiguzi_fenjiejindu","pram":{"count":10,"item":[1,133,1]}},
-  {"key":"dadiguzi_kaiwu","pram":{"item":[1,131,1]}},
-  {"key":"dadiguzi_zidong","pram":{"count":400,"item":[1,1,5]}},
-  {"key":"dadiguzi_free","pram":{"count":2,"item":[1,133,50]}},
-  {"key":"dadiguzi_chongzhi","pram":{"item":[1,1,100]}},
-  {"key":"dadiguzi_time","pram":{"count":3,"count1":1}},
-  {"key":"dadiguzi_shufa_default","pram":{"count":1}},
-  {"key":"dadiguzi_shufaexp","pram":{"item":[1,132,20]}},
-  {"key":"dadiguzi_bagLimit","pram":{"count":200}},
-  {"key":"dadiguzi_shufaLvMax","pram":{"count":625}},
-  {"key":"zhangjie_kind11","pram":{"count":2,"count1":7200}},
-  {"key":"gjsy_show_time","pram":{"count":3600}},
-  {"key":"zhangjie_guaiji","pram":{"count":7200}},
-  {"key":"dizi_zhaomu_item2","pram":{"item":[1,1,200]}},
-  {"key":"dizi_zhaomu_count","pram":{"count":1,"count1":10}},
-  {"key":"dizi_zhaomu_xiaohao","pram":{"kv":{"1":1,"10":10}}},
-  {"key":"dizi_zhaomu_kind","pram":{"count1":2,"item":[1,102,3]}},
-  {"key":"dizi_hc","pram":{"count":5}},
-  {"key":"dizi_zhaomu_daily_limit","pram":{"count":100000}},
-  {"key":"dizi_zhaomu_item1","pram":{"item":[1,102,1]}},
-  {"key":"dizi_jingjie_item","pram":{"item":[1,137,1]}},
-  {"key":"dizi_jingjie_add","pram":{"count":200}},
-  {"key":"dizi_chongzhi","pram":{"kv":{"2":100,"3":100,"4":100,"5":100,"7":100}}},
-  {"key":"initial_item","pram":{"items":[]}},
-  {"key":"douLuo_map","pram":{"str":"bg3"}},
-  {"key":"lingmai_duihuan_time","pram":{"count":86400}},
-  {"key":"lingmai_base_score","pram":{"count":100}},
-  {"key":"lingmai_get_item","pram":{"item":[1,7,1]}},
-  {"key":"lingmai_jiaru_time","pram":{"count":36000,"count1":86400}},
-  {"key":"lingmai_kin11","pram":{"count":3,"item":[1,101,1],"count1":1}},
-  {"key":"lingmai_baohu_time","pram":{"count":120,"count1":300}},
-  {"key":"lingmai_xiezhu","pram":{"count":10,"count1":5}},
-  {"key":"lingmai_get_time","pram":{"count":7200}},
-  {"key":"lingmai_kaiqi_time","pram":{"count":36000,"count1":79200,"item":[1,101,1]}},
-  {"key":"lingmai_dazhe","pram":{"items":[[1,80],[2,80],[3,60],[4,10]]}},
-  {"key":"luofuxianyu_set","pram":{"count":30,"count1":20}},
-  {"key":"luofuxianyu_sevCj","pram":{"count":1}},
-  {"key":"luofuxianyu_itemLock","pram":{"kv":{"85":150,"86":12}}},
-  {"key":"luofuxianyu_jlyl","pram":{"items":[[1,1,0],[1,133,0],[1,132,0]]}},
-  {"key":"needShow_Taskid_List","pram":{"item":[4,8,9,23,33,40,45,51,52,58,59,69,74,82,94]}},
-  {"key":"task_guide_lv_limit","pram":{"count":10}},
-  {"key":"noShow_TaskId_List","pram":{"items":[[13,20,31,32,41,51,59,62,70,71,84,99,109,122,124,128,130,153,167,233,547,548,549,550,551]]}},
-  {"key":"club_duowei","pram":{"count":10000}},
-  {"key":"club_createNeed","pram":{"item":[1,1,200]}},
-  {"key":"club_nameLong","pram":{"item":[4,15]}},
-  {"key":"taichu_rwditems","pram":{"items":[[1,1,1],[1,2,1]]}},
-  {"key":"taichu_kind11","pram":{"count":2,"kv":{"145":1,"146":1}}},
-  {"key":"taichu_auto","pram":{"count":200}},
-  {"key":"taichu_speed","pram":{"count":1000,"count1":3000}},
-  {"key":"taichu_showitems","pram":{"items":[[1,125,1],[1,126,1],[1,129,1],[1,147,1]]}},
-  {"key":"club_autoMaster","pram":{"count":3}},
-  {"key":"club_bossFightNum","pram":{"count":1}},
-  {"key":"club_boss_zhenTime","pram":{"count":3600}},
-  {"key":"club_boss_zhenLv","pram":{"count":20}},
-  {"key":"club_boss_zhenBuff","pram":{"kv":{"7":100}}},
-  {"key":"club_boss_zhenNum","pram":{"count":1}},
-  {"key":"club_nameNeed","pram":{"item":[1,1,200]}},
-  {"key":"club_bossTime","pram":{"count":79200}},
-  {"key":"club_quitNum","pram":{"count":1}},
-  {"key":"club_outInCd","pram":{"count":1}},
-  {"key":"club_yiJiaprob","pram":{"count":3000}},
-  {"key":"club_yiJiaChuFa","pram":{"count":10}},
-  {"key":"club_yiJiaTime","pram":{"count":10800}},
-  {"key":"club_yiJiaLimit","pram":{"count":1}},
-  {"key":"lingshou_tq_baodi","pram":{"items":[[207001,10],[207002,10],[207003,10],[207004,10],[207005,10],[207006,10],[207007,10]],"count":100,"count1":7}},
-  {"key":"lingshou_lv_chongzhi","pram":{"count":10000}},
-  {"key":"lingshou_shuaxin_xianzhi","pram":{"kv":{"5":1}}},
-  {"key":"lingshou_chouqu_show","pram":{"items":[[2,5000],[3,2800],[4,1600],[5,580],[7,20]]}},
-  {"key":"lingshou_xilian_tips_quality","pram":{"count":5}},
-  {"key":"lingshou_chou_kind11","pram":{"count":3}},
-  {"key":"lingshou_chou","pram":{"item":[1,113,10]}},
-  {"key":"lingshou_init","pram":{"item":[202005,202005,202005]}},
-  {"key":"lingshou_chouqu","pram":{"items":[[207001,10],[207002,10],[207003,10],[207004,10],[207005,10],[207006,10],[207007,10],[205001,290],[205002,290],[205003,290],[205004,290],[205005,290],[205006,290],[205007,290],[204001,700],[204002,700],[204003,700],[204004,700],[204005,700],[204006,700],[204007,700],[204008,700],[203001,1960],[203002,1960],[203003,1960],[203004,1960],[203005,1960],[202001,3500],[202002,3500],[202003,3500],[202004,3500],[202005,3500]]}},
-  {"key":"lingshou_max","pram":{"count":200}},
-  {"key":"lingshou_xilian_open","pram":{"count":4}},
-  {"key":"lingshou_xilian_items","pram":{"items":[[1,115,20],[1,115,70],[1,115,120],[1,115,170],[1,115,220],[1,115,270]]}},
-  {"key":"lingshou_baodiList","pram":{"item":[207001,207002,207003,207006]}},
-  {"key":"lingshou_mubiao","pram":{"kv":{"7":6}}},
-  {"key":"lingshou_skill_cd","pram":{"item":[10000,10000]}},
-  {"key":"lingshou_juexing_kaiqi","pram":{"item":[7,5]}},
-  {"key":"lingshou_juexing_return","pram":{"count":8000}},
-  {"key":"lingshou_huaxing_reset_need","pram":{"item":[1,1,200]}},
-  {"key":"lingshou_huaxing_return","pram":{"count":10000}},
-  {"key":"dayRwd","pram":{"item":[1,1,20]}},
-  {"key":"tjzr_lp1","pram":{"item":[105301,105302,105101,105401,105303,105102,105201,105402,105304,105202,105305,105403,105306,105203,105103,105104]}},
-  {"key":"tjzr_lp2","pram":{"item":[107201,107401,107301,107101,107302]}},
-  {"key":"tjzr_lp3","pram":{"item":[105202,104102,107201,107101,105102,105104]}},
-  {"key":"yixiang_initial","pram":{"count":300001}},
-  {"key":"yixiang_Packs","pram":{"items":[[1,1,120],[2,300002,1],[2,300003,1],[2,300004,1],[2,300005,1],[2,300006,1],[2,300007,1]],"count":12}},
-  {"key":"yixiang_item","pram":{"item":[1,106,1]}},
-  {"key":"youli_tili_cd","pram":{"count":60}},
-  {"key":"youli_need","pram":{"item":[1,1,200]}},
-  {"key":"battle_role_speed","pram":{"item":[0,0]}},
-  {"key":"battle_lingli","pram":{"items":[[10,10],[15,15]]}},
-  {"key":"battle_monster_speed","pram":{"item":[0,0]}},
-  {"key":"battle_shouling_speed","pram":{"item":[0,0]}},
-  {"key":"battletime","pram":{"count":45}},
-  {"key":"battle_zhujue_speed","pram":{"item":[0,0]}},
-  {"key":"zhuli_count","pram":{"count":10,"item":[1,104,1],"count1":300}},
-  {"key":"zhenfa_kind11","pram":{"count":1800,"count1":1800}},
-  {"key":"doZhuli_count","pram":{"count":100}},
-  {"key":"zhenfa_zd_open","pram":{"count":20}},
-  {"key":"zhenfa_mp_open","pram":{"count":13}},
-  {"key":"zhenfa_chouqu","pram":{"item":[1,103,1]}},
-  {"key":"zhenfa_bagMax","pram":{"count":20}},
-  {"key":"fazhen_pifu_lv","pram":{"items":[[-1,1795],[0,7000],[1,1000],[2,200],[3,5]]}},
-  {"key":"mainbattle_monster_sumber","pram":{"item":[2000,4000,5500,7000,9000,11000,14000]}},
-  {"key":"zhenfa_zhaomu_kind","pram":{"count1":2,"item":[1,140,1]}},
-  {"key":"zhenfa_zhaomu_item1","pram":{"item":[1,140,1]}},
-  {"key":"zhenfa_zhaomu_item2","pram":{"item":[1,1,400]}},
-  {"key":"zhenfa_zhaomu_daily_limit","pram":{"count":100000}},
-  {"key":"zhenfa_zhaomu_pzbd","pram":{"count":100,"items":[[252,80],[272,20]]}},
-  {"key":"zhenfa_zhaomu_zskpzbd","pram":{"items":[[270,5000]]}},
-  {"key":"zhenfa_zhaomu_dropid","pram":{"items":[[200,40000],[230,15000],[231,30000],[240,6000],[241,12000],[250,1716],[251,3432],[270,504],[271,1008]]}},
-  {"key":"zhenfa_zhaomu_show","pram":{"items":[[3,3670,0],[4,1300,0],[5,500,0],[7,30,0]]}},
-  {"key":"zhenfa_zhaomu_fbaodi","pram":{"item":[2,5]}},
-  {"key":"zhenfa_huishou_count","pram":{"count":300}},
-  {"key":"zhenfa_huishou","pram":{"items":[[3,240],[4,250],[5,270]]}},
-  {"key":"zhenfa_get_chushi","pram":{"items":[[13,20301,1]]}},
-  {"key":"zongMen_graduatedLimit","pram":{"count":100}},
-  {"key":"zongMen_applyTime","pram":{"count":72}},
-  {"key":"zongMen_recover_item","pram":{"item":[1,162,1],"count":1}},
-  {"key":"zongMen_ad","pram":{"count":2}},
-  {"key":"zongMen_ad_item","pram":{"item":[1,162,100]}},
-  {"key":"zongMen_autoTrain","pram":{"count":10}},
-  {"key":"zongMen_freeRefresh","pram":{"kv":{"hefu":10,"club":10,"kua":10}}},
-  {"key":"zongMen_refreshItem","pram":{"item":[1,1,10]}},
-  {"key":"zongMen_TrainClick","pram":{"count":1,"count1":100}},
-  {"key":"zongMen_add_basicAttr_limit","pram":{"count":3}},
-  {"key":"zongMen_add_graduateAttr_limit","pram":{"count":2}},
-  {"key":"zongMen_skip","pram":{"count":3}},
-  {"key":"zongMen_birth","pram":{"count":100,"count1":55}},
-  {"key":"zongMen_kuaChannel","pram":{"count":5}},
-  {"key":"zongMen_pricard_baodi","pram":{"items":[[5,6666],[7,3333]]}},
-  {"key":"pvd_maxTiLi","pram":{"count":3}},
-  {"key":"zudui_ready_time","pram":{"count":15}},
-  {"key":"zudui_fight_time","pram":{"count":5}},
-  {"key":"zudui_offline_time","pram":{"count":60}},
-  {"key":"zudui_recruit_CD","pram":{"count":3}},
-  {"key":"zudui_assemble_time","pram":{"count":60}},
-  {"key":"zudui_assist_reward","pram":{"items":[[1,13,20]]}},
-  {"key":"zudui_assist_conunt","pram":{"count":10}},
-  {"key":"yaodifenzhong_player_count","pram":{"count":10}},
-  {"key":"yaodifenzhong_cheer","pram":{"items":[[1,1,100],[1,1,200],[1,1,300]]}},
-  {"key":"yaodifenzhong_cheer_effect","pram":{"count":100}},
-  {"key":"huanggujindi_reward_preview","pram":{"items":[[1,102,0,0,0,0],[1,138,0,0,0,0],[1,137,0,0,0,1]]}},
-  {"key":"yaodifenzhong_reward_preview","pram":{"items":[[1,114,0,0,0,0],[1,113,0,0,0,0],[1,115,0,0,0,1]]}},
-  {"key":"qingtongxiandian_reward_preview","pram":{"items":[[1,134,0,0,0,0]]}},
-  {"key":"zudui_jijie_kaiqi","pram":{"count":1}},
-  {"key":"clubQues_server_count","pram":{"count":10}},
-  {"key":"clubQues_escortTime","pram":{"count":79200}},
-  {"key":"clubQuest_task","pram":{"count":2}},
-  {"key":"clubQuest_task_refresh","pram":{"item":[1,161,1]}},
-  {"key":"clubQuest_target_freeRefresh","pram":{"count":2}},
-  {"key":"clubQuest_target_buyRefresh","pram":{"items":[[1,1,50],[1,1,100],[1,1,150],[1,1,200],[1,1,300]]}},
-  {"key":"clubQuest_fight_reward","pram":{"count":2}},
-  {"key":"clubQuest_fight","pram":{"count":3}},
-  {"key":"clubQuest_fight_buy","pram":{"items":[[1,1,50],[1,1,100],[1,1,150],[1,1,200],[1,1,300]]}},
-  {"key":"clubQuest_fighted","pram":{"count":3}},
-  {"key":"clubQuest_energy","pram":{"count":100}},
-  {"key":"clubQuest_energy_reduce","pram":{"count":1}},
-  {"key":"clubQuest_energy_limit","pram":{"count":10}},
-  {"key":"clubQuest_ratio","pram":{"item":[2,3,5]}},
-  {"key":"clubQuest_search","pram":{"item":[1,1,50]}},
-  {"key":"clubQuest_worship","pram":{"items":[[1,1,50]]}},
-  {"key":"clubQuest_ad","pram":{"count":2}},
-  {"key":"clubQuest_power","pram":{"count":20}},
-  {"key":"clubQuest_assistInvite_CD","pram":{"count":3}},
-  {"key":"clubQuest_boss_hpper","pram":{"count":100000}},
-  {"key":"clubQuest_boss_atkper","pram":{"count":0}},
-  {"key":"clubQuest_boss_defper","pram":{"count":0}},
-  {"key":"xianyu_qifu_rwd","pram":{"items":[[1,1,20]]}},
-  {"key":"xianyu_cifu_starttime","pram":{"count":79200}},
-  {"key":"xianyu_cifu_time","pram":{"count":86400}},
-  {"key":"xianyu_cifu_rwdlimit","pram":{"count":1000}},
-  {"key":"xianyu_cifu_jiarenshu","pram":{"item":[20,50]}},
-  {"key":"xianyu_xml_day","pram":{"count":3}},
-  {"key":"diziskin_reset","pram":{"item":[1,1,200]}},
-  {"key":"rebate","pram":{"count":1,"count1":10}},
-  {"key":"faze_drag_time","pram":{"count":300}},
-  {"key":"faze_init_bagcount","pram":{"count":8}},
-  {"key":"faze_bag_unlockcost","pram":{"items":[[1,1,100],[1,1,200],[1,1,300],[1,1,400],[1,1,500],[1,1,600],[1,1,700],[1,1,800]]}},
-  {"key":"faze_fighteps_rate","pram":{"item":[10000,10000]}},
-  {"key":"faze_additem_cd","pram":{"count":21600}},
-  {"key":"faze_additem_count","pram":{"item":[1,191,1]}},
-  {"key":"faze_itemcount_limit","pram":{"count":5}},
-  {"key":"faze_itemprice","pram":{"item":[1,1,200]}},
-  {"key":"faze_autohecheng_time","pram":{"count":300}},
-  {"key":"faze_cuiling_reset","pram":{"count":200}},
-  {"key":"faze_cuiling_reset_return","pram":{"count":10000}},
-  {"key":"faze_cuiling_return","pram":{"count":8000}},
-  {"key":"faze_ningyuan_kaiqi","pram":{"count":7}},
-  {"key":"faze_delete_return","pram":{"count":8000}},
-  {"key":"faze_tujian_star_show","pram":{"count":5}}
+  {"key":"hc_tili_cd","pram":[1800,6,30]}
 ]

+ 15 - 15
assets/script/common/xlsConfig.ts

@@ -29,7 +29,7 @@ export type xlsLanguageLang = {key:string,cn:string,kr:string,tw:string,jp:strin
 // type for level.excel
 export type xlsLevelLevel = {level:number,exp:number}
 // type for math.excel
-export type xlsMathInfo = {key:string,pram:{"count"?:number,"count1"?:number,"str"?:string,"item"?:number[],"items"?:number[][],"kv"?:{[key:string]:number}}}
+export type xlsMathInfo = {key:string,pram:number[]}
 // type for mergeProp.excel
 export type xlsMergePropInfo = {id:number,name:string,icon:string,type:number,quality:number}
 // type for merge.excel
@@ -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[]
-    xlsEmitterInfo: xlsEmitterInfo[]
-    xlsLanguageClientText: xlsLanguageClientText[]
-    xlsItemKind: xlsItemKind[]
-    xlsItemInfo: xlsItemInfo[]
-    xlsGuideInfo: xlsGuideInfo[]
-    xlsLevelLevel: xlsLevelLevel[]
     xlsEquipInfo: xlsEquipInfo[]
     xlsKaiqiInfo: xlsKaiqiInfo[]
-    xlsAttrAttr: xlsAttrAttr[]
-    xlsPackageInfo: xlsPackageInfo[]
-    xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
-    xlsMergePropInfo: xlsMergePropInfo[]
     xlsChapterInfo: xlsChapterInfo[]
     xlsChapterLayout: xlsChapterLayout[]
-    xlsMergeInfo: xlsMergeInfo[]
-    xlsNameName: xlsNameName[]
+    xlsLanguageClientText: xlsLanguageClientText[]
+    xlsAudioInfo: xlsAudioInfo[]
     xlsPingbiciInfo: xlsPingbiciInfo[]
+    xlsNameName: xlsNameName[]
+    xlsMergeInfo: xlsMergeInfo[]
+    xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
+    xlsAttrAttr: xlsAttrAttr[]
+    xlsMathInfo: xlsMathInfo[]
+    xlsItemKind: xlsItemKind[]
+    xlsItemInfo: xlsItemInfo[]
+    xlsEmitterInfo: xlsEmitterInfo[]
+    xlsPackageInfo: xlsPackageInfo[]
     xlsTaskDesc: xlsTaskDesc[]
     xlsTaskMain: xlsTaskMain[]
-    xlsMathInfo: xlsMathInfo[]
+    xlsMergePropInfo: xlsMergePropInfo[]
+    xlsLevelLevel: xlsLevelLevel[]
+    xlsGuideInfo: xlsGuideInfo[]
     xlsLanguageLang: xlsLanguageLang[]
 
     constructor(bundleName:string, callback: Function, progressCallback?: Function) {

+ 16 - 16
assets/script/data/model/Battle/BattleModel.ts

@@ -8,8 +8,8 @@ import GameDataCenter from "../../GameDataCenter";
 import { BattleModelData } from "./BattleModelData";
 
 export default class BattleModel extends BattleModelData {
-    battleRoleList: { [id: string]: UEBattleRole } = {}
-    realBattleSpeed: number;
+	battleRoleList: { [id: string]: UEBattleRole } = {}
+	realBattleSpeed: number;
 	fightInfo: ResFightTest;
 
 	constructor() {
@@ -18,26 +18,26 @@ export default class BattleModel extends BattleModelData {
 	}
 
 	//发起战斗
-    startFight(fightInfo: FightBase) {
-    	
-        FguiMgr.Instance.openUI(BattleMainView, ViewZOrder.Battle, () => {
-
-		}, {fightInfo: fightInfo});
-    }
-	
-    addRole(id: string, role: UEBattleRole) {
+	startFight(fightInfo: FightBase, closeCb?: Function) {
+
+		FguiMgr.Instance.openUI(BattleMainView, ViewZOrder.Battle, () => {
+
+		}, { fightInfo: fightInfo, closeCb: closeCb });
+	}
+
+	addRole(id: string, role: UEBattleRole) {
 		this.battleRoleList[id] = role
-    }
+	}
 
 	setFightInfo(res: ResFightTest) {
 		this.fightInfo = res;
 	}
 
-	async SendTestFight(cb:	Function) {
+	async SendTestFight(cb: Function) {
 		let ret = await GameDataCenter.gameServer.ReqApi("fight/FightTest", {});
-        if (ret?.res) {
-            this.setFightInfo(ret.res);
-            cb(ret.res);
-        }
+		if (ret?.res) {
+			this.setFightInfo(ret.res);
+			cb(ret.res);
+		}
 	}
 }

+ 5 - 10
assets/script/data/model/GridMap/GridMapModel.ts

@@ -26,7 +26,6 @@ export default class GridMapModel extends GridMapModelData {
     /** 可合成物品的配方 */
     public itemFormula: { [key: string]: string[] } = {};
     private ueGridMap: UEGridMap;
-    private cellSize: number;
     constructor() {
         super('gridMap');
     }
@@ -40,11 +39,6 @@ export default class GridMapModel extends GridMapModelData {
         this.ueGridMap = ueGridMap;
         this.FilterMergeChain();
 
-        this.cellSize = GridConstant.CELL_WIDTH;
-    }
-
-    get CellSize() {
-        return this.cellSize;
     }
 
     /** 过滤合成链 */
@@ -105,11 +99,12 @@ export default class GridMapModel extends GridMapModelData {
     async sendFightHc(gzid: number) {
         let ret = await GameDataCenter.gameServer.ReqApi("fight/FightHc", { gzid: gzid.toString() });
         if (ret?.res) {
-            if (ret.res.win) {
-                EventMng.emit(GridEvent.HC_FIGHT_OVER, { gzid: gzid, list: ret.res.list });
-            }
+            GameDataCenter.battle.startFight(ret.res, () => {
+                if (ret.res.win) {
+                    EventMng.emit(GridEvent.HC_FIGHT_OVER, { gzid: gzid, list: ret.res.list });
+                }
+            });
         }
-
     }
 
     /** 尝试合成 */

+ 14 - 5
assets/script/logic/fgui/Battle/BattleMain/BattleMainCtrl.ts

@@ -8,14 +8,21 @@
 import { ResCollector } from "../../../../frameWork/compment/ResCollector";
 import FguiMgr from "../../../../frameWork/fgui/FguiMgr";
 import { FguiViewCtrl } from "../../../../frameWork/fgui/mvc/FguiViewCtrl";
+import EventMng from "../../../../manager/EventMng";
+import { FightBase } from "../../../../shared/base";
 import AssetMgr from "../../../../utils/AssetMgr";
 import UEBattleView from "../../../battle/UEBattleView";
 import UESubHp from "../../../battle/UESubHp";
 import { BattleMainVM } from "./BattleMainVM";
 import { BattleMainView } from "./BattleMainView";
 
+export interface I_BattleData {
+    fightInfo: FightBase,
+    closeCb?: Function
+}
 export class BattleMainCtrl extends FguiViewCtrl<BattleMainVM> {
     ueBattle: UEBattleView;
+    uiData: I_BattleData;
     onCollectRes(resCollector: ResCollector, param: any): void {
         resCollector.AddUEClass([UEBattleView, UESubHp])
     }
@@ -24,7 +31,8 @@ export class BattleMainCtrl extends FguiViewCtrl<BattleMainVM> {
         this.VM.BattleCom.node.addChild(this.ueBattle.node);
         this.ueBattle.Init();
     }
-    OnShow(intent?: any): void {
+    OnShow(intent?: I_BattleData): void {
+        this.uiData = intent;
         this.AddListeners();
         this.ueBattle.onStartFight(intent?.fightInfo);
     }
@@ -33,19 +41,20 @@ export class BattleMainCtrl extends FguiViewCtrl<BattleMainVM> {
         this.ueBattle.onDisable();
     }
     //#region UI事件
-    private AddListeners() : void {
+    private AddListeners(): void {
         this.RegisterClick(this.VM.MaskBgBtn, this.OnClickMaskBgBtn);
 
     }
-    private RemoveListeners() : void {
-// <#UIEventsRemoveArea>
+    private RemoveListeners(): void {
+        // <#UIEventsRemoveArea>
     }
     private OnClickMaskBgBtn(): void {
         this.Close();
     }
 
-    private Close(): void{
+    private Close(): void {
         FguiMgr.Instance.closeUI(BattleMainView, true);
+        this.uiData.closeCb && this.uiData.closeCb();
     }
     //#endregion
 }

+ 30 - 10
assets/script/logic/fgui/Home/Home/HomeMergeTipItem.ts

@@ -1,16 +1,19 @@
 
+import Gamecfg from "../../../../common/gameCfg";
+import { MergeItem } from "../../../../data/model/GridMap/GridMapModel";
+import ResSprite from "../../../../frameWork/compment/ResSprite";
+import { Autowire } from "../../../../frameWork/fgui/Autowire";
 import { ItemRender } from "../../../../frameWork/fgui/ListUtil";
-
-
-export interface IData_HomeMergeTipItem {
-	id: number
-}
+import { HcType } from "../../../../shared/hc/PtlHcInfo";
 
 export default class HomeMergeTipItem extends ItemRender {
 
-	private mData: IData_HomeMergeTipItem;
-	protected onConstruct() {
-
+	@Autowire
+	IconLoad: fgui.GLoader;
+	private mData: MergeItem;
+	sp_item: ResSprite;
+	onInit() {
+		this.sp_item = this.IconLoad.node.addComponent(ResSprite);
 	}
 
 	onShow(): void {
@@ -19,9 +22,26 @@ export default class HomeMergeTipItem extends ItemRender {
 	onHide(): void {
 	}
 
-	setData(data: IData_HomeMergeTipItem, index?: number, param?: { refresh: boolean }) {
+	setData(data: MergeItem, index?: number, param?: { refresh: boolean }) {
 		this.mData = data;
-
+		let quality = 0;
+		if (this.mData.type == HcType.emitter) {
+			let mergePropCfg = Gamecfg.emitterInfo.getItem(this.mData.id.toString());
+			this.sp_item.setSpriteFrame('gridMap', `mergeProp/${mergePropCfg.icon}`);
+			quality = mergePropCfg.quality;
+		} else if (this.mData.type == HcType.material) {
+			let mergePropCfg = Gamecfg.mergePropInfo.getItem(this.mData.id.toString());
+			this.sp_item.setSpriteFrame('gridMap', `mergeProp/${mergePropCfg.icon}`);
+			quality = mergePropCfg.quality;
+		} else if (this.mData.type == HcType.equip) {
+			let mergePropCfg = Gamecfg.equipInfo.getItem(this.mData.id.toString());
+			this.sp_item.setSpriteFrame('gridMap', `mergeEquip/${mergePropCfg.icon}`);
+			quality = mergePropCfg.quality;
+		} else if (this.mData.type == HcType.monster) {
+			// this.ueHomeRole = AssetMgr.instantiateUE(UEHomeRole);
+			// this.itemNode.addChild(this.ueHomeRole.node);
+			// this.ueHomeRole.Init(this.mData);
+		}
 	}
 
 

+ 2 - 2
assets/script/logic/gridMap/GridConstant.ts

@@ -3,6 +3,6 @@
 export class GridConstant {
     static readonly ROW = 7;
     static readonly COL = 8;
-    static readonly CELL_WIDTH = 84;
-    static readonly CELL_REAL_WIN_HEIGHT = 1334;//格子大小对应实际屏幕大小
+    static readonly CELL_WIDTH = 93;
+    static readonly CELL_REAL_WIN_HEIGHT = 1750;//格子大小对应实际屏幕大小
 }

+ 5 - 0
assets/script/logic/gridMap/UECell.ts

@@ -51,6 +51,11 @@ export default class UECell extends UEBase {
         return this.cellData.unlock == HcUnlock.off;
     }
 
+    ChangeLockState(unlock: HcUnlock) {
+        this.cellData.unlock = unlock;
+        this.SetLock();
+    }
+
     SetLock() {
         if (this.cellData.unlock == HcUnlock.off) {
             this.node_lock.active = true;

+ 2 - 2
assets/script/logic/gridMap/UECube.ts

@@ -43,7 +43,7 @@ export default class UECube extends UEBase {
         if (cubeData.type == HcType.emitter) {
             let mergePropCfg = Gamecfg.emitterInfo.getItem(cubeData.id.toString());
             this.sp_item.setSpriteFrame('gridMap', `mergeProp/${mergePropCfg.icon}`);
-            // this.quality = mergePropCfg.
+            this.quality = mergePropCfg.quality;
             this.node_emitter_num.active = true;
         } else if (cubeData.type == HcType.material) {
             let mergePropCfg = Gamecfg.mergePropInfo.getItem(cubeData.id.toString());
@@ -52,7 +52,7 @@ export default class UECube extends UEBase {
         } else if (cubeData.type == HcType.equip) {
             let mergePropCfg = Gamecfg.equipInfo.getItem(cubeData.id.toString());
             this.sp_item.setSpriteFrame('gridMap', `mergeEquip/${mergePropCfg.icon}`);
-            // this.quality = mergePropCfg.quality;
+            this.quality = mergePropCfg.quality;
         } else if (cubeData.type == HcType.user) {
             this.ueHomeRole = AssetMgr.instantiateUE(UEHomeRole);
             this.itemNode.addChild(this.ueHomeRole.node);

+ 14 - 31
assets/script/logic/gridMap/UEGridMap.ts

@@ -1,6 +1,7 @@
 import Gamecfg from "../../common/gameCfg";
 import { gameMethod } from "../../common/gameMethod";
 import { xlsChapterLayout } from "../../common/xlsConfig";
+import Config from "../../Config";
 import GameDataCenter from "../../data/GameDataCenter";
 import UEBase from "../../frameWork/compment/UEBase";
 import { HcInfoGeziInfo, ResHcInfo } from "../../shared/hc/PtlHcInfo";
@@ -47,7 +48,15 @@ export default class UEGridMap extends UEBase {
         this.ueMergeTip.node.active = false;
         GameDataCenter.gridMap.Init(this);
         this.gridLayer.setContentSize(GridConstant.CELL_WIDTH * GridConstant.ROW, GridConstant.CELL_WIDTH * GridConstant.COL);
-        this.node.scale = 1 * (cc.winSize.height / GridConstant.CELL_REAL_WIN_HEIGHT)
+        // 计算缩放比例
+        // ratio为0表示屏幕高度等于标准高度1750
+        // ratio为1表示屏幕高度等于1334(需要缩放15%)
+        const ratio = Math.max(0, (GridConstant.CELL_REAL_WIN_HEIGHT - cc.winSize.height) / (GridConstant.CELL_REAL_WIN_HEIGHT - Config.realHeight));
+        // 当ratio为1时,scale = 0.85(缩放15%)
+        // 当ratio为0时,scale = 1(不缩放)
+        const scale = 1 - (0.15 * ratio);
+        this.node.scale = scale;
+
         this.InitEvent();
         GameDataCenter.gridMap.sendHcInfo({});
     }
@@ -107,6 +116,9 @@ export default class UEGridMap extends UEBase {
             let geziData = data.list[key];
             if (geziData.type != 0) {
                 let curCell = this.cellMap[Number(key)];
+                if (curCell.IsLock()) {
+                    curCell.ChangeLockState(geziData.unlock);
+                }
                 let vec = GameDataCenter.gridMap.TranIdxToPos(Number(key));
                 let mergeCube = this.CreateCube(vec.y, vec.x);
                 mergeCube.Init({
@@ -167,11 +179,7 @@ export default class UEGridMap extends UEBase {
                 if (cell.CanDrag()) {
                     this.dragStartPos = touchPos;
                 }
-                // if (this.selectedCell && this.selectedCell != cell) {
-                //     this.clickCnt = 1;
-                // } else if (!this.selectedCell) {
-                //     this.clickCnt = 1;
-                // }
+
                 if (this.selectedCell != cell) {
                     this.clickCnt = 1;
                 }
@@ -374,29 +382,4 @@ export default class UEGridMap extends UEBase {
         mergeCube.node.runAction(seq);
     }
 
-    /** 计算圆上的位置 */
-    private GetCirclePosition(index: number, total: number): cc.Vec2 {
-        const radius = 150; // 圆的半径
-
-        if (total === 1) {
-            // 只有一个元素时,放在正上方
-            return cc.v2(0, radius);
-        }
-
-        // 计算每个元素之间的角度
-        const angleStep = 60; // 相邻两个元素之间的角度
-        const startAngle = 90 + ((total - 1) * angleStep) / 2; // 从90度(正上方)开始,向右分布
-
-        // 计算当前元素的角度(角度转弧度)
-        const angle = (startAngle - index * angleStep) * Math.PI / 180; // 减去角度使其向右分布
-
-        // 计算圆上的位置
-        const x = radius * Math.cos(angle);
-        const y = radius * Math.sin(angle);
-
-        return cc.v2(x, y);
-    }
-
-
-
 }

+ 1 - 0
assets/script/shared/hc/PtlHcInfo.ts

@@ -13,6 +13,7 @@ export interface ReqHcInfo {
 export interface ResHcInfo {
     chapterId:number  //章节ID
     tili:number  //体力
+    maxTili:number  //体力最大值
     lastTime:number //最后一次结算体力时间
     list:HcInfoList //格子列表
 }

+ 13 - 0
assets/script/shared/hc/server.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "01502326-6cc6-4169-a4ce-e472fbf7b437",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 11 - 0
assets/script/shared/hc/server/MsgHcTili_s.ts

@@ -0,0 +1,11 @@
+
+
+/**
+ * msg推送信息
+ */
+export interface MsgHcTili_s {
+    tili:number  //体力
+    maxTili:number  //体力最大值
+    lastTime:number //最后一次结算体力时间
+}
+

+ 10 - 0
assets/script/shared/hc/server/MsgHcTili_s.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "8b81b85e-7531-45ea-9aa8-3abd6beec2db",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 41 - 1
assets/script/shared/serviceProto.ts

@@ -33,6 +33,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 { MsgHcTili_s } from './hc/server/MsgHcTili_s';
 import { ReqItemInfo, ResItemInfo } from './item/PtlItemInfo';
 import { MsgItemChange_s } from './item/server/MsgItemChange_s';
 import { ReqMailDelAll, ResMailDelAll } from './mail/PtlMailDelAll';
@@ -236,6 +237,7 @@ export interface ServiceType {
         "common/Items": MsgItems,
         "common/Message": MsgMessage,
         "eps/server/EpsChange_s": MsgEpsChange_s,
+        "hc/server/HcTili_s": MsgHcTili_s,
         "item/server/ItemChange_s": MsgItemChange_s,
         "mail/server/MailNew_s": MsgMailNew_s,
         "task/server/TaskCons_s": MsgTaskCons_s,
@@ -244,7 +246,7 @@ export interface ServiceType {
 }
 
 export const serviceProto: ServiceProto<ServiceType> = {
-    "version": 62,
+    "version": 63,
     "services": [
         {
             "id": 39,
@@ -507,6 +509,11 @@ export const serviceProto: ServiceProto<ServiceType> = {
             }
         },
         {
+            "id": 91,
+            "name": "hc/server/HcTili_s",
+            "type": "msg"
+        },
+        {
             "id": 67,
             "name": "item/ItemInfo",
             "type": "api",
@@ -1805,6 +1812,13 @@ export const serviceProto: ServiceProto<ServiceType> = {
                     }
                 },
                 {
+                    "id": 4,
+                    "name": "maxTili",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
                     "id": 2,
                     "name": "lastTime",
                     "type": {
@@ -1882,6 +1896,32 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
+        "hc/server/MsgHcTili_s/MsgHcTili_s": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "tili",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 1,
+                    "name": "maxTili",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 2,
+                    "name": "lastTime",
+                    "type": {
+                        "type": "Number"
+                    }
+                }
+            ]
+        },
         "item/PtlItemInfo/ReqItemInfo": {
             "type": "Interface"
         },