Merge branch 'master' of http://git.mokasz.com/zouyong/team1_nc

assets/resources/animation/load.anim

@@ -5,7 +5,7 @@
   "_native": "",
   "_duration": 1.4833333333333334,
   "sample": 60,
-  "speed": 1,
+  "speed": 2,
   "wrapMode": 2,
   "curveData": {
     "props": {

assets/script/game/module/cashPro/CashPro.ts

@@ -42,7 +42,7 @@ export default class CashPro extends cc.Component {
     }
 
     async tixianSuccess() {
-        await mk.time.WaitForSeconds(3);
+        await mk.time.WaitForSeconds(1.5);
         this.loadPart.active = false
         this.cashPro.active = true;
 

build/jsb-link/assets/resources/import/02/024cd5fe-88ea-4a60-bfcd-645d8a6045cd.json

@@ -1 +0,0 @@
-[1,0,0,[["cc.AudioClip",["_name","_native","duration"],0]],[[0,0,1,2,4]],[[0,"taskWindow",".mp3",7.053061],-1],0,0,[],[],[]]

build/jsb-link/assets/resources/import/03/03698f52-e14b-4aef-a49a-27762e7b74eb.json

@@ -1 +0,0 @@
-[1,0,0,[["cc.AudioClip",["_name","_native","duration"],0]],[[0,0,1,2,4]],[[0,"dayLoginWindow",".mp3",3.94449],-1],0,0,[],[],[]]

build/jsb-link/assets/resources/import/04/045ef3f6-5ec1-4d15-8950-1167699aab98.json

@@ -1 +0,0 @@
-[1,["157CMWCyhA7rCmrplqEnCd"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_hongbao","rect":[1,0,600,790],"offset":[0,0],"originalSize":[602,790],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/0d/0d2fcd49-54d1-4164-bbde-6ea66227e976.json

@@ -1 +0,0 @@
-[1,["d31L/zkodE34viRj+I9OGU"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_button2","rect":[0,0,171,74],"offset":[0,0],"originalSize":[171,74],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/10/101fcffa-1874-47e9-b3c5-f72a86760b69.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/10/104833f4-c040-407f-a267-e0a9592eb59a.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/12/12b12f1e-ca86-4381-a182-761d70d925aa.json

@@ -1 +0,0 @@
-[1,["21sHJ4kTJDxJUoGvGpW0vl"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_title","rect":[0,0,441,75],"offset":[0,0],"originalSize":[441,75],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/15/15ec2316-0b28-40ee-b0a6-ae996a12709d.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/16/16b8a42d-4146-40eb-b1f1-bbf074ff383c.json

@@ -1 +0,0 @@
-[1,["e31ZUqAq1G25XDze+lRBnD"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_button","rect":[0,0,171,74],"offset":[0,0],"originalSize":[171,74],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/1b/1b38cfcf-e41f-434b-b2b2-b4cdc427409d.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/21/215ceb1f-646f-450a-b2bc-b77c35da9221.json

@@ -1 +0,0 @@
-[1,["e2de7xg99CW6K7a82bSLhJ"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_icon_bg","rect":[0,0,105,37],"offset":[0,0],"originalSize":[105,37],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/21/21b07278-9132-43c4-9528-1af1a95b4be5.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/27/275dd814-37de-49df-83d5-405d2535de5a.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/36/3653945c-e4d5-4e48-ad95-3050adaba2ea.json

@@ -1 +0,0 @@
-[1,0,0,[["cc.AudioClip",["_name","_native","duration"],0]],[[0,0,1,2,4]],[[0,"buildTouch",".mp3",0.653061],-1],0,0,[],[],[]]

build/jsb-link/assets/resources/import/3f/3f015ead-0e41-4b54-939a-167cdffaaf52.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/40/40982b35-3d7d-4d2e-a985-d9ccd8f490df.json

@@ -1 +0,0 @@
-[1,["f7NHGEuxdDpYdwVNXtkZ1R"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_bgrb","rect":[0,0,689,642],"offset":[0,0],"originalSize":[689,642],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/46/466b4885-a423-44a6-a773-e21f51450aed.json

@@ -1 +0,0 @@
-[1,["74MIHh+OlJAq+VEbjN/N6/"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_shuoming","rect":[0,0,53,53],"offset":[0,0],"originalSize":[53,53],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/4b/4b2dcae5-d439-45fc-9eb4-73daec915ba5.json

@@ -1 +0,0 @@
-[1,["10SDP0wEBAf6Jn4KlZLrWa"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_jindu2","rect":[0,0,277,28],"offset":[0,0],"originalSize":[277,28],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/4b/4b940db6-1267-4f4e-aea6-e664c272f968.json

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

build/jsb-link/assets/resources/import/58/58d101fb-5a3e-42db-9d7e-bd3e13165319.json

@@ -1 +0,0 @@
-[1,0,0,[["cc.AudioClip",["_name","_native","duration"],0]],[[0,0,1,2,4]],[[0,"prizeEffect2",".mp3",0.992653],-1],0,0,[],[],[]]

build/jsb-link/assets/resources/import/5c/5cc2cfa6-42ac-426e-ba17-c3d5f3a62e81.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/5d/5d87efbb-f79e-4c7b-a845-40b6f5855eb6.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/5f/5ff3af67-0953-491c-986b-2782f9bf0bbc.json

@@ -1 +0,0 @@
-[1,0,0,[["cc.AudioClip",["_name","_native","duration"],0]],[[0,0,1,2,4]],[[0,"bozhong",".mp3",1.464],-1],0,0,[],[],[]]

build/jsb-link/assets/resources/import/66/6602198a-0c78-4aec-a38a-d3ee5be20da8.json

@@ -1 +0,0 @@
-[1,0,0,[["cc.AudioClip",["_name","_native","duration"],0]],[[0,0,1,2,4]],[[0,"prizeWindow",".mp3",1.28],-1],0,0,[],[],[]]

build/jsb-link/assets/resources/import/67/67cb1a1e-bb3f-46a7-b764-1ba019d8087c.json

@@ -1 +0,0 @@
-[1,["10H8/6GHRH6bPF9yqGdgtp"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_button1","rect":[0,0,171,74],"offset":[0,0],"originalSize":[171,74],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/6a/6a374f02-0c27-4c9c-a3fc-51351fd60cf0.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/71/71024f09-edd3-4ad5-8604-d92b7283e29b.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/74/743081e1-f8e9-4902-af95-11b8cdfcdebf.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

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]]

build/jsb-link/assets/resources/import/79/79f7b639-b53d-4f48-9751-fa6f52323526.json

@@ -1 +0,0 @@
-[1,0,0,[["cc.AudioClip",["_name","_native","duration"],0]],[[0,0,1,2,4]],[[0,"ji",".mp3",1.358367],-1],0,0,[],[],[]]

build/jsb-link/assets/resources/import/7e/7e935650-7822-4095-9a76-fd558f8f4c9a.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/84/8439ef46-b1cb-4a56-bacd-4d36acc82e85.json

@@ -1 +0,0 @@
-[1,["5cws+mQqxCbroXw9Xzpi6B"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_open","rect":[0,0,185,189],"offset":[0,0],"originalSize":[185,189],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/84/84ff9a73-ddef-465a-aebc-7f4c2c329f4a.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/89/895ec8ab-8a73-4933-8889-12421c4b3955.json

@@ -1 +0,0 @@
-[1,["84/5pz3e9GWq68f0wsMp9K"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_shipin","rect":[0,0,51,55],"offset":[0,0],"originalSize":[51,55],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/98/98382c62-5108-4efb-bf07-913b4da3698e.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/9c/9c8b5486-32c6-4eb8-adf0-5c02c7b21470.json

@@ -1 +0,0 @@
-[1,["c6SW8I8llC4I1VYv3QZ07o"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_jindu1","rect":[0,0,285,36],"offset":[0,0],"originalSize":[285,36],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/a1/a114a165-9624-4ec6-81d6-e16a0f7da326.json

@@ -1 +0,0 @@
-[1,["1bOM/P5B9DS7KytM3EJ0Cd"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_bg","rect":[0,0,750,1334],"offset":[0,0],"originalSize":[750,1334],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/a2/a2fb61e8-bcb4-4320-a7f3-a8c04d280165.json

@@ -1 +0,0 @@
-[1,["98OCxiUQhO+78HkTtNo2mO"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_title1","rect":[0,0,304,79],"offset":[0,0],"originalSize":[304,79],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/a6/a65ea8ba-d780-4a54-9b17-39dffa5d4e58.json

@@ -1 +0,0 @@
-[1,["f9Ve1VvmBCer8SK9WG61nS"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_icon","rect":[0,0,113,114],"offset":[0,0],"originalSize":[113,114],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/a9/a9615995-78c2-4fd6-a07c-995d3e30be57.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/a9/a9988116-779a-4b5b-aa48-a8aefdbaac21.json

@@ -1 +0,0 @@
-[1,["71Ak8J7dNK1YYE2Styg+Kb"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_button3","rect":[0,0,171,70],"offset":[0,0],"originalSize":[171,70],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/ac/ac279013-fcb6-4e97-91b4-0c839cdf2512.json

@@ -1 +0,0 @@
-[1,["27XdgUN95J34PVQF0lNd5a"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_hb","rect":[0,0,661,344],"offset":[0,0],"originalSize":[661,344],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/ad/ad4a3dbd-988e-4542-ad67-f8a8cba864ec.json

@@ -1 +0,0 @@
-[1,["7ek1ZQeCJAlZp2/VWPj0ya"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_button_big","rect":[0,0,324,110],"offset":[0,0],"originalSize":[324,110],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/af/aff7a7b5-a397-42b8-b7b5-aa9c6076b352.json

@@ -1 +0,0 @@
-[1,["a9YVmVeMJP1qB8mV0+ML5X"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_back","rect":[0,0,75,60],"offset":[0,0],"originalSize":[75,60],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/bd/bd6c894d-eedf-45f1-82af-bfc10b688c57.json

@@ -1 +0,0 @@
-[1,["5dh++7955Me6hFQLb1hV62"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_ring","rect":[0,0,160,160],"offset":[0,0],"originalSize":[160,160],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/c1/c14b9f01-4a48-4266-ae4d-879d988373bd.json

@@ -1 +0,0 @@
-[1,0,0,[["cc.AudioClip",["_name","_native","duration"],0]],[[0,0,1,2,4]],[[0,"frameTouch",".mp3",0.287347],-1],0,0,[],[],[]]

build/jsb-link/assets/resources/import/c3/c3764b6f-ea22-4c3a-a9b1-fb0c25494170.json

@@ -1 +0,0 @@
-[1,["6aN08CDCdMnKP8UTUf1gzw"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"common_bg_tanchuangBg","rect":[0,0,592,748],"offset":[0,0],"originalSize":[592,748],"capInsets":[35,321,37,319]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/c6/c6496f08-f259-42e0-8d55-62fdd0674ee8.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/c9/c96a7216-125e-41f0-86ae-6d324d87effc.json

@@ -1 +0,0 @@
-[1,["3fAV6tDkFLVJOaFnzf+q9S"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"close","rect":[0,0,53,49],"offset":[0,0],"originalSize":[53,49],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/ca/ca6b0d14-9d7e-42c2-adb0-07269c5df201.json

@@ -1 +0,0 @@
-[1,["eaZ25brHxJWIS7OMEdHYAu"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"common_btn_closeCircle","rect":[2,0,78,236],"offset":[1,1],"originalSize":[80,238],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/cd/cdec3ccb-5ef5-427b-ac62-ddfd08857202.json

@@ -1 +0,0 @@
-[1,["eedidTxFVG8KSlVnqT5EvJ"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_helptitle","rect":[0,0,147,34],"offset":[0,0],"originalSize":[147,34],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/d3/d3d4bff3-9287-44df-8be2-463f88f4e194.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/e2/e275eef1-83df-425b-a2bb-6bcd9b48b849.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/e3/e3d5952a-02ad-46db-95c3-cdefa54419c3.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/e4/e46a42a2-f5da-49fc-9e21-5fb28cb7c9f6.json

@@ -1 +0,0 @@
-[1,["eapRtB/hJGDp0tUDL+lpPv"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_bangzhu_title","rect":[1,1,315,72],"offset":[0,0],"originalSize":[317,74],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/e4/e4b6c86a-f500-4913-98b5-bc94c3f5b89e.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/e4/e4b6c86a-f500-4913-98b5-bc94c3f5b89e@6c48a.json

@@ -1 +0,0 @@
-[1,["e4tshq9QBJE5i1vJTD9bie"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"cricleProgressBg","rect":[0,0,273,123],"offset":[0,0],"originalSize":[273,123],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/e4/e4d28e59-b7b1-4035-82b4-bdb3a593b540.json

@@ -1 +0,0 @@
-[1,0,0,[["cc.AudioClip",["_name","_native","duration"],0]],[[0,0,1,2,4]],[[0,"niu",".mp3",1.28],-1],0,0,[],[],[]]

build/jsb-link/assets/resources/import/e7/e7e4df9e-c217-46be-9e55-618d1da56e6c.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/ea/ea676e5b-ac7c-4958-84bb-38c11d1d802e.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/ea/eaa51b41-fe12-460e-9d2d-5032fe9693ef.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/ee/ee58b804-bbf7-4964-b0d8-32ac0a6bbee4.json

@@ -1 +0,0 @@
-[1,["e75N+ewhdGvp5VYY0dpW5s"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"panda","rect":[0,0,167,213],"offset":[0,0],"originalSize":[167,213],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/ee/ee762753-c455-46f0-a4a5-567a93e44bc9.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/f6/f649e362-5385-4616-be37-bd88b1da095d.json

@@ -1 +0,0 @@
-[1,0,0,[["cc.AudioClip",["_name","_native","duration"],0]],[[0,0,1,2,4]],[[0,"achievementWindow",".mp3",0.783673],-1],0,0,[],[],[]]

build/jsb-link/assets/resources/import/f7/f7347184-bb17-43a5-8770-54d5ed919d51.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/f7/f753bb18-1ac6-4000-9600-702b1ea9c7bc.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/f7/f753bb18-1ac6-4000-9600-702b1ea9c7bc@6c48a.json

@@ -1 +0,0 @@
-[1,["f7U7sYGsZAAJYAcCseqce8"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"cricleProgress","rect":[0,0,105,79],"offset":[0,0],"originalSize":[105,79],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/f9/f955ed55-be60-427a-bf12-2bd586eb59d2.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

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

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

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