Browse Source

数据更新

baowen 1 week ago
parent
commit
775a8a80bf

+ 72 - 72
assets/hall/data/gamecfg.json

@@ -11,76 +11,76 @@
     {"id":9, "title":"骑乐无穷", "bundle":"unit108", "unit":108, "maxScale":1, "minScale":0.67},
     {"id":10, "title":"四面楚鸽", "bundle":"unit109", "unit":109, "maxScale":1, "minScale":0.67},
     {"id":11, "title":"提壶灌顶", "bundle":"unit110", "unit":110, "maxScale":1, "minScale":0.64},
-    {"id":12, "title":"应接不暇", "bundle":"unit102", "unit":102, "maxScale":1, "minScale":0.67},
-    {"id":13, "title":"顺手牵羊", "bundle":"unit103", "unit":103, "maxScale":0.7, "minScale":0.43},
-    {"id":14, "title":"霸王别基", "bundle":"unit81", "unit":81, "maxScale":1, "minScale":0.67},
-    {"id":15, "title":"负金请罪", "bundle":"unit83", "unit":83, "maxScale":1, "minScale":0.67},
-    {"id":16, "title":"曹冲称象", "bundle":"unit78", "unit":78, "maxScale":1, "minScale":0.67},
-    {"id":17, "title":"猛虎下山", "bundle":"unit80", "unit":80, "maxScale":1, "minScale":0.67},
-    {"id":18, "title":"孔雀开瓶", "bundle":"unit79", "unit":79, "maxScale":1, "minScale":0.67},
-    {"id":19, "title":"口若悬河", "bundle":"unit84", "unit":84, "maxScale":0.8, "minScale":0.5},
-    {"id":20, "title":"灯火戏诸侯", "bundle":"unit76", "unit":76, "maxScale":1, "minScale":0.67},
-    {"id":21, "title":"司马光砸缸", "bundle":"unit77", "unit":77, "maxScale":1, "minScale":0.67},
-    {"id":22, "title":"哪吒闹厨房", "bundle":"unit85", "unit":85, "maxScale":0.8, "minScale":0.5},
-    {"id":23, "title":"搬门弄虎", "bundle":"unit86", "unit":86, "maxScale":0.8, "minScale":0.5},
-    {"id":24, "title":"鹿见不平", "bundle":"unit88", "unit":88, "maxScale":0.8, "minScale":0.5},
-    {"id":25, "title":"守猪待兔", "bundle":"unit87", "unit":87, "maxScale":0.8, "minScale":0.5},
-    {"id":26, "title":"随心所浴", "bundle":"unit89", "unit":89, "maxScale":1, "minScale":0.67},
-    {"id":27, "title":"背井离乡", "bundle":"unit90", "unit":90, "maxScale":1, "minScale":0.67},
-    {"id":28, "title":"羊没吐气", "bundle":"unit91", "unit":91, "maxScale":1, "minScale":0.67},
-    {"id":29, "title":"画蛇添足", "bundle":"unit92", "unit":92, "maxScale":1, "minScale":0.67},
-    {"id":30, "title":"鸡不可湿", "bundle":"unit93", "unit":93, "maxScale":1, "minScale":0.67},
-    {"id":31, "title":"背水一战", "bundle":"unit82", "unit":82, "maxScale":0.8, "minScale":0.5},
-    {"id":32, "title":"病鸡乱投医", "bundle":"unit104", "unit":104, "maxScale":1, "minScale":0.67},
-    {"id":33, "title":"对牛弹琴", "bundle":"unit68", "unit":68, "maxScale":0.8, "minScale":0.5},
-    {"id":34, "title":"凿壁偷光", "bundle":"unit65", "unit":65, "maxScale":0.8, "minScale":0.5},
-    {"id":35, "title":"坐山观虎斗", "bundle":"unit60", "unit":60, "maxScale":0.8, "minScale":0.5},
-    {"id":36, "title":"愚公移山", "bundle":"unit57", "unit":57, "maxScale":0.8, "minScale":0.5},
-    {"id":37, "title":"西门吹雪", "bundle":"unit62", "unit":62, "maxScale":1, "minScale":0.68},
-    {"id":38, "title":"吊虎离山", "bundle":"unit59", "unit":59, "maxScale":0.4, "minScale":0.25},
-    {"id":39, "title":"闺房密语", "bundle":"unit44", "unit":44, "maxScale":0.8, "minScale":0.5},
-    {"id":40, "title":"秦王绕柱", "bundle":"unit74", "unit":74, "maxScale":0.8, "minScale":0.48},
-    {"id":41, "title":"二龙戏珠", "bundle":"unit70", "unit":70, "maxScale":0.8, "minScale":0.49},
-    {"id":42, "title":"夜公好龙", "bundle":"unit94", "unit":94, "maxScale":0.4, "minScale":0.25},
-    {"id":43, "title":"牛头马面", "bundle":"unit95", "unit":95, "maxScale":1, "minScale":0.67},
-    {"id":44, "title":"马车郊游", "bundle":"unit32", "unit":32, "maxScale":0.5, "minScale":0.33},
-    {"id":45, "title":"雨夜沐足", "bundle":"unit35", "unit":35, "maxScale":1.25, "minScale":0.73},
-    {"id":46, "title":"古代郊游", "bundle":"unit39", "unit":39, "maxScale":1, "minScale":0.67},
-    {"id":47, "title":"海边露营", "bundle":"unit43", "unit":43, "maxScale":0.8, "minScale":0.5},
-    {"id":48, "title":"雨夜露营", "bundle":"unit45", "unit":45, "maxScale":0.8, "minScale":0.5},
-    {"id":49, "title":"古代出游", "bundle":"unit42", "unit":42, "maxScale":1, "minScale":0.67},
-    {"id":50, "title":"雪夜用膳", "bundle":"unit55", "unit":55, "maxScale":0.4, "minScale":0.25},
-    {"id":51, "title":"古法带妹", "bundle":"unit38", "unit":38, "maxScale":1.4, "minScale":0.94},
-    {"id":52, "title":"古代炸鸡店", "bundle":"unit49", "unit":49, "maxScale":0.8, "minScale":0.5},
-    {"id":53, "title":"杜甫逛街", "bundle":"unit37", "unit":37, "maxScale":1.3, "minScale":0.8},
-    {"id":54, "title":"古代刑场", "bundle":"unit72", "unit":72, "maxScale":0.8, "minScale":0.48},
-    {"id":55, "title":"古代消暑", "bundle":"unit73", "unit":73, "maxScale":0.8, "minScale":0.48},
-    {"id":56, "title":"四爷吃汉堡", "bundle":"unit75", "unit":75, "maxScale":0.8, "minScale":0.48},
-    {"id":57, "title":"大驾光临", "bundle":"unit67", "unit":67, "maxScale":1, "minScale":0.68},
-    {"id":58, "title":"火焰山烧烤", "bundle":"unit53", "unit":53, "maxScale":0.8, "minScale":0.5},
-    {"id":59, "title":"七仙女带货", "bundle":"unit48", "unit":48, "maxScale":0.8, "minScale":0.5},
-    {"id":60, "title":"大郎烧饼店", "bundle":"unit58", "unit":58, "maxScale":0.8, "minScale":0.5},
-    {"id":61, "title":"拳打镇关西", "bundle":"unit61", "unit":61, "maxScale":1, "minScale":0.68},
-    {"id":62, "title":"武松打虎", "bundle":"unit63", "unit":63, "maxScale":1, "minScale":0.68},
-    {"id":63, "title":"虎牢关之战", "bundle":"unit40", "unit":40, "maxScale":1, "minScale":0.67},
-    {"id":64, "title":"三英战吕布", "bundle":"unit51", "unit":51, "maxScale":0.8, "minScale":0.5},
-    {"id":65, "title":"长坂救阿斗", "bundle":"unit47", "unit":47, "maxScale":0.8, "minScale":0.5},
-    {"id":66, "title":"青梅煮火锅", "bundle":"unit52", "unit":52, "maxScale":0.4, "minScale":0.26},
-    {"id":67, "title":"草船借舰", "bundle":"unit50", "unit":50, "maxScale":0.8, "minScale":0.5},
-    {"id":68, "title":"借东风", "bundle":"unit69", "unit":69, "maxScale":0.4, "minScale":0.25},
-    {"id":69, "title":"三国军乐团", "bundle":"unit46", "unit":46, "maxScale":0.9, "minScale":0.58},
-    {"id":70, "title":"关羽过关", "bundle":"unit56", "unit":56, "maxScale":0.8, "minScale":0.5},
-    {"id":71, "title":"常山造纸农", "bundle":"unit64", "unit":64, "maxScale":0.8, "minScale":0.5},
-    {"id":72, "title":"焊骨疗伤", "bundle":"unit71", "unit":71, "maxScale":0.8, "minScale":0.5},
-    {"id":73, "title":"三顾茅庐", "bundle":"unit66", "unit":66, "maxScale":1, "minScale":0.68},
-    {"id":74, "title":"三兄弟团建", "bundle":"unit29", "unit":29, "maxScale":1.35, "minScale":0.8},
-    {"id":75, "title":"印度医院", "bundle":"unit26", "unit":26, "maxScale":1.25, "minScale":0.73},
-    {"id":76, "title":"食材健身房", "bundle":"unit25", "unit":25, "maxScale":1.25, "minScale":0.73},
-    {"id":77, "title":"哪吒郊游", "bundle":"unit12", "unit":12, "maxScale":0.4, "minScale":0.25},
-    {"id":78, "title":"狗狗杂技", "bundle":"unit36", "unit":36, "maxScale":0.85, "minScale":0.54},
-    {"id":79, "title":"猪猪劫狱", "bundle":"unit41", "unit":41, "maxScale":1.2, "minScale":0.78}
-    ,    {"id":80, "title":"破屋取暖", "bundle":"unit111", "unit":111, "maxScale":1, "minScale":1},
-        {"id":81, "title":"上屋抽屉子", "bundle":"unit112", "unit":112, "maxScale":1, "minScale":1},
-            {"id":82, "title":"卧薪尝胆", "bundle":"unit113", "unit":113, "maxScale":1, "minScale":1},
-                {"id":53, "title":"依依不舍", "bundle":"unit114", "unit":114, "maxScale":1, "minScale":1}
+    {"id":12, "title":"破屋取暖", "bundle":"unit111", "unit":111, "maxScale":1, "minScale":0.64},
+    {"id":13, "title":"上屋抽梯", "bundle":"unit112", "unit":112, "maxScale":1, "minScale":0.64},
+    {"id":14, "title":"卧星尝胆", "bundle":"unit113", "unit":113, "maxScale":1, "minScale":0.64},
+    {"id":15, "title":"衣衣不舍", "bundle":"unit114", "unit":114, "maxScale":1, "minScale":0.64},
+    {"id":16, "title":"应接不暇", "bundle":"unit102", "unit":102, "maxScale":1, "minScale":0.67},
+    {"id":17, "title":"顺手牵羊", "bundle":"unit103", "unit":103, "maxScale":0.7, "minScale":0.43},
+    {"id":18, "title":"夜公好龙", "bundle":"unit94", "unit":94, "maxScale":0.4, "minScale":0.25},
+    {"id":19, "title":"牛头马面", "bundle":"unit95", "unit":95, "maxScale":1, "minScale":0.67},
+    {"id":20, "title":"霸王别基", "bundle":"unit81", "unit":81, "maxScale":1, "minScale":0.67},
+    {"id":21, "title":"负金请罪", "bundle":"unit83", "unit":83, "maxScale":1, "minScale":0.67},
+    {"id":22, "title":"曹冲称象", "bundle":"unit78", "unit":78, "maxScale":1, "minScale":0.67},
+    {"id":23, "title":"猛虎下山", "bundle":"unit80", "unit":80, "maxScale":1, "minScale":0.67},
+    {"id":24, "title":"孔雀开瓶", "bundle":"unit79", "unit":79, "maxScale":1, "minScale":0.67},
+    {"id":25, "title":"口若悬河", "bundle":"unit84", "unit":84, "maxScale":0.8, "minScale":0.5},
+    {"id":26, "title":"灯火戏诸侯", "bundle":"unit76", "unit":76, "maxScale":1, "minScale":0.67},
+    {"id":27, "title":"司马光砸缸", "bundle":"unit77", "unit":77, "maxScale":1, "minScale":0.67},
+    {"id":28, "title":"哪吒闹厨房", "bundle":"unit85", "unit":85, "maxScale":0.8, "minScale":0.5},
+    {"id":29, "title":"搬门弄虎", "bundle":"unit86", "unit":86, "maxScale":0.8, "minScale":0.5},
+    {"id":30, "title":"鹿见不平", "bundle":"unit88", "unit":88, "maxScale":0.8, "minScale":0.5},
+    {"id":31, "title":"守猪待兔", "bundle":"unit87", "unit":87, "maxScale":0.8, "minScale":0.5},
+    {"id":32, "title":"随心所浴", "bundle":"unit89", "unit":89, "maxScale":1, "minScale":0.67},
+    {"id":33, "title":"背井离乡", "bundle":"unit90", "unit":90, "maxScale":1, "minScale":0.67},
+    {"id":34, "title":"羊没吐气", "bundle":"unit91", "unit":91, "maxScale":1, "minScale":0.67},
+    {"id":35, "title":"画蛇添足", "bundle":"unit92", "unit":92, "maxScale":1, "minScale":0.67},
+    {"id":36, "title":"鸡不可湿", "bundle":"unit93", "unit":93, "maxScale":1, "minScale":0.67},
+    {"id":37, "title":"背水一战", "bundle":"unit82", "unit":82, "maxScale":0.8, "minScale":0.5},
+    {"id":38, "title":"病鸡乱投医", "bundle":"unit104", "unit":104, "maxScale":1, "minScale":0.67},
+    {"id":39, "title":"对牛弹琴", "bundle":"unit68", "unit":68, "maxScale":0.8, "minScale":0.5},
+    {"id":40, "title":"凿壁偷光", "bundle":"unit65", "unit":65, "maxScale":0.8, "minScale":0.5},
+    {"id":41, "title":"坐山观虎斗", "bundle":"unit60", "unit":60, "maxScale":0.8, "minScale":0.5},
+    {"id":42, "title":"愚公移山", "bundle":"unit57", "unit":57, "maxScale":0.8, "minScale":0.5},
+    {"id":43, "title":"西门吹雪", "bundle":"unit62", "unit":62, "maxScale":1, "minScale":0.68},
+    {"id":44, "title":"吊虎离山", "bundle":"unit59", "unit":59, "maxScale":0.4, "minScale":0.25},
+    {"id":45, "title":"闺房密语", "bundle":"unit44", "unit":44, "maxScale":0.8, "minScale":0.5},
+    {"id":46, "title":"秦王绕柱", "bundle":"unit74", "unit":74, "maxScale":0.8, "minScale":0.48},
+    {"id":47, "title":"二龙戏珠", "bundle":"unit70", "unit":70, "maxScale":0.8, "minScale":0.49},
+    {"id":48, "title":"马车郊游", "bundle":"unit32", "unit":32, "maxScale":0.5, "minScale":0.33},
+    {"id":49, "title":"雨夜沐足", "bundle":"unit35", "unit":35, "maxScale":1.25, "minScale":0.73},
+    {"id":50, "title":"古代郊游", "bundle":"unit39", "unit":39, "maxScale":1, "minScale":0.67},
+    {"id":51, "title":"海边露营", "bundle":"unit43", "unit":43, "maxScale":0.8, "minScale":0.5},
+    {"id":52, "title":"雨夜露营", "bundle":"unit45", "unit":45, "maxScale":0.8, "minScale":0.5},
+    {"id":53, "title":"古代出游", "bundle":"unit42", "unit":42, "maxScale":1, "minScale":0.67},
+    {"id":54, "title":"雪夜用膳", "bundle":"unit55", "unit":55, "maxScale":0.4, "minScale":0.25},
+    {"id":55, "title":"古法带妹", "bundle":"unit38", "unit":38, "maxScale":1.4, "minScale":0.94},
+    {"id":56, "title":"古代炸鸡店", "bundle":"unit49", "unit":49, "maxScale":0.8, "minScale":0.5},
+    {"id":57, "title":"杜甫逛街", "bundle":"unit37", "unit":37, "maxScale":1.3, "minScale":0.8},
+    {"id":58, "title":"古代刑场", "bundle":"unit72", "unit":72, "maxScale":0.8, "minScale":0.48},
+    {"id":59, "title":"古代消暑", "bundle":"unit73", "unit":73, "maxScale":0.8, "minScale":0.48},
+    {"id":60, "title":"四爷吃汉堡", "bundle":"unit75", "unit":75, "maxScale":0.8, "minScale":0.48},
+    {"id":61, "title":"大驾光临", "bundle":"unit67", "unit":67, "maxScale":1, "minScale":0.68},
+    {"id":62, "title":"火焰山烧烤", "bundle":"unit53", "unit":53, "maxScale":0.8, "minScale":0.5},
+    {"id":63, "title":"七仙女带货", "bundle":"unit48", "unit":48, "maxScale":0.8, "minScale":0.5},
+    {"id":64, "title":"大郎烧饼店", "bundle":"unit58", "unit":58, "maxScale":0.8, "minScale":0.5},
+    {"id":65, "title":"拳打镇关西", "bundle":"unit61", "unit":61, "maxScale":1, "minScale":0.68},
+    {"id":66, "title":"武松打虎", "bundle":"unit63", "unit":63, "maxScale":1, "minScale":0.68},
+    {"id":67, "title":"虎牢关之战", "bundle":"unit40", "unit":40, "maxScale":1, "minScale":0.67},
+    {"id":68, "title":"三英战吕布", "bundle":"unit51", "unit":51, "maxScale":0.8, "minScale":0.5},
+    {"id":69, "title":"长坂救阿斗", "bundle":"unit47", "unit":47, "maxScale":0.8, "minScale":0.5},
+    {"id":70, "title":"青梅煮火锅", "bundle":"unit52", "unit":52, "maxScale":0.4, "minScale":0.26},
+    {"id":71, "title":"草船借舰", "bundle":"unit50", "unit":50, "maxScale":0.8, "minScale":0.5},
+    {"id":72, "title":"借东风", "bundle":"unit69", "unit":69, "maxScale":0.4, "minScale":0.25},
+    {"id":73, "title":"三国军乐团", "bundle":"unit46", "unit":46, "maxScale":0.9, "minScale":0.58},
+    {"id":74, "title":"关羽过关", "bundle":"unit56", "unit":56, "maxScale":0.8, "minScale":0.5},
+    {"id":75, "title":"常山造纸农", "bundle":"unit64", "unit":64, "maxScale":0.8, "minScale":0.5},
+    {"id":76, "title":"焊骨疗伤", "bundle":"unit71", "unit":71, "maxScale":0.8, "minScale":0.5},
+    {"id":77, "title":"三顾茅庐", "bundle":"unit66", "unit":66, "maxScale":1, "minScale":0.68},
+    {"id":78, "title":"三兄弟团建", "bundle":"unit29", "unit":29, "maxScale":1.35, "minScale":0.8},
+    {"id":79, "title":"印度医院", "bundle":"unit26", "unit":26, "maxScale":1.25, "minScale":0.73},
+    {"id":80, "title":"食材健身房", "bundle":"unit25", "unit":25, "maxScale":1.25, "minScale":0.73},
+    {"id":81, "title":"哪吒郊游", "bundle":"unit12", "unit":12, "maxScale":0.4, "minScale":0.25},
+    {"id":82, "title":"狗狗杂技", "bundle":"unit36", "unit":36, "maxScale":0.85, "minScale":0.54},
+    {"id":83, "title":"猪猪劫狱", "bundle":"unit41", "unit":41, "maxScale":1.2, "minScale":0.78}
 ]

+ 6 - 6
assets/unit112/prefab/game.prefab

@@ -2519,7 +2519,7 @@
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "default",
-    "defaultAnimation": "",
+    "defaultAnimation": "idle",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -2655,7 +2655,7 @@
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "default",
-    "defaultAnimation": "",
+    "defaultAnimation": "idle",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -2790,8 +2790,8 @@
       "__uuid__": "a122af7c-ecb2-4dbd-a34d-c2a41dd3bae6",
       "__expectedType__": "sp.SkeletonData"
     },
-    "defaultSkin": "",
-    "defaultAnimation": "",
+    "defaultSkin": "default",
+    "defaultAnimation": "idle",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -2926,8 +2926,8 @@
       "__uuid__": "960f81cf-f7a7-4c6c-bfc9-5cd60c0db68e",
       "__expectedType__": "sp.SkeletonData"
     },
-    "defaultSkin": "",
-    "defaultAnimation": "",
+    "defaultSkin": "default",
+    "defaultAnimation": "idle",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,

BIN
assets/unit114/image/bg.jpg


+ 6 - 6
assets/unit114/image/bg.jpg.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "e73894f8-4caa-4878-b102-e2a7dbe8b382",
+  "uuid": "a681043d-a06b-4550-aa1f-82d5ab367332",
   "files": [
     ".jpg",
     ".json"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "e73894f8-4caa-4878-b102-e2a7dbe8b382@6c48a",
+      "uuid": "a681043d-a06b-4550-aa1f-82d5ab367332@6c48a",
       "displayName": "bg",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "e73894f8-4caa-4878-b102-e2a7dbe8b382",
+        "imageUuidOrDatabaseUri": "a681043d-a06b-4550-aa1f-82d5ab367332",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "e73894f8-4caa-4878-b102-e2a7dbe8b382@f9941",
+      "uuid": "a681043d-a06b-4550-aa1f-82d5ab367332@f9941",
       "displayName": "bg",
       "id": "f9941",
       "name": "spriteFrame",
@@ -113,7 +113,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "e73894f8-4caa-4878-b102-e2a7dbe8b382@6c48a",
+        "imageUuidOrDatabaseUri": "a681043d-a06b-4550-aa1f-82d5ab367332@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": false,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "e73894f8-4caa-4878-b102-e2a7dbe8b382@6c48a"
+    "redirect": "a681043d-a06b-4550-aa1f-82d5ab367332@6c48a"
   }
 }

+ 2 - 2
assets/unit114/prefab/game.prefab

@@ -2947,7 +2947,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -5195,7 +5195,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "e73894f8-4caa-4878-b102-e2a7dbe8b382@f9941",
+      "__uuid__": "a681043d-a06b-4550-aa1f-82d5ab367332@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,