baowen 4 dias atrás
pai
commit
ace2f39a8f
100 arquivos alterados com 2348 adições e 1447 exclusões
  1. 608 73
      assets/hall/data/gamecfg.json
  2. BIN
      assets/hall/image/levelbg/level105.png
  3. 28 28
      assets/hall/image/levelbg/level105.png.meta
  4. BIN
      assets/hall/image/levelbg/level106.png
  5. 134 0
      assets/hall/image/levelbg/level106.png.meta
  6. 19 5
      assets/hall/script/BaseZhaocha.ts
  7. 2 2
      assets/unit104/prefab/game.prefab
  8. BIN
      assets/unit105/image/bg.jpg
  9. BIN
      assets/unit105/image/bg.png
  10. 36 36
      assets/unit105/image/bg.png.meta
  11. BIN
      assets/unit105/image/item0.png
  12. 27 27
      assets/unit105/image/item0.png.meta
  13. BIN
      assets/unit105/image/item1.png
  14. 27 27
      assets/unit105/image/item1.png.meta
  15. BIN
      assets/unit105/image/item10.png
  16. BIN
      assets/unit105/image/item11.png
  17. 27 27
      assets/unit105/image/item11.png.meta
  18. BIN
      assets/unit105/image/item2.png
  19. 27 27
      assets/unit105/image/item2.png.meta
  20. BIN
      assets/unit105/image/item3.png
  21. 27 27
      assets/unit105/image/item3.png.meta
  22. BIN
      assets/unit105/image/item4.png
  23. 27 27
      assets/unit105/image/item4.png.meta
  24. BIN
      assets/unit105/image/item5.png
  25. 27 27
      assets/unit105/image/item5.png.meta
  26. BIN
      assets/unit105/image/item6.png
  27. 27 27
      assets/unit105/image/item6.png.meta
  28. BIN
      assets/unit105/image/item7.png
  29. 27 27
      assets/unit105/image/item7.png.meta
  30. BIN
      assets/unit105/image/item8.png
  31. 27 27
      assets/unit105/image/item8.png.meta
  32. BIN
      assets/unit105/image/item9.png
  33. 27 27
      assets/unit105/image/item9.png.meta
  34. BIN
      assets/unit105/image/zhangai1.png
  35. 134 0
      assets/unit105/image/zhangai1.png.meta
  36. BIN
      assets/unit105/image/zhangai2.png
  37. 134 0
      assets/unit105/image/zhangai2.png.meta
  38. BIN
      assets/unit105/image/悬壶济世.jpg
  39. 28 28
      assets/unit105/image/悬壶济世.jpg.meta
  40. 168 585
      assets/unit105/prefab/game.prefab
  41. 35 16
      assets/unit105/script/unit105.ts
  42. 0 0
      assets/unit105/script/unit105.ts.meta
  43. 20 0
      assets/unit105/spine/7.1.2_baiyi.atlas
  44. 12 0
      assets/unit105/spine/7.1.2_baiyi.atlas.meta
  45. 0 0
      assets/unit105/spine/7.1.2_baiyi.json
  46. 13 0
      assets/unit105/spine/7.1.2_baiyi.json.meta
  47. BIN
      assets/unit105/spine/7.1.2_baiyi.png
  48. 134 0
      assets/unit105/spine/7.1.2_baiyi.png.meta
  49. 5 5
      assets/unit105/spine/7.1.2_huiyi.atlas
  50. 12 0
      assets/unit105/spine/7.1.2_huiyi.atlas.meta
  51. 0 0
      assets/unit105/spine/7.1.2_huiyi.json
  52. 13 0
      assets/unit105/spine/7.1.2_huiyi.json.meta
  53. BIN
      assets/unit105/spine/7.1.2_huiyi.png
  54. 30 30
      assets/unit105/spine/7.1.2_huiyi.png.meta
  55. 5 5
      assets/unit105/spine/7.1.2_qiziy.atlas
  56. 12 0
      assets/unit105/spine/7.1.2_qiziy.atlas.meta
  57. 0 0
      assets/unit105/spine/7.1.2_qiziy.json
  58. 13 0
      assets/unit105/spine/7.1.2_qiziy.json.meta
  59. BIN
      assets/unit105/spine/7.1.2_qiziy.png
  60. 38 38
      assets/unit105/spine/7.1.2_qiziy.png.meta
  61. 5 5
      assets/unit105/spine/7.1.2_qiziz.atlas
  62. 12 0
      assets/unit105/spine/7.1.2_qiziz.atlas.meta
  63. 0 0
      assets/unit105/spine/7.1.2_qiziz.json
  64. 13 0
      assets/unit105/spine/7.1.2_qiziz.json.meta
  65. BIN
      assets/unit105/spine/7.1.2_qiziz.png
  66. 134 0
      assets/unit105/spine/7.1.2_qiziz.png.meta
  67. 0 1
      assets/unit105/spine/qy_qizi1.atlas.meta
  68. 0 0
      assets/unit105/spine/qy_qizi1.json
  69. 0 1
      assets/unit105/spine/qy_qizi1.json.meta
  70. BIN
      assets/unit105/spine/qy_qizi1.png
  71. 0 1
      assets/unit105/spine/qy_qizi2.atlas.meta
  72. 0 0
      assets/unit105/spine/qy_qizi2.json
  73. 0 1
      assets/unit105/spine/qy_qizi2.json.meta
  74. BIN
      assets/unit105/spine/qy_qizi2.png
  75. 0 34
      assets/unit105/spine/qy_ren.atlas
  76. 0 1
      assets/unit105/spine/qy_ren.atlas.meta
  77. 0 0
      assets/unit105/spine/qy_ren.json
  78. 0 1
      assets/unit105/spine/qy_ren.json.meta
  79. BIN
      assets/unit105/spine/qy_ren.png
  80. 1 1
      assets/unit106.meta
  81. 1 1
      assets/unit106/image.meta
  82. BIN
      assets/unit106/image/bg.jpg
  83. BIN
      assets/unit106/image/bg.png
  84. 36 36
      assets/unit106/image/bg.png.meta
  85. BIN
      assets/unit106/image/item0.png
  86. 27 27
      assets/unit106/image/item0.png.meta
  87. BIN
      assets/unit106/image/item1.png
  88. 27 27
      assets/unit106/image/item1.png.meta
  89. BIN
      assets/unit106/image/item10.png
  90. 27 27
      assets/unit106/image/item10.png.meta
  91. BIN
      assets/unit106/image/item11.png
  92. 27 27
      assets/unit106/image/item11.png.meta
  93. BIN
      assets/unit106/image/item2.png
  94. 27 27
      assets/unit106/image/item2.png.meta
  95. BIN
      assets/unit106/image/item3.png
  96. 27 27
      assets/unit106/image/item3.png.meta
  97. BIN
      assets/unit106/image/item4.png
  98. 27 27
      assets/unit106/image/item4.png.meta
  99. BIN
      assets/unit106/image/item5.png
  100. 27 27
      assets/unit106/image/item5.png.meta

+ 608 - 73
assets/hall/data/gamecfg.json

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

BIN
assets/hall/image/levelbg/level105.png


+ 28 - 28
assets/unit105/image/item10.png.meta → assets/hall/image/levelbg/level105.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "19001ef1-245b-4828-b91d-eb14aa3f1e34",
+  "uuid": "67a1cb40-8da0-42e0-8bef-ed3dce458baa",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "19001ef1-245b-4828-b91d-eb14aa3f1e34@6c48a",
-      "displayName": "item10",
+      "uuid": "67a1cb40-8da0-42e0-8bef-ed3dce458baa@6c48a",
+      "displayName": "level105",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "19001ef1-245b-4828-b91d-eb14aa3f1e34",
+        "imageUuidOrDatabaseUri": "67a1cb40-8da0-42e0-8bef-ed3dce458baa",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "19001ef1-245b-4828-b91d-eb14aa3f1e34@f9941",
-      "displayName": "item10",
+      "uuid": "67a1cb40-8da0-42e0-8bef-ed3dce458baa@f9941",
+      "displayName": "level105",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 163,
-        "height": 206,
-        "rawWidth": 163,
-        "rawHeight": 206,
+        "width": 175,
+        "height": 165,
+        "rawWidth": 175,
+        "rawHeight": 165,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -81.5,
-            -103,
+            -87.5,
+            -82.5,
             0,
-            81.5,
-            -103,
+            87.5,
+            -82.5,
             0,
-            -81.5,
-            103,
+            -87.5,
+            82.5,
             0,
-            81.5,
-            103,
+            87.5,
+            82.5,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            206,
-            163,
-            206,
+            165,
+            175,
+            165,
             0,
             0,
-            163,
+            175,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -81.5,
-            -103,
+            -87.5,
+            -82.5,
             0
           ],
           "maxPos": [
-            81.5,
-            103,
+            87.5,
+            82.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "19001ef1-245b-4828-b91d-eb14aa3f1e34@6c48a",
+        "imageUuidOrDatabaseUri": "67a1cb40-8da0-42e0-8bef-ed3dce458baa@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": false,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "19001ef1-245b-4828-b91d-eb14aa3f1e34@6c48a"
+    "redirect": "67a1cb40-8da0-42e0-8bef-ed3dce458baa@6c48a"
   }
 }

BIN
assets/hall/image/levelbg/level106.png


+ 134 - 0
assets/hall/image/levelbg/level106.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "3343a970-68bd-4907-baa0-473910c96399",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "3343a970-68bd-4907-baa0-473910c96399@6c48a",
+      "displayName": "level106",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "3343a970-68bd-4907-baa0-473910c96399",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "3343a970-68bd-4907-baa0-473910c96399@f9941",
+      "displayName": "level106",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 175,
+        "height": 165,
+        "rawWidth": 175,
+        "rawHeight": 165,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -87.5,
+            -82.5,
+            0,
+            87.5,
+            -82.5,
+            0,
+            -87.5,
+            82.5,
+            0,
+            87.5,
+            82.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            165,
+            175,
+            165,
+            0,
+            0,
+            175,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -87.5,
+            -82.5,
+            0
+          ],
+          "maxPos": [
+            87.5,
+            82.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "3343a970-68bd-4907-baa0-473910c96399@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "3343a970-68bd-4907-baa0-473910c96399@6c48a"
+  }
+}

+ 19 - 5
assets/hall/script/BaseZhaocha.ts

@@ -1,4 +1,4 @@
-import { _decorator, color, Color, Component, EventTouch, instantiate, Label, log, Node, Prefab, ScrollView, Sprite, tween, UIOpacity, UITransform, Vec2, Vec3 } from 'cc';
+import { _decorator, color, Color, Component, EventTouch, find, instantiate, Label, log, Node, Prefab, ScrollView, Sprite, tween, UIOpacity, UITransform, Vec2, Vec3 } from 'cc';
 import EventMgr from '../../script/Manager/EventMgr';
 import { LayerMgr } from '../../script/Manager/LayerMgr';
 import { GameCfg } from '../../script/Config/GameCfg';
@@ -20,7 +20,7 @@ export class BaseZhaocha extends Component {
 
     sv_cha: ScrollView = null
 
-    num_count: number = 12
+    num_count: number = 0
 
     arr_areadygetnum: Array<number> = []
 
@@ -41,10 +41,23 @@ export class BaseZhaocha extends Component {
 
     FindObj() {
         this.sv_cha = this.node.getChildByName("ScrollView").getComponent(ScrollView)
-        for (let index = 0; index < 12; index++) {
+        for (let index = 0; index < this.answerName.length; index++) {
             this.arr_node_allitem.push(this.node.getChildByName("mask").getChildByName("bg").getChildByName("item_" + index))// this.arr_node_allitem = this.node.getChildByName("mask").getChildByName("bg").children
         }
+        this.num_count = this.answerName.length
+    }
+
+    setActiveItemFrame() {
 
+        for (let index = 0; index < this.answerName.length; index++) {
+            this.sv_cha.node.getChildByName("view").getChildByName("content").getChildByName(index.toString()).active = true
+        }
+    }
+
+    setActiveAllNeedItemFrame() {
+        for (let index = 0; index < this.answerName.length; index++) {
+
+        }
     }
 
     bool_cantouch = true
@@ -62,6 +75,7 @@ export class BaseZhaocha extends Component {
             }, 0.1)
         }, this)
         this.FindObj()
+        this.setActiveItemFrame()
 
         this.node.on(Node.EventType.TOUCH_END, (event: EventTouch) => {
             if (this.bool_cantouch == false) return
@@ -102,7 +116,7 @@ export class BaseZhaocha extends Component {
                     let parent = this.getNullItem()
                     item.parent = this.node
 
-                    let point = (this.arr_areadygetnum.length - 1) * 1.2 / 12
+                    let point = (this.arr_areadygetnum.length - 1) * 1.2 / this.answerName.length
                     this.sv_cha.scrollToPercentHorizontal(point, 0.3, true)
 
                     // 获取点击项的世界坐标,并转换为当前节点下的局部坐标
@@ -147,7 +161,7 @@ export class BaseZhaocha extends Component {
     }
 
     ShowTishi() {
-        for (let index = 0; index < 12; index++) {
+        for (let index = 0; index < this.answerName.length; index++) {
             if (this.arr_areadygetnum.indexOf(index) == -1 && !this.arr_node_allitem[index].getComponent(Sprite).color.equals(Color.GREEN)) {
                 if (this.num_showTip == index) {
                     // if (this.arr_node_allitem[index].active) {

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

@@ -4827,7 +4827,7 @@
     "node": {
       "__id__": 98
     },
-    "_enabled": false,
+    "_enabled": true,
     "__prefab": {
       "__id__": 236
     },
@@ -4849,7 +4849,7 @@
     "node": {
       "__id__": 98
     },
-    "_enabled": false,
+    "_enabled": true,
     "__prefab": {
       "__id__": 238
     },

BIN
assets/unit105/image/bg.jpg


BIN
assets/unit105/image/bg.png


+ 36 - 36
assets/unit105/spine/qy_qizi2.png.meta → assets/unit105/image/bg.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "efea1f8c-7d93-49cd-8e61-ce33f0f6e8c2",
+  "uuid": "614cc36d-79f8-4e98-88d7-22837297edbb",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "efea1f8c-7d93-49cd-8e61-ce33f0f6e8c2@6c48a",
-      "displayName": "qy_qizi2",
+      "uuid": "614cc36d-79f8-4e98-88d7-22837297edbb@6c48a",
+      "displayName": "bg",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "efea1f8c-7d93-49cd-8e61-ce33f0f6e8c2",
+        "imageUuidOrDatabaseUri": "614cc36d-79f8-4e98-88d7-22837297edbb",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "efea1f8c-7d93-49cd-8e61-ce33f0f6e8c2@f9941",
-      "displayName": "qy_qizi2",
+      "uuid": "614cc36d-79f8-4e98-88d7-22837297edbb@f9941",
+      "displayName": "bg",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 1,
         "trimY": 1,
-        "width": 191,
-        "height": 294,
-        "rawWidth": 193,
-        "rawHeight": 296,
+        "width": 3000,
+        "height": 4284,
+        "rawWidth": 3002,
+        "rawHeight": 4286,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -95.5,
-            -147,
+            -1500,
+            -2142,
             0,
-            95.5,
-            -147,
+            1500,
+            -2142,
             0,
-            -95.5,
-            147,
+            -1500,
+            2142,
             0,
-            95.5,
-            147,
+            1500,
+            2142,
             0
           ],
           "indexes": [
@@ -83,37 +83,37 @@
           ],
           "uv": [
             1,
-            295,
-            192,
-            295,
+            4285,
+            3001,
+            4285,
             1,
             1,
-            192,
+            3001,
             1
           ],
           "nuv": [
-            0.0051813471502590676,
-            0.0033783783783783786,
-            0.9948186528497409,
-            0.0033783783783783786,
-            0.0051813471502590676,
-            0.9966216216216216,
-            0.9948186528497409,
-            0.9966216216216216
+            0.00033311125916055963,
+            0.0002333177788147457,
+            0.9996668887408394,
+            0.0002333177788147457,
+            0.00033311125916055963,
+            0.9997666822211853,
+            0.9996668887408394,
+            0.9997666822211853
           ],
           "minPos": [
-            -95.5,
-            -147,
+            -1500,
+            -2142,
             0
           ],
           "maxPos": [
-            95.5,
-            147,
+            1500,
+            2142,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "efea1f8c-7d93-49cd-8e61-ce33f0f6e8c2@6c48a",
+        "imageUuidOrDatabaseUri": "614cc36d-79f8-4e98-88d7-22837297edbb@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "efea1f8c-7d93-49cd-8e61-ce33f0f6e8c2@6c48a"
+    "redirect": "614cc36d-79f8-4e98-88d7-22837297edbb@6c48a"
   }
 }

BIN
assets/unit105/image/item0.png


+ 27 - 27
assets/unit105/image/item0.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "8fb4271a-8d80-41e9-ab40-d092e8b81333",
+  "uuid": "8b3eeb27-35bf-4457-849d-e54d98659fbf",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "8fb4271a-8d80-41e9-ab40-d092e8b81333@6c48a",
+      "uuid": "8b3eeb27-35bf-4457-849d-e54d98659fbf@6c48a",
       "displayName": "item0",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "8fb4271a-8d80-41e9-ab40-d092e8b81333",
+        "imageUuidOrDatabaseUri": "8b3eeb27-35bf-4457-849d-e54d98659fbf",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "8fb4271a-8d80-41e9-ab40-d092e8b81333@f9941",
+      "uuid": "8b3eeb27-35bf-4457-849d-e54d98659fbf@f9941",
       "displayName": "item0",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 172,
-        "height": 149,
-        "rawWidth": 172,
-        "rawHeight": 149,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -86,
-            -74.5,
+            -49,
+            -49,
             0,
-            86,
-            -74.5,
+            49,
+            -49,
             0,
-            -86,
-            74.5,
+            -49,
+            49,
             0,
-            86,
-            74.5,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            149,
-            172,
-            149,
+            98,
+            98,
+            98,
             0,
             0,
-            172,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -86,
-            -74.5,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            86,
-            74.5,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "8fb4271a-8d80-41e9-ab40-d092e8b81333@6c48a",
+        "imageUuidOrDatabaseUri": "8b3eeb27-35bf-4457-849d-e54d98659fbf@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "8fb4271a-8d80-41e9-ab40-d092e8b81333@6c48a"
+    "redirect": "8b3eeb27-35bf-4457-849d-e54d98659fbf@6c48a"
   }
 }

BIN
assets/unit105/image/item1.png


+ 27 - 27
assets/unit105/image/item1.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "5ccf84b6-94d4-42a2-8be5-711126cc16b6",
+  "uuid": "1513a37e-1261-4b8f-9a76-dcc2cc42fe6d",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "5ccf84b6-94d4-42a2-8be5-711126cc16b6@6c48a",
+      "uuid": "1513a37e-1261-4b8f-9a76-dcc2cc42fe6d@6c48a",
       "displayName": "item1",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "5ccf84b6-94d4-42a2-8be5-711126cc16b6",
+        "imageUuidOrDatabaseUri": "1513a37e-1261-4b8f-9a76-dcc2cc42fe6d",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "5ccf84b6-94d4-42a2-8be5-711126cc16b6@f9941",
+      "uuid": "1513a37e-1261-4b8f-9a76-dcc2cc42fe6d@f9941",
       "displayName": "item1",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 106,
-        "height": 118,
-        "rawWidth": 106,
-        "rawHeight": 118,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -53,
-            -59,
+            -49,
+            -49,
             0,
-            53,
-            -59,
+            49,
+            -49,
             0,
-            -53,
-            59,
+            -49,
+            49,
             0,
-            53,
-            59,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            118,
-            106,
-            118,
+            98,
+            98,
+            98,
             0,
             0,
-            106,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -53,
-            -59,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            53,
-            59,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "5ccf84b6-94d4-42a2-8be5-711126cc16b6@6c48a",
+        "imageUuidOrDatabaseUri": "1513a37e-1261-4b8f-9a76-dcc2cc42fe6d@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "5ccf84b6-94d4-42a2-8be5-711126cc16b6@6c48a"
+    "redirect": "1513a37e-1261-4b8f-9a76-dcc2cc42fe6d@6c48a"
   }
 }

BIN
assets/unit105/image/item10.png


BIN
assets/unit105/image/item11.png


+ 27 - 27
assets/unit105/image/item11.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "1a044c5e-3396-4491-b962-11163d3064f1",
+  "uuid": "c0310347-c8b1-444e-b296-b32f6503c303",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "1a044c5e-3396-4491-b962-11163d3064f1@6c48a",
+      "uuid": "c0310347-c8b1-444e-b296-b32f6503c303@6c48a",
       "displayName": "item11",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "1a044c5e-3396-4491-b962-11163d3064f1",
+        "imageUuidOrDatabaseUri": "c0310347-c8b1-444e-b296-b32f6503c303",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "1a044c5e-3396-4491-b962-11163d3064f1@f9941",
+      "uuid": "c0310347-c8b1-444e-b296-b32f6503c303@f9941",
       "displayName": "item11",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 176,
-        "height": 176,
-        "rawWidth": 176,
-        "rawHeight": 176,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -88,
-            -88,
+            -49,
+            -49,
             0,
-            88,
-            -88,
+            49,
+            -49,
             0,
-            -88,
-            88,
+            -49,
+            49,
             0,
-            88,
-            88,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            176,
-            176,
-            176,
+            98,
+            98,
+            98,
             0,
             0,
-            176,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -88,
-            -88,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            88,
-            88,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "1a044c5e-3396-4491-b962-11163d3064f1@6c48a",
+        "imageUuidOrDatabaseUri": "c0310347-c8b1-444e-b296-b32f6503c303@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "1a044c5e-3396-4491-b962-11163d3064f1@6c48a"
+    "redirect": "c0310347-c8b1-444e-b296-b32f6503c303@6c48a"
   }
 }

BIN
assets/unit105/image/item2.png


+ 27 - 27
assets/unit105/image/item2.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "86ee262a-3123-48e2-9691-b546c733f01b",
+  "uuid": "35148bf2-a712-4914-865c-0db76ca56a52",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "86ee262a-3123-48e2-9691-b546c733f01b@6c48a",
+      "uuid": "35148bf2-a712-4914-865c-0db76ca56a52@6c48a",
       "displayName": "item2",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "86ee262a-3123-48e2-9691-b546c733f01b",
+        "imageUuidOrDatabaseUri": "35148bf2-a712-4914-865c-0db76ca56a52",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "86ee262a-3123-48e2-9691-b546c733f01b@f9941",
+      "uuid": "35148bf2-a712-4914-865c-0db76ca56a52@f9941",
       "displayName": "item2",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 83,
-        "height": 91,
-        "rawWidth": 83,
-        "rawHeight": 91,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -41.5,
-            -45.5,
+            -49,
+            -49,
             0,
-            41.5,
-            -45.5,
+            49,
+            -49,
             0,
-            -41.5,
-            45.5,
+            -49,
+            49,
             0,
-            41.5,
-            45.5,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            91,
-            83,
-            91,
+            98,
+            98,
+            98,
             0,
             0,
-            83,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -41.5,
-            -45.5,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            41.5,
-            45.5,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "86ee262a-3123-48e2-9691-b546c733f01b@6c48a",
+        "imageUuidOrDatabaseUri": "35148bf2-a712-4914-865c-0db76ca56a52@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "86ee262a-3123-48e2-9691-b546c733f01b@6c48a"
+    "redirect": "35148bf2-a712-4914-865c-0db76ca56a52@6c48a"
   }
 }

BIN
assets/unit105/image/item3.png


+ 27 - 27
assets/unit105/image/item3.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "c0c5bd7a-c7d9-4e35-a048-9640cfb03c14",
+  "uuid": "b0bdfdc0-6045-43f7-87c3-2e2cd97c8686",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "c0c5bd7a-c7d9-4e35-a048-9640cfb03c14@6c48a",
+      "uuid": "b0bdfdc0-6045-43f7-87c3-2e2cd97c8686@6c48a",
       "displayName": "item3",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "c0c5bd7a-c7d9-4e35-a048-9640cfb03c14",
+        "imageUuidOrDatabaseUri": "b0bdfdc0-6045-43f7-87c3-2e2cd97c8686",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "c0c5bd7a-c7d9-4e35-a048-9640cfb03c14@f9941",
+      "uuid": "b0bdfdc0-6045-43f7-87c3-2e2cd97c8686@f9941",
       "displayName": "item3",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 160,
-        "height": 152,
-        "rawWidth": 160,
-        "rawHeight": 152,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -80,
-            -76,
+            -49,
+            -49,
             0,
-            80,
-            -76,
+            49,
+            -49,
             0,
-            -80,
-            76,
+            -49,
+            49,
             0,
-            80,
-            76,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            152,
-            160,
-            152,
+            98,
+            98,
+            98,
             0,
             0,
-            160,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -80,
-            -76,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            80,
-            76,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "c0c5bd7a-c7d9-4e35-a048-9640cfb03c14@6c48a",
+        "imageUuidOrDatabaseUri": "b0bdfdc0-6045-43f7-87c3-2e2cd97c8686@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "c0c5bd7a-c7d9-4e35-a048-9640cfb03c14@6c48a"
+    "redirect": "b0bdfdc0-6045-43f7-87c3-2e2cd97c8686@6c48a"
   }
 }

BIN
assets/unit105/image/item4.png


+ 27 - 27
assets/unit105/image/item4.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "48309056-1744-47c8-b452-6fc3891b4ec2",
+  "uuid": "055793cb-c6bb-4c7c-a271-8de3d3eedb36",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "48309056-1744-47c8-b452-6fc3891b4ec2@6c48a",
+      "uuid": "055793cb-c6bb-4c7c-a271-8de3d3eedb36@6c48a",
       "displayName": "item4",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "48309056-1744-47c8-b452-6fc3891b4ec2",
+        "imageUuidOrDatabaseUri": "055793cb-c6bb-4c7c-a271-8de3d3eedb36",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "48309056-1744-47c8-b452-6fc3891b4ec2@f9941",
+      "uuid": "055793cb-c6bb-4c7c-a271-8de3d3eedb36@f9941",
       "displayName": "item4",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 176,
-        "height": 176,
-        "rawWidth": 176,
-        "rawHeight": 176,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -88,
-            -88,
+            -49,
+            -49,
             0,
-            88,
-            -88,
+            49,
+            -49,
             0,
-            -88,
-            88,
+            -49,
+            49,
             0,
-            88,
-            88,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            176,
-            176,
-            176,
+            98,
+            98,
+            98,
             0,
             0,
-            176,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -88,
-            -88,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            88,
-            88,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "48309056-1744-47c8-b452-6fc3891b4ec2@6c48a",
+        "imageUuidOrDatabaseUri": "055793cb-c6bb-4c7c-a271-8de3d3eedb36@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "48309056-1744-47c8-b452-6fc3891b4ec2@6c48a"
+    "redirect": "055793cb-c6bb-4c7c-a271-8de3d3eedb36@6c48a"
   }
 }

BIN
assets/unit105/image/item5.png


+ 27 - 27
assets/unit105/image/item5.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "3ba76ec8-33eb-4685-af26-9d6139888bc3",
+  "uuid": "682cc55e-c9a7-44eb-847c-f95157ee0070",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "3ba76ec8-33eb-4685-af26-9d6139888bc3@6c48a",
+      "uuid": "682cc55e-c9a7-44eb-847c-f95157ee0070@6c48a",
       "displayName": "item5",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "3ba76ec8-33eb-4685-af26-9d6139888bc3",
+        "imageUuidOrDatabaseUri": "682cc55e-c9a7-44eb-847c-f95157ee0070",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "3ba76ec8-33eb-4685-af26-9d6139888bc3@f9941",
+      "uuid": "682cc55e-c9a7-44eb-847c-f95157ee0070@f9941",
       "displayName": "item5",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 187,
-        "height": 206,
-        "rawWidth": 187,
-        "rawHeight": 206,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -93.5,
-            -103,
+            -49,
+            -49,
             0,
-            93.5,
-            -103,
+            49,
+            -49,
             0,
-            -93.5,
-            103,
+            -49,
+            49,
             0,
-            93.5,
-            103,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            206,
-            187,
-            206,
+            98,
+            98,
+            98,
             0,
             0,
-            187,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -93.5,
-            -103,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            93.5,
-            103,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "3ba76ec8-33eb-4685-af26-9d6139888bc3@6c48a",
+        "imageUuidOrDatabaseUri": "682cc55e-c9a7-44eb-847c-f95157ee0070@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "3ba76ec8-33eb-4685-af26-9d6139888bc3@6c48a"
+    "redirect": "682cc55e-c9a7-44eb-847c-f95157ee0070@6c48a"
   }
 }

BIN
assets/unit105/image/item6.png


+ 27 - 27
assets/unit105/image/item6.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "5f8c2cfb-0d89-40c4-9d34-b62e3bdf8b8a",
+  "uuid": "7bb6da91-04ab-4bee-9ef1-6802677572e5",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "5f8c2cfb-0d89-40c4-9d34-b62e3bdf8b8a@6c48a",
+      "uuid": "7bb6da91-04ab-4bee-9ef1-6802677572e5@6c48a",
       "displayName": "item6",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "5f8c2cfb-0d89-40c4-9d34-b62e3bdf8b8a",
+        "imageUuidOrDatabaseUri": "7bb6da91-04ab-4bee-9ef1-6802677572e5",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "5f8c2cfb-0d89-40c4-9d34-b62e3bdf8b8a@f9941",
+      "uuid": "7bb6da91-04ab-4bee-9ef1-6802677572e5@f9941",
       "displayName": "item6",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 94,
-        "height": 77,
-        "rawWidth": 94,
-        "rawHeight": 77,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -47,
-            -38.5,
+            -49,
+            -49,
             0,
-            47,
-            -38.5,
+            49,
+            -49,
             0,
-            -47,
-            38.5,
+            -49,
+            49,
             0,
-            47,
-            38.5,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            77,
-            94,
-            77,
+            98,
+            98,
+            98,
             0,
             0,
-            94,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -47,
-            -38.5,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            47,
-            38.5,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "5f8c2cfb-0d89-40c4-9d34-b62e3bdf8b8a@6c48a",
+        "imageUuidOrDatabaseUri": "7bb6da91-04ab-4bee-9ef1-6802677572e5@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "5f8c2cfb-0d89-40c4-9d34-b62e3bdf8b8a@6c48a"
+    "redirect": "7bb6da91-04ab-4bee-9ef1-6802677572e5@6c48a"
   }
 }

BIN
assets/unit105/image/item7.png


+ 27 - 27
assets/unit105/image/item7.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "90509956-8c49-489a-834a-d2625602f0a3",
+  "uuid": "ede1ea06-aa8e-43ce-a842-c6c4ac70a077",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "90509956-8c49-489a-834a-d2625602f0a3@6c48a",
+      "uuid": "ede1ea06-aa8e-43ce-a842-c6c4ac70a077@6c48a",
       "displayName": "item7",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "90509956-8c49-489a-834a-d2625602f0a3",
+        "imageUuidOrDatabaseUri": "ede1ea06-aa8e-43ce-a842-c6c4ac70a077",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "90509956-8c49-489a-834a-d2625602f0a3@f9941",
+      "uuid": "ede1ea06-aa8e-43ce-a842-c6c4ac70a077@f9941",
       "displayName": "item7",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 87,
-        "height": 109,
-        "rawWidth": 87,
-        "rawHeight": 109,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -43.5,
-            -54.5,
+            -49,
+            -49,
             0,
-            43.5,
-            -54.5,
+            49,
+            -49,
             0,
-            -43.5,
-            54.5,
+            -49,
+            49,
             0,
-            43.5,
-            54.5,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            109,
-            87,
-            109,
+            98,
+            98,
+            98,
             0,
             0,
-            87,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -43.5,
-            -54.5,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            43.5,
-            54.5,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "90509956-8c49-489a-834a-d2625602f0a3@6c48a",
+        "imageUuidOrDatabaseUri": "ede1ea06-aa8e-43ce-a842-c6c4ac70a077@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "90509956-8c49-489a-834a-d2625602f0a3@6c48a"
+    "redirect": "ede1ea06-aa8e-43ce-a842-c6c4ac70a077@6c48a"
   }
 }

BIN
assets/unit105/image/item8.png


+ 27 - 27
assets/unit105/image/item8.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "9fe3291c-bf86-4b91-a58b-49770bfbd678",
+  "uuid": "b6c69a7c-e2f2-43f1-8a3e-a319574a262d",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "9fe3291c-bf86-4b91-a58b-49770bfbd678@6c48a",
+      "uuid": "b6c69a7c-e2f2-43f1-8a3e-a319574a262d@6c48a",
       "displayName": "item8",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "9fe3291c-bf86-4b91-a58b-49770bfbd678",
+        "imageUuidOrDatabaseUri": "b6c69a7c-e2f2-43f1-8a3e-a319574a262d",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "9fe3291c-bf86-4b91-a58b-49770bfbd678@f9941",
+      "uuid": "b6c69a7c-e2f2-43f1-8a3e-a319574a262d@f9941",
       "displayName": "item8",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 114,
-        "height": 101,
-        "rawWidth": 114,
-        "rawHeight": 101,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -57,
-            -50.5,
+            -49,
+            -49,
             0,
-            57,
-            -50.5,
+            49,
+            -49,
             0,
-            -57,
-            50.5,
+            -49,
+            49,
             0,
-            57,
-            50.5,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            101,
-            114,
-            101,
+            98,
+            98,
+            98,
             0,
             0,
-            114,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -57,
-            -50.5,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            57,
-            50.5,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "9fe3291c-bf86-4b91-a58b-49770bfbd678@6c48a",
+        "imageUuidOrDatabaseUri": "b6c69a7c-e2f2-43f1-8a3e-a319574a262d@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "9fe3291c-bf86-4b91-a58b-49770bfbd678@6c48a"
+    "redirect": "b6c69a7c-e2f2-43f1-8a3e-a319574a262d@6c48a"
   }
 }

BIN
assets/unit105/image/item9.png


+ 27 - 27
assets/unit105/image/item9.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "1dd07fb2-6a8f-4e5e-8e69-0d562a094b50",
+  "uuid": "0292f376-81cd-40e0-96ae-f5b2361235b7",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "1dd07fb2-6a8f-4e5e-8e69-0d562a094b50@6c48a",
+      "uuid": "0292f376-81cd-40e0-96ae-f5b2361235b7@6c48a",
       "displayName": "item9",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "1dd07fb2-6a8f-4e5e-8e69-0d562a094b50",
+        "imageUuidOrDatabaseUri": "0292f376-81cd-40e0-96ae-f5b2361235b7",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "1dd07fb2-6a8f-4e5e-8e69-0d562a094b50@f9941",
+      "uuid": "0292f376-81cd-40e0-96ae-f5b2361235b7@f9941",
       "displayName": "item9",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 89,
-        "height": 73,
-        "rawWidth": 89,
-        "rawHeight": 73,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -44.5,
-            -36.5,
+            -49,
+            -49,
             0,
-            44.5,
-            -36.5,
+            49,
+            -49,
             0,
-            -44.5,
-            36.5,
+            -49,
+            49,
             0,
-            44.5,
-            36.5,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            73,
-            89,
-            73,
+            98,
+            98,
+            98,
             0,
             0,
-            89,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -44.5,
-            -36.5,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            44.5,
-            36.5,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "1dd07fb2-6a8f-4e5e-8e69-0d562a094b50@6c48a",
+        "imageUuidOrDatabaseUri": "0292f376-81cd-40e0-96ae-f5b2361235b7@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "1dd07fb2-6a8f-4e5e-8e69-0d562a094b50@6c48a"
+    "redirect": "0292f376-81cd-40e0-96ae-f5b2361235b7@6c48a"
   }
 }

BIN
assets/unit105/image/zhangai1.png


+ 134 - 0
assets/unit105/image/zhangai1.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "0fc690ec-56c3-4ab4-8410-ffb07c43d6a1",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "0fc690ec-56c3-4ab4-8410-ffb07c43d6a1@6c48a",
+      "displayName": "zhangai1",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "0fc690ec-56c3-4ab4-8410-ffb07c43d6a1",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "0fc690ec-56c3-4ab4-8410-ffb07c43d6a1@f9941",
+      "displayName": "zhangai1",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 181,
+        "height": 321,
+        "rawWidth": 181,
+        "rawHeight": 321,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -90.5,
+            -160.5,
+            0,
+            90.5,
+            -160.5,
+            0,
+            -90.5,
+            160.5,
+            0,
+            90.5,
+            160.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            321,
+            181,
+            321,
+            0,
+            0,
+            181,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -90.5,
+            -160.5,
+            0
+          ],
+          "maxPos": [
+            90.5,
+            160.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "0fc690ec-56c3-4ab4-8410-ffb07c43d6a1@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "0fc690ec-56c3-4ab4-8410-ffb07c43d6a1@6c48a"
+  }
+}

BIN
assets/unit105/image/zhangai2.png


+ 134 - 0
assets/unit105/image/zhangai2.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "5eadf405-f512-483a-8e2d-ebd0ccb599c7",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "5eadf405-f512-483a-8e2d-ebd0ccb599c7@6c48a",
+      "displayName": "zhangai2",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "5eadf405-f512-483a-8e2d-ebd0ccb599c7",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "5eadf405-f512-483a-8e2d-ebd0ccb599c7@f9941",
+      "displayName": "zhangai2",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 193,
+        "height": 737,
+        "rawWidth": 193,
+        "rawHeight": 737,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -96.5,
+            -368.5,
+            0,
+            96.5,
+            -368.5,
+            0,
+            -96.5,
+            368.5,
+            0,
+            96.5,
+            368.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            737,
+            193,
+            737,
+            0,
+            0,
+            193,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -96.5,
+            -368.5,
+            0
+          ],
+          "maxPos": [
+            96.5,
+            368.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "5eadf405-f512-483a-8e2d-ebd0ccb599c7@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "5eadf405-f512-483a-8e2d-ebd0ccb599c7@6c48a"
+  }
+}

BIN
assets/unit105/image/悬壶济世.jpg


+ 28 - 28
assets/unit106/image/bg.jpg.meta → assets/unit105/image/悬壶济世.jpg.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "43625c6b-cdcc-4646-ac17-7ebc244a65d7",
+  "uuid": "4e928ea4-ab2c-4f4a-b8d4-6a3fe5717961",
   "files": [
     ".jpg",
     ".json"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "43625c6b-cdcc-4646-ac17-7ebc244a65d7@6c48a",
-      "displayName": "bg",
+      "uuid": "4e928ea4-ab2c-4f4a-b8d4-6a3fe5717961@6c48a",
+      "displayName": "悬壶济世",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "43625c6b-cdcc-4646-ac17-7ebc244a65d7",
+        "imageUuidOrDatabaseUri": "4e928ea4-ab2c-4f4a-b8d4-6a3fe5717961",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "43625c6b-cdcc-4646-ac17-7ebc244a65d7@f9941",
-      "displayName": "bg",
+      "uuid": "4e928ea4-ab2c-4f4a-b8d4-6a3fe5717961@f9941",
+      "displayName": "悬壶济世",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 1730,
-        "height": 2306,
-        "rawWidth": 1730,
-        "rawHeight": 2306,
+        "width": 3000,
+        "height": 4000,
+        "rawWidth": 3000,
+        "rawHeight": 4000,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -865,
-            -1153,
+            -1500,
+            -2000,
             0,
-            865,
-            -1153,
+            1500,
+            -2000,
             0,
-            -865,
-            1153,
+            -1500,
+            2000,
             0,
-            865,
-            1153,
+            1500,
+            2000,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            2306,
-            1730,
-            2306,
+            4000,
+            3000,
+            4000,
             0,
             0,
-            1730,
+            3000,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -865,
-            -1153,
+            -1500,
+            -2000,
             0
           ],
           "maxPos": [
-            865,
-            1153,
+            1500,
+            2000,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "43625c6b-cdcc-4646-ac17-7ebc244a65d7@6c48a",
+        "imageUuidOrDatabaseUri": "4e928ea4-ab2c-4f4a-b8d4-6a3fe5717961@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": false,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "43625c6b-cdcc-4646-ac17-7ebc244a65d7@6c48a"
+    "redirect": "4e928ea4-ab2c-4f4a-b8d4-6a3fe5717961@6c48a"
   }
 }

Diferenças do arquivo suprimidas por serem muito extensas
+ 168 - 585
assets/unit105/prefab/game.prefab


+ 35 - 16
assets/unit105/script/unit103.ts → assets/unit105/script/unit105.ts

@@ -3,29 +3,31 @@ import { BaseZhaocha } from '../../hall/script/BaseZhaocha';
 
 const { ccclass, property } = _decorator;
 
-@ccclass('unit103')
-export class unit103 extends BaseZhaocha {
+@ccclass('unit105')
+export class unit105 extends BaseZhaocha {
     override  answerName: Array<string> = [
-        "下水管道",
-        "车前灯",
-        "公交站牌",
-        "合格印章",
-        "宝马牌子",
-        "气球",
-        "黑皮钱包",
-        "竖琴",
-        "编程书",
-        "防腐剂",
-        "铝篷子",
-        "酒精坛",
+        "灯泡",
+        "眼镜",
+        "输电塔",
+        "酒精灯",
+        "专科医院",
+        "避雷针",
+        "立式空调",
+        "保安队长",
+        "橡皮鸭子",
+        "书包",
+        "井盖",
     ]
 
-    override  num_showTip: number = 9;
+    override  num_showTip: number = 0;
     override  str_tishi = "滑动移开烧饼,露出下面的一袋防腐剂";
 
     @property(Node)
     node_zhanai: Node = null;
 
+    @property(Node)
+    node_zhanai2: Node = null;
+
     startPos = null
 
 
@@ -35,6 +37,10 @@ export class unit103 extends BaseZhaocha {
         this.node_zhanai.on(Node.EventType.TOUCH_MOVE, this.touchMove, this)
         this.node_zhanai.on(Node.EventType.TOUCH_END, this.touchEnd, this)
         this.node_zhanai.on(Node.EventType.TOUCH_CANCEL, this.touchEnd, this)
+        this.node_zhanai2.on(Node.EventType.TOUCH_START, this.touchStart, this)
+        this.node_zhanai2.on(Node.EventType.TOUCH_MOVE, this.touchMove, this)
+        this.node_zhanai2.on(Node.EventType.TOUCH_END, this.touchEnd2, this)
+        this.node_zhanai2.on(Node.EventType.TOUCH_CANCEL, this.touchEnd2, this)
     }
 
     touchStart(e) {
@@ -52,11 +58,24 @@ export class unit103 extends BaseZhaocha {
                 .to(0.5, { opacity: 0 })
                 .call(() => {
                     this.node_zhanai.active = false
-                    this.arr_node_allitem[this.num_showTip].active = true
+                    this.arr_node_allitem[0].active = true
                 })
                 .start()
         }
 
         this.startPos = null
     }
+    touchEnd2(e) {
+        let endpos = e.getUILocation()
+        if (this.startPos.subtract(endpos).length() > 100) {
+            tween(this.node_zhanai2.getComponent(UIOpacity))
+                .to(0.5, { opacity: 0 })
+                .call(() => {
+                    this.node_zhanai2.active = false
+                    this.arr_node_allitem[6].active = true
+                }).start()
+
+
+        }
+    }
 }

+ 0 - 0
assets/unit105/script/unit103.ts.meta → assets/unit105/script/unit105.ts.meta


+ 20 - 0
assets/unit105/spine/7.1.2_baiyi.atlas

@@ -0,0 +1,20 @@
+
+7.1.2_baiyi.png
+size: 1998,1044
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+7.1.2_1
+  rotate: false
+  xy: 1365, 0
+  size: 633, 1044
+  orig: 633, 1044
+  offset: 0, 0
+  index: -1
+7.1.2_2
+  rotate: true
+  xy: 0, 119
+  size: 925, 1363
+  orig: 925, 1363
+  offset: 0, 0
+  index: -1

+ 12 - 0
assets/unit105/spine/7.1.2_baiyi.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.0",
+  "importer": "*",
+  "imported": true,
+  "uuid": "63289e3c-a2d9-4e7b-9f58-8d287b887927",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
assets/unit105/spine/7.1.2_baiyi.json


+ 13 - 0
assets/unit105/spine/7.1.2_baiyi.json.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.2.7",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "39f1e363-c5c3-4cab-8cbf-a743a1382da1",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "atlasUuid": "63289e3c-a2d9-4e7b-9f58-8d287b887927"
+  }
+}

BIN
assets/unit105/spine/7.1.2_baiyi.png


+ 134 - 0
assets/unit105/spine/7.1.2_baiyi.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "06e41495-348e-4b5c-9ceb-63ced1da6add",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "06e41495-348e-4b5c-9ceb-63ced1da6add@6c48a",
+      "displayName": "7.1.2_baiyi",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "06e41495-348e-4b5c-9ceb-63ced1da6add",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "06e41495-348e-4b5c-9ceb-63ced1da6add@f9941",
+      "displayName": "7.1.2_baiyi",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 1998,
+        "height": 1044,
+        "rawWidth": 1998,
+        "rawHeight": 1044,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -999,
+            -522,
+            0,
+            999,
+            -522,
+            0,
+            -999,
+            522,
+            0,
+            999,
+            522,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            1044,
+            1998,
+            1044,
+            0,
+            0,
+            1998,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -999,
+            -522,
+            0
+          ],
+          "maxPos": [
+            999,
+            522,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "06e41495-348e-4b5c-9ceb-63ced1da6add@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "06e41495-348e-4b5c-9ceb-63ced1da6add@6c48a"
+  }
+}

+ 5 - 5
assets/unit105/spine/qy_qizi1.atlas → assets/unit105/spine/7.1.2_huiyi.atlas

@@ -1,13 +1,13 @@
 
-qy_qizi1.png
-size: 224,326
+7.1.2_huiyi.png
+size: 341,711
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
-qy_0
+7.1.2_3
   rotate: false
   xy: 0, 0
-  size: 224, 326
-  orig: 224, 326
+  size: 341, 711
+  orig: 341, 711
   offset: 0, 0
   index: -1

+ 12 - 0
assets/unit105/spine/7.1.2_huiyi.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.0",
+  "importer": "*",
+  "imported": true,
+  "uuid": "03de5d73-7d66-40c7-9a7b-0e340f65a6e8",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
assets/unit105/spine/7.1.2_huiyi.json


+ 13 - 0
assets/unit105/spine/7.1.2_huiyi.json.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.2.7",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "c2ac7409-d3bc-4e5b-9e06-d4d79a41ceb5",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "atlasUuid": "03de5d73-7d66-40c7-9a7b-0e340f65a6e8"
+  }
+}

BIN
assets/unit105/spine/7.1.2_huiyi.png


+ 30 - 30
assets/unit106/image/zhangai.png.meta → assets/unit105/spine/7.1.2_huiyi.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "d5646cf8-191a-41cf-b70a-b61d9b99be57",
+  "uuid": "e058ffb2-e6ab-4fe5-b5c7-b5953cdb71b7",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "d5646cf8-191a-41cf-b70a-b61d9b99be57@6c48a",
-      "displayName": "zhangai",
+      "uuid": "e058ffb2-e6ab-4fe5-b5c7-b5953cdb71b7@6c48a",
+      "displayName": "7.1.2_huiyi",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "d5646cf8-191a-41cf-b70a-b61d9b99be57",
+        "imageUuidOrDatabaseUri": "e058ffb2-e6ab-4fe5-b5c7-b5953cdb71b7",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "d5646cf8-191a-41cf-b70a-b61d9b99be57@f9941",
-      "displayName": "zhangai",
+      "uuid": "e058ffb2-e6ab-4fe5-b5c7-b5953cdb71b7@f9941",
+      "displayName": "7.1.2_huiyi",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -45,10 +45,10 @@
         "offsetY": -0.5,
         "trimX": 0,
         "trimY": 1,
-        "width": 88,
-        "height": 56,
-        "rawWidth": 88,
-        "rawHeight": 57,
+        "width": 341,
+        "height": 710,
+        "rawWidth": 341,
+        "rawHeight": 711,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -44,
-            -28,
+            -170.5,
+            -355,
             0,
-            44,
-            -28,
+            170.5,
+            -355,
             0,
-            -44,
-            28,
+            -170.5,
+            355,
             0,
-            44,
-            28,
+            170.5,
+            355,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            56,
-            88,
-            56,
+            710,
+            341,
+            710,
             0,
             0,
-            88,
+            341,
             0
           ],
           "nuv": [
@@ -97,23 +97,23 @@
             1,
             0,
             0,
-            0.9824561403508771,
+            0.9985935302390999,
             1,
-            0.9824561403508771
+            0.9985935302390999
           ],
           "minPos": [
-            -44,
-            -28,
+            -170.5,
+            -355,
             0
           ],
           "maxPos": [
-            44,
-            28,
+            170.5,
+            355,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "d5646cf8-191a-41cf-b70a-b61d9b99be57@6c48a",
+        "imageUuidOrDatabaseUri": "e058ffb2-e6ab-4fe5-b5c7-b5953cdb71b7@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "d5646cf8-191a-41cf-b70a-b61d9b99be57@6c48a"
+    "redirect": "e058ffb2-e6ab-4fe5-b5c7-b5953cdb71b7@6c48a"
   }
 }

+ 5 - 5
assets/unit105/spine/qy_qizi2.atlas → assets/unit105/spine/7.1.2_qiziy.atlas

@@ -1,13 +1,13 @@
 
-qy_qizi2.png
-size: 193,296
+7.1.2_qiziy.png
+size: 251,532
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
-qy_1
+7.1.2_5
   rotate: false
   xy: 0, 0
-  size: 193, 296
-  orig: 193, 296
+  size: 251, 532
+  orig: 251, 532
   offset: 0, 0
   index: -1

+ 12 - 0
assets/unit105/spine/7.1.2_qiziy.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.0",
+  "importer": "*",
+  "imported": true,
+  "uuid": "fe93050e-7f39-4fe1-af75-dce0c3293f2f",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
assets/unit105/spine/7.1.2_qiziy.json


+ 13 - 0
assets/unit105/spine/7.1.2_qiziy.json.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.2.7",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "84f1d052-4910-44c5-931c-318b1b2e5d48",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "atlasUuid": "fe93050e-7f39-4fe1-af75-dce0c3293f2f"
+  }
+}

BIN
assets/unit105/spine/7.1.2_qiziy.png


+ 38 - 38
assets/unit106/spine/qy_qizi1.png.meta → assets/unit105/spine/7.1.2_qiziy.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "723351cc-ea44-4536-8e71-1ed72ec1d3bd",
+  "uuid": "f75ddf46-2471-419b-b058-c9d5e842d6c4",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "723351cc-ea44-4536-8e71-1ed72ec1d3bd@6c48a",
-      "displayName": "qy_qizi1",
+      "uuid": "f75ddf46-2471-419b-b058-c9d5e842d6c4@6c48a",
+      "displayName": "7.1.2_qiziy",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "723351cc-ea44-4536-8e71-1ed72ec1d3bd",
+        "imageUuidOrDatabaseUri": "f75ddf46-2471-419b-b058-c9d5e842d6c4",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,21 +34,21 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "723351cc-ea44-4536-8e71-1ed72ec1d3bd@f9941",
-      "displayName": "qy_qizi1",
+      "uuid": "f75ddf46-2471-419b-b058-c9d5e842d6c4@f9941",
+      "displayName": "7.1.2_qiziy",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": 0,
+        "offsetY": 0.5,
         "trimX": 1,
-        "trimY": 1,
-        "width": 222,
-        "height": 324,
-        "rawWidth": 224,
-        "rawHeight": 326,
+        "trimY": 0,
+        "width": 249,
+        "height": 531,
+        "rawWidth": 251,
+        "rawHeight": 532,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -111,
-            -162,
+            -124.5,
+            -265.5,
             0,
-            111,
-            -162,
+            124.5,
+            -265.5,
             0,
-            -111,
-            162,
+            -124.5,
+            265.5,
             0,
-            111,
-            162,
+            124.5,
+            265.5,
             0
           ],
           "indexes": [
@@ -83,37 +83,37 @@
           ],
           "uv": [
             1,
-            325,
-            223,
-            325,
+            532,
+            250,
+            532,
             1,
             1,
-            223,
+            250,
             1
           ],
           "nuv": [
-            0.004464285714285714,
-            0.003067484662576687,
-            0.9955357142857143,
-            0.003067484662576687,
-            0.004464285714285714,
-            0.9969325153374233,
-            0.9955357142857143,
-            0.9969325153374233
+            0.00398406374501992,
+            0.0018796992481203006,
+            0.9960159362549801,
+            0.0018796992481203006,
+            0.00398406374501992,
+            1,
+            0.9960159362549801,
+            1
           ],
           "minPos": [
-            -111,
-            -162,
+            -124.5,
+            -265.5,
             0
           ],
           "maxPos": [
-            111,
-            162,
+            124.5,
+            265.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "723351cc-ea44-4536-8e71-1ed72ec1d3bd@6c48a",
+        "imageUuidOrDatabaseUri": "f75ddf46-2471-419b-b058-c9d5e842d6c4@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "723351cc-ea44-4536-8e71-1ed72ec1d3bd@6c48a"
+    "redirect": "f75ddf46-2471-419b-b058-c9d5e842d6c4@6c48a"
   }
 }

+ 5 - 5
assets/unit106/spine/qy_qizi1.atlas → assets/unit105/spine/7.1.2_qiziz.atlas

@@ -1,13 +1,13 @@
 
-qy_qizi1.png
-size: 224,326
+7.1.2_qiziz.png
+size: 185,372
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
-qy_0
+7.1.2_4
   rotate: false
   xy: 0, 0
-  size: 224, 326
-  orig: 224, 326
+  size: 185, 372
+  orig: 185, 372
   offset: 0, 0
   index: -1

+ 12 - 0
assets/unit105/spine/7.1.2_qiziz.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.0",
+  "importer": "*",
+  "imported": true,
+  "uuid": "f136835f-2fc5-4ea4-bc48-7813afd53011",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
assets/unit105/spine/7.1.2_qiziz.json


+ 13 - 0
assets/unit105/spine/7.1.2_qiziz.json.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.2.7",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "319cb43c-3bff-4837-8a27-3398e13e3243",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "atlasUuid": "f136835f-2fc5-4ea4-bc48-7813afd53011"
+  }
+}

BIN
assets/unit105/spine/7.1.2_qiziz.png


+ 134 - 0
assets/unit105/spine/7.1.2_qiziz.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "b60ab3db-46f9-4e6b-8768-5b80b72e9409",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "b60ab3db-46f9-4e6b-8768-5b80b72e9409@6c48a",
+      "displayName": "7.1.2_qiziz",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "b60ab3db-46f9-4e6b-8768-5b80b72e9409",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "b60ab3db-46f9-4e6b-8768-5b80b72e9409@f9941",
+      "displayName": "7.1.2_qiziz",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 185,
+        "height": 372,
+        "rawWidth": 185,
+        "rawHeight": 372,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -92.5,
+            -186,
+            0,
+            92.5,
+            -186,
+            0,
+            -92.5,
+            186,
+            0,
+            92.5,
+            186,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            372,
+            185,
+            372,
+            0,
+            0,
+            185,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -92.5,
+            -186,
+            0
+          ],
+          "maxPos": [
+            92.5,
+            186,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "b60ab3db-46f9-4e6b-8768-5b80b72e9409@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "b60ab3db-46f9-4e6b-8768-5b80b72e9409@6c48a"
+  }
+}

+ 0 - 1
assets/unit105/spine/qy_qizi1.atlas.meta

@@ -1 +0,0 @@
-{"ver":"1.0.0","importer":"*","imported":true,"uuid":"f34d2420-70de-4384-bbca-48e07c54f464","files":[".atlas",".json"],"subMetas":{},"userData":{}}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
assets/unit105/spine/qy_qizi1.json


+ 0 - 1
assets/unit105/spine/qy_qizi1.json.meta

@@ -1 +0,0 @@
-{"ver":"1.2.7","importer":"spine-data","imported":true,"uuid":"f701bf58-d7b1-49f9-8584-51193c7daedf","files":[".json"],"subMetas":{},"userData":{"atlasUuid":"8adfffeb-0278-4719-a3ce-e75aa44dbb97"}}

BIN
assets/unit105/spine/qy_qizi1.png


+ 0 - 1
assets/unit105/spine/qy_qizi2.atlas.meta

@@ -1 +0,0 @@
-{"ver":"1.0.0","importer":"*","imported":true,"uuid":"0918a8d8-cfda-4ad5-9ca2-f060b857ccae","files":[".atlas",".json"],"subMetas":{},"userData":{}}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
assets/unit105/spine/qy_qizi2.json


+ 0 - 1
assets/unit105/spine/qy_qizi2.json.meta

@@ -1 +0,0 @@
-{"ver":"1.2.7","importer":"spine-data","imported":true,"uuid":"91f8905e-6045-4fb8-9bcc-e16fb06f06db","files":[".json"],"subMetas":{},"userData":{"atlasUuid":"4acbe56a-df3d-4ca5-a716-7228776e9e44"}}

BIN
assets/unit105/spine/qy_qizi2.png


+ 0 - 34
assets/unit105/spine/qy_ren.atlas

@@ -1,34 +0,0 @@
-
-qy_ren.png
-size: 310,806
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-qy_2
-  rotate: true
-  xy: 0, 450
-  size: 208, 310
-  orig: 208, 310
-  offset: 0, 0
-  index: -1
-qy_3
-  rotate: false
-  xy: 133, 0
-  size: 163, 448
-  orig: 163, 448
-  offset: 0, 0
-  index: -1
-qy_4
-  rotate: false
-  xy: 0, 660
-  size: 181, 146
-  orig: 181, 146
-  offset: 0, 0
-  index: -1
-qy_5
-  rotate: false
-  xy: 0, 12
-  size: 131, 436
-  orig: 131, 436
-  offset: 0, 0
-  index: -1

+ 0 - 1
assets/unit105/spine/qy_ren.atlas.meta

@@ -1 +0,0 @@
-{"ver":"1.0.0","importer":"*","imported":true,"uuid":"57569b88-a609-4e3a-b1de-c2920231575b","files":[".atlas",".json"],"subMetas":{},"userData":{}}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
assets/unit105/spine/qy_ren.json


+ 0 - 1
assets/unit105/spine/qy_ren.json.meta

@@ -1 +0,0 @@
-{"ver":"1.2.7","importer":"spine-data","imported":true,"uuid":"f42bb8c5-f4c5-4196-aea5-317719c61407","files":[".json"],"subMetas":{},"userData":{"atlasUuid":"64e66e05-7505-42f9-b4fb-ca812924e377"}}

BIN
assets/unit105/spine/qy_ren.png


+ 1 - 1
assets/unit106.meta

@@ -1 +1 @@
-{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"2b88c864-79f4-4499-ba73-3c08fa769af7","files":[],"subMetas":{},"userData":{"isBundle":true,"bundleConfigID":"c2DHb/LN5EVqRUC6vbP6V9"}}
+{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"f07d83e2-80a3-4ffb-8c6e-b93d129e09ac","files":[],"subMetas":{},"userData":{"isBundle":true,"bundleConfigID":"c2DHb/LN5EVqRUC6vbP6V9"}}

+ 1 - 1
assets/unit106/image.meta

@@ -1 +1 @@
-{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"c9b9c7cd-6380-4d6a-8f28-b0abe275f9a9","files":[],"subMetas":{},"userData":{}}
+{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"cbf825aa-99eb-4ccb-a3b2-856981c93084","files":[],"subMetas":{},"userData":{}}

BIN
assets/unit106/image/bg.jpg


BIN
assets/unit106/image/bg.png


+ 36 - 36
assets/unit106/spine/qy_ren.png.meta → assets/unit106/image/bg.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "d873d31d-b261-4676-8529-c467bfbaaab2",
+  "uuid": "a117c84c-e2dc-4fe9-b743-2e1e17207ce1",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "d873d31d-b261-4676-8529-c467bfbaaab2@6c48a",
-      "displayName": "qy_ren",
+      "uuid": "a117c84c-e2dc-4fe9-b743-2e1e17207ce1@6c48a",
+      "displayName": "bg",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "d873d31d-b261-4676-8529-c467bfbaaab2",
+        "imageUuidOrDatabaseUri": "a117c84c-e2dc-4fe9-b743-2e1e17207ce1",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "d873d31d-b261-4676-8529-c467bfbaaab2@f9941",
-      "displayName": "qy_ren",
+      "uuid": "a117c84c-e2dc-4fe9-b743-2e1e17207ce1@f9941",
+      "displayName": "bg",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 1,
         "trimY": 1,
-        "width": 308,
-        "height": 804,
-        "rawWidth": 310,
-        "rawHeight": 806,
+        "width": 1104,
+        "height": 1472,
+        "rawWidth": 1106,
+        "rawHeight": 1474,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -154,
-            -402,
+            -552,
+            -736,
             0,
-            154,
-            -402,
+            552,
+            -736,
             0,
-            -154,
-            402,
+            -552,
+            736,
             0,
-            154,
-            402,
+            552,
+            736,
             0
           ],
           "indexes": [
@@ -83,37 +83,37 @@
           ],
           "uv": [
             1,
-            805,
-            309,
-            805,
+            1473,
+            1105,
+            1473,
             1,
             1,
-            309,
+            1105,
             1
           ],
           "nuv": [
-            0.0032258064516129032,
-            0.0012406947890818859,
-            0.9967741935483871,
-            0.0012406947890818859,
-            0.0032258064516129032,
-            0.9987593052109182,
-            0.9967741935483871,
-            0.9987593052109182
+            0.0009041591320072332,
+            0.0006784260515603799,
+            0.9990958408679927,
+            0.0006784260515603799,
+            0.0009041591320072332,
+            0.9993215739484396,
+            0.9990958408679927,
+            0.9993215739484396
           ],
           "minPos": [
-            -154,
-            -402,
+            -552,
+            -736,
             0
           ],
           "maxPos": [
-            154,
-            402,
+            552,
+            736,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "d873d31d-b261-4676-8529-c467bfbaaab2@6c48a",
+        "imageUuidOrDatabaseUri": "a117c84c-e2dc-4fe9-b743-2e1e17207ce1@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "d873d31d-b261-4676-8529-c467bfbaaab2@6c48a"
+    "redirect": "a117c84c-e2dc-4fe9-b743-2e1e17207ce1@6c48a"
   }
 }

BIN
assets/unit106/image/item0.png


+ 27 - 27
assets/unit106/image/item0.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "3941ee76-02f8-4adc-946f-eb4df44e0fe2",
+  "uuid": "db2e893b-e225-4641-815b-2b74a67ac460",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "3941ee76-02f8-4adc-946f-eb4df44e0fe2@6c48a",
+      "uuid": "db2e893b-e225-4641-815b-2b74a67ac460@6c48a",
       "displayName": "item0",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "3941ee76-02f8-4adc-946f-eb4df44e0fe2",
+        "imageUuidOrDatabaseUri": "db2e893b-e225-4641-815b-2b74a67ac460",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "3941ee76-02f8-4adc-946f-eb4df44e0fe2@f9941",
+      "uuid": "db2e893b-e225-4641-815b-2b74a67ac460@f9941",
       "displayName": "item0",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 172,
-        "height": 149,
-        "rawWidth": 172,
-        "rawHeight": 149,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -86,
-            -74.5,
+            -49,
+            -49,
             0,
-            86,
-            -74.5,
+            49,
+            -49,
             0,
-            -86,
-            74.5,
+            -49,
+            49,
             0,
-            86,
-            74.5,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            149,
-            172,
-            149,
+            98,
+            98,
+            98,
             0,
             0,
-            172,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -86,
-            -74.5,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            86,
-            74.5,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "3941ee76-02f8-4adc-946f-eb4df44e0fe2@6c48a",
+        "imageUuidOrDatabaseUri": "db2e893b-e225-4641-815b-2b74a67ac460@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "3941ee76-02f8-4adc-946f-eb4df44e0fe2@6c48a"
+    "redirect": "db2e893b-e225-4641-815b-2b74a67ac460@6c48a"
   }
 }

BIN
assets/unit106/image/item1.png


+ 27 - 27
assets/unit106/image/item1.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "7c1e5cbc-3a94-456e-b314-a3dbc319def8",
+  "uuid": "c96b5429-7cfa-4f14-8fff-942a327fde0f",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "7c1e5cbc-3a94-456e-b314-a3dbc319def8@6c48a",
+      "uuid": "c96b5429-7cfa-4f14-8fff-942a327fde0f@6c48a",
       "displayName": "item1",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "7c1e5cbc-3a94-456e-b314-a3dbc319def8",
+        "imageUuidOrDatabaseUri": "c96b5429-7cfa-4f14-8fff-942a327fde0f",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "7c1e5cbc-3a94-456e-b314-a3dbc319def8@f9941",
+      "uuid": "c96b5429-7cfa-4f14-8fff-942a327fde0f@f9941",
       "displayName": "item1",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 106,
-        "height": 118,
-        "rawWidth": 106,
-        "rawHeight": 118,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -53,
-            -59,
+            -49,
+            -49,
             0,
-            53,
-            -59,
+            49,
+            -49,
             0,
-            -53,
-            59,
+            -49,
+            49,
             0,
-            53,
-            59,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            118,
-            106,
-            118,
+            98,
+            98,
+            98,
             0,
             0,
-            106,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -53,
-            -59,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            53,
-            59,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "7c1e5cbc-3a94-456e-b314-a3dbc319def8@6c48a",
+        "imageUuidOrDatabaseUri": "c96b5429-7cfa-4f14-8fff-942a327fde0f@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "7c1e5cbc-3a94-456e-b314-a3dbc319def8@6c48a"
+    "redirect": "c96b5429-7cfa-4f14-8fff-942a327fde0f@6c48a"
   }
 }

BIN
assets/unit106/image/item10.png


+ 27 - 27
assets/unit106/image/item10.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "19d7d312-5699-44c5-a4ce-0ed965cc1e7a",
+  "uuid": "005c2bf5-8bf8-4b22-a084-a83dc944d907",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "19d7d312-5699-44c5-a4ce-0ed965cc1e7a@6c48a",
+      "uuid": "005c2bf5-8bf8-4b22-a084-a83dc944d907@6c48a",
       "displayName": "item10",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "19d7d312-5699-44c5-a4ce-0ed965cc1e7a",
+        "imageUuidOrDatabaseUri": "005c2bf5-8bf8-4b22-a084-a83dc944d907",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "19d7d312-5699-44c5-a4ce-0ed965cc1e7a@f9941",
+      "uuid": "005c2bf5-8bf8-4b22-a084-a83dc944d907@f9941",
       "displayName": "item10",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 163,
-        "height": 206,
-        "rawWidth": 163,
-        "rawHeight": 206,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -81.5,
-            -103,
+            -49,
+            -49,
             0,
-            81.5,
-            -103,
+            49,
+            -49,
             0,
-            -81.5,
-            103,
+            -49,
+            49,
             0,
-            81.5,
-            103,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            206,
-            163,
-            206,
+            98,
+            98,
+            98,
             0,
             0,
-            163,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -81.5,
-            -103,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            81.5,
-            103,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "19d7d312-5699-44c5-a4ce-0ed965cc1e7a@6c48a",
+        "imageUuidOrDatabaseUri": "005c2bf5-8bf8-4b22-a084-a83dc944d907@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "19d7d312-5699-44c5-a4ce-0ed965cc1e7a@6c48a"
+    "redirect": "005c2bf5-8bf8-4b22-a084-a83dc944d907@6c48a"
   }
 }

BIN
assets/unit106/image/item11.png


+ 27 - 27
assets/unit106/image/item11.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "005fd0a5-8e15-4800-8903-db913e0c98d4",
+  "uuid": "df5dd322-e547-4003-87b5-03c6aa415048",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "005fd0a5-8e15-4800-8903-db913e0c98d4@6c48a",
+      "uuid": "df5dd322-e547-4003-87b5-03c6aa415048@6c48a",
       "displayName": "item11",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "005fd0a5-8e15-4800-8903-db913e0c98d4",
+        "imageUuidOrDatabaseUri": "df5dd322-e547-4003-87b5-03c6aa415048",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "005fd0a5-8e15-4800-8903-db913e0c98d4@f9941",
+      "uuid": "df5dd322-e547-4003-87b5-03c6aa415048@f9941",
       "displayName": "item11",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 176,
-        "height": 176,
-        "rawWidth": 176,
-        "rawHeight": 176,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -88,
-            -88,
+            -49,
+            -49,
             0,
-            88,
-            -88,
+            49,
+            -49,
             0,
-            -88,
-            88,
+            -49,
+            49,
             0,
-            88,
-            88,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            176,
-            176,
-            176,
+            98,
+            98,
+            98,
             0,
             0,
-            176,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -88,
-            -88,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            88,
-            88,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "005fd0a5-8e15-4800-8903-db913e0c98d4@6c48a",
+        "imageUuidOrDatabaseUri": "df5dd322-e547-4003-87b5-03c6aa415048@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "005fd0a5-8e15-4800-8903-db913e0c98d4@6c48a"
+    "redirect": "df5dd322-e547-4003-87b5-03c6aa415048@6c48a"
   }
 }

BIN
assets/unit106/image/item2.png


+ 27 - 27
assets/unit106/image/item2.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "a046a7f9-667a-4bb4-b0fe-acb341dc0f22",
+  "uuid": "b3907615-5663-41d6-86b3-ff27ed906098",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "a046a7f9-667a-4bb4-b0fe-acb341dc0f22@6c48a",
+      "uuid": "b3907615-5663-41d6-86b3-ff27ed906098@6c48a",
       "displayName": "item2",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "a046a7f9-667a-4bb4-b0fe-acb341dc0f22",
+        "imageUuidOrDatabaseUri": "b3907615-5663-41d6-86b3-ff27ed906098",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "a046a7f9-667a-4bb4-b0fe-acb341dc0f22@f9941",
+      "uuid": "b3907615-5663-41d6-86b3-ff27ed906098@f9941",
       "displayName": "item2",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 83,
-        "height": 91,
-        "rawWidth": 83,
-        "rawHeight": 91,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -41.5,
-            -45.5,
+            -49,
+            -49,
             0,
-            41.5,
-            -45.5,
+            49,
+            -49,
             0,
-            -41.5,
-            45.5,
+            -49,
+            49,
             0,
-            41.5,
-            45.5,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            91,
-            83,
-            91,
+            98,
+            98,
+            98,
             0,
             0,
-            83,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -41.5,
-            -45.5,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            41.5,
-            45.5,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "a046a7f9-667a-4bb4-b0fe-acb341dc0f22@6c48a",
+        "imageUuidOrDatabaseUri": "b3907615-5663-41d6-86b3-ff27ed906098@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "a046a7f9-667a-4bb4-b0fe-acb341dc0f22@6c48a"
+    "redirect": "b3907615-5663-41d6-86b3-ff27ed906098@6c48a"
   }
 }

BIN
assets/unit106/image/item3.png


+ 27 - 27
assets/unit106/image/item3.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "86861b69-2775-44ca-8367-d53534af50b8",
+  "uuid": "ae138cf9-652f-4100-90b4-90c7c0e24506",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "86861b69-2775-44ca-8367-d53534af50b8@6c48a",
+      "uuid": "ae138cf9-652f-4100-90b4-90c7c0e24506@6c48a",
       "displayName": "item3",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "86861b69-2775-44ca-8367-d53534af50b8",
+        "imageUuidOrDatabaseUri": "ae138cf9-652f-4100-90b4-90c7c0e24506",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "86861b69-2775-44ca-8367-d53534af50b8@f9941",
+      "uuid": "ae138cf9-652f-4100-90b4-90c7c0e24506@f9941",
       "displayName": "item3",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 160,
-        "height": 152,
-        "rawWidth": 160,
-        "rawHeight": 152,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -80,
-            -76,
+            -49,
+            -49,
             0,
-            80,
-            -76,
+            49,
+            -49,
             0,
-            -80,
-            76,
+            -49,
+            49,
             0,
-            80,
-            76,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            152,
-            160,
-            152,
+            98,
+            98,
+            98,
             0,
             0,
-            160,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -80,
-            -76,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            80,
-            76,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "86861b69-2775-44ca-8367-d53534af50b8@6c48a",
+        "imageUuidOrDatabaseUri": "ae138cf9-652f-4100-90b4-90c7c0e24506@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "86861b69-2775-44ca-8367-d53534af50b8@6c48a"
+    "redirect": "ae138cf9-652f-4100-90b4-90c7c0e24506@6c48a"
   }
 }

BIN
assets/unit106/image/item4.png


+ 27 - 27
assets/unit106/image/item4.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "dc9074bc-616d-4dcc-afd3-722934b0e313",
+  "uuid": "d4d04830-2ea4-4e14-a5d5-7e081270f9ec",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "dc9074bc-616d-4dcc-afd3-722934b0e313@6c48a",
+      "uuid": "d4d04830-2ea4-4e14-a5d5-7e081270f9ec@6c48a",
       "displayName": "item4",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "dc9074bc-616d-4dcc-afd3-722934b0e313",
+        "imageUuidOrDatabaseUri": "d4d04830-2ea4-4e14-a5d5-7e081270f9ec",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "dc9074bc-616d-4dcc-afd3-722934b0e313@f9941",
+      "uuid": "d4d04830-2ea4-4e14-a5d5-7e081270f9ec@f9941",
       "displayName": "item4",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 176,
-        "height": 176,
-        "rawWidth": 176,
-        "rawHeight": 176,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -88,
-            -88,
+            -49,
+            -49,
             0,
-            88,
-            -88,
+            49,
+            -49,
             0,
-            -88,
-            88,
+            -49,
+            49,
             0,
-            88,
-            88,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            176,
-            176,
-            176,
+            98,
+            98,
+            98,
             0,
             0,
-            176,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -88,
-            -88,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            88,
-            88,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "dc9074bc-616d-4dcc-afd3-722934b0e313@6c48a",
+        "imageUuidOrDatabaseUri": "d4d04830-2ea4-4e14-a5d5-7e081270f9ec@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "dc9074bc-616d-4dcc-afd3-722934b0e313@6c48a"
+    "redirect": "d4d04830-2ea4-4e14-a5d5-7e081270f9ec@6c48a"
   }
 }

BIN
assets/unit106/image/item5.png


+ 27 - 27
assets/unit106/image/item5.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "9851e58b-2790-4e26-a363-b5fb1461eef1",
+  "uuid": "33d6e440-b832-4727-b57c-d1f2bc9b1bde",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "9851e58b-2790-4e26-a363-b5fb1461eef1@6c48a",
+      "uuid": "33d6e440-b832-4727-b57c-d1f2bc9b1bde@6c48a",
       "displayName": "item5",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "9851e58b-2790-4e26-a363-b5fb1461eef1",
+        "imageUuidOrDatabaseUri": "33d6e440-b832-4727-b57c-d1f2bc9b1bde",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "9851e58b-2790-4e26-a363-b5fb1461eef1@f9941",
+      "uuid": "33d6e440-b832-4727-b57c-d1f2bc9b1bde@f9941",
       "displayName": "item5",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 187,
-        "height": 206,
-        "rawWidth": 187,
-        "rawHeight": 206,
+        "width": 98,
+        "height": 98,
+        "rawWidth": 98,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -93.5,
-            -103,
+            -49,
+            -49,
             0,
-            93.5,
-            -103,
+            49,
+            -49,
             0,
-            -93.5,
-            103,
+            -49,
+            49,
             0,
-            93.5,
-            103,
+            49,
+            49,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            206,
-            187,
-            206,
+            98,
+            98,
+            98,
             0,
             0,
-            187,
+            98,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -93.5,
-            -103,
+            -49,
+            -49,
             0
           ],
           "maxPos": [
-            93.5,
-            103,
+            49,
+            49,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "9851e58b-2790-4e26-a363-b5fb1461eef1@6c48a",
+        "imageUuidOrDatabaseUri": "33d6e440-b832-4727-b57c-d1f2bc9b1bde@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "9851e58b-2790-4e26-a363-b5fb1461eef1@6c48a"
+    "redirect": "33d6e440-b832-4727-b57c-d1f2bc9b1bde@6c48a"
   }
 }

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff