wuwangdong 4 lat temu
rodzic
commit
fba7ea8215
64 zmienionych plików z 2041 dodań i 1750 usunięć
  1. BIN
      build/jsb-link/assets/main/index.jsc
  2. 0 0
      build/jsb-link/assets/resources/config.json
  3. 0 0
      build/jsb-link/assets/resources/import/09/09134bba-feed-4255-ac95-f412d855035e.json
  4. 0 0
      build/jsb-link/assets/resources/import/14/14193c60-068a-42b4-92cf-a6cb623fe40f.json
  5. 0 0
      build/jsb-link/assets/resources/import/18/18e0b7f8-059f-4a52-9e57-690fe778a31a.json
  6. 0 0
      build/jsb-link/assets/resources/import/18/18ff1999-641d-40dc-bc3f-e4efbb12918a.json
  7. 1 1
      build/jsb-link/assets/resources/import/26/26068860-88ac-4831-bc68-c16d9580de6b.json
  8. 1 1
      build/jsb-link/assets/resources/import/29/29d7f431-2497-45fc-ab04-a4d2f031fcc1@6c48a.json
  9. 0 0
      build/jsb-link/assets/resources/import/2b/2b8feb46-8bbf-401a-87fd-36a33df6f510.json
  10. 0 0
      build/jsb-link/assets/resources/import/31/310aa3e6-7065-424d-851c-52437a7c1c36.json
  11. 0 0
      build/jsb-link/assets/resources/import/35/35d03fbf-2b63-4d0e-b621-be53decefa7f.json
  12. 0 0
      build/jsb-link/assets/resources/import/39/3985d4e0-463e-412c-946d-dfea97cb75bc.json
  13. 0 0
      build/jsb-link/assets/resources/import/3c/3c12cc7b-777b-45f9-8bf1-8a285075e6f7.json
  14. 0 1
      build/jsb-link/assets/resources/import/52/5210cba6-9314-4f36-85a2-4754a0df287f.json
  15. 0 0
      build/jsb-link/assets/resources/import/53/532ccd25-6cf0-47ba-ac65-b0be647eb7ba.json
  16. 0 0
      build/jsb-link/assets/resources/import/5c/5c60bd7e-abeb-4804-bb23-115cc66c3b44.json
  17. 0 0
      build/jsb-link/assets/resources/import/65/65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c.json
  18. 1 1
      build/jsb-link/assets/resources/import/79/79de3169-75ed-43f8-abaf-8a5a9b38b727.json
  19. 1 1
      build/jsb-link/assets/resources/import/7b/7b17b419-9c62-47a5-a9a2-cec821bec1b4.json
  20. 1 1
      build/jsb-link/assets/resources/import/7f/7f0df32b-32ac-4682-add1-a43eb0bffca7@6c48a.json
  21. 0 0
      build/jsb-link/assets/resources/import/80/80f9ffc5-91ca-4d08-aedd-b3712be53310.json
  22. 0 0
      build/jsb-link/assets/resources/import/82/82a16e23-7ade-43a5-af4f-5504bb39b61f.json
  23. 0 0
      build/jsb-link/assets/resources/import/8d/8de08dc2-a439-4a3c-b667-a56bec3c0f5d.json
  24. 0 0
      build/jsb-link/assets/resources/import/92/9221bfa6-48ee-44cb-ba6c-f37e5847e165.json
  25. 0 0
      build/jsb-link/assets/resources/import/94/94760687-648e-4d1f-ac2f-169b0dc625d9.json
  26. 0 0
      build/jsb-link/assets/resources/import/9d/9d4f03cb-eee3-4d8d-bb0a-457af009d1cd.json
  27. 0 0
      build/jsb-link/assets/resources/import/a2/a2f8ad6a-6054-4b3e-8202-7e9e1975fad9.json
  28. 0 0
      build/jsb-link/assets/resources/import/b3/b3a90f8c-06c6-4d76-aa5d-bfecd35a2294.json
  29. 0 0
      build/jsb-link/assets/resources/import/b4/b4dea4a9-29c8-46bc-a50d-5754afa7a2bd.json
  30. 0 0
      build/jsb-link/assets/resources/import/c2/c24623b9-b557-420c-bf8c-8927ea736fa1.json
  31. 0 0
      build/jsb-link/assets/resources/import/c9/c92ee1bb-0e83-4868-97e3-d71b8b58fae0.json
  32. 0 0
      build/jsb-link/assets/resources/import/ce/ce87165a-e80b-46ed-b9df-d2690132ca17.json
  33. 0 0
      build/jsb-link/assets/resources/import/d0/d0583c3f-ff06-4cb3-bf78-51680bc632e0.json
  34. 0 0
      build/jsb-link/assets/resources/import/d7/d7adad34-ed08-4539-bd75-ff56d401edee.json
  35. 1 1
      build/jsb-link/assets/resources/import/db/db6ee5b7-c54c-44b6-a20f-64caad0c7ab7@6c48a.json
  36. 0 0
      build/jsb-link/assets/resources/import/e8/e86f7583-0e5e-46f6-ae3f-0904f46acf88.json
  37. 0 0
      build/jsb-link/assets/resources/import/eb/eb23e881-c37e-4e36-a213-79bd42d111d1.json
  38. 1 1
      build/jsb-link/assets/resources/import/f6/f61a8a27-64a7-438c-931f-63943247efde.json
  39. 0 0
      build/jsb-link/assets/resources/import/f7/f7b563d2-2a35-4ed4-b0b0-05dd74c0033f.json
  40. 27 27
      build/jsb-link/assets/resources/native/03/03be9c7c-fdd9-4b58-8468-91188bfb3d62.atlas
  41. 34 34
      build/jsb-link/assets/resources/native/03/03d9c064-1b11-47c4-97d4-4973c1d96697.atlas
  42. 34 34
      build/jsb-link/assets/resources/native/08/0885da9a-6ef6-466b-8fde-4348308101ee.atlas
  43. 244 244
      build/jsb-link/assets/resources/native/0e/0ea867d9-68b1-4e17-92cd-067791bfc76b.atlas
  44. BIN
      build/jsb-link/assets/resources/native/29/29d7f431-2497-45fc-ab04-a4d2f031fcc1.png
  45. 20 20
      build/jsb-link/assets/resources/native/55/550608f2-0747-4d47-bbed-4bbe9f2fbd98.atlas
  46. 419 419
      build/jsb-link/assets/resources/native/55/55cdcb24-b372-4ff3-b1a4-da14d081cf00.atlas
  47. 335 335
      build/jsb-link/assets/resources/native/58/580216f6-a0b4-45df-89d5-849ddcb562f3.atlas
  48. 27 27
      build/jsb-link/assets/resources/native/68/68c76a85-3cbb-4f0e-b98d-bb383ae73331.atlas
  49. 251 251
      build/jsb-link/assets/resources/native/6c/6c81d684-e6d4-47f3-8c1d-4879a72ddbb7.atlas
  50. 34 34
      build/jsb-link/assets/resources/native/73/73e6b261-caab-44c1-b678-2d31ea81e9e5.atlas
  51. 27 27
      build/jsb-link/assets/resources/native/79/79ff2dcd-4579-4a1a-9adc-f0c01bc9c945.atlas
  52. BIN
      build/jsb-link/assets/resources/native/7f/7f0df32b-32ac-4682-add1-a43eb0bffca7.png
  53. 27 27
      build/jsb-link/assets/resources/native/8a/8a72d93b-a055-4bf4-86c5-7be5ddd02758.atlas
  54. 27 27
      build/jsb-link/assets/resources/native/97/97d51e7c-adeb-454b-8c93-1975eaf64dd4.atlas
  55. BIN
      build/jsb-link/assets/resources/native/c8/c8c2d471-bdec-442b-be6c-fdc5aa07297c.mp3
  56. 62 62
      build/jsb-link/assets/resources/native/d2/d20d76d5-2805-46f5-97ed-c028f6f6b2cc.atlas
  57. BIN
      build/jsb-link/assets/resources/native/db/db6ee5b7-c54c-44b6-a20f-64caad0c7ab7.png
  58. 34 34
      build/jsb-link/assets/resources/native/f1/f1b77e26-c94e-4177-a84c-58e7e52c9a9b.atlas
  59. BIN
      build/jsb-link/assets/resources/native/f6/f61a8a27-64a7-438c-931f-63943247efde.mp3
  60. 27 27
      build/jsb-link/assets/resources/native/fb/fb79aa84-27ed-4d27-8321-7f1e99585ade.atlas
  61. BIN
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser
  62. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/gradle.properties
  63. 402 110
      build/jsb-link/js backups (useful for debugging)/main.index.js
  64. 2 2
      packages-hot-update/cfg.json

BIN
build/jsb-link/assets/main/index.jsc


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/config.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/09/09134bba-feed-4255-ac95-f412d855035e.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/14/14193c60-068a-42b4-92cf-a6cb623fe40f.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/18/18e0b7f8-059f-4a52-9e57-690fe778a31a.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/18/18ff1999-641d-40dc-bc3f-e4efbb12918a.json


+ 1 - 1
build/jsb-link/assets/resources/import/26/26068860-88ac-4831-bc68-c16d9580de6b.json

@@ -1 +1 @@
-[1,["c7ezvvJ61MBLgInHwdxgS7"],0,[["sp.SkeletonData",["_name","_atlasText","textureNames","_skeletonJson","textures"],-1,3]],[[0,0,1,2,3,4,5]],[[0,"zhuanpan","\nzhuanpan.png\nsize: 175,101\nformat: RGBA8888\nfilter: Linear,Linear\nrepeat: none\nbg\n  rotate: false\n  xy: 2, 2\n  size: 97, 97\n  orig: 97, 97\n  offset: 0, 0\n  index: -1\nzhuanpan\n  rotate: false\n  xy: 101, 27\n  size: 72, 72\n  orig: 72, 72\n  offset: 0, 0\n  index: -1\nzhuanpan1\n  rotate: false\n  xy: 101, 2\n  size: 20, 23\n  orig: 21, 24\n  offset: 0, 1\n  index: -1\n",["zhuanpan.png"],{"skeleton":{"hash":"+YrprJEAGsqE0XVM+MfB1+ruwAQ","spine":"3.8.99","x":-48.5,"y":-48.5,"width":97,"height":97,"images":"","audio":""},"bones":[{"name":"root"},{"name":"bg","parent":"root","length":19.84,"rotation":90,"x":-1.22,"y":-41.77},{"name":"zhuanpan","parent":"bg","x":41.6,"y":-2,"scaleX":0.98,"scaleY":0.98}],"slots":[{"name":"bg","bone":"bg","attachment":"bg"},{"name":"zhuanpan","bone":"zhuanpan","attachment":"zhuanpan"},{"name":"zhuanpan1","bone":"root","attachment":"zhuanpan1"}],"skins":[{"name":"default","attachments":{"bg":{"bg":{"x":41.77,"y":-1.22,"rotation":-90,"width":97,"height":97}},"zhuanpan":{"zhuanpan":{"x":0.17,"y":0.78,"width":72,"height":72}},"zhuanpan1":{"zhuanpan1":{"x":1.82,"y":0.19,"width":21,"height":24}}}}],"animations":{"animation":{"bones":{"zhuanpan":{"rotate":[{"angle":-90},{"time":0.6667,"angle":-180},{"time":1.3333,"angle":90},{"time":2},{"time":2.6667,"angle":-90}]}}}}},[0]]],0,0,[0],[-1],[0]]
+[1,["c7ezvvJ61MBLgInHwdxgS7"],0,[["sp.SkeletonData",["_name","_atlasText","textureNames","_skeletonJson","textures"],-1,3]],[[0,0,1,2,3,4,5]],[[0,"zhuanpan","\r\nzhuanpan.png\r\nsize: 175,101\r\nformat: RGBA8888\r\nfilter: Linear,Linear\r\nrepeat: none\r\nbg\r\n  rotate: false\r\n  xy: 2, 2\r\n  size: 97, 97\r\n  orig: 97, 97\r\n  offset: 0, 0\r\n  index: -1\r\nzhuanpan\r\n  rotate: false\r\n  xy: 101, 27\r\n  size: 72, 72\r\n  orig: 72, 72\r\n  offset: 0, 0\r\n  index: -1\r\nzhuanpan1\r\n  rotate: false\r\n  xy: 101, 2\r\n  size: 20, 23\r\n  orig: 21, 24\r\n  offset: 0, 1\r\n  index: -1\r\n",["zhuanpan.png"],{"skeleton":{"hash":"+YrprJEAGsqE0XVM+MfB1+ruwAQ","spine":"3.8.99","x":-48.5,"y":-48.5,"width":97,"height":97,"images":"","audio":""},"bones":[{"name":"root"},{"name":"bg","parent":"root","length":19.84,"rotation":90,"x":-1.22,"y":-41.77},{"name":"zhuanpan","parent":"bg","x":41.6,"y":-2,"scaleX":0.98,"scaleY":0.98}],"slots":[{"name":"bg","bone":"bg","attachment":"bg"},{"name":"zhuanpan","bone":"zhuanpan","attachment":"zhuanpan"},{"name":"zhuanpan1","bone":"root","attachment":"zhuanpan1"}],"skins":[{"name":"default","attachments":{"bg":{"bg":{"x":41.77,"y":-1.22,"rotation":-90,"width":97,"height":97}},"zhuanpan":{"zhuanpan":{"x":0.17,"y":0.78,"width":72,"height":72}},"zhuanpan1":{"zhuanpan1":{"x":1.82,"y":0.19,"width":21,"height":24}}}}],"animations":{"animation":{"bones":{"zhuanpan":{"rotate":[{"angle":-90},{"time":0.6667,"angle":-180},{"time":1.3333,"angle":90},{"time":2},{"time":2.6667,"angle":-90}]}}}}},[0]]],0,0,[0],[-1],[0]]

+ 1 - 1
build/jsb-link/assets/resources/import/29/29d7f431-2497-45fc-ab04-a4d2f031fcc1@6c48a.json

@@ -1 +1 @@
-[1,["291/QxJJdF/KsEpNLwMfzB"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"factory_name_icon_20011","rect":[0,0,48,23],"offset":[0,0],"originalSize":[48,23],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]
+[1,["291/QxJJdF/KsEpNLwMfzB"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"factory_name_icon_20011","rect":[3,2,46,23],"offset":[1,-1],"originalSize":[50,25],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/2b/2b8feb46-8bbf-401a-87fd-36a33df6f510.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/31/310aa3e6-7065-424d-851c-52437a7c1c36.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/35/35d03fbf-2b63-4d0e-b621-be53decefa7f.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/39/3985d4e0-463e-412c-946d-dfea97cb75bc.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/3c/3c12cc7b-777b-45f9-8bf1-8a285075e6f7.json


Plik diff jest za duży
+ 0 - 1
build/jsb-link/assets/resources/import/52/5210cba6-9314-4f36-85a2-4754a0df287f.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/53/532ccd25-6cf0-47ba-ac65-b0be647eb7ba.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/5c/5c60bd7e-abeb-4804-bb23-115cc66c3b44.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/65/65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c.json


+ 1 - 1
build/jsb-link/assets/resources/import/79/79de3169-75ed-43f8-abaf-8a5a9b38b727.json

@@ -1 +1 @@
-[1,["b3bts3M+lPULj/Fidt+oIR"],0,[["sp.SkeletonData",["_name","_atlasText","textureNames","_skeletonJson","textures"],-1,3]],[[0,0,1,2,3,4,5]],[[0,"light","\nlight.png\nsize: 1382,1360\nformat: RGBA8888\nfilter: Linear,Linear\nrepeat: none\ndeng1\n  rotate: true\n  xy: 2, 2\n  size: 679, 688\n  orig: 683, 692\n  offset: 2, 2\n  index: -1\ndeng2\n  rotate: true\n  xy: 688, 683\n  size: 675, 684\n  orig: 683, 692\n  offset: 4, 4\n  index: -1\ndeng3\n  rotate: true\n  xy: 692, 2\n  size: 679, 688\n  orig: 683, 692\n  offset: 2, 2\n  index: -1\ndeng4\n  rotate: true\n  xy: 2, 683\n  size: 675, 684\n  orig: 683, 692\n  offset: 4, 4\n  index: -1\n",["light.png"],{"skeleton":{"hash":"JohK5TUu0lUroLrlSwXiPn4dSGA","spine":"3.8.99","x":-341.5,"y":-346,"width":683,"height":692,"images":"C:/Users/jyh12059/Desktop/donghua/灯动画","audio":""},"bones":[{"name":"root"}],"slots":[{"name":"deng1","bone":"root","attachment":"deng4"}],"skins":[{"name":"default","attachments":{"deng1":{"deng1":{"width":683,"height":692},"deng2":{"width":683,"height":692},"deng3":{"width":683,"height":692},"deng4":{"width":683,"height":692}}}}],"animations":{"animation":{"slots":{"deng1":{"attachment":[{"name":"deng1"},{"time":0.1,"name":"deng2"},{"time":0.2,"name":"deng3"},{"time":0.3,"name":"deng4"},{"time":0.4,"name":"deng1"}]}}}}},[0]]],0,0,[0],[-1],[0]]
+[1,["b3bts3M+lPULj/Fidt+oIR"],0,[["sp.SkeletonData",["_name","_atlasText","textureNames","_skeletonJson","textures"],-1,3]],[[0,0,1,2,3,4,5]],[[0,"light","\r\nlight.png\r\nsize: 1382,1360\r\nformat: RGBA8888\r\nfilter: Linear,Linear\r\nrepeat: none\r\ndeng1\r\n  rotate: true\r\n  xy: 2, 2\r\n  size: 679, 688\r\n  orig: 683, 692\r\n  offset: 2, 2\r\n  index: -1\r\ndeng2\r\n  rotate: true\r\n  xy: 688, 683\r\n  size: 675, 684\r\n  orig: 683, 692\r\n  offset: 4, 4\r\n  index: -1\r\ndeng3\r\n  rotate: true\r\n  xy: 692, 2\r\n  size: 679, 688\r\n  orig: 683, 692\r\n  offset: 2, 2\r\n  index: -1\r\ndeng4\r\n  rotate: true\r\n  xy: 2, 683\r\n  size: 675, 684\r\n  orig: 683, 692\r\n  offset: 4, 4\r\n  index: -1\r\n",["light.png"],{"skeleton":{"hash":"JohK5TUu0lUroLrlSwXiPn4dSGA","spine":"3.8.99","x":-341.5,"y":-346,"width":683,"height":692,"images":"C:/Users/jyh12059/Desktop/donghua/灯动画","audio":""},"bones":[{"name":"root"}],"slots":[{"name":"deng1","bone":"root","attachment":"deng4"}],"skins":[{"name":"default","attachments":{"deng1":{"deng1":{"width":683,"height":692},"deng2":{"width":683,"height":692},"deng3":{"width":683,"height":692},"deng4":{"width":683,"height":692}}}}],"animations":{"animation":{"slots":{"deng1":{"attachment":[{"name":"deng1"},{"time":0.1,"name":"deng2"},{"time":0.2,"name":"deng3"},{"time":0.3,"name":"deng4"},{"time":0.4,"name":"deng1"}]}}}}},[0]]],0,0,[0],[-1],[0]]

+ 1 - 1
build/jsb-link/assets/resources/import/7b/7b17b419-9c62-47a5-a9a2-cec821bec1b4.json

@@ -1 +1 @@
-[1,["67wjo27Y5ADYHW50oEJ2mj"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"bg","rect":[0,0,651,1020],"offset":[0,0],"originalSize":[651,1020],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]
+[1,["67wjo27Y5ADYHW50oEJ2mj"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"bg","rect":[0,0,651,1020],"offset":[0,0],"originalSize":[651,1020],"capInsets":[0,354,0,382]}],[0],0,[0],[0],[0]]

+ 1 - 1
build/jsb-link/assets/resources/import/7f/7f0df32b-32ac-4682-add1-a43eb0bffca7@6c48a.json

@@ -1 +1 @@
-[1,["7fDfMrMqxGgq3RpD6wv/yn"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"factory_name_icon_20010","rect":[0,0,48,23],"offset":[0,0],"originalSize":[48,23],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]
+[1,["7fDfMrMqxGgq3RpD6wv/yn"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"factory_name_icon_20010","rect":[1,0,48,23],"offset":[0,0.5],"originalSize":[50,24],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/80/80f9ffc5-91ca-4d08-aedd-b3712be53310.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/82/82a16e23-7ade-43a5-af4f-5504bb39b61f.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/8d/8de08dc2-a439-4a3c-b667-a56bec3c0f5d.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/92/9221bfa6-48ee-44cb-ba6c-f37e5847e165.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/94/94760687-648e-4d1f-ac2f-169b0dc625d9.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/9d/9d4f03cb-eee3-4d8d-bb0a-457af009d1cd.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/a2/a2f8ad6a-6054-4b3e-8202-7e9e1975fad9.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/b3/b3a90f8c-06c6-4d76-aa5d-bfecd35a2294.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/b4/b4dea4a9-29c8-46bc-a50d-5754afa7a2bd.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/c2/c24623b9-b557-420c-bf8c-8927ea736fa1.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/c9/c92ee1bb-0e83-4868-97e3-d71b8b58fae0.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/ce/ce87165a-e80b-46ed-b9df-d2690132ca17.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/d0/d0583c3f-ff06-4cb3-bf78-51680bc632e0.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/d7/d7adad34-ed08-4539-bd75-ff56d401edee.json


+ 1 - 1
build/jsb-link/assets/resources/import/db/db6ee5b7-c54c-44b6-a20f-64caad0c7ab7@6c48a.json

@@ -1 +1 @@
-[1,["dbbuW3xUxEtqIPZMqtDHq3"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"factory_name_icon_20012","rect":[0,0,47,23],"offset":[0,0],"originalSize":[47,23],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]
+[1,["dbbuW3xUxEtqIPZMqtDHq3"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"factory_name_icon_20012","rect":[1,1,48,23],"offset":[0,0],"originalSize":[50,25],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/e8/e86f7583-0e5e-46f6-ae3f-0904f46acf88.json


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/eb/eb23e881-c37e-4e36-a213-79bd42d111d1.json


+ 1 - 1
build/jsb-link/assets/resources/import/f6/f61a8a27-64a7-438c-931f-63943247efde.json

@@ -1 +1 @@
-[1,0,0,[["cc.AudioClip",["_name","_native","duration"],0]],[[0,0,1,2,4]],[[0,"redmoney",".mp3",2.638367],-1],0,0,[],[],[]]
+[1,0,0,[["cc.AudioClip",["_name","_native","duration"],0]],[[0,0,1,2,4]],[[0,"redmoney",".mp3",2.6654],-1],0,0,[],[],[]]

Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/import/f7/f7b563d2-2a35-4ed4-b0b0-05dd74c0033f.json


+ 27 - 27
build/jsb-link/assets/resources/native/03/03be9c7c-fdd9-4b58-8468-91188bfb3d62.atlas

@@ -1,27 +1,27 @@
-
-zhuanpan.png
-size: 175,101
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 2
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-zhuanpan
-  rotate: false
-  xy: 101, 27
-  size: 72, 72
-  orig: 72, 72
-  offset: 0, 0
-  index: -1
-zhuanpan1
-  rotate: false
-  xy: 101, 2
-  size: 20, 23
-  orig: 21, 24
-  offset: 0, 1
-  index: -1
+
+zhuanpan.png
+size: 175,101
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 2
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+zhuanpan
+  rotate: false
+  xy: 101, 27
+  size: 72, 72
+  orig: 72, 72
+  offset: 0, 0
+  index: -1
+zhuanpan1
+  rotate: false
+  xy: 101, 2
+  size: 20, 23
+  orig: 21, 24
+  offset: 0, 1
+  index: -1

+ 34 - 34
build/jsb-link/assets/resources/native/03/03d9c064-1b11-47c4-97d4-4973c1d96697.atlas

@@ -1,34 +1,34 @@
-
-libao.png
-size: 234,101
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 2
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-lihe-1
-  rotate: false
-  xy: 101, 42
-  size: 78, 57
-  orig: 78, 57
-  offset: 0, 0
-  index: -1
-lihe-2
-  rotate: true
-  xy: 181, 26
-  size: 73, 51
-  orig: 74, 51
-  offset: 1, 0
-  index: -1
-xing
-  rotate: true
-  xy: 101, 8
-  size: 32, 37
-  orig: 36, 41
-  offset: 2, 2
-  index: -1
+
+libao.png
+size: 234,101
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 2
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+lihe-1
+  rotate: false
+  xy: 101, 42
+  size: 78, 57
+  orig: 78, 57
+  offset: 0, 0
+  index: -1
+lihe-2
+  rotate: true
+  xy: 181, 26
+  size: 73, 51
+  orig: 74, 51
+  offset: 1, 0
+  index: -1
+xing
+  rotate: true
+  xy: 101, 8
+  size: 32, 37
+  orig: 36, 41
+  offset: 2, 2
+  index: -1

+ 34 - 34
build/jsb-link/assets/resources/native/08/0885da9a-6ef6-466b-8fde-4348308101ee.atlas

@@ -1,34 +1,34 @@
-
-light.png
-size: 1382,1360
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-deng1
-  rotate: true
-  xy: 2, 2
-  size: 679, 688
-  orig: 683, 692
-  offset: 2, 2
-  index: -1
-deng2
-  rotate: true
-  xy: 688, 683
-  size: 675, 684
-  orig: 683, 692
-  offset: 4, 4
-  index: -1
-deng3
-  rotate: true
-  xy: 692, 2
-  size: 679, 688
-  orig: 683, 692
-  offset: 2, 2
-  index: -1
-deng4
-  rotate: true
-  xy: 2, 683
-  size: 675, 684
-  orig: 683, 692
-  offset: 4, 4
-  index: -1
+
+light.png
+size: 1382,1360
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+deng1
+  rotate: true
+  xy: 2, 2
+  size: 679, 688
+  orig: 683, 692
+  offset: 2, 2
+  index: -1
+deng2
+  rotate: true
+  xy: 688, 683
+  size: 675, 684
+  orig: 683, 692
+  offset: 4, 4
+  index: -1
+deng3
+  rotate: true
+  xy: 692, 2
+  size: 679, 688
+  orig: 683, 692
+  offset: 2, 2
+  index: -1
+deng4
+  rotate: true
+  xy: 2, 683
+  size: 675, 684
+  orig: 683, 692
+  offset: 4, 4
+  index: -1

+ 244 - 244
build/jsb-link/assets/resources/native/0e/0ea867d9-68b1-4e17-92cd-067791bfc76b.atlas

@@ -1,244 +1,244 @@
-
-pandan.png
-size: 1848,400
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-baoxiang
-  rotate: true
-  xy: 692, 162
-  size: 236, 191
-  orig: 236, 191
-  offset: 0, 0
-  index: -1
-body
-  rotate: false
-  xy: 468, 147
-  size: 222, 251
-  orig: 222, 251
-  offset: 0, 0
-  index: -1
-ditan
-  rotate: false
-  xy: 1050, 2
-  size: 464, 164
-  orig: 464, 164
-  offset: 0, 0
-  index: -1
-dudou
-  rotate: true
-  xy: 1113, 238
-  size: 160, 129
-  orig: 162, 131
-  offset: 1, 1
-  index: -1
-erduo
-  rotate: true
-  xy: 310, 37
-  size: 361, 156
-  orig: 361, 156
-  offset: 0, 0
-  index: -1
-eye1-1
-  rotate: true
-  xy: 566, 8
-  size: 137, 145
-  orig: 144, 154
-  offset: 5, 4
-  index: -1
-eye1-2
-  rotate: true
-  xy: 1244, 246
-  size: 152, 151
-  orig: 156, 158
-  offset: 2, 3
-  index: -1
-eye2-1
-  rotate: true
-  xy: 1496, 169
-  size: 97, 110
-  orig: 99, 112
-  offset: 1, 1
-  index: -1
-eye2-2
-  rotate: false
-  xy: 468, 37
-  size: 96, 108
-  orig: 98, 110
-  offset: 1, 1
-  index: -1
-eye2-3
-  rotate: false
-  xy: 1490, 268
-  size: 122, 130
-  orig: 124, 132
-  offset: 1, 1
-  index: -1
-eye3-1
-  rotate: false
-  xy: 1089, 171
-  size: 118, 59
-  orig: 120, 61
-  offset: 1, 1
-  index: -1
-eye3-2
-  rotate: false
-  xy: 1209, 177
-  size: 101, 59
-  orig: 103, 61
-  offset: 1, 1
-  index: -1
-eye4-4
-  rotate: false
-  xy: 1516, 37
-  size: 122, 130
-  orig: 125, 132
-  offset: 2, 1
-  index: -1
-face
-  rotate: true
-  xy: 2, 21
-  size: 377, 306
-  orig: 377, 306
-  offset: 0, 0
-  index: -1
-jinbi
-  rotate: false
-  xy: 480, 12
-  size: 58, 23
-  orig: 59, 23
-  offset: 0, 0
-  index: -1
-jinbi1
-  rotate: false
-  xy: 1640, 113
-  size: 76, 55
-  orig: 76, 55
-  offset: 0, 0
-  index: -1
-meimao1
-  rotate: false
-  xy: 349, 10
-  size: 67, 25
-  orig: 70, 27
-  offset: 1, 1
-  index: -1
-meimao2
-  rotate: false
-  xy: 418, 12
-  size: 60, 23
-  orig: 62, 25
-  offset: 1, 1
-  index: -1
-naiping
-  rotate: false
-  xy: 833, 7
-  size: 215, 153
-  orig: 217, 155
-  offset: 1, 1
-  index: -1
-naizui
-  rotate: true
-  xy: 1608, 170
-  size: 96, 116
-  orig: 99, 118
-  offset: 1, 1
-  index: -1
-shou2
-  rotate: false
-  xy: 1397, 252
-  size: 91, 146
-  orig: 97, 148
-  offset: 1, 1
-  index: -1
-shou3
-  rotate: true
-  xy: 713, 6
-  size: 154, 118
-  orig: 156, 120
-  offset: 1, 1
-  index: -1
-toufa
-  rotate: false
-  xy: 957, 168
-  size: 130, 60
-  orig: 133, 63
-  offset: 1, 2
-  index: -1
-tui1
-  rotate: false
-  xy: 1733, 65
-  size: 112, 96
-  orig: 114, 98
-  offset: 1, 1
-  index: -1
-tui2
-  rotate: true
-  xy: 1614, 268
-  size: 130, 92
-  orig: 132, 94
-  offset: 1, 1
-  index: -1
-xing
-  rotate: true
-  xy: 310, 3
-  size: 32, 37
-  orig: 36, 41
-  offset: 2, 2
-  index: -1
-youshou_1
-  rotate: false
-  xy: 957, 230
-  size: 77, 168
-  orig: 78, 174
-  offset: 0, 6
-  index: -1
-youshouzhang
-  rotate: true
-  xy: 1312, 168
-  size: 76, 90
-  orig: 76, 90
-  offset: 0, 0
-  index: -1
-yy
-  rotate: true
-  xy: 885, 182
-  size: 216, 70
-  orig: 216, 70
-  offset: 0, 0
-  index: -1
-zui1-2
-  rotate: true
-  xy: 1726, 163
-  size: 105, 120
-  orig: 115, 125
-  offset: 3, 4
-  index: -1
-zui1-3
-  rotate: true
-  xy: 1640, 6
-  size: 105, 91
-  orig: 115, 96
-  offset: 3, 4
-  index: -1
-zui2-1
-  rotate: true
-  xy: 1708, 270
-  size: 128, 120
-  orig: 138, 125
-  offset: 5, 4
-  index: -1
-zuoshou_1
-  rotate: false
-  xy: 1036, 232
-  size: 75, 166
-  orig: 78, 174
-  offset: 3, 8
-  index: -1
-zuoshouzhang
-  rotate: true
-  xy: 1404, 174
-  size: 76, 90
-  orig: 76, 90
-  offset: 0, 0
-  index: -1
+
+pandan.png
+size: 1848,400
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+baoxiang
+  rotate: true
+  xy: 692, 162
+  size: 236, 191
+  orig: 236, 191
+  offset: 0, 0
+  index: -1
+body
+  rotate: false
+  xy: 468, 147
+  size: 222, 251
+  orig: 222, 251
+  offset: 0, 0
+  index: -1
+ditan
+  rotate: false
+  xy: 1050, 2
+  size: 464, 164
+  orig: 464, 164
+  offset: 0, 0
+  index: -1
+dudou
+  rotate: true
+  xy: 1113, 238
+  size: 160, 129
+  orig: 162, 131
+  offset: 1, 1
+  index: -1
+erduo
+  rotate: true
+  xy: 310, 37
+  size: 361, 156
+  orig: 361, 156
+  offset: 0, 0
+  index: -1
+eye1-1
+  rotate: true
+  xy: 566, 8
+  size: 137, 145
+  orig: 144, 154
+  offset: 5, 4
+  index: -1
+eye1-2
+  rotate: true
+  xy: 1244, 246
+  size: 152, 151
+  orig: 156, 158
+  offset: 2, 3
+  index: -1
+eye2-1
+  rotate: true
+  xy: 1496, 169
+  size: 97, 110
+  orig: 99, 112
+  offset: 1, 1
+  index: -1
+eye2-2
+  rotate: false
+  xy: 468, 37
+  size: 96, 108
+  orig: 98, 110
+  offset: 1, 1
+  index: -1
+eye2-3
+  rotate: false
+  xy: 1490, 268
+  size: 122, 130
+  orig: 124, 132
+  offset: 1, 1
+  index: -1
+eye3-1
+  rotate: false
+  xy: 1089, 171
+  size: 118, 59
+  orig: 120, 61
+  offset: 1, 1
+  index: -1
+eye3-2
+  rotate: false
+  xy: 1209, 177
+  size: 101, 59
+  orig: 103, 61
+  offset: 1, 1
+  index: -1
+eye4-4
+  rotate: false
+  xy: 1516, 37
+  size: 122, 130
+  orig: 125, 132
+  offset: 2, 1
+  index: -1
+face
+  rotate: true
+  xy: 2, 21
+  size: 377, 306
+  orig: 377, 306
+  offset: 0, 0
+  index: -1
+jinbi
+  rotate: false
+  xy: 480, 12
+  size: 58, 23
+  orig: 59, 23
+  offset: 0, 0
+  index: -1
+jinbi1
+  rotate: false
+  xy: 1640, 113
+  size: 76, 55
+  orig: 76, 55
+  offset: 0, 0
+  index: -1
+meimao1
+  rotate: false
+  xy: 349, 10
+  size: 67, 25
+  orig: 70, 27
+  offset: 1, 1
+  index: -1
+meimao2
+  rotate: false
+  xy: 418, 12
+  size: 60, 23
+  orig: 62, 25
+  offset: 1, 1
+  index: -1
+naiping
+  rotate: false
+  xy: 833, 7
+  size: 215, 153
+  orig: 217, 155
+  offset: 1, 1
+  index: -1
+naizui
+  rotate: true
+  xy: 1608, 170
+  size: 96, 116
+  orig: 99, 118
+  offset: 1, 1
+  index: -1
+shou2
+  rotate: false
+  xy: 1397, 252
+  size: 91, 146
+  orig: 97, 148
+  offset: 1, 1
+  index: -1
+shou3
+  rotate: true
+  xy: 713, 6
+  size: 154, 118
+  orig: 156, 120
+  offset: 1, 1
+  index: -1
+toufa
+  rotate: false
+  xy: 957, 168
+  size: 130, 60
+  orig: 133, 63
+  offset: 1, 2
+  index: -1
+tui1
+  rotate: false
+  xy: 1733, 65
+  size: 112, 96
+  orig: 114, 98
+  offset: 1, 1
+  index: -1
+tui2
+  rotate: true
+  xy: 1614, 268
+  size: 130, 92
+  orig: 132, 94
+  offset: 1, 1
+  index: -1
+xing
+  rotate: true
+  xy: 310, 3
+  size: 32, 37
+  orig: 36, 41
+  offset: 2, 2
+  index: -1
+youshou_1
+  rotate: false
+  xy: 957, 230
+  size: 77, 168
+  orig: 78, 174
+  offset: 0, 6
+  index: -1
+youshouzhang
+  rotate: true
+  xy: 1312, 168
+  size: 76, 90
+  orig: 76, 90
+  offset: 0, 0
+  index: -1
+yy
+  rotate: true
+  xy: 885, 182
+  size: 216, 70
+  orig: 216, 70
+  offset: 0, 0
+  index: -1
+zui1-2
+  rotate: true
+  xy: 1726, 163
+  size: 105, 120
+  orig: 115, 125
+  offset: 3, 4
+  index: -1
+zui1-3
+  rotate: true
+  xy: 1640, 6
+  size: 105, 91
+  orig: 115, 96
+  offset: 3, 4
+  index: -1
+zui2-1
+  rotate: true
+  xy: 1708, 270
+  size: 128, 120
+  orig: 138, 125
+  offset: 5, 4
+  index: -1
+zuoshou_1
+  rotate: false
+  xy: 1036, 232
+  size: 75, 166
+  orig: 78, 174
+  offset: 3, 8
+  index: -1
+zuoshouzhang
+  rotate: true
+  xy: 1404, 174
+  size: 76, 90
+  orig: 76, 90
+  offset: 0, 0
+  index: -1

BIN
build/jsb-link/assets/resources/native/29/29d7f431-2497-45fc-ab04-a4d2f031fcc1.png


+ 20 - 20
build/jsb-link/assets/resources/native/55/550608f2-0747-4d47-bbed-4bbe9f2fbd98.atlas

@@ -1,20 +1,20 @@
-
-skeleton.png
-size: 323,60
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-hb
-  rotate: false
-  xy: 250, 5
-  size: 71, 53
-  orig: 71, 53
-  offset: 0, 0
-  index: -1
-tuowei
-  rotate: false
-  xy: 2, 2
-  size: 246, 56
-  orig: 254, 58
-  offset: 2, 1
-  index: -1
+
+skeleton.png
+size: 323,60
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+hb
+  rotate: false
+  xy: 250, 5
+  size: 71, 53
+  orig: 71, 53
+  offset: 0, 0
+  index: -1
+tuowei
+  rotate: false
+  xy: 2, 2
+  size: 246, 56
+  orig: 254, 58
+  offset: 2, 1
+  index: -1

+ 419 - 419
build/jsb-link/assets/resources/native/55/55cdcb24-b372-4ff3-b1a4-da14d081cf00.atlas

@@ -1,419 +1,419 @@
-
-loading.png
-size: 2017,1540
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bei
-  rotate: false
-  xy: 1959, 892
-  size: 49, 67
-  orig: 52, 70
-  offset: 2, 1
-  index: -1
-beijing
-  rotate: true
-  xy: 2, 786
-  size: 752, 1702
-  orig: 752, 1702
-  offset: 0, 0
-  index: -1
-bizi
-  rotate: true
-  xy: 1924, 438
-  size: 41, 39
-  orig: 43, 42
-  offset: 1, 2
-  index: -1
-caihong
-  rotate: false
-  xy: 2, 63
-  size: 712, 721
-  orig: 738, 735
-  offset: 14, 7
-  index: -1
-chengbao
-  rotate: true
-  xy: 1814, 213
-  size: 223, 190
-  orig: 230, 192
-  offset: 3, 1
-  index: -1
-chuan
-  rotate: false
-  xy: 1837, 12
-  size: 75, 63
-  orig: 77, 65
-  offset: 1, 1
-  index: -1
-er1
-  rotate: false
-  xy: 773, 7
-  size: 52, 52
-  orig: 54, 54
-  offset: 1, 1
-  index: -1
-er2
-  rotate: false
-  xy: 827, 10
-  size: 51, 49
-  orig: 53, 51
-  offset: 1, 1
-  index: -1
-eye1
-  rotate: true
-  xy: 1985, 131
-  size: 80, 30
-  orig: 80, 30
-  offset: 0, 0
-  index: -1
-eye2
-  rotate: true
-  xy: 1951, 105
-  size: 106, 32
-  orig: 108, 34
-  offset: 1, 1
-  index: -1
-eye3
-  rotate: false
-  xy: 598, 33
-  size: 111, 28
-  orig: 113, 31
-  offset: 1, 2
-  index: -1
-head
-  rotate: true
-  xy: 1289, 16
-  size: 152, 110
-  orig: 154, 113
-  offset: 1, 2
-  index: -1
-kuzi
-  rotate: false
-  xy: 1401, 15
-  size: 95, 58
-  orig: 97, 61
-  offset: 1, 2
-  index: -1
-lang1
-  rotate: false
-  xy: 380, 18
-  size: 216, 43
-  orig: 224, 54
-  offset: 3, 4
-  index: -1
-lang2
-  rotate: false
-  xy: 1757, 77
-  size: 164, 24
-  orig: 170, 34
-  offset: 2, 3
-  index: -1
-lang3
-  rotate: true
-  xy: 1946, 1119
-  size: 174, 46
-  orig: 180, 52
-  offset: 4, 3
-  index: -1
-lang4
-  rotate: true
-  xy: 1946, 1295
-  size: 243, 53
-  orig: 251, 59
-  offset: 5, 3
-  index: -1
-mei1
-  rotate: false
-  xy: 1289, 2
-  size: 28, 12
-  orig: 32, 14
-  offset: 2, 1
-  index: -1
-mei2
-  rotate: false
-  xy: 130, 2
-  size: 28, 10
-  orig: 32, 12
-  offset: 2, 1
-  index: -1
-niao1
-  rotate: false
-  xy: 2, 2
-  size: 126, 59
-  orig: 126, 59
-  offset: 0, 0
-  index: -1
-san
-  rotate: false
-  xy: 1531, 438
-  size: 338, 346
-  orig: 338, 346
-  offset: 0, 0
-  index: -1
-sanying
-  rotate: false
-  xy: 716, 61
-  size: 259, 107
-  orig: 270, 121
-  offset: 8, 8
-  index: -1
-shatan
-  rotate: false
-  xy: 130, 14
-  size: 248, 47
-  orig: 248, 47
-  offset: 0, 0
-  index: -1
-shou1
-  rotate: false
-  xy: 919, 2
-  size: 28, 24
-  orig: 32, 27
-  offset: 2, 2
-  index: -1
-shou2-1
-  rotate: true
-  xy: 1959, 961
-  size: 32, 56
-  orig: 35, 59
-  offset: 1, 1
-  index: -1
-shou2-2
-  rotate: true
-  xy: 1965, 448
-  size: 31, 50
-  orig: 33, 54
-  offset: 1, 3
-  index: -1
-shou3
-  rotate: true
-  xy: 1871, 438
-  size: 41, 51
-  orig: 45, 54
-  offset: 2, 2
-  index: -1
-shou4
-  rotate: false
-  xy: 880, 19
-  size: 37, 40
-  orig: 39, 42
-  offset: 1, 1
-  index: -1
-shu1
-  rotate: true
-  xy: 1757, 103
-  size: 108, 192
-  orig: 108, 192
-  offset: 0, 0
-  index: -1
-shu2
-  rotate: false
-  xy: 1871, 607
-  size: 94, 204
-  orig: 94, 204
-  offset: 0, 0
-  index: -1
-shu3
-  rotate: true
-  xy: 977, 2
-  size: 166, 121
-  orig: 166, 121
-  offset: 0, 0
-  index: -1
-shu4
-  rotate: true
-  xy: 1530, 23
-  size: 196, 225
-  orig: 196, 225
-  offset: 0, 0
-  index: -1
-shu5
-  rotate: true
-  xy: 1531, 221
-  size: 215, 281
-  orig: 215, 281
-  offset: 0, 0
-  index: -1
-shu7
-  rotate: true
-  xy: 1923, 19
-  size: 82, 92
-  orig: 82, 92
-  offset: 0, 0
-  index: -1
-shu8
-  rotate: true
-  xy: 1414, 154
-  size: 100, 114
-  orig: 100, 114
-  offset: 0, 0
-  index: -1
-shugan1
-  rotate: false
-  xy: 1706, 1100
-  size: 238, 438
-  orig: 238, 438
-  offset: 0, 0
-  index: -1
-shuying
-  rotate: true
-  xy: 1414, 256
-  size: 528, 115
-  orig: 533, 125
-  offset: 2, 4
-  index: -1
-toufa
-  rotate: false
-  xy: 711, 20
-  size: 60, 39
-  orig: 60, 39
-  offset: 0, 0
-  index: -1
-tui1
-  rotate: false
-  xy: 1959, 836
-  size: 51, 54
-  orig: 51, 54
-  offset: 0, 0
-  index: -1
-tui2
-  rotate: false
-  xy: 1959, 1071
-  size: 56, 46
-  orig: 56, 46
-  offset: 0, 0
-  index: -1
-tuoxie1
-  rotate: false
-  xy: 1498, 36
-  size: 28, 37
-  orig: 30, 40
-  offset: 1, 2
-  index: -1
-tuoxie2
-  rotate: false
-  xy: 919, 28
-  size: 40, 31
-  orig: 42, 34
-  offset: 1, 2
-  index: -1
-xie1
-  rotate: true
-  xy: 1959, 995
-  size: 74, 54
-  orig: 78, 56
-  offset: 2, 1
-  index: -1
-xie10
-  rotate: false
-  xy: 598, 2
-  size: 102, 29
-  orig: 108, 34
-  offset: 3, 3
-  index: -1
-xie2
-  rotate: true
-  xy: 1706, 788
-  size: 23, 32
-  orig: 23, 32
-  offset: 0, 0
-  index: -1
-xie3
-  rotate: true
-  xy: 1740, 788
-  size: 23, 31
-  orig: 23, 31
-  offset: 0, 0
-  index: -1
-xie4
-  rotate: false
-  xy: 1513, 115
-  size: 15, 17
-  orig: 18, 19
-  offset: 2, 1
-  index: -1
-xie5
-  rotate: false
-  xy: 961, 42
-  size: 14, 17
-  orig: 17, 20
-  offset: 1, 1
-  index: -1
-xie6
-  rotate: true
-  xy: 1513, 134
-  size: 18, 15
-  orig: 21, 17
-  offset: 2, 1
-  index: -1
-xie7
-  rotate: true
-  xy: 2001, 1520
-  size: 18, 14
-  orig: 21, 17
-  offset: 1, 1
-  index: -1
-xie8
-  rotate: false
-  xy: 1965, 438
-  size: 21, 8
-  orig: 24, 10
-  offset: 2, 1
-  index: -1
-xie9
-  rotate: false
-  xy: 1988, 438
-  size: 21, 8
-  orig: 24, 10
-  offset: 1, 1
-  index: -1
-xigua
-  rotate: false
-  xy: 1757, 17
-  size: 78, 58
-  orig: 80, 60
-  offset: 1, 1
-  index: -1
-yguang
-  rotate: false
-  xy: 716, 170
-  size: 696, 614
-  orig: 750, 627
-  offset: 0, 13
-  index: -1
-yifu
-  rotate: false
-  xy: 1401, 75
-  size: 110, 77
-  orig: 110, 84
-  offset: 0, 7
-  index: -1
-yingzi
-  rotate: false
-  xy: 1100, 6
-  size: 187, 162
-  orig: 191, 166
-  offset: 2, 2
-  index: -1
-yizi
-  rotate: false
-  xy: 1706, 813
-  size: 251, 285
-  orig: 255, 288
-  offset: 1, 2
-  index: -1
-zhuozi
-  rotate: true
-  xy: 1871, 481
-  size: 124, 116
-  orig: 126, 118
-  offset: 1, 1
-  index: -1
-zui
-  rotate: true
-  xy: 1985, 106
-  size: 23, 27
-  orig: 32, 30
-  offset: 5, 2
-  index: -1
+
+loading.png
+size: 2017,1540
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bei
+  rotate: false
+  xy: 1959, 892
+  size: 49, 67
+  orig: 52, 70
+  offset: 2, 1
+  index: -1
+beijing
+  rotate: true
+  xy: 2, 786
+  size: 752, 1702
+  orig: 752, 1702
+  offset: 0, 0
+  index: -1
+bizi
+  rotate: true
+  xy: 1924, 438
+  size: 41, 39
+  orig: 43, 42
+  offset: 1, 2
+  index: -1
+caihong
+  rotate: false
+  xy: 2, 63
+  size: 712, 721
+  orig: 738, 735
+  offset: 14, 7
+  index: -1
+chengbao
+  rotate: true
+  xy: 1814, 213
+  size: 223, 190
+  orig: 230, 192
+  offset: 3, 1
+  index: -1
+chuan
+  rotate: false
+  xy: 1837, 12
+  size: 75, 63
+  orig: 77, 65
+  offset: 1, 1
+  index: -1
+er1
+  rotate: false
+  xy: 773, 7
+  size: 52, 52
+  orig: 54, 54
+  offset: 1, 1
+  index: -1
+er2
+  rotate: false
+  xy: 827, 10
+  size: 51, 49
+  orig: 53, 51
+  offset: 1, 1
+  index: -1
+eye1
+  rotate: true
+  xy: 1985, 131
+  size: 80, 30
+  orig: 80, 30
+  offset: 0, 0
+  index: -1
+eye2
+  rotate: true
+  xy: 1951, 105
+  size: 106, 32
+  orig: 108, 34
+  offset: 1, 1
+  index: -1
+eye3
+  rotate: false
+  xy: 598, 33
+  size: 111, 28
+  orig: 113, 31
+  offset: 1, 2
+  index: -1
+head
+  rotate: true
+  xy: 1289, 16
+  size: 152, 110
+  orig: 154, 113
+  offset: 1, 2
+  index: -1
+kuzi
+  rotate: false
+  xy: 1401, 15
+  size: 95, 58
+  orig: 97, 61
+  offset: 1, 2
+  index: -1
+lang1
+  rotate: false
+  xy: 380, 18
+  size: 216, 43
+  orig: 224, 54
+  offset: 3, 4
+  index: -1
+lang2
+  rotate: false
+  xy: 1757, 77
+  size: 164, 24
+  orig: 170, 34
+  offset: 2, 3
+  index: -1
+lang3
+  rotate: true
+  xy: 1946, 1119
+  size: 174, 46
+  orig: 180, 52
+  offset: 4, 3
+  index: -1
+lang4
+  rotate: true
+  xy: 1946, 1295
+  size: 243, 53
+  orig: 251, 59
+  offset: 5, 3
+  index: -1
+mei1
+  rotate: false
+  xy: 1289, 2
+  size: 28, 12
+  orig: 32, 14
+  offset: 2, 1
+  index: -1
+mei2
+  rotate: false
+  xy: 130, 2
+  size: 28, 10
+  orig: 32, 12
+  offset: 2, 1
+  index: -1
+niao1
+  rotate: false
+  xy: 2, 2
+  size: 126, 59
+  orig: 126, 59
+  offset: 0, 0
+  index: -1
+san
+  rotate: false
+  xy: 1531, 438
+  size: 338, 346
+  orig: 338, 346
+  offset: 0, 0
+  index: -1
+sanying
+  rotate: false
+  xy: 716, 61
+  size: 259, 107
+  orig: 270, 121
+  offset: 8, 8
+  index: -1
+shatan
+  rotate: false
+  xy: 130, 14
+  size: 248, 47
+  orig: 248, 47
+  offset: 0, 0
+  index: -1
+shou1
+  rotate: false
+  xy: 919, 2
+  size: 28, 24
+  orig: 32, 27
+  offset: 2, 2
+  index: -1
+shou2-1
+  rotate: true
+  xy: 1959, 961
+  size: 32, 56
+  orig: 35, 59
+  offset: 1, 1
+  index: -1
+shou2-2
+  rotate: true
+  xy: 1965, 448
+  size: 31, 50
+  orig: 33, 54
+  offset: 1, 3
+  index: -1
+shou3
+  rotate: true
+  xy: 1871, 438
+  size: 41, 51
+  orig: 45, 54
+  offset: 2, 2
+  index: -1
+shou4
+  rotate: false
+  xy: 880, 19
+  size: 37, 40
+  orig: 39, 42
+  offset: 1, 1
+  index: -1
+shu1
+  rotate: true
+  xy: 1757, 103
+  size: 108, 192
+  orig: 108, 192
+  offset: 0, 0
+  index: -1
+shu2
+  rotate: false
+  xy: 1871, 607
+  size: 94, 204
+  orig: 94, 204
+  offset: 0, 0
+  index: -1
+shu3
+  rotate: true
+  xy: 977, 2
+  size: 166, 121
+  orig: 166, 121
+  offset: 0, 0
+  index: -1
+shu4
+  rotate: true
+  xy: 1530, 23
+  size: 196, 225
+  orig: 196, 225
+  offset: 0, 0
+  index: -1
+shu5
+  rotate: true
+  xy: 1531, 221
+  size: 215, 281
+  orig: 215, 281
+  offset: 0, 0
+  index: -1
+shu7
+  rotate: true
+  xy: 1923, 19
+  size: 82, 92
+  orig: 82, 92
+  offset: 0, 0
+  index: -1
+shu8
+  rotate: true
+  xy: 1414, 154
+  size: 100, 114
+  orig: 100, 114
+  offset: 0, 0
+  index: -1
+shugan1
+  rotate: false
+  xy: 1706, 1100
+  size: 238, 438
+  orig: 238, 438
+  offset: 0, 0
+  index: -1
+shuying
+  rotate: true
+  xy: 1414, 256
+  size: 528, 115
+  orig: 533, 125
+  offset: 2, 4
+  index: -1
+toufa
+  rotate: false
+  xy: 711, 20
+  size: 60, 39
+  orig: 60, 39
+  offset: 0, 0
+  index: -1
+tui1
+  rotate: false
+  xy: 1959, 836
+  size: 51, 54
+  orig: 51, 54
+  offset: 0, 0
+  index: -1
+tui2
+  rotate: false
+  xy: 1959, 1071
+  size: 56, 46
+  orig: 56, 46
+  offset: 0, 0
+  index: -1
+tuoxie1
+  rotate: false
+  xy: 1498, 36
+  size: 28, 37
+  orig: 30, 40
+  offset: 1, 2
+  index: -1
+tuoxie2
+  rotate: false
+  xy: 919, 28
+  size: 40, 31
+  orig: 42, 34
+  offset: 1, 2
+  index: -1
+xie1
+  rotate: true
+  xy: 1959, 995
+  size: 74, 54
+  orig: 78, 56
+  offset: 2, 1
+  index: -1
+xie10
+  rotate: false
+  xy: 598, 2
+  size: 102, 29
+  orig: 108, 34
+  offset: 3, 3
+  index: -1
+xie2
+  rotate: true
+  xy: 1706, 788
+  size: 23, 32
+  orig: 23, 32
+  offset: 0, 0
+  index: -1
+xie3
+  rotate: true
+  xy: 1740, 788
+  size: 23, 31
+  orig: 23, 31
+  offset: 0, 0
+  index: -1
+xie4
+  rotate: false
+  xy: 1513, 115
+  size: 15, 17
+  orig: 18, 19
+  offset: 2, 1
+  index: -1
+xie5
+  rotate: false
+  xy: 961, 42
+  size: 14, 17
+  orig: 17, 20
+  offset: 1, 1
+  index: -1
+xie6
+  rotate: true
+  xy: 1513, 134
+  size: 18, 15
+  orig: 21, 17
+  offset: 2, 1
+  index: -1
+xie7
+  rotate: true
+  xy: 2001, 1520
+  size: 18, 14
+  orig: 21, 17
+  offset: 1, 1
+  index: -1
+xie8
+  rotate: false
+  xy: 1965, 438
+  size: 21, 8
+  orig: 24, 10
+  offset: 2, 1
+  index: -1
+xie9
+  rotate: false
+  xy: 1988, 438
+  size: 21, 8
+  orig: 24, 10
+  offset: 1, 1
+  index: -1
+xigua
+  rotate: false
+  xy: 1757, 17
+  size: 78, 58
+  orig: 80, 60
+  offset: 1, 1
+  index: -1
+yguang
+  rotate: false
+  xy: 716, 170
+  size: 696, 614
+  orig: 750, 627
+  offset: 0, 13
+  index: -1
+yifu
+  rotate: false
+  xy: 1401, 75
+  size: 110, 77
+  orig: 110, 84
+  offset: 0, 7
+  index: -1
+yingzi
+  rotate: false
+  xy: 1100, 6
+  size: 187, 162
+  orig: 191, 166
+  offset: 2, 2
+  index: -1
+yizi
+  rotate: false
+  xy: 1706, 813
+  size: 251, 285
+  orig: 255, 288
+  offset: 1, 2
+  index: -1
+zhuozi
+  rotate: true
+  xy: 1871, 481
+  size: 124, 116
+  orig: 126, 118
+  offset: 1, 1
+  index: -1
+zui
+  rotate: true
+  xy: 1985, 106
+  size: 23, 27
+  orig: 32, 30
+  offset: 5, 2
+  index: -1

+ 335 - 335
build/jsb-link/assets/resources/native/58/580216f6-a0b4-45df-89d5-849ddcb562f3.atlas

@@ -1,335 +1,335 @@
-
-chengnian.png
-size: 1609,780
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-01
-  rotate: true
-  xy: 1201, 339
-  size: 165, 273
-  orig: 165, 273
-  offset: 0, 0
-  index: -1
-03
-  rotate: true
-  xy: 1228, 506
-  size: 272, 291
-  orig: 272, 291
-  offset: 0, 0
-  index: -1
-04
-  rotate: false
-  xy: 2, 109
-  size: 356, 356
-  orig: 356, 356
-  offset: 0, 0
-  index: -1
-body
-  rotate: false
-  xy: 401, 269
-  size: 152, 196
-  orig: 152, 196
-  offset: 0, 0
-  index: -1
-erduo
-  rotate: false
-  xy: 814, 366
-  size: 385, 166
-  orig: 385, 166
-  offset: 0, 0
-  index: -1
-erji1
-  rotate: false
-  xy: 814, 534
-  size: 412, 244
-  orig: 414, 248
-  offset: 1, 3
-  index: -1
-erji2
-  rotate: false
-  xy: 434, 2
-  size: 80, 154
-  orig: 82, 157
-  offset: 1, 1
-  index: -1
-eye1-1
-  rotate: true
-  xy: 1232, 17
-  size: 73, 87
-  orig: 75, 89
-  offset: 1, 1
-  index: -1
-eye1-2
-  rotate: false
-  xy: 1469, 42
-  size: 73, 87
-  orig: 75, 89
-  offset: 1, 1
-  index: -1
-eye1-3
-  rotate: false
-  xy: 660, 2
-  size: 109, 104
-  orig: 111, 106
-  offset: 1, 1
-  index: -1
-eye1-4
-  rotate: false
-  xy: 771, 2
-  size: 109, 104
-  orig: 112, 106
-  offset: 2, 1
-  index: -1
-eye2-1
-  rotate: true
-  xy: 1406, 37
-  size: 105, 61
-  orig: 107, 63
-  offset: 1, 1
-  index: -1
-eye2-2
-  rotate: true
-  xy: 1544, 39
-  size: 90, 61
-  orig: 92, 63
-  offset: 1, 1
-  index: -1
-eye3
-  rotate: false
-  xy: 1350, 209
-  size: 122, 128
-  orig: 127, 133
-  offset: 3, 2
-  index: -1
-eye3-2
-  rotate: false
-  xy: 1474, 196
-  size: 128, 128
-  orig: 132, 133
-  offset: 2, 2
-  index: -1
-eye4-1
-  rotate: false
-  xy: 2, 20
-  size: 337, 87
-  orig: 344, 98
-  offset: 2, 5
-  index: -1
-eye4-2
-  rotate: true
-  xy: 360, 194
-  size: 271, 39
-  orig: 274, 41
-  offset: 1, 1
-  index: -1
-face
-  rotate: false
-  xy: 447, 473
-  size: 365, 305
-  orig: 367, 307
-  offset: 1, 1
-  index: -1
-kuzi
-  rotate: false
-  xy: 962, 137
-  size: 153, 87
-  orig: 153, 87
-  offset: 0, 0
-  index: -1
-meimao1
-  rotate: true
-  xy: 360, 122
-  size: 70, 22
-  orig: 72, 24
-  offset: 1, 1
-  index: -1
-meimao2
-  rotate: false
-  xy: 1145, 27
-  size: 60, 21
-  orig: 62, 23
-  offset: 1, 1
-  index: -1
-shou-jita
-  rotate: false
-  xy: 1321, 42
-  size: 83, 100
-  orig: 86, 103
-  offset: 2, 2
-  index: -1
-shou-jita2
-  rotate: false
-  xy: 341, 2
-  size: 91, 105
-  orig: 94, 108
-  offset: 1, 1
-  index: -1
-shou-jita3
-  rotate: false
-  xy: 2, 467
-  size: 443, 311
-  orig: 445, 313
-  offset: 1, 1
-  index: -1
-shou-jita4
-  rotate: false
-  xy: 1232, 92
-  size: 87, 105
-  orig: 113, 111
-  offset: 1, 5
-  index: -1
-shou1
-  rotate: true
-  xy: 555, 243
-  size: 90, 171
-  orig: 98, 173
-  offset: 1, 1
-  index: -1
-shou10
-  rotate: true
-  xy: 728, 235
-  size: 98, 75
-  orig: 100, 77
-  offset: 1, 1
-  index: -1
-shou11
-  rotate: true
-  xy: 401, 158
-  size: 109, 152
-  orig: 112, 154
-  offset: 2, 1
-  index: -1
-shou12
-  rotate: false
-  xy: 1145, 50
-  size: 85, 147
-  orig: 85, 147
-  offset: 0, 0
-  index: -1
-shou2
-  rotate: false
-  xy: 1521, 639
-  size: 86, 139
-  orig: 97, 141
-  offset: 10, 1
-  index: -1
-shou3
-  rotate: false
-  xy: 1521, 498
-  size: 86, 139
-  orig: 96, 141
-  offset: 1, 1
-  index: -1
-shou4
-  rotate: false
-  xy: 1474, 131
-  size: 130, 63
-  orig: 132, 65
-  offset: 1, 1
-  index: -1
-shou5
-  rotate: false
-  xy: 555, 118
-  size: 155, 123
-  orig: 155, 123
-  offset: 0, 0
-  index: -1
-shou6
-  rotate: false
-  xy: 810, 241
-  size: 155, 123
-  orig: 155, 123
-  offset: 0, 0
-  index: -1
-shou7
-  rotate: true
-  xy: 967, 226
-  size: 138, 151
-  orig: 138, 151
-  offset: 0, 0
-  index: -1
-shou8
-  rotate: true
-  xy: 1198, 199
-  size: 138, 150
-  orig: 138, 150
-  offset: 0, 0
-  index: -1
-shou9
-  rotate: false
-  xy: 1476, 326
-  size: 123, 170
-  orig: 123, 170
-  offset: 0, 0
-  index: -1
-toufa
-  rotate: false
-  xy: 516, 7
-  size: 142, 109
-  orig: 142, 109
-  offset: 0, 0
-  index: -1
-tui1
-  rotate: false
-  xy: 1120, 243
-  size: 76, 121
-  orig: 76, 121
-  offset: 0, 0
-  index: -1
-tui2
-  rotate: true
-  xy: 1350, 144
-  size: 63, 122
-  orig: 63, 122
-  offset: 0, 0
-  index: -1
-weijin1
-  rotate: false
-  xy: 1098, 10
-  size: 45, 125
-  orig: 45, 125
-  offset: 0, 0
-  index: -1
-weijin2
-  rotate: true
-  xy: 726, 335
-  size: 136, 82
-  orig: 139, 85
-  offset: 2, 2
-  index: -1
-yifu
-  rotate: false
-  xy: 555, 335
-  size: 169, 136
-  orig: 169, 136
-  offset: 0, 0
-  index: -1
-zui1-2
-  rotate: false
-  xy: 712, 108
-  size: 117, 125
-  orig: 133, 131
-  offset: 5, 5
-  index: -1
-zui1-2-2
-  rotate: false
-  xy: 882, 3
-  size: 117, 109
-  orig: 133, 112
-  offset: 5, 2
-  index: -1
-zui1-3
-  rotate: true
-  xy: 1001, 14
-  size: 121, 95
-  orig: 133, 101
-  offset: 5, 5
-  index: -1
-zui2-1
-  rotate: false
-  xy: 831, 114
-  size: 129, 125
-  orig: 158, 131
-  offset: 6, 5
-  index: -1
+
+chengnian.png
+size: 1609,780
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+01
+  rotate: true
+  xy: 1201, 339
+  size: 165, 273
+  orig: 165, 273
+  offset: 0, 0
+  index: -1
+03
+  rotate: true
+  xy: 1228, 506
+  size: 272, 291
+  orig: 272, 291
+  offset: 0, 0
+  index: -1
+04
+  rotate: false
+  xy: 2, 109
+  size: 356, 356
+  orig: 356, 356
+  offset: 0, 0
+  index: -1
+body
+  rotate: false
+  xy: 401, 269
+  size: 152, 196
+  orig: 152, 196
+  offset: 0, 0
+  index: -1
+erduo
+  rotate: false
+  xy: 814, 366
+  size: 385, 166
+  orig: 385, 166
+  offset: 0, 0
+  index: -1
+erji1
+  rotate: false
+  xy: 814, 534
+  size: 412, 244
+  orig: 414, 248
+  offset: 1, 3
+  index: -1
+erji2
+  rotate: false
+  xy: 434, 2
+  size: 80, 154
+  orig: 82, 157
+  offset: 1, 1
+  index: -1
+eye1-1
+  rotate: true
+  xy: 1232, 17
+  size: 73, 87
+  orig: 75, 89
+  offset: 1, 1
+  index: -1
+eye1-2
+  rotate: false
+  xy: 1469, 42
+  size: 73, 87
+  orig: 75, 89
+  offset: 1, 1
+  index: -1
+eye1-3
+  rotate: false
+  xy: 660, 2
+  size: 109, 104
+  orig: 111, 106
+  offset: 1, 1
+  index: -1
+eye1-4
+  rotate: false
+  xy: 771, 2
+  size: 109, 104
+  orig: 112, 106
+  offset: 2, 1
+  index: -1
+eye2-1
+  rotate: true
+  xy: 1406, 37
+  size: 105, 61
+  orig: 107, 63
+  offset: 1, 1
+  index: -1
+eye2-2
+  rotate: true
+  xy: 1544, 39
+  size: 90, 61
+  orig: 92, 63
+  offset: 1, 1
+  index: -1
+eye3
+  rotate: false
+  xy: 1350, 209
+  size: 122, 128
+  orig: 127, 133
+  offset: 3, 2
+  index: -1
+eye3-2
+  rotate: false
+  xy: 1474, 196
+  size: 128, 128
+  orig: 132, 133
+  offset: 2, 2
+  index: -1
+eye4-1
+  rotate: false
+  xy: 2, 20
+  size: 337, 87
+  orig: 344, 98
+  offset: 2, 5
+  index: -1
+eye4-2
+  rotate: true
+  xy: 360, 194
+  size: 271, 39
+  orig: 274, 41
+  offset: 1, 1
+  index: -1
+face
+  rotate: false
+  xy: 447, 473
+  size: 365, 305
+  orig: 367, 307
+  offset: 1, 1
+  index: -1
+kuzi
+  rotate: false
+  xy: 962, 137
+  size: 153, 87
+  orig: 153, 87
+  offset: 0, 0
+  index: -1
+meimao1
+  rotate: true
+  xy: 360, 122
+  size: 70, 22
+  orig: 72, 24
+  offset: 1, 1
+  index: -1
+meimao2
+  rotate: false
+  xy: 1145, 27
+  size: 60, 21
+  orig: 62, 23
+  offset: 1, 1
+  index: -1
+shou-jita
+  rotate: false
+  xy: 1321, 42
+  size: 83, 100
+  orig: 86, 103
+  offset: 2, 2
+  index: -1
+shou-jita2
+  rotate: false
+  xy: 341, 2
+  size: 91, 105
+  orig: 94, 108
+  offset: 1, 1
+  index: -1
+shou-jita3
+  rotate: false
+  xy: 2, 467
+  size: 443, 311
+  orig: 445, 313
+  offset: 1, 1
+  index: -1
+shou-jita4
+  rotate: false
+  xy: 1232, 92
+  size: 87, 105
+  orig: 113, 111
+  offset: 1, 5
+  index: -1
+shou1
+  rotate: true
+  xy: 555, 243
+  size: 90, 171
+  orig: 98, 173
+  offset: 1, 1
+  index: -1
+shou10
+  rotate: true
+  xy: 728, 235
+  size: 98, 75
+  orig: 100, 77
+  offset: 1, 1
+  index: -1
+shou11
+  rotate: true
+  xy: 401, 158
+  size: 109, 152
+  orig: 112, 154
+  offset: 2, 1
+  index: -1
+shou12
+  rotate: false
+  xy: 1145, 50
+  size: 85, 147
+  orig: 85, 147
+  offset: 0, 0
+  index: -1
+shou2
+  rotate: false
+  xy: 1521, 639
+  size: 86, 139
+  orig: 97, 141
+  offset: 10, 1
+  index: -1
+shou3
+  rotate: false
+  xy: 1521, 498
+  size: 86, 139
+  orig: 96, 141
+  offset: 1, 1
+  index: -1
+shou4
+  rotate: false
+  xy: 1474, 131
+  size: 130, 63
+  orig: 132, 65
+  offset: 1, 1
+  index: -1
+shou5
+  rotate: false
+  xy: 555, 118
+  size: 155, 123
+  orig: 155, 123
+  offset: 0, 0
+  index: -1
+shou6
+  rotate: false
+  xy: 810, 241
+  size: 155, 123
+  orig: 155, 123
+  offset: 0, 0
+  index: -1
+shou7
+  rotate: true
+  xy: 967, 226
+  size: 138, 151
+  orig: 138, 151
+  offset: 0, 0
+  index: -1
+shou8
+  rotate: true
+  xy: 1198, 199
+  size: 138, 150
+  orig: 138, 150
+  offset: 0, 0
+  index: -1
+shou9
+  rotate: false
+  xy: 1476, 326
+  size: 123, 170
+  orig: 123, 170
+  offset: 0, 0
+  index: -1
+toufa
+  rotate: false
+  xy: 516, 7
+  size: 142, 109
+  orig: 142, 109
+  offset: 0, 0
+  index: -1
+tui1
+  rotate: false
+  xy: 1120, 243
+  size: 76, 121
+  orig: 76, 121
+  offset: 0, 0
+  index: -1
+tui2
+  rotate: true
+  xy: 1350, 144
+  size: 63, 122
+  orig: 63, 122
+  offset: 0, 0
+  index: -1
+weijin1
+  rotate: false
+  xy: 1098, 10
+  size: 45, 125
+  orig: 45, 125
+  offset: 0, 0
+  index: -1
+weijin2
+  rotate: true
+  xy: 726, 335
+  size: 136, 82
+  orig: 139, 85
+  offset: 2, 2
+  index: -1
+yifu
+  rotate: false
+  xy: 555, 335
+  size: 169, 136
+  orig: 169, 136
+  offset: 0, 0
+  index: -1
+zui1-2
+  rotate: false
+  xy: 712, 108
+  size: 117, 125
+  orig: 133, 131
+  offset: 5, 5
+  index: -1
+zui1-2-2
+  rotate: false
+  xy: 882, 3
+  size: 117, 109
+  orig: 133, 112
+  offset: 5, 2
+  index: -1
+zui1-3
+  rotate: true
+  xy: 1001, 14
+  size: 121, 95
+  orig: 133, 101
+  offset: 5, 5
+  index: -1
+zui2-1
+  rotate: false
+  xy: 831, 114
+  size: 129, 125
+  orig: 158, 131
+  offset: 6, 5
+  index: -1

+ 27 - 27
build/jsb-link/assets/resources/native/68/68c76a85-3cbb-4f0e-b98d-bb383ae73331.atlas

@@ -1,27 +1,27 @@
-
-qiandao.png
-size: 182,105
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 6
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-qiandao
-  rotate: true
-  xy: 101, 2
-  size: 19, 42
-  orig: 19, 42
-  offset: 0, 0
-  index: -1
-qiandao1
-  rotate: true
-  xy: 101, 23
-  size: 80, 79
-  orig: 81, 80
-  offset: 1, 1
-  index: -1
+
+qiandao.png
+size: 182,105
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 6
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+qiandao
+  rotate: true
+  xy: 101, 2
+  size: 19, 42
+  orig: 19, 42
+  offset: 0, 0
+  index: -1
+qiandao1
+  rotate: true
+  xy: 101, 23
+  size: 80, 79
+  orig: 81, 80
+  offset: 1, 1
+  index: -1

+ 251 - 251
build/jsb-link/assets/resources/native/6c/6c81d684-e6d4-47f3-8c1d-4879a72ddbb7.atlas

@@ -1,251 +1,251 @@
-
-shaonian.png
-size: 1137,528
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-body
-  rotate: true
-  xy: 815, 368
-  size: 158, 173
-  orig: 158, 173
-  offset: 0, 0
-  index: -1
-dengpao
-  rotate: false
-  xy: 2, 3
-  size: 188, 230
-  orig: 201, 236
-  offset: 8, 1
-  index: -1
-erduo
-  rotate: false
-  xy: 387, 362
-  size: 426, 164
-  orig: 426, 164
-  offset: 0, 0
-  index: -1
-eye1-1
-  rotate: false
-  xy: 1057, 264
-  size: 76, 93
-  orig: 78, 95
-  offset: 1, 1
-  index: -1
-eye1-2
-  rotate: true
-  xy: 513, 135
-  size: 77, 92
-  orig: 79, 94
-  offset: 1, 1
-  index: -1
-eye1-3
-  rotate: true
-  xy: 510, 16
-  size: 117, 111
-  orig: 119, 113
-  offset: 1, 1
-  index: -1
-eye1-4
-  rotate: true
-  xy: 738, 178
-  size: 117, 111
-  orig: 120, 113
-  offset: 2, 1
-  index: -1
-eye2-1
-  rotate: true
-  xy: 731, 57
-  size: 114, 65
-  orig: 116, 68
-  offset: 1, 2
-  index: -1
-eye2-2
-  rotate: true
-  xy: 957, 66
-  size: 97, 65
-  orig: 99, 68
-  offset: 1, 2
-  index: -1
-face
-  rotate: false
-  xy: 2, 235
-  size: 383, 291
-  orig: 385, 293
-  offset: 1, 1
-  index: -1
-kuzi
-  rotate: false
-  xy: 355, 147
-  size: 156, 78
-  orig: 156, 78
-  offset: 0, 0
-  index: -1
-lingjin
-  rotate: true
-  xy: 869, 7
-  size: 57, 105
-  orig: 59, 107
-  offset: 1, 1
-  index: -1
-meimao1
-  rotate: false
-  xy: 798, 55
-  size: 69, 24
-  orig: 73, 26
-  offset: 2, 1
-  index: -1
-meimao2
-  rotate: true
-  xy: 780, 298
-  size: 62, 23
-  orig: 64, 25
-  offset: 1, 1
-  index: -1
-shou1-2
-  rotate: false
-  xy: 192, 123
-  size: 161, 110
-  orig: 161, 110
-  offset: 0, 0
-  index: -1
-shou2-2-copy
-  rotate: true
-  xy: 607, 173
-  size: 122, 129
-  orig: 122, 129
-  offset: 0, 0
-  index: -1
-shou3-2
-  rotate: true
-  xy: 387, 227
-  size: 94, 152
-  orig: 101, 154
-  offset: 1, 1
-  index: -1
-shou4-2
-  rotate: true
-  xy: 192, 2
-  size: 119, 122
-  orig: 119, 122
-  offset: 0, 0
-  index: -1
-shou4-3
-  rotate: true
-  xy: 316, 2
-  size: 119, 122
-  orig: 119, 122
-  offset: 0, 0
-  index: -1
-shou5-1
-  rotate: false
-  xy: 1044, 179
-  size: 84, 83
-  orig: 86, 85
-  offset: 1, 1
-  index: -1
-shou5-2
-  rotate: false
-  xy: 798, 81
-  size: 85, 82
-  orig: 87, 85
-  offset: 1, 1
-  index: -1
-shou6-1
-  rotate: true
-  xy: 440, 18
-  size: 127, 68
-  orig: 129, 70
-  offset: 1, 1
-  index: -1
-shou6-2
-  rotate: true
-  xy: 885, 67
-  size: 96, 70
-  orig: 98, 72
-  offset: 1, 1
-  index: -1
-shou6-3
-  rotate: false
-  xy: 387, 323
-  size: 218, 37
-  orig: 220, 39
-  offset: 1, 1
-  index: -1
-shou6-4
-  rotate: true
-  xy: 623, 5
-  size: 40, 103
-  orig: 42, 105
-  offset: 1, 1
-  index: -1
-shou6-5
-  rotate: false
-  xy: 976, 3
-  size: 87, 61
-  orig: 89, 63
-  offset: 1, 1
-  index: -1
-shou7-1
-  rotate: true
-  xy: 607, 297
-  size: 63, 171
-  orig: 65, 173
-  offset: 1, 1
-  index: -1
-toufa
-  rotate: false
-  xy: 851, 165
-  size: 112, 93
-  orig: 112, 93
-  offset: 0, 0
-  index: -1
-tui1
-  rotate: false
-  xy: 541, 214
-  size: 64, 107
-  orig: 66, 109
-  offset: 1, 1
-  index: -1
-tui2
-  rotate: false
-  xy: 1024, 66
-  size: 61, 106
-  orig: 63, 108
-  offset: 1, 1
-  index: -1
-yifu
-  rotate: true
-  xy: 990, 359
-  size: 167, 145
-  orig: 168, 146
-  offset: 1, 1
-  index: -1
-zui1-2
-  rotate: false
-  xy: 851, 260
-  size: 101, 106
-  orig: 112, 112
-  offset: 4, 4
-  index: -1
-zui1-3
-  rotate: false
-  xy: 954, 277
-  size: 101, 80
-  orig: 112, 87
-  offset: 4, 5
-  index: -1
-zui1-4
-  rotate: true
-  xy: 965, 174
-  size: 101, 77
-  orig: 112, 84
-  offset: 4, 5
-  index: -1
-zui2-1
-  rotate: true
-  xy: 623, 47
-  size: 124, 106
-  orig: 134, 112
-  offset: 5, 4
-  index: -1
+
+shaonian.png
+size: 1137,528
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+body
+  rotate: true
+  xy: 815, 368
+  size: 158, 173
+  orig: 158, 173
+  offset: 0, 0
+  index: -1
+dengpao
+  rotate: false
+  xy: 2, 3
+  size: 188, 230
+  orig: 201, 236
+  offset: 8, 1
+  index: -1
+erduo
+  rotate: false
+  xy: 387, 362
+  size: 426, 164
+  orig: 426, 164
+  offset: 0, 0
+  index: -1
+eye1-1
+  rotate: false
+  xy: 1057, 264
+  size: 76, 93
+  orig: 78, 95
+  offset: 1, 1
+  index: -1
+eye1-2
+  rotate: true
+  xy: 513, 135
+  size: 77, 92
+  orig: 79, 94
+  offset: 1, 1
+  index: -1
+eye1-3
+  rotate: true
+  xy: 510, 16
+  size: 117, 111
+  orig: 119, 113
+  offset: 1, 1
+  index: -1
+eye1-4
+  rotate: true
+  xy: 738, 178
+  size: 117, 111
+  orig: 120, 113
+  offset: 2, 1
+  index: -1
+eye2-1
+  rotate: true
+  xy: 731, 57
+  size: 114, 65
+  orig: 116, 68
+  offset: 1, 2
+  index: -1
+eye2-2
+  rotate: true
+  xy: 957, 66
+  size: 97, 65
+  orig: 99, 68
+  offset: 1, 2
+  index: -1
+face
+  rotate: false
+  xy: 2, 235
+  size: 383, 291
+  orig: 385, 293
+  offset: 1, 1
+  index: -1
+kuzi
+  rotate: false
+  xy: 355, 147
+  size: 156, 78
+  orig: 156, 78
+  offset: 0, 0
+  index: -1
+lingjin
+  rotate: true
+  xy: 869, 7
+  size: 57, 105
+  orig: 59, 107
+  offset: 1, 1
+  index: -1
+meimao1
+  rotate: false
+  xy: 798, 55
+  size: 69, 24
+  orig: 73, 26
+  offset: 2, 1
+  index: -1
+meimao2
+  rotate: true
+  xy: 780, 298
+  size: 62, 23
+  orig: 64, 25
+  offset: 1, 1
+  index: -1
+shou1-2
+  rotate: false
+  xy: 192, 123
+  size: 161, 110
+  orig: 161, 110
+  offset: 0, 0
+  index: -1
+shou2-2-copy
+  rotate: true
+  xy: 607, 173
+  size: 122, 129
+  orig: 122, 129
+  offset: 0, 0
+  index: -1
+shou3-2
+  rotate: true
+  xy: 387, 227
+  size: 94, 152
+  orig: 101, 154
+  offset: 1, 1
+  index: -1
+shou4-2
+  rotate: true
+  xy: 192, 2
+  size: 119, 122
+  orig: 119, 122
+  offset: 0, 0
+  index: -1
+shou4-3
+  rotate: true
+  xy: 316, 2
+  size: 119, 122
+  orig: 119, 122
+  offset: 0, 0
+  index: -1
+shou5-1
+  rotate: false
+  xy: 1044, 179
+  size: 84, 83
+  orig: 86, 85
+  offset: 1, 1
+  index: -1
+shou5-2
+  rotate: false
+  xy: 798, 81
+  size: 85, 82
+  orig: 87, 85
+  offset: 1, 1
+  index: -1
+shou6-1
+  rotate: true
+  xy: 440, 18
+  size: 127, 68
+  orig: 129, 70
+  offset: 1, 1
+  index: -1
+shou6-2
+  rotate: true
+  xy: 885, 67
+  size: 96, 70
+  orig: 98, 72
+  offset: 1, 1
+  index: -1
+shou6-3
+  rotate: false
+  xy: 387, 323
+  size: 218, 37
+  orig: 220, 39
+  offset: 1, 1
+  index: -1
+shou6-4
+  rotate: true
+  xy: 623, 5
+  size: 40, 103
+  orig: 42, 105
+  offset: 1, 1
+  index: -1
+shou6-5
+  rotate: false
+  xy: 976, 3
+  size: 87, 61
+  orig: 89, 63
+  offset: 1, 1
+  index: -1
+shou7-1
+  rotate: true
+  xy: 607, 297
+  size: 63, 171
+  orig: 65, 173
+  offset: 1, 1
+  index: -1
+toufa
+  rotate: false
+  xy: 851, 165
+  size: 112, 93
+  orig: 112, 93
+  offset: 0, 0
+  index: -1
+tui1
+  rotate: false
+  xy: 541, 214
+  size: 64, 107
+  orig: 66, 109
+  offset: 1, 1
+  index: -1
+tui2
+  rotate: false
+  xy: 1024, 66
+  size: 61, 106
+  orig: 63, 108
+  offset: 1, 1
+  index: -1
+yifu
+  rotate: true
+  xy: 990, 359
+  size: 167, 145
+  orig: 168, 146
+  offset: 1, 1
+  index: -1
+zui1-2
+  rotate: false
+  xy: 851, 260
+  size: 101, 106
+  orig: 112, 112
+  offset: 4, 4
+  index: -1
+zui1-3
+  rotate: false
+  xy: 954, 277
+  size: 101, 80
+  orig: 112, 87
+  offset: 4, 5
+  index: -1
+zui1-4
+  rotate: true
+  xy: 965, 174
+  size: 101, 77
+  orig: 112, 84
+  offset: 4, 5
+  index: -1
+zui2-1
+  rotate: true
+  xy: 623, 47
+  size: 124, 106
+  orig: 134, 112
+  offset: 5, 4
+  index: -1

+ 34 - 34
build/jsb-link/assets/resources/native/73/73e6b261-caab-44c1-b678-2d31ea81e9e5.atlas

@@ -1,34 +1,34 @@
-
-yaoqing.png
-size: 162,135
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 36
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-hb1
-  rotate: false
-  xy: 101, 61
-  size: 59, 72
-  orig: 62, 75
-  offset: 0, 3
-  index: -1
-hb2
-  rotate: true
-  xy: 101, 8
-  size: 51, 59
-  orig: 52, 60
-  offset: 0, 1
-  index: -1
-xing
-  rotate: true
-  xy: 2, 2
-  size: 32, 37
-  orig: 36, 41
-  offset: 2, 2
-  index: -1
+
+yaoqing.png
+size: 162,135
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 36
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+hb1
+  rotate: false
+  xy: 101, 61
+  size: 59, 72
+  orig: 62, 75
+  offset: 0, 3
+  index: -1
+hb2
+  rotate: true
+  xy: 101, 8
+  size: 51, 59
+  orig: 52, 60
+  offset: 0, 1
+  index: -1
+xing
+  rotate: true
+  xy: 2, 2
+  size: 32, 37
+  orig: 36, 41
+  offset: 2, 2
+  index: -1

+ 27 - 27
build/jsb-link/assets/resources/native/79/79ff2dcd-4579-4a1a-9adc-f0c01bc9c945.atlas

@@ -1,27 +1,27 @@
-
-qiandao.png
-size: 182,105
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 6
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-qiandao
-  rotate: true
-  xy: 101, 2
-  size: 19, 42
-  orig: 19, 42
-  offset: 0, 0
-  index: -1
-qiandao1
-  rotate: true
-  xy: 101, 23
-  size: 80, 79
-  orig: 81, 80
-  offset: 1, 1
-  index: -1
+
+qiandao.png
+size: 182,105
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 6
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+qiandao
+  rotate: true
+  xy: 101, 2
+  size: 19, 42
+  orig: 19, 42
+  offset: 0, 0
+  index: -1
+qiandao1
+  rotate: true
+  xy: 101, 23
+  size: 80, 79
+  orig: 81, 80
+  offset: 1, 1
+  index: -1

BIN
build/jsb-link/assets/resources/native/7f/7f0df32b-32ac-4682-add1-a43eb0bffca7.png


+ 27 - 27
build/jsb-link/assets/resources/native/8a/8a72d93b-a055-4bf4-86c5-7be5ddd02758.atlas

@@ -1,27 +1,27 @@
-
-pig.png
-size: 172,101
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 2
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-fudai1
-  rotate: false
-  xy: 101, 9
-  size: 26, 17
-  orig: 26, 17
-  offset: 0, 0
-  index: -1
-zhu
-  rotate: true
-  xy: 101, 28
-  size: 71, 69
-  orig: 71, 69
-  offset: 0, 0
-  index: -1
+
+pig.png
+size: 172,101
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 2
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+fudai1
+  rotate: false
+  xy: 101, 9
+  size: 26, 17
+  orig: 26, 17
+  offset: 0, 0
+  index: -1
+zhu
+  rotate: true
+  xy: 101, 28
+  size: 71, 69
+  orig: 71, 69
+  offset: 0, 0
+  index: -1

+ 27 - 27
build/jsb-link/assets/resources/native/97/97d51e7c-adeb-454b-8c93-1975eaf64dd4.atlas

@@ -1,27 +1,27 @@
-
-pig.png
-size: 427,355
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-icon_hb
-  rotate: false
-  xy: 360, 270
-  size: 65, 83
-  orig: 65, 83
-  offset: 0, 0
-  index: -1
-xing
-  rotate: false
-  xy: 360, 231
-  size: 33, 37
-  orig: 35, 39
-  offset: 1, 1
-  index: -1
-zhu
-  rotate: false
-  xy: 2, 2
-  size: 356, 351
-  orig: 356, 351
-  offset: 0, 0
-  index: -1
+
+pig.png
+size: 427,355
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+icon_hb
+  rotate: false
+  xy: 360, 270
+  size: 65, 83
+  orig: 65, 83
+  offset: 0, 0
+  index: -1
+xing
+  rotate: false
+  xy: 360, 231
+  size: 33, 37
+  orig: 35, 39
+  offset: 1, 1
+  index: -1
+zhu
+  rotate: false
+  xy: 2, 2
+  size: 356, 351
+  orig: 356, 351
+  offset: 0, 0
+  index: -1

BIN
build/jsb-link/assets/resources/native/c8/c8c2d471-bdec-442b-be6c-fdc5aa07297c.mp3


+ 62 - 62
build/jsb-link/assets/resources/native/d2/d20d76d5-2805-46f5-97ed-c028f6f6b2cc.atlas

@@ -1,62 +1,62 @@
-
-skeleton.png
-size: 1386,710
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-1
-  rotate: true
-  xy: 1051, 233
-  size: 136, 131
-  orig: 145, 141
-  offset: 7, 4
-  index: -1
-2
-  rotate: true
-  xy: 355, 4
-  size: 350, 349
-  orig: 359, 359
-  offset: 5, 5
-  index: -1
-3
-  rotate: true
-  xy: 1048, 371
-  size: 337, 336
-  orig: 347, 348
-  offset: 6, 5
-  index: -1
-4
-  rotate: true
-  xy: 707, 367
-  size: 341, 339
-  orig: 350, 349
-  offset: 6, 5
-  index: -1
-5
-  rotate: true
-  xy: 2, 2
-  size: 352, 351
-  orig: 361, 362
-  offset: 5, 5
-  index: -1
-6
-  rotate: false
-  xy: 2, 356
-  size: 352, 352
-  orig: 359, 362
-  offset: 3, 5
-  index: -1
-7
-  rotate: false
-  xy: 356, 359
-  size: 349, 349
-  orig: 359, 362
-  offset: 5, 7
-  index: -1
-8
-  rotate: false
-  xy: 706, 11
-  size: 343, 346
-  orig: 351, 357
-  offset: 4, 5
-  index: -1
+
+skeleton.png
+size: 1386,710
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: true
+  xy: 1051, 233
+  size: 136, 131
+  orig: 145, 141
+  offset: 7, 4
+  index: -1
+2
+  rotate: true
+  xy: 355, 4
+  size: 350, 349
+  orig: 359, 359
+  offset: 5, 5
+  index: -1
+3
+  rotate: true
+  xy: 1048, 371
+  size: 337, 336
+  orig: 347, 348
+  offset: 6, 5
+  index: -1
+4
+  rotate: true
+  xy: 707, 367
+  size: 341, 339
+  orig: 350, 349
+  offset: 6, 5
+  index: -1
+5
+  rotate: true
+  xy: 2, 2
+  size: 352, 351
+  orig: 361, 362
+  offset: 5, 5
+  index: -1
+6
+  rotate: false
+  xy: 2, 356
+  size: 352, 352
+  orig: 359, 362
+  offset: 3, 5
+  index: -1
+7
+  rotate: false
+  xy: 356, 359
+  size: 349, 349
+  orig: 359, 362
+  offset: 5, 7
+  index: -1
+8
+  rotate: false
+  xy: 706, 11
+  size: 343, 346
+  orig: 351, 357
+  offset: 4, 5
+  index: -1

BIN
build/jsb-link/assets/resources/native/db/db6ee5b7-c54c-44b6-a20f-64caad0c7ab7.png


+ 34 - 34
build/jsb-link/assets/resources/native/f1/f1b77e26-c94e-4177-a84c-58e7e52c9a9b.atlas

@@ -1,34 +1,34 @@
-
-fudai.png
-size: 177,107
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 8
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-fudai
-  rotate: true
-  xy: 101, 36
-  size: 69, 74
-  orig: 70, 75
-  offset: 0, 1
-  index: -1
-fudai1
-  rotate: true
-  xy: 140, 8
-  size: 26, 17
-  orig: 26, 17
-  offset: 0, 0
-  index: -1
-xing
-  rotate: true
-  xy: 101, 2
-  size: 32, 37
-  orig: 36, 41
-  offset: 2, 2
-  index: -1
+
+fudai.png
+size: 177,107
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 8
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+fudai
+  rotate: true
+  xy: 101, 36
+  size: 69, 74
+  orig: 70, 75
+  offset: 0, 1
+  index: -1
+fudai1
+  rotate: true
+  xy: 140, 8
+  size: 26, 17
+  orig: 26, 17
+  offset: 0, 0
+  index: -1
+xing
+  rotate: true
+  xy: 101, 2
+  size: 32, 37
+  orig: 36, 41
+  offset: 2, 2
+  index: -1

BIN
build/jsb-link/assets/resources/native/f6/f61a8a27-64a7-438c-931f-63943247efde.mp3


+ 27 - 27
build/jsb-link/assets/resources/native/fb/fb79aa84-27ed-4d27-8321-7f1e99585ade.atlas

@@ -1,27 +1,27 @@
-
-guanghuan.png
-size: 445,248
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-button_lq
-  rotate: false
-  xy: 248, 42
-  size: 195, 204
-  orig: 195, 204
-  offset: 0, 0
-  index: -1
-button_tv
-  rotate: false
-  xy: 248, 11
-  size: 27, 29
-  orig: 27, 29
-  offset: 0, 0
-  index: -1
-huan
-  rotate: false
-  xy: 2, 2
-  size: 244, 244
-  orig: 244, 244
-  offset: 0, 0
-  index: -1
+
+guanghuan.png
+size: 445,248
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+button_lq
+  rotate: false
+  xy: 248, 42
+  size: 195, 204
+  orig: 195, 204
+  offset: 0, 0
+  index: -1
+button_tv
+  rotate: false
+  xy: 248, 11
+  size: 27, 29
+  orig: 27, 29
+  offset: 0, 0
+  index: -1
+huan
+  rotate: false
+  xy: 2, 2
+  size: 244, 244
+  orig: 244, 244
+  offset: 0, 0
+  index: -1

BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser


+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/gradle.properties

@@ -36,7 +36,7 @@ PROP_BUILD_TOOLS_VERSION=28.0.3
 PROP_APP_ABI=armeabi-v7a
 
 # fill in sign information for release mode
-#RELEASE_STORE_FILE=D:/mokaszProjects/team1_nc/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/keystore/mokakey.keystore
+#RELEASE_STORE_FILE=D:/projects/team1_nc/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/keystore/mokakey.keystore
 RELEASE_STORE_PASSWORD=szmoka
 RELEASE_KEY_ALIAS=mokakey
 RELEASE_KEY_PASSWORD=szmoka

+ 402 - 110
build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -258,7 +258,7 @@ return [ 2 ];
 });
 };
 e.prototype.onEnable = function() {
-gData.adData.checkPopInter(s.InterAdType.interstitial1_click_3);
+gData.gameData.playerProp.completeFarmTaskTimes >= 1 && gData.adData.checkPopInter(s.InterAdType.interstitial1_click_3);
 mk.ad.showBanner(s.BannerAdType.banner_click_8);
 };
 e.prototype.onDisable = function() {
@@ -886,7 +886,7 @@ gData.adData.updateADLog(7, t, o);
 this.loadBanner();
 };
 e.prototype.onBannerAdClick = function() {
-mk.data.sendDataEvent(r.DataEventId.banner_click, mk.ad.bannerAdType);
+mk.data.sendDataEvent(r.DataEventId.Ad_click, mk.ad.bannerAdType);
 };
 e.prototype.onBannerAdAutoRefresh = function() {};
 e.prototype.onBannerAdAutoRefreshFail = function() {};
@@ -1283,7 +1283,7 @@ gData.adData.updateADLog(a, t, n);
 this.loadInter(o);
 };
 e.prototype.onInterstitialAdClick = function(t) {
-1 == this.checkPlacementIDType(t) ? mk.data.sendDataEvent(s.DataEventId.interstitial2_click, mk.ad.interFullAdType) : mk.data.sendDataEvent(s.DataEventId.interstitial1_click, mk.ad.interAdType);
+1 == this.checkPlacementIDType(t) ? mk.data.sendDataEvent(s.DataEventId.Ad_click, mk.ad.interFullAdType) : mk.data.sendDataEvent(s.DataEventId.Ad_click, mk.ad.interAdType);
 };
 e.prototype.onInterstitialAdClose = function(t, e) {
 var o = this.checkPlacementIDType(t);
@@ -1846,7 +1846,7 @@ this.canGet = !1;
 this.loadAd();
 };
 e.prototype.onRewardedVideoAdPlayClicked = function() {
-mk.data.sendDataEvent(r.DataEventId.video_click, mk.ad.videoAdType);
+mk.data.sendDataEvent(r.DataEventId.Ad_click, mk.ad.videoAdType);
 };
 e.prototype.onReward = function() {
 console.log("onReward  ");
@@ -2558,7 +2558,7 @@ return [ 4, mk.http.sendData("updateVideo", e) ];
 
 case 1:
 if (0 != (o = a.sent()).errcode) return [ 2 ];
-n = gData.gameData.getProp(c.GameProp.videoTimes);
+(n = gData.gameData.getProp(c.GameProp.videoTimes)) || (n = 0);
 gData.gameData.setProp(c.GameProp.videoTimes, ++n);
 n < 5 && mk.data.sendXYEvent("video_end_" + n, "第" + n + "次看视频");
 (i = this.adMap.get(this.ad_subType)) && i.setAdData(o.data);
@@ -3858,17 +3858,29 @@ return i > 3 && r && Object.defineProperty(e, o, r), r;
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var r = cc._decorator, c = r.ccclass, s = (r.property, function(t) {
+var r = cc._decorator, c = r.ccclass, s = r.property, l = function(t) {
 a(e, t);
 function e() {
-return null !== t && t.apply(this, arguments) || this;
+var e = null !== t && t.apply(this, arguments) || this;
+e.isFitSpecialNode = !1;
+return e;
 }
 e.prototype.onLoad = function() {
 this._AdaptLeftAndRight();
 };
+e.prototype.start = function() {};
 e.prototype._AdaptLeftAndRight = function() {
 var t = this.node.getComponent(cc.Widget);
-t && this.IsBigScreenRatio() && (t.top = 65);
+if (t && this.IsBigScreenRatio()) if (this.isFitSpecialNode) {
+if (t.isAlignTop) {
+var e = Math.round(80 * this.GetWinHeightWidthRatio() / 1.86);
+t.top = t.top + e;
+}
+if (t.isAlignBottom) {
+e = Math.round(80 * this.GetWinHeightWidthRatio() / 1.86);
+t.bottom = t.bottom + e;
+}
+} else t.top = 65;
 };
 e.prototype.IsBigScreenRatio = function() {
 return this.GetWinHeightWidthRatio() >= 1.86;
@@ -3876,9 +3888,12 @@ return this.GetWinHeightWidthRatio() >= 1.86;
 e.prototype.GetWinHeightWidthRatio = function() {
 return cc.winSize.height >= cc.winSize.width ? cc.winSize.height / cc.winSize.width : cc.winSize.width / cc.winSize.height;
 };
+i([ s({
+displayName: "是否适配特殊节点"
+}) ], e.prototype, "isFitSpecialNode", void 0);
 return i([ c ], e);
-}(cc.Component));
-o.default = s;
+}(cc.Component);
+o.default = l;
 cc._RF.pop();
 }, {} ],
 BitmapData: [ function(t, e, o) {
@@ -4695,7 +4710,7 @@ done: !0
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var s = t("../../../mk/system/JsbSystem"), l = t("../../component/SetGray"), p = t("../../component/TableView"), u = t("../../data/GameData"), d = t("../../data/module/CashProData"), h = cc._decorator, f = h.ccclass, y = h.property, g = function(t) {
+var s = t("../../../mk/system/JsbSystem"), l = t("../../component/SetGray"), p = t("../../component/TableView"), u = t("../../data/GameData"), d = cc._decorator, h = d.ccclass, f = d.property, y = function(t) {
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -4763,7 +4778,7 @@ if (o) {
 this.video_btn.interactable = !1;
 (a = this.video_btn.getComponent(l.default)) && a.setGray(!0);
 }
-if (!this.video_btn.interactable) {
+if (!o && !this.video_btn.interactable) {
 this.video_btn.interactable = !0;
 var a;
 (a = this.video_btn.getComponent(l.default)) && a.setGray(!1);
@@ -4897,7 +4912,7 @@ return c(this, function() {
 mk.audio.playEffect("button");
 if (!this.canOpen) return [ 2 ];
 this.canOpen = !1;
-if (1 == this.rbPanelType) gData.cashPro.openCashPro(d.cashProType.blessing_bigCash, gData.blessingBag.bigRbNum); else {
+if (1 == this.rbPanelType) gData.cashPro.openCashPro(gData.blessingBag.bigRbNum); else {
 this.rbOpenBtn.active = !1;
 this.aniBtnAd.node.active = !0;
 this.aniBtnAd.setCurrentTime(0);
@@ -4930,37 +4945,36 @@ e.prototype.onClickClose = function() {};
 e.prototype.onDisable = function() {
 gData.adData.checkShowFullInter(4);
 };
-i([ y(cc.Label) ], e.prototype, "txtBigNum", void 0);
-i([ y(cc.Label) ], e.prototype, "txtAddEft", void 0);
-i([ y(cc.RichText) ], e.prototype, "txtTipAd", void 0);
-i([ y(cc.RichText) ], e.prototype, "txtBigDelta", void 0);
-i([ y(cc.RichText) ], e.prototype, "txtBigTask", void 0);
-i([ y(cc.RichText) ], e.prototype, "txtRemaindAdNum", void 0);
-i([ y(cc.Prefab) ], e.prototype, "blassingBagItem", void 0);
-i([ y(cc.Node) ], e.prototype, "itemContent", void 0);
-i([ y(cc.Node) ], e.prototype, "btnCash", void 0);
-i([ y(cc.Node) ], e.prototype, "btnAd", void 0);
-i([ y(cc.Animation) ], e.prototype, "aniBigAdBtn", void 0);
-i([ y(cc.Node) ], e.prototype, "adIcon", void 0);
-i([ y(cc.Animation) ], e.prototype, "aniBtnAd", void 0);
-i([ y(cc.Node) ], e.prototype, "rbOpenBtn", void 0);
-i([ y(cc.Node) ], e.prototype, "nodeRb", void 0);
-i([ y(cc.Label) ], e.prototype, "txtRbNum", void 0);
-i([ y(cc.Node) ], e.prototype, "testNode", void 0);
-i([ y(cc.EditBox) ], e.prototype, "inputBox", void 0);
-i([ y(cc.Node) ], e.prototype, "node_xiabiao", void 0);
-i([ y(p.default) ], e.prototype, "tableview", void 0);
-i([ y(cc.Button) ], e.prototype, "video_btn", void 0);
-return i([ f ], e);
+i([ f(cc.Label) ], e.prototype, "txtBigNum", void 0);
+i([ f(cc.Label) ], e.prototype, "txtAddEft", void 0);
+i([ f(cc.RichText) ], e.prototype, "txtTipAd", void 0);
+i([ f(cc.RichText) ], e.prototype, "txtBigDelta", void 0);
+i([ f(cc.RichText) ], e.prototype, "txtBigTask", void 0);
+i([ f(cc.RichText) ], e.prototype, "txtRemaindAdNum", void 0);
+i([ f(cc.Prefab) ], e.prototype, "blassingBagItem", void 0);
+i([ f(cc.Node) ], e.prototype, "itemContent", void 0);
+i([ f(cc.Node) ], e.prototype, "btnCash", void 0);
+i([ f(cc.Node) ], e.prototype, "btnAd", void 0);
+i([ f(cc.Animation) ], e.prototype, "aniBigAdBtn", void 0);
+i([ f(cc.Node) ], e.prototype, "adIcon", void 0);
+i([ f(cc.Animation) ], e.prototype, "aniBtnAd", void 0);
+i([ f(cc.Node) ], e.prototype, "rbOpenBtn", void 0);
+i([ f(cc.Node) ], e.prototype, "nodeRb", void 0);
+i([ f(cc.Label) ], e.prototype, "txtRbNum", void 0);
+i([ f(cc.Node) ], e.prototype, "testNode", void 0);
+i([ f(cc.EditBox) ], e.prototype, "inputBox", void 0);
+i([ f(cc.Node) ], e.prototype, "node_xiabiao", void 0);
+i([ f(p.default) ], e.prototype, "tableview", void 0);
+i([ f(cc.Button) ], e.prototype, "video_btn", void 0);
+return i([ h ], e);
 }(cc.Component);
-o.default = g;
+o.default = y;
 cc._RF.pop();
 }, {
 "../../../mk/system/JsbSystem": "JsbSystem",
 "../../component/SetGray": "SetGray",
 "../../component/TableView": "TableView",
-"../../data/GameData": "GameData",
-"../../data/module/CashProData": "CashProData"
+"../../data/GameData": "GameData"
 } ],
 BonusTip: [ function(t, e, o) {
 "use strict";
@@ -6209,11 +6223,123 @@ t.prototype = null === e ? Object.create(e) : (o.prototype = e.prototype, new o(
 var a, i = arguments.length, r = i < 3 ? e : null === n ? n = Object.getOwnPropertyDescriptor(e, o) : n;
 if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(t, e, o, n); else for (var c = t.length - 1; c >= 0; c--) (a = t[c]) && (r = (i < 3 ? a(r) : i > 3 ? a(e, o, r) : a(e, o)) || r);
 return i > 3 && r && Object.defineProperty(e, o, r), r;
+}, r = this && this.__awaiter || function(t, e, o, n) {
+return new (o || (o = Promise))(function(a, i) {
+function r(t) {
+try {
+s(n.next(t));
+} catch (t) {
+i(t);
+}
+}
+function c(t) {
+try {
+s(n.throw(t));
+} catch (t) {
+i(t);
+}
+}
+function s(t) {
+t.done ? a(t.value) : (e = t.value, e instanceof o ? e : new o(function(t) {
+t(e);
+})).then(r, c);
+var e;
+}
+s((n = n.apply(t, e || [])).next());
+});
+}, c = this && this.__generator || function(t, e) {
+var o, n, a, i, r = {
+label: 0,
+sent: function() {
+if (1 & a[0]) throw a[1];
+return a[1];
+},
+trys: [],
+ops: []
+};
+return i = {
+next: c(0),
+throw: c(1),
+return: c(2)
+}, "function" == typeof Symbol && (i[Symbol.iterator] = function() {
+return this;
+}), i;
+function c(t) {
+return function(e) {
+return s([ t, e ]);
+};
+}
+function s(i) {
+if (o) throw new TypeError("Generator is already executing.");
+for (;r; ) try {
+if (o = 1, n && (a = 2 & i[0] ? n.return : i[0] ? n.throw || ((a = n.return) && a.call(n), 
+0) : n.next) && !(a = a.call(n, i[1])).done) return a;
+(n = 0, a) && (i = [ 2 & i[0], a.value ]);
+switch (i[0]) {
+case 0:
+case 1:
+a = i;
+break;
+
+case 4:
+r.label++;
+return {
+value: i[1],
+done: !1
+};
+
+case 5:
+r.label++;
+n = i[1];
+i = [ 0 ];
+continue;
+
+case 7:
+i = r.ops.pop();
+r.trys.pop();
+continue;
+
+default:
+if (!(a = r.trys, a = a.length > 0 && a[a.length - 1]) && (6 === i[0] || 2 === i[0])) {
+r = 0;
+continue;
+}
+if (3 === i[0] && (!a || i[1] > a[0] && i[1] < a[3])) {
+r.label = i[1];
+break;
+}
+if (6 === i[0] && r.label < a[1]) {
+r.label = a[1];
+a = i;
+break;
+}
+if (a && r.label < a[2]) {
+r.label = a[2];
+r.ops.push(i);
+break;
+}
+a[2] && r.ops.pop();
+r.trys.pop();
+continue;
+}
+i = e.call(t, r);
+} catch (t) {
+i = [ 6, t ];
+n = 0;
+} finally {
+o = a = 0;
+}
+if (5 & i[0]) throw i[1];
+return {
+value: i[0] ? i[1] : void 0,
+done: !0
+};
+}
 };
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var r = cc._decorator, c = r.ccclass, s = r.property, l = function(t) {
+var s = cc._decorator, l = s.ccclass, p = s.property, u = function(t) {
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -6238,6 +6364,14 @@ this.loadPart.active = !0;
 this.loadAni.play("load", 0);
 };
 e.prototype.tixianSuccess = function() {
+return r(this, void 0, void 0, function() {
+return c(this, function(t) {
+switch (t.label) {
+case 0:
+return [ 4, mk.time.WaitForSeconds(1) ];
+
+case 1:
+t.sent();
 this.loadPart.active = !1;
 this.cashPro.active = !0;
 mk.tween.move(this.cashPro, .3, cc.v2(1e3, 0), cc.v2(0, 0), function() {
@@ -6246,19 +6380,23 @@ gData.adData.checkShowFullInter(1);
 mk.data.setTAEventUser(1, "cash_time", 1);
 mk.data.setTAEventUser(1, "cash_total", gData.cashPro.cashPro_money / 100);
 this.labMoney.string = "¥" + (gData.cashPro.cashPro_money / 100).toFixed(2);
+return [ 2 ];
+}
+});
+});
 };
 e.prototype.tixianFail = function() {
 console.log("tixianFail  ");
 this.loadPart.active = !1;
 mk.ui.closePanel(this.node.name);
 };
-i([ s(cc.Node) ], e.prototype, "loadPart", void 0);
-i([ s(cc.Animation) ], e.prototype, "loadAni", void 0);
-i([ s(cc.Node) ], e.prototype, "cashPro", void 0);
-i([ s(cc.Label) ], e.prototype, "labMoney", void 0);
-return i([ c ], e);
+i([ p(cc.Node) ], e.prototype, "loadPart", void 0);
+i([ p(cc.Animation) ], e.prototype, "loadAni", void 0);
+i([ p(cc.Node) ], e.prototype, "cashPro", void 0);
+i([ p(cc.Label) ], e.prototype, "labMoney", void 0);
+return i([ l ], e);
 }(cc.Component);
-o.default = l;
+o.default = u;
 cc._RF.pop();
 }, {} ],
 Certification: [ function(t, e, o) {
@@ -6980,9 +7118,12 @@ configurable: !0
 e.prototype.onLoad = function() {};
 e.prototype.start = function() {
 var t = this;
-this.isDelayOneFrame ? cc.tween(this.effect_par).delay(.16).call(function() {
+if (this.isDelayOneFrame) {
+r.scale && (this.effect_par.opacity = 0);
+cc.tween(this.effect_par).delay(.16).call(function() {
 t.showEffect();
-}).start() : this.showEffect();
+}).start();
+} else this.showEffect();
 };
 e.prototype.showEffect = function() {
 if (this.effect_par) switch (this.open_effect) {
@@ -6991,6 +7132,7 @@ break;
 
 case r.scale:
 var t = this.effect_par.scale;
+this.effect_par.opacity = 255;
 mk.tween.scale(this.effect_par, .3, void 0, t, void 0, "backOut");
 break;
 
@@ -11281,7 +11423,7 @@ Object.defineProperty(o, "__esModule", {
 value: !0
 });
 o.Fun = void 0;
-var n, a = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/PigBankData"), d = t("./module/TurnableData"), h = t("./module/SignData"), f = t("./module/FissionData"), y = t("./AdData"), g = t("./module/RewardData"), m = t("./module/CashNormalData"), _ = t("./module/ReceiptNoticeData"), v = t("./module/BlessingBagData"), b = t("./module/CashProData"), D = t("./module/RedBagCashData"), w = t("./module/RedCodeData"), S = t("./module/RedeemData"), A = t("./module/MoreGameData"), P = t("./module/SettingData"), k = t("./module/GuideData"), O = t("./module/GuideWeakData"), I = t("./ConfigData"), T = t("./module/NewCashUIData"), R = t("../../before/view/data/ADUnlockData"), C = t("../../before/view/data/PlantData"), x = t("../../before/main/FarmSystem"), N = t("../../before/view/data/HarvestData"), F = t("../../before/view/data/ADClearSickData"), j = t("../../before/main/PastureSystem"), M = t("../../before/main/FactorySystem"), B = t("./module/FarmMapData"), L = t("./module/GradeRewardData"), E = t("./module/WalletCashOutData"), U = t("./module/LineUpUIData"), G = function() {
+var n, a = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/PigBankData"), d = t("./module/TurnableData"), h = t("./module/SignData"), f = t("./module/FissionData"), y = t("./AdData"), g = t("./module/RewardData"), m = t("./module/CashNormalData"), _ = t("./module/ReceiptNoticeData"), v = t("./module/BlessingBagData"), b = t("./module/CashProData"), D = t("./module/RedBagCashData"), w = t("./module/RedCodeData"), S = t("./module/RedeemData"), A = t("./module/MoreGameData"), P = t("./module/SettingData"), k = t("./module/GuideData"), O = t("./module/GuideWeakData"), I = t("./ConfigData"), T = t("./module/NewCashUIData"), R = t("../../before/view/data/ADUnlockData"), C = t("../../before/view/data/PlantData"), x = t("../../before/main/FarmSystem"), N = t("../../before/view/data/HarvestData"), F = t("../../before/view/data/ADClearSickData"), M = t("../../before/main/PastureSystem"), j = t("../../before/main/FactorySystem"), B = t("./module/FarmMapData"), L = t("./module/GradeRewardData"), E = t("./module/WalletCashOutData"), U = t("./module/LineUpUIData"), G = function() {
 function t() {
 this.init();
 }
@@ -11316,8 +11458,8 @@ this.adUnlockData = new R.default();
 this.plantData = new C.default();
 this.harvestData = new N.default();
 this.adClearSickData = new F.default();
-this.pastureSystem = new j.default();
-this.factorySystem = new M.default();
+this.pastureSystem = new M.default();
+this.factorySystem = new j.default();
 this.farmSystem = new x.FarmSystem();
 this.farmMapData = new B.FarmMapData();
 this.farmGradeData = new L.GradeRewardData();
@@ -11774,6 +11916,8 @@ this.playerProp.userFarmTaskInfo = t.userFarmTaskInfo;
 this.playerProp.speedUpLeftTimes = t.speedUpLeftTimes;
 this.playerProp.completeFarmTaskTimes = t.completeFarmTaskTimes;
 mk.data.setTAUserID(gData.loginData.uin);
+mk.data.setTAEventUser(0, "logindays_total", this.playerProp.loginDays);
+0 == this.playerProp.completeFarmTaskTimes && mk.data.setTAEventUser(0, "Cumulative_task", gData.gameData.playerProp.completeFarmTaskTimes);
 if (gData.loginData.isFirstIn) {
 gData.loginData.isFirstIn = !1;
 mk.data.setTAEventRegister();
@@ -11941,37 +12085,70 @@ gData.gameData.setNextProduct(!1);
 }
 };
 t.prototype.makeProduct = function() {
-var t = !0;
+return n(this, void 0, void 0, function() {
+var t;
+return a(this, function(e) {
+switch (e.label) {
+case 0:
+t = !0;
 switch (this.nextType) {
 case 0:
+return [ 3, 1 ];
+
+case 1:
+return [ 3, 2 ];
+
+case 2:
+return [ 3, 4 ];
+
+case 3:
+return [ 3, 6 ];
+}
+return [ 3, 8 ];
+
+case 1:
 mk.tip.pop("农场已满,无法继续生产");
 t = !1;
-break;
+return [ 3, 8 ];
 
-case 1:
+case 2:
 gData.farmSystem.btnMake();
 this.nextMake = null;
 this.setNextProduct(!1);
 gData.adData.checkPopRed();
-this.updateNewTaskProgress();
-break;
+return [ 4, this.updateNewTaskProgress() ];
 
-case 2:
+case 3:
+e.sent();
+return [ 3, 8 ];
+
+case 4:
 gData.pastureSystem.btnMake();
 this.nextMake = null;
 this.setNextProduct(!1);
 gData.adData.checkPopRed();
-this.updateNewTaskProgress();
-break;
+return [ 4, this.updateNewTaskProgress() ];
 
-case 3:
+case 5:
+e.sent();
+return [ 3, 8 ];
+
+case 6:
 gData.factorySystem.btnMake();
 this.nextMake = null;
 this.setNextProduct(!1);
 gData.adData.checkPopRed();
-this.updateNewTaskProgress();
+return [ 4, this.updateNewTaskProgress() ];
+
+case 7:
+e.sent();
+return [ 3, 8 ];
+
+case 8:
+return [ 2, t ];
 }
-return t;
+});
+});
 };
 t.prototype.updateNewTaskProgress = function(t) {
 void 0 === t && (t = !1);
@@ -12426,6 +12603,7 @@ this._redMoney = t;
 gData.gameData.init_coin = !0;
 gData.gameData.init_wallet_redMoney = !0;
 mk.ui.invokeRefreshEventByName("refreshCoin");
+mk.data.setTAEventUser(0, "current_redmoney_stock", this._redMoney);
 },
 enumerable: !1,
 configurable: !0
@@ -12510,14 +12688,10 @@ t.UPDATE_CashNum = "UPDATE_CashNum";
 t.guide = "guide";
 t.button_click = "button_click";
 t.video_init = "video_init";
-t.video_click = "video_click";
 t.video_end = "video_end";
 t.interstitial2_init = "interstitial2_init";
-t.interstitial2_click = "interstitial2_click";
+t.Ad_click = "Ad_click";
 t.interstitial2_end = "interstitial2_end";
-t.interstitial1_click = "interstitial1_click";
-t.banner_click = "banner_click";
-t.splash_click = "splash_click";
 t.fudaiFunction = "fudaiFunction";
 t.hutuiFunction = "hutuiFunction";
 t.ad_videoEcpm = "ad_video";
@@ -12930,7 +13104,6 @@ this.ani_add.node.active = !1;
 gData.gameData.gameStyle = this;
 this.span = 6e4 * gData.gameData.ProductionRecovery;
 gData.gameData.checkGradeUpUnLock();
-this.loadMain();
 this.registerCallBack();
 };
 e.prototype.start = function() {
@@ -13027,6 +13200,7 @@ if (gData.gameData.playerProp.userFarmTaskInfo) {
 var t = gData.gameData.playerProp.userFarmTaskInfo.completeCount, e = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
 this.lbl_task.string = "<b><color=#8D4D32>进行" + e + "次生产</c><color=#D73D25>(" + t + "/" + e + ")</color></b>";
 this.node_hand.active = t >= e;
+gData.gameData.playerProp.completeFarmTaskTimes < 1 && mk.tip.pop("百元红包进度+1");
 }
 gData.gameData.init_task = !1;
 };
@@ -13170,22 +13344,43 @@ e.prototype.onClickTask = function() {
 mk.data.sendDataEvent(l.DataEventId.button_click, "任务红包icon");
 };
 e.prototype.onClickPlant = function() {
+return r(this, void 0, void 0, function() {
+var t, e;
+return c(this, function(o) {
+switch (o.label) {
+case 0:
 mk.audio.playEffect("button");
-if (gData.gameData.leftTimes <= 0) mk.ui.openPanel("module/speedUpUI/productReward"); else if (gData.gameData.isProducting) mk.tip.pop("点击太快了"); else {
-var t = gData.gameData.makeProduct();
+if (gData.gameData.leftTimes <= 0) {
+mk.ui.openPanel("module/speedUpUI/productReward");
+return [ 2 ];
+}
+if (gData.gameData.isProducting) {
+mk.tip.pop("点击太快了");
+return [ 2 ];
+}
+return [ 4, gData.gameData.makeProduct() ];
+
+case 1:
+t = o.sent();
 gData.gameData.playerProp.gradeLevel < 2 && mk.tip.pop("生产次数+1");
 if (t) {
-var e = this.node_taskHb.parent.convertToWorldSpaceAR(this.node_taskHb.getPosition());
+e = this.node_taskHb.parent.convertToWorldSpaceAR(this.node_taskHb.getPosition());
 mk.fly.PlayCoinAnim(1, 3, this.btn_product, e, function() {
 gData.gameData.init_task = !0;
 }, .8);
 }
+return [ 2 ];
 }
+});
+});
 };
 e.prototype.doFlyExpAni = function(t, e, o) {
 var n = this, a = this.lbl_farmLevel.node.parent.convertToWorldSpaceAR(this.lbl_farmLevel.node.getPosition());
 mk.fly.PlayCoinAnim(2, 3, e, a, function() {
-gData.gameData.playerProp.gradeLevel < o.farmLevel && (gData.gameData.playerProp.gradeLevel = o.farmLevel);
+if (gData.gameData.playerProp.gradeLevel < o.farmLevel) {
+gData.gameData.playerProp.gradeLevel = o.farmLevel;
+mk.data.setTAEventUser(0, "farm_lv", gData.gameData.playerProp.gradeLevel);
+}
 gData.gameData.playerProp.farmExpValue = o.userExp;
 gData.gameData.playerProp.farmGradeData = o.userFarmGrageRewardInfo;
 gData.gameData.init_red_point = !0;
@@ -16231,7 +16426,7 @@ mk.storage.setStorage("ad_openEcpm", n);
 n <= 300 && (n <= 50 ? mk.data.sendDataEventValue(a.DataEventId.ad_openEcpm, "ad_video_ecpm" + n, o.adsource_price) : n % 10 == 0 && mk.data.sendDataEventValue(a.DataEventId.ad_openEcpm, "ad_video_ecpm" + n, o.adsource_price));
 };
 t.clickSplash = function() {
-mk.data.sendDataEvent(a.DataEventId.splash_click, "splash_click");
+mk.data.sendDataEvent(a.DataEventId.Ad_click, "splash_click");
 };
 t.getAliRiskDeviceToken = function() {
 var t = "";
@@ -16378,11 +16573,14 @@ t ? n(t) : o(e);
 });
 });
 };
-t.prototype.load = function(t, e) {
-return new Promise(function(o, n) {
-cc.resources.load(t, e, function() {}, function(t, e) {
+t.prototype.load = function(t, e, o) {
+void 0 === o && (o = null);
+return new Promise(function(n, a) {
+cc.resources.load(t, e, function(t, e) {
+o && o(t / e * 100);
+}, function(t, e) {
 void 0 === t && (t = null);
-t ? n(t) : o(e);
+t ? a(t) : n(e);
 });
 });
 };
@@ -17113,24 +17311,43 @@ e.lbl_progress = null;
 e.node_load = null;
 e.lbl_server = null;
 e.lbl_privacy = null;
+e.node_loadPart = null;
+e.node_btnLogin = null;
 e.process = 0;
 e.hotUpdatePanel = null;
 e.hasDeviceBackInit = !1;
 e.hasCheckAnti = !1;
 e.hasCheckPermission = !1;
 e.hasCheckPrivacy = !1;
+e.loadSceneState = !1;
+e.coreGame = null;
+e.cool = !1;
 return e;
 }
 e.prototype.onLoad = function() {
 this.lbl_progress.node.active = !1;
 this.node_load.active = !0;
+this.node_loadPart.active = !0;
+this.node_btnLogin.active = !1;
 this.setProgress(0);
 };
 e.prototype.start = function() {
-if (1 != mk.storage.getStorage("alifengkong")) {
+return r(this, void 0, void 0, function() {
+var t;
+return c(this, function(e) {
+switch (e.label) {
+case 0:
+if (1 == mk.storage.getStorage("alifengkong")) return [ 2 ];
 mk.aliRiskManager.init();
-mk.loader.preload("game/coregame/coregame", cc.Prefab);
+t = this;
+return [ 4, mk.loader.load("game/coregame/coregame", cc.Prefab) ];
+
+case 1:
+t.coreGame = e.sent();
+return [ 2 ];
 }
+});
+});
 };
 e.prototype.update = function() {
 if (!this.hasDeviceBackInit) {
@@ -17160,19 +17377,23 @@ this.checkShowIdentification();
 }
 if (!gData.loginData.passAnti) return;
 }
-if (this.process < 100) {
-this.process += 2;
-this.setProgress(this.process);
+if (!this.loadSceneState) {
+this.loadSceneState = !0;
+this.loadMain();
 }
 if (gData.loginData.loadResCompelete) {
 if (mk.aliRiskManager.getRiskCode) {
 mk.aliRiskManager.getRiskCode = !1;
 this.login();
-} else if (gData.gameData.dataFinish) {
-var t = cc.find("Canvas/主界面层");
-mk.ui.openPanel("game/prefab/game", p.OpenActionType.closeOther, t);
+} else if (gData.gameData.dataFinish && this.coreGame) {
+if (gData.loginData.isAuth) {
+this.addToScene();
 console.log("===[Jsbsystem 显示开屏广告================================");
 mk.ad.ifShowAd && l.default.showSplash();
+} else {
+this.node_loadPart.active = !1;
+this.node_btnLogin.active = !0;
+}
 gData.gameData.dataFinish = !1;
 }
 } else gData.loginData.loadLocalRes();
@@ -17185,12 +17406,36 @@ this.node_load.active = !1;
 this.setProgress(100 * gData.appData.updatePercent);
 }
 };
+e.prototype.loadMain = function() {
+return r(this, void 0, void 0, function() {
+var t;
+return c(this, function(e) {
+switch (e.label) {
+case 0:
+t = this;
+return [ 4, mk.loader.load("game/coregame/coregame", cc.Prefab, this.setProgress.bind(this)) ];
+
+case 1:
+t.coreGame = e.sent();
+return [ 2 ];
+}
+});
+});
+};
+e.prototype.addToScene = function() {
+var t = cc.find("Canvas/主容器"), e = cc.find("Canvas/主界面层");
+mk.ui.openPanel("game/prefab/game", p.OpenActionType.closeOther, e);
+t.addChild(cc.instantiate(this.coreGame));
+};
 e.prototype.checkPrivacy = function() {
 1 != mk.storage.getStorage("agreementTip") ? mk.ui.openPanel("module/login/agreementTip") : gData.loginData.passPrivacy = !0;
 };
 e.prototype.setProgress = function(t) {
-this.bar.fillRange = t / 100;
+var e = t / 100;
+if (e > this.bar.fillRange) {
+this.bar.fillRange = e;
 this.lbl_progress.string = "加载中 " + t + "%";
+}
 };
 e.prototype.getDeviceInfoBack = function() {
 return r(this, void 0, void 0, function() {
@@ -17324,6 +17569,17 @@ return [ 2 ];
 e.prototype.checkShowIdentification = function() {
 1 == mk.storage.getStorage("identification") ? gData.loginData.passAnti = !0 : mk.ui.openPanel("module/certification/CertificationNode");
 };
+e.prototype.clickLogin = function() {
+var t = this;
+mk.audio.playEffect("button");
+if (!this.cool) {
+this.cool = !0;
+this.scheduleOnce(function() {
+t.cool = !1;
+}, 2);
+l.default.WxAuth();
+}
+};
 i([ y(cc.Sprite) ], e.prototype, "bar", void 0);
 i([ y({
 displayName: "更新文本",
@@ -17341,6 +17597,14 @@ i([ y({
 displayName: "隐私协议",
 type: cc.Label
 }) ], e.prototype, "lbl_privacy", void 0);
+i([ y({
+displayName: "加载部分",
+type: cc.Node
+}) ], e.prototype, "node_loadPart", void 0);
+i([ y({
+displayName: "登录按钮",
+type: cc.Node
+}) ], e.prototype, "node_btnLogin", void 0);
 return i([ f ], e);
 }(cc.Component);
 o.default = g;
@@ -17769,6 +18033,7 @@ function e() {
 var e = null !== t && t.apply(this, arguments) || this;
 e.map = null;
 e.canvas = null;
+e.onScale = !1;
 e.tarScale = 1.5;
 e.isDoubleTouch = !1;
 return e;
@@ -17779,6 +18044,12 @@ this.node.on(cc.Node.EventType.TOUCH_START, this.onMapTouchBegin, this);
 this.map.scale = 1.2;
 this.node.setPosition(cc.v2(72, 348));
 };
+e.prototype.onEnable = function() {
+var t = this;
+this.scheduleOnce(function() {
+t.onScale = !0;
+}, .3);
+};
 e.prototype.onDestroy = function() {
 this.node.off(cc.Node.EventType.TOUCH_START, this.onMapTouchBegin, this);
 };
@@ -17810,9 +18081,11 @@ this.node.off(cc.Node.EventType.TOUCH_CANCEL, this.onTouchEnd, this);
 this.isDoubleTouch = !1;
 };
 e.prototype.update = function() {
+if (this.onScale) {
 var t = this.map.scale;
 t < this.tarScale ? (t += .005) >= this.tarScale && (t = this.tarScale) : (t -= .005) <= this.tarScale && (t = this.tarScale);
 this.map.scale = t;
+}
 };
 e.prototype.move = function(t) {
 this.startPoint = cc.Vec2.ZERO;
@@ -23220,7 +23493,7 @@ done: !0
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var s = t("../../../before/util/Util"), l = t("../../component/SetGray"), p = t("../../data/GameData"), u = cc._decorator, d = u.ccclass, h = u.property, f = function(t) {
+var s = t("../../../before/util/Util"), l = t("../../../mk/system/JsbSystem"), p = t("../../component/SetGray"), u = t("../../data/GameData"), d = cc._decorator, h = d.ccclass, f = d.property, y = function(t) {
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -23268,7 +23541,7 @@ this.lbl_Ani.node.active = !0;
 gData.gameData.init_task = !0;
 };
 e.prototype.onEnable = function() {
-mk.ad.showBanner(p.BannerAdType.banner_click_2);
+mk.ad.showBanner(u.BannerAdType.banner_click_2);
 };
 e.prototype.onDisable = function() {
 mk.ui.removeRefreshEvent(this);
@@ -23351,7 +23624,7 @@ t.lbl_taskProgress.string = e + "/" + o;
 t.lbl_taskProgress.string = e + "/" + o;
 }).start();
 this.lbl_taskNum.string = o.toString();
-var a = this.openBtn_ani.getComponent(l.default);
+var a = this.openBtn_ani.getComponent(p.default);
 if (a && e < o) {
 a.setGray(!0);
 this.openBtn_ani.getComponent(cc.Button).interactable = !1;
@@ -23389,7 +23662,13 @@ t >= o.redMoney ? this.node_cash.play() : this.node_cash.stop();
 e.prototype.clickVideoBtn = function() {};
 e.prototype.clickGetRewardBtn = function() {
 mk.audio.playEffect("button");
-this.isCanCash && this.httpCashOut();
+if (this.isCanCash) {
+if (cc.sys.isNative && !gData.loginData.isAuth) {
+l.default.WxAuth();
+return;
+}
+this.httpCashOut();
+} else mk.tip.pop("完成任务即可提现");
 };
 e.prototype.httpCashOut = function() {
 return r(this, void 0, void 0, function() {
@@ -23410,15 +23689,17 @@ return [ 2, null ];
 }
 gData.gameData.playerProp.userFarmTaskInfo = e.data.userFarmTaskInfo;
 gData.gameData.playerProp.completeFarmTaskTimes = e.data.completeFarmTaskTimes;
+mk.data.setTAEventUser(0, "Cumulative_task", gData.gameData.playerProp.completeFarmTaskTimes);
 gData.gameData.checkGradeUpUnLock();
 gData.gameData.init_task = !0;
 this.maxNum = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
 this.num = 0;
 this.delayTime = 0;
 this.times = 0;
+mk.ui.closePanel(this.node.name);
 gData.cashPro.cashPro_money = e.data.cashMoney;
 gData.cashPro.init_success = !0;
-mk.data.sendDataEvent(p.DataEventId.Sundry, "任务红包提现成功");
+mk.data.sendDataEvent(u.DataEventId.Sundry, "任务红包提现成功");
 gData.adData.checkPopCashFull();
 return [ 2 ];
 }
@@ -23433,50 +23714,51 @@ mk.ui.openPanel("module/newCashUI/walletCashOut");
 e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("closeButton");
 };
-i([ h({
+i([ f({
 displayName: "数字组",
 type: cc.Label
 }) ], e.prototype, "lbl_value", void 0);
-i([ h({
+i([ f({
 displayName: "任务进度条",
 type: cc.Sprite
 }) ], e.prototype, "sp_taskProgress", void 0);
-i([ h({
+i([ f({
 displayName: "任务进度文本",
 type: cc.Label
 }) ], e.prototype, "lbl_taskProgress", void 0);
-i([ h({
+i([ f({
 displayName: "按钮动画",
 type: cc.Animation
 }) ], e.prototype, "openBtn_ani", void 0);
-i([ h(cc.Label) ], e.prototype, "lbl_reward_value", void 0);
-i([ h(cc.Sprite) ], e.prototype, "spr_cash_out", void 0);
-i([ h(cc.Label) ], e.prototype, "lbl_progress", void 0);
-i([ h(cc.Animation) ], e.prototype, "node_cash", void 0);
-i([ h({
+i([ f(cc.Label) ], e.prototype, "lbl_reward_value", void 0);
+i([ f(cc.Sprite) ], e.prototype, "spr_cash_out", void 0);
+i([ f(cc.Label) ], e.prototype, "lbl_progress", void 0);
+i([ f(cc.Animation) ], e.prototype, "node_cash", void 0);
+i([ f({
 type: cc.Node,
 displayName: "显示金额节点"
 }) ], e.prototype, "node_value", void 0);
-i([ h({
+i([ f({
 type: cc.Node,
 displayName: "任务节点"
 }) ], e.prototype, "node_task", void 0);
-i([ h({
+i([ f({
 type: cc.Label,
 displayName: "动画显示文字"
 }) ], e.prototype, "lbl_Ani", void 0);
-i([ h({
+i([ f({
 type: cc.Label,
 displayName: "任务数量"
 }) ], e.prototype, "lbl_taskNum", void 0);
-i([ h(cc.Node) ], e.prototype, "node_videoIcon", void 0);
-i([ h(cc.Node) ], e.prototype, "node_hand", void 0);
-return i([ d ], e);
+i([ f(cc.Node) ], e.prototype, "node_videoIcon", void 0);
+i([ f(cc.Node) ], e.prototype, "node_hand", void 0);
+return i([ h ], e);
 }(cc.Component);
-o.default = f;
+o.default = y;
 cc._RF.pop();
 }, {
 "../../../before/util/Util": "Util",
+"../../../mk/system/JsbSystem": "JsbSystem",
 "../../component/SetGray": "SetGray",
 "../../data/GameData": "GameData"
 } ],
@@ -24455,6 +24737,7 @@ e.node_cash = null;
 e.node_newRedBag = null;
 e.lbl_reward_num = null;
 e.node_hb = null;
+e.lbl_des = null;
 e.cur_stage = s.none;
 return e;
 }
@@ -24520,8 +24803,11 @@ n.spriteFrame = i.sent();
 gData.reward.data[0].rewardType === l.RewardType.productTimes ? this.node_hb.node.scale = .5 : this.node_hb.node.scale = 1;
 a = gData.reward.data[0].rewardNum || 0;
 if (gData.reward.data[0].rewardType === l.RewardType.pigRmb) ; else {
-gData.reward.data[0].rewardType != l.RewardType.productTimes && (a /= 100);
-this.lbl_reward_num.string = "x" + a;
+if (gData.reward.data[0].rewardType != l.RewardType.productTimes) {
+a = Math.round(a / 100);
+this.lbl_des.string = "红包币";
+} else this.lbl_des.string = "生产次数";
+this.lbl_reward_num.string = "+" + a;
 }
 gData.reward.data[0].rewardType === l.RewardType.redBag && (gData.reward.add_redbag_value = gData.reward.data[0].rewardNum);
 return [ 2 ];
@@ -24538,7 +24824,6 @@ gData.reward.callback();
 gData.reward.callback = null;
 }
 this.onClickClose();
-0 == gData.gameData.getProp(l.GameProp.videoTimes) && mk.data.sendXYEvent("guide_receive", "新手引导领取2500红包币");
 };
 e.prototype.clickCashOut = function() {
 gData.reward.addReward();
@@ -24579,6 +24864,10 @@ i([ d({
 displayName: "红包节点",
 type: cc.Sprite
 }) ], e.prototype, "node_hb", void 0);
+i([ d({
+displayName: "描述",
+type: cc.Label
+}) ], e.prototype, "lbl_des", void 0);
 return i([ u ], e);
 }(cc.Component);
 o.default = h;
@@ -25516,6 +25805,7 @@ case 0:
 cc.log("签到奖励", gData.sign.adData);
 gData.gameData.playerProp.signInDay++;
 gData.gameData.playerProp.isSignInToday = 1;
+mk.data.setTAEventUser(0, "sign_total", gData.gameData.playerProp.signInDay);
 if ((t = this.c_sign[gData.gameData.playerProp.signInDay - 1]).rewardType !== l.RewardType.redBag) return [ 3, 1 ];
 gData.reward.adData = gData.sign.adData;
 mk.ui.openPanel("module/reward/reward", s.OpenActionType.closeLast);
@@ -28712,7 +29002,7 @@ e.perMinus = 0;
 e.act_rotate = null;
 return e;
 }
-e.prototype.onLoad = function() {
+e.prototype.start = function() {
 this.baozhaAni.node.active = !1;
 this.node_point.active = !1;
 this.initData();
@@ -28793,6 +29083,7 @@ return [ 4, mk.time.WaitForSeconds(.7) ];
 case 1:
 t.sent();
 mk.ui.openPanel("module/reward/reward");
+mk.data.setTAEventUser(1, "turntable_total", 1);
 return [ 2 ];
 }
 });
@@ -31200,6 +31491,7 @@ return [ 2 ];
 e.prototype.clickAgree = function() {
 mk.storage.setStorage("agreementTip", 1);
 gData.loginData.passPrivacy = !0;
+mk.ui.closePanel(this.node.name);
 };
 return i([ l ], e);
 }(cc.Component));

+ 2 - 2
packages-hot-update/cfg.json

@@ -9,7 +9,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/"
     ],
-    "buildTime": 1631583672440,
-    "genTime": 1631583672440,
+    "buildTime": 1631613781686,
+    "genTime": 1631613781686,
     "genVersion": null
 }

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików