Merge branch 'master' of http://git.izouma.com/zc/airpg-front

build/web-mobile/assets/main/import/01/0108112ee.json

@@ -0,0 +1 @@
+[1,["8fSnWMTz9KXYBf+VPWYjgQ","725bqv0VtKVbYy1jJgxrbn@f9941"],["node","_font","root","data","_spriteFrame"],[["cc.Node",["_name","_layer","_components","_prefab","_lpos","_parent","_children"],1,9,4,5,1,2],["cc.Label",["_string","_actualFontSize","_fontSize","_lineHeight","_isSystemFontUsed","node","__prefab","_font","_color"],-2,1,4,6,5],["cc.Prefab",["_name"],2],["cc.UITransform",["node","__prefab","_contentSize"],3,1,4,5],["cc.CompPrefabInfo",["fileId"],2],["cc.Sprite",["node","__prefab","_spriteFrame"],3,1,4,6],["cc.PrefabInfo",["fileId","instance","targetOverrides","nestedPrefabInstanceRoots","root","asset"],-1,1,1],["cc.TTFFont",["_name","_native"],1]],[[4,0,2],[3,0,1,2,1],[6,0,1,2,3,4,5,5],[0,0,1,5,2,3,4,3],[1,0,1,2,3,4,5,6,7,6],[2,0,2],[0,0,6,2,3,4,2],[0,0,1,5,2,3,3],[5,0,1,2,1],[1,0,1,2,3,4,5,6,8,7,6],[7,0,1,3]],[[[[5,"rank_item1"],[6,"rank_item1",[-4,-5,-6],[[1,-2,[0,"faBrcEFttFcrKQSb34b8HQ"],[5,371,57]],[8,-3,[0,"01G8owDU9Pw7EgE0c1rtjE"],3]],[2,"edvVKEs2dJM6QH6dUZQrKf",null,null,null,-1,0],[1,-12,348.922,0]],[3,"text_rank_number",33554432,1,[[1,-7,[0,"a6C27ru1lODKpgmFJH7Way"],[5,13.974609375,88.2]],[9,"1",30,30,70,false,-8,[0,"52O/QWYhlEAJo5jhWkqKHZ"],[4,4286164404],0]],[2,"9fTjCmwhdFl7Nr/nf5l97S",null,null,null,1,0],[1,-138.671,0,0]],[7,"text_player_name",33554432,1,[[1,-9,[0,"19K7W8rnJBeZaw2hjuJoDa"],[5,9.2529296875,88.2]],[4,"-",25,25,70,false,-10,[0,"23HUcYebdCHqx58tcueZRU"],1]],[2,"79L2MJsnFGUaq/BdvWM9hZ",null,null,null,1,0]],[3,"text_value",33554432,1,[[1,-11,[0,"47qYAsz7xPZI29fmlQYUw9"],[5,9.2529296875,88.2]],[4,"-",25,25,70,false,-12,[0,"87gluk09JAI6cY7pLm0oQU"],2]],[2,"81s2Ftd3NEhJ2WrGgH4/Cz",null,null,null,1,0],[1,124.929,0,0]]],0,[0,2,1,0,0,1,0,0,1,0,-1,2,0,-2,3,0,-3,4,0,0,2,0,0,2,0,0,3,0,0,3,0,0,4,0,0,4,0,3,1,12],[0,0,0,0],[1,1,1,4],[0,0,0,1]],[[[10,"dreamhanserifexpcn-w12","dreamhanserifexpcn-w12.ttf"],-1],0,0,[],[],[]]]]

build/web-mobile/assets/main/import/06/067a91548.json → build/web-mobile/assets/main/import/02/02e42bcdb.json

@@ -1 +1 @@
-{"type":"cc.Texture2D","data":[["2,2,2,2,0,0",["9f2QDdIhtPiY8s+6NCQ8g1"]],["2,2,0,0,0,0",["13e0d1faa"]],["2,2,2,2,0,0",["24pwTaKGdEbY0aXpIMdeCd"]],["2,2,2,2,0,0",["37jgHmh2xFaJsKI3o99zJC"]],["2,2,2,2,0,0",["54TknWPwVPqJqeCR+Y/Czo"]],["2,2,2,2,0,0",["20g1ukYUVPvKWKBRznAKo+"]],["2,2,2,2,0,0",["95EkngnxZFbYuFpsqVTaFr"]],["2,2,2,2,0,0",["abNjRqDNZIYqjp4Ghn1Vht"]],["2,2,2,2,0,0",["e2WvMWNDVEwKYtHPMemyZO"]]]}
+{"type":"cc.Texture2D","data":[["2,2,2,2,0,0",["9f2QDdIhtPiY8s+6NCQ8g1"]],["2,2,0,0,0,0",["13e0d1faa"]],["2,2,2,2,0,0",["24pwTaKGdEbY0aXpIMdeCd"]],["2,2,2,2,0,0",["37jgHmh2xFaJsKI3o99zJC"]],["2,2,2,2,0,0",["54TknWPwVPqJqeCR+Y/Czo"]],["2,2,2,2,0,0",["20g1ukYUVPvKWKBRznAKo+"]],["2,2,2,2,0,0",["95EkngnxZFbYuFpsqVTaFr"]],["2,2,2,2,0,0",["abNjRqDNZIYqjp4Ghn1Vht"]],["2,2,2,2,0,0",["afxHkx8GZGsJC+n+YfITQo"]],["2,2,2,2,0,0",["e2WvMWNDVEwKYtHPMemyZO"]],["2,2,2,2,0,0",["ffuIqPr2JI9I8dPLYGRDpD"]]]}

build/web-mobile/assets/main/import/af/afc47931-f066-46b0-90be-9fe61f213428.json

@@ -0,0 +1 @@
+[1,0,0,["cc.ImageAsset"],0,[{"fmt":"0","w":0,"h":0},-1],[0],0,[],[],[]]

build/web-mobile/assets/main/import/ff/ffb88a8f-af62-48f4-8f1d-3cb606443a43.json

@@ -0,0 +1 @@
+[1,0,0,["cc.ImageAsset"],0,[{"fmt":"0","w":0,"h":0},-1],[0],0,[],[],[]]