diff --git a/assets/main.fire b/assets/main.fire index 864ca93..a246282 100644 --- a/assets/main.fire +++ b/assets/main.fire @@ -659,7 +659,16 @@ "__uuid__": "6c21a659-0cc4-49e6-a4b6-9697e946aaa1" }, "topMenu": null, + "infoView": null, "partsY": [], + "needCode": true, + "logined": false, + "mobile": "", + "images": [], + "uid": "", + "allshow": false, + "infoSchedule": null, + "shareUser": "", "_id": "caqu3+UstJ+6Bc+xrIMgmV" }, { diff --git a/assets/resources/prefabs/img_swiper.prefab b/assets/resources/prefabs/img_swiper.prefab index 9a2d113..0536b26 100644 --- a/assets/resources/prefabs/img_swiper.prefab +++ b/assets/resources/prefabs/img_swiper.prefab @@ -29,21 +29,24 @@ "__id__": 11 }, { - "__id__": 15 + "__id__": 13 }, { - "__id__": 19 + "__id__": 17 + }, + { + "__id__": 21 } ], "_active": true, "_level": 1, "_components": [ { - "__id__": 25 + "__id__": 27 } ], "_prefab": { - "__id__": 26 + "__id__": 28 }, "_opacity": 255, "_color": { @@ -396,6 +399,76 @@ "fileId": "83Q8Za8eFB8rdVssFCys9w", "sync": false }, + { + "__type__": "cc.Node", + "_name": "touch_node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_level": 2, + "_components": [], + "_prefab": { + "__id__": 12 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 750, + "height": 1161 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 0, + "y": 13, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "_zIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__uuid__": "9c00729f-1f46-4905-a9e1-bc0e74feb37c" + }, + "fileId": "25SCcUlyZI7LPwVf3gg2yg", + "sync": false + }, { "__type__": "cc.Node", "_name": "arrow_right", @@ -408,14 +481,14 @@ "_level": 4, "_components": [ { - "__id__": 12 + "__id__": 14 }, { - "__id__": 13 + "__id__": 15 } ], "_prefab": { - "__id__": 14 + "__id__": 16 }, "_opacity": 255, "_color": { @@ -467,7 +540,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 11 + "__id__": 13 }, "_enabled": true, "_srcBlendFactor": 770, @@ -495,7 +568,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 11 + "__id__": 13 }, "_enabled": true, "transition": 0, @@ -539,7 +612,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 11 + "__id__": 13 }, "_id": "" }, @@ -566,14 +639,14 @@ "_level": 4, "_components": [ { - "__id__": 16 + "__id__": 18 }, { - "__id__": 17 + "__id__": 19 } ], "_prefab": { - "__id__": 18 + "__id__": 20 }, "_opacity": 255, "_color": { @@ -625,7 +698,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 15 + "__id__": 17 }, "_enabled": true, "_srcBlendFactor": 770, @@ -653,7 +726,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 15 + "__id__": 17 }, "_enabled": true, "transition": 0, @@ -697,7 +770,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 15 + "__id__": 17 }, "_id": "" }, @@ -721,18 +794,18 @@ }, "_children": [ { - "__id__": 20 + "__id__": 22 } ], "_active": true, "_level": 4, "_components": [ { - "__id__": 23 + "__id__": 25 } ], "_prefab": { - "__id__": 24 + "__id__": 26 }, "_opacity": 255, "_color": { @@ -784,18 +857,18 @@ "_name": "btn_title_4", "_objFlags": 0, "_parent": { - "__id__": 19 + "__id__": 21 }, "_children": [], "_active": true, "_level": 4, "_components": [ { - "__id__": 21 + "__id__": 23 } ], "_prefab": { - "__id__": 22 + "__id__": 24 }, "_opacity": 255, "_color": { @@ -847,7 +920,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 20 + "__id__": 22 }, "_enabled": true, "_srcBlendFactor": 770, @@ -886,7 +959,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 19 + "__id__": 21 }, "_enabled": true, "_srcBlendFactor": 770, @@ -929,10 +1002,10 @@ }, "_enabled": true, "leftBtn": { - "__id__": 15 + "__id__": 17 }, "rightBtn": { - "__id__": 11 + "__id__": 13 }, "currentNode": { "__id__": 2 @@ -943,7 +1016,11 @@ "rightNode": { "__id__": 8 }, + "touchNode": { + "__id__": 11 + }, "currentIdx": 2, + "scrolling": false, "_id": "" }, { diff --git a/assets/resources/prefabs/top_menu_content.prefab b/assets/resources/prefabs/top_menu_content.prefab index 76b6292..ba640dd 100644 --- a/assets/resources/prefabs/top_menu_content.prefab +++ b/assets/resources/prefabs/top_menu_content.prefab @@ -52,12 +52,12 @@ "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 1 }, "_position": { "__type__": "cc.Vec3", "x": 375, - "y": 812, + "y": 1624, "z": 0 }, "_scale": { @@ -123,7 +123,7 @@ "_position": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -812, "z": 0 }, "_scale": { @@ -251,6 +251,7 @@ "btnPrefab": { "__uuid__": "5dbe24bd-73e4-4b1e-aee7-497e6c0306fb" }, + "btns": [], "_id": "" }, { diff --git a/assets/resources/textures/menu/AutoAtlas.pac b/assets/resources/textures/menu/AutoAtlas.pac new file mode 100644 index 0000000..56719c9 --- /dev/null +++ b/assets/resources/textures/menu/AutoAtlas.pac @@ -0,0 +1,3 @@ +{ + "__type__": "cc.SpriteAtlas" +} \ No newline at end of file diff --git a/assets/resources/textures/menu/AutoAtlas.pac.meta b/assets/resources/textures/menu/AutoAtlas.pac.meta new file mode 100644 index 0000000..4043cba --- /dev/null +++ b/assets/resources/textures/menu/AutoAtlas.pac.meta @@ -0,0 +1,17 @@ +{ + "ver": "1.1.0", + "uuid": "016cd873-44de-4581-9802-930ecf066c8a", + "maxWidth": 1024, + "maxHeight": 1024, + "padding": 2, + "allowRotation": true, + "forceSquared": false, + "powerOfTwo": false, + "heuristices": "BestAreaFit", + "format": "png", + "quality": 80, + "contourBleed": true, + "paddingBleed": true, + "filterUnused": false, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/resources/textures/menu/captcha_btn.png b/assets/resources/textures/menu/captcha_btn.png index 6f85628..fcb0141 100644 Binary files a/assets/resources/textures/menu/captcha_btn.png and b/assets/resources/textures/menu/captcha_btn.png differ diff --git a/assets/resources/textures/menu/menu_border.png b/assets/resources/textures/menu/menu_border.png index 2c729f4..6dc6b03 100644 Binary files a/assets/resources/textures/menu/menu_border.png and b/assets/resources/textures/menu/menu_border.png differ diff --git a/assets/resources/textures/menu/menu_btn.png b/assets/resources/textures/menu/menu_btn.png index a880fff..ae77853 100644 Binary files a/assets/resources/textures/menu/menu_btn.png and b/assets/resources/textures/menu/menu_btn.png differ diff --git a/assets/resources/textures/menu/menu_close_btn.png b/assets/resources/textures/menu/menu_close_btn.png index 9162e73..1437fd7 100644 Binary files a/assets/resources/textures/menu/menu_close_btn.png and b/assets/resources/textures/menu/menu_close_btn.png differ diff --git a/assets/resources/textures/menu/menu_inner_bg.png b/assets/resources/textures/menu/menu_inner_bg.png index ec662fc..7652a30 100644 Binary files a/assets/resources/textures/menu/menu_inner_bg.png and b/assets/resources/textures/menu/menu_inner_bg.png differ diff --git a/assets/resources/textures/menu/menu_title_03.png b/assets/resources/textures/menu/menu_title_03.png index 15e12d6..f1ad76c 100644 Binary files a/assets/resources/textures/menu/menu_title_03.png and b/assets/resources/textures/menu/menu_title_03.png differ diff --git a/assets/resources/textures/menu/result_02.png b/assets/resources/textures/menu/result_02.png index ab09f20..1b4eb43 100644 Binary files a/assets/resources/textures/menu/result_02.png and b/assets/resources/textures/menu/result_02.png differ diff --git a/assets/resources/textures/part1/AutoAtlas.pac b/assets/resources/textures/part1/AutoAtlas.pac new file mode 100644 index 0000000..56719c9 --- /dev/null +++ b/assets/resources/textures/part1/AutoAtlas.pac @@ -0,0 +1,3 @@ +{ + "__type__": "cc.SpriteAtlas" +} \ No newline at end of file diff --git a/assets/resources/textures/part1/AutoAtlas.pac.meta b/assets/resources/textures/part1/AutoAtlas.pac.meta new file mode 100644 index 0000000..18d6be6 --- /dev/null +++ b/assets/resources/textures/part1/AutoAtlas.pac.meta @@ -0,0 +1,17 @@ +{ + "ver": "1.1.0", + "uuid": "93e33745-6aed-4b69-8a59-6dc3710fe8f2", + "maxWidth": 1024, + "maxHeight": 1024, + "padding": 2, + "allowRotation": true, + "forceSquared": false, + "powerOfTwo": false, + "heuristices": "BestAreaFit", + "format": "png", + "quality": 80, + "contourBleed": true, + "paddingBleed": true, + "filterUnused": false, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/resources/textures/part1/back_1.png b/assets/resources/textures/part1/back_1.png index 4b9407e..955aabe 100644 Binary files a/assets/resources/textures/part1/back_1.png and b/assets/resources/textures/part1/back_1.png differ diff --git a/assets/resources/textures/part1/bar_boder.png b/assets/resources/textures/part1/bar_boder.png index 877d045..b44540f 100644 Binary files a/assets/resources/textures/part1/bar_boder.png and b/assets/resources/textures/part1/bar_boder.png differ diff --git a/assets/resources/textures/part1/bar_corner_left.png b/assets/resources/textures/part1/bar_corner_left.png index 7c5a53f..763860c 100644 Binary files a/assets/resources/textures/part1/bar_corner_left.png and b/assets/resources/textures/part1/bar_corner_left.png differ diff --git a/assets/resources/textures/part1/bar_corner_right.png b/assets/resources/textures/part1/bar_corner_right.png index 316058b..8360cc3 100644 Binary files a/assets/resources/textures/part1/bar_corner_right.png and b/assets/resources/textures/part1/bar_corner_right.png differ diff --git a/assets/resources/textures/part1/bar_count_pop.png b/assets/resources/textures/part1/bar_count_pop.png index 1841b33..c641940 100644 Binary files a/assets/resources/textures/part1/bar_count_pop.png and b/assets/resources/textures/part1/bar_count_pop.png differ diff --git a/assets/resources/textures/part1/bar_cube_gold_c.png b/assets/resources/textures/part1/bar_cube_gold_c.png index 2703f8e..19ccf1c 100644 Binary files a/assets/resources/textures/part1/bar_cube_gold_c.png and b/assets/resources/textures/part1/bar_cube_gold_c.png differ diff --git a/assets/resources/textures/part1/bar_cube_gold_o.png b/assets/resources/textures/part1/bar_cube_gold_o.png index 438300d..0661956 100644 Binary files a/assets/resources/textures/part1/bar_cube_gold_o.png and b/assets/resources/textures/part1/bar_cube_gold_o.png differ diff --git a/assets/resources/textures/part1/bar_cube_silver_c.png b/assets/resources/textures/part1/bar_cube_silver_c.png index 75fd856..1061404 100644 Binary files a/assets/resources/textures/part1/bar_cube_silver_c.png and b/assets/resources/textures/part1/bar_cube_silver_c.png differ diff --git a/assets/resources/textures/part1/bar_cube_silver_o.png b/assets/resources/textures/part1/bar_cube_silver_o.png index b4bcbbc..e87ebee 100644 Binary files a/assets/resources/textures/part1/bar_cube_silver_o.png and b/assets/resources/textures/part1/bar_cube_silver_o.png differ diff --git a/assets/resources/textures/part1/bar_cube_wood_c.png b/assets/resources/textures/part1/bar_cube_wood_c.png index 9982a2e..dfd1d80 100644 Binary files a/assets/resources/textures/part1/bar_cube_wood_c.png and b/assets/resources/textures/part1/bar_cube_wood_c.png differ diff --git a/assets/resources/textures/part1/bar_cube_wood_o.png b/assets/resources/textures/part1/bar_cube_wood_o.png index be62640..b96e521 100644 Binary files a/assets/resources/textures/part1/bar_cube_wood_o.png and b/assets/resources/textures/part1/bar_cube_wood_o.png differ diff --git a/assets/resources/textures/part1/bar_gold.png b/assets/resources/textures/part1/bar_gold.png index 76d6534..4e0a4f2 100644 Binary files a/assets/resources/textures/part1/bar_gold.png and b/assets/resources/textures/part1/bar_gold.png differ diff --git a/assets/resources/textures/part1/bar_pop.png b/assets/resources/textures/part1/bar_pop.png index a433a28..a2df4e8 100644 Binary files a/assets/resources/textures/part1/bar_pop.png and b/assets/resources/textures/part1/bar_pop.png differ diff --git a/assets/resources/textures/part1/btn_title_1.png b/assets/resources/textures/part1/btn_title_1.png index 0fb8e01..ad51cb9 100644 Binary files a/assets/resources/textures/part1/btn_title_1.png and b/assets/resources/textures/part1/btn_title_1.png differ diff --git a/assets/resources/textures/part1/join_btn.png b/assets/resources/textures/part1/join_btn.png index bb4ae2e..a067f96 100644 Binary files a/assets/resources/textures/part1/join_btn.png and b/assets/resources/textures/part1/join_btn.png differ diff --git a/assets/resources/textures/part1/leaf.png b/assets/resources/textures/part1/leaf.png index b7732b3..f09e448 100644 Binary files a/assets/resources/textures/part1/leaf.png and b/assets/resources/textures/part1/leaf.png differ diff --git a/assets/resources/textures/part1/person.png b/assets/resources/textures/part1/person.png index d431e95..6f6016f 100644 Binary files a/assets/resources/textures/part1/person.png and b/assets/resources/textures/part1/person.png differ diff --git a/assets/resources/textures/part1/title.png b/assets/resources/textures/part1/title.png index c082701..fa9631b 100644 Binary files a/assets/resources/textures/part1/title.png and b/assets/resources/textures/part1/title.png differ diff --git a/assets/resources/textures/part4/000.png b/assets/resources/textures/part4/000.png index d67a269..90d4c32 100644 Binary files a/assets/resources/textures/part4/000.png and b/assets/resources/textures/part4/000.png differ diff --git a/assets/resources/textures/part4/000.png.meta b/assets/resources/textures/part4/000.png.meta index 1d5f33d..668681b 100644 --- a/assets/resources/textures/part4/000.png.meta +++ b/assets/resources/textures/part4/000.png.meta @@ -14,11 +14,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": -12, + "offsetY": -12.5, "trimX": 0, - "trimY": 35, + "trimY": 37, "width": 750, - "height": 1115, + "height": 1112, "rawWidth": 750, "rawHeight": 1161, "borderTop": 0, diff --git a/assets/resources/textures/part4/001.png b/assets/resources/textures/part4/001.png index adc6317..f835ee6 100644 Binary files a/assets/resources/textures/part4/001.png and b/assets/resources/textures/part4/001.png differ diff --git a/assets/resources/textures/part4/001.png.meta b/assets/resources/textures/part4/001.png.meta index 80a1154..e1b9613 100644 --- a/assets/resources/textures/part4/001.png.meta +++ b/assets/resources/textures/part4/001.png.meta @@ -16,9 +16,9 @@ "offsetX": 0, "offsetY": -12, "trimX": 0, - "trimY": 35, + "trimY": 36, "width": 750, - "height": 1115, + "height": 1113, "rawWidth": 750, "rawHeight": 1161, "borderTop": 0, diff --git a/assets/resources/textures/part4/002.png b/assets/resources/textures/part4/002.png index bbfe491..9519af2 100644 Binary files a/assets/resources/textures/part4/002.png and b/assets/resources/textures/part4/002.png differ diff --git a/assets/resources/textures/part4/002.png.meta b/assets/resources/textures/part4/002.png.meta index a4da885..fb411a3 100644 --- a/assets/resources/textures/part4/002.png.meta +++ b/assets/resources/textures/part4/002.png.meta @@ -16,9 +16,9 @@ "offsetX": 0, "offsetY": -12, "trimX": 0, - "trimY": 35, + "trimY": 36, "width": 750, - "height": 1115, + "height": 1113, "rawWidth": 750, "rawHeight": 1161, "borderTop": 0, diff --git a/assets/resources/textures/part4/003.png b/assets/resources/textures/part4/003.png index d4e1faa..46fc3d6 100644 Binary files a/assets/resources/textures/part4/003.png and b/assets/resources/textures/part4/003.png differ diff --git a/assets/resources/textures/part4/003.png.meta b/assets/resources/textures/part4/003.png.meta index f9ac521..1dce8f5 100644 --- a/assets/resources/textures/part4/003.png.meta +++ b/assets/resources/textures/part4/003.png.meta @@ -16,9 +16,9 @@ "offsetX": 0, "offsetY": -12, "trimX": 0, - "trimY": 35, + "trimY": 36, "width": 750, - "height": 1115, + "height": 1113, "rawWidth": 750, "rawHeight": 1161, "borderTop": 0, diff --git a/assets/resources/textures/part4/004.png b/assets/resources/textures/part4/004.png index f33798d..0ed1364 100644 Binary files a/assets/resources/textures/part4/004.png and b/assets/resources/textures/part4/004.png differ diff --git a/assets/resources/textures/part4/004.png.meta b/assets/resources/textures/part4/004.png.meta index 7f44622..e83bb92 100644 --- a/assets/resources/textures/part4/004.png.meta +++ b/assets/resources/textures/part4/004.png.meta @@ -16,9 +16,9 @@ "offsetX": 0, "offsetY": -12, "trimX": 0, - "trimY": 35, + "trimY": 36, "width": 750, - "height": 1115, + "height": 1113, "rawWidth": 750, "rawHeight": 1161, "borderTop": 0, diff --git a/assets/resources/textures/part4/arrow.png b/assets/resources/textures/part4/arrow.png index 6b1ccec..0e052a1 100644 Binary files a/assets/resources/textures/part4/arrow.png and b/assets/resources/textures/part4/arrow.png differ diff --git a/assets/resources/textures/part4/btn_title_4.png b/assets/resources/textures/part4/btn_title_4.png index f93ad63..e26f23f 100644 Binary files a/assets/resources/textures/part4/btn_title_4.png and b/assets/resources/textures/part4/btn_title_4.png differ diff --git a/assets/resources/textures/part4/ruls.png b/assets/resources/textures/part4/ruls.png index 878e5ff..2a513a7 100644 Binary files a/assets/resources/textures/part4/ruls.png and b/assets/resources/textures/part4/ruls.png differ diff --git a/assets/resources/textures/part4/ruls.png.meta b/assets/resources/textures/part4/ruls.png.meta index 815e1fd..72e8604 100644 --- a/assets/resources/textures/part4/ruls.png.meta +++ b/assets/resources/textures/part4/ruls.png.meta @@ -13,14 +13,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 1, - "offsetY": -0.5, - "trimX": 3, - "trimY": 5, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, "width": 601, "height": 99, - "rawWidth": 605, - "rawHeight": 108, + "rawWidth": 601, + "rawHeight": 99, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/resources/textures/part5/00.png b/assets/resources/textures/part5/00.png index 07e50b6..b33a2db 100644 Binary files a/assets/resources/textures/part5/00.png and b/assets/resources/textures/part5/00.png differ diff --git a/assets/resources/textures/part5/01.png b/assets/resources/textures/part5/01.png index 7139cdc..e1befb0 100644 Binary files a/assets/resources/textures/part5/01.png and b/assets/resources/textures/part5/01.png differ diff --git a/assets/resources/textures/part5/02.png b/assets/resources/textures/part5/02.png index 8912a1e..9b5547c 100644 Binary files a/assets/resources/textures/part5/02.png and b/assets/resources/textures/part5/02.png differ diff --git a/assets/resources/textures/part5/03.png b/assets/resources/textures/part5/03.png index 3e62721..d935ebb 100644 Binary files a/assets/resources/textures/part5/03.png and b/assets/resources/textures/part5/03.png differ diff --git a/assets/resources/textures/part5/04.png b/assets/resources/textures/part5/04.png index 62a6c82..0c13b97 100644 Binary files a/assets/resources/textures/part5/04.png and b/assets/resources/textures/part5/04.png differ diff --git a/assets/resources/textures/part5/AutoAtlas.pac b/assets/resources/textures/part5/AutoAtlas.pac new file mode 100644 index 0000000..56719c9 --- /dev/null +++ b/assets/resources/textures/part5/AutoAtlas.pac @@ -0,0 +1,3 @@ +{ + "__type__": "cc.SpriteAtlas" +} \ No newline at end of file diff --git a/assets/resources/textures/part5/AutoAtlas.pac.meta b/assets/resources/textures/part5/AutoAtlas.pac.meta new file mode 100644 index 0000000..74c0b82 --- /dev/null +++ b/assets/resources/textures/part5/AutoAtlas.pac.meta @@ -0,0 +1,17 @@ +{ + "ver": "1.1.0", + "uuid": "e99524d9-6db9-426b-a6eb-8787a71f3827", + "maxWidth": 1024, + "maxHeight": 1024, + "padding": 2, + "allowRotation": true, + "forceSquared": false, + "powerOfTwo": false, + "heuristices": "BestAreaFit", + "format": "png", + "quality": 80, + "contourBleed": true, + "paddingBleed": true, + "filterUnused": false, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/resources/textures/part5/arrow_5.png b/assets/resources/textures/part5/arrow_5.png index 6b1ccec..0e052a1 100644 Binary files a/assets/resources/textures/part5/arrow_5.png and b/assets/resources/textures/part5/arrow_5.png differ diff --git a/assets/resources/textures/part5/bottom_btn.png b/assets/resources/textures/part5/bottom_btn.png index 8b89beb..976832c 100644 Binary files a/assets/resources/textures/part5/bottom_btn.png and b/assets/resources/textures/part5/bottom_btn.png differ diff --git a/assets/resources/textures/part5/bottom_tip.png b/assets/resources/textures/part5/bottom_tip.png index 36390f7..8d2037b 100644 Binary files a/assets/resources/textures/part5/bottom_tip.png and b/assets/resources/textures/part5/bottom_tip.png differ diff --git a/assets/resources/textures/part5/btn_title_5.png b/assets/resources/textures/part5/btn_title_5.png index 7aa18ce..733364d 100644 Binary files a/assets/resources/textures/part5/btn_title_5.png and b/assets/resources/textures/part5/btn_title_5.png differ diff --git a/assets/resources/textures/part5/qr_qq.png b/assets/resources/textures/part5/qr_qq.png index aa96f0c..1f216af 100644 Binary files a/assets/resources/textures/part5/qr_qq.png and b/assets/resources/textures/part5/qr_qq.png differ diff --git a/assets/resources/textures/part5/qr_wechat.png b/assets/resources/textures/part5/qr_wechat.png index 8de4990..3d343bc 100644 Binary files a/assets/resources/textures/part5/qr_wechat.png and b/assets/resources/textures/part5/qr_wechat.png differ diff --git a/assets/scripts/bottomSwiper.js b/assets/scripts/bottomSwiper.js index 556b5c3..14001ae 100644 --- a/assets/scripts/bottomSwiper.js +++ b/assets/scripts/bottomSwiper.js @@ -33,13 +33,13 @@ cc.Class({ this.leftBtn.on('click', () => { if (!self.scrolling) { self.scrolling = true; - this.moveLeft(); + self.moveRight(); } }); this.rightBtn.on('click', () => { if (!self.scrolling) { self.scrolling = true; - self.moveRight(); + this.moveLeft(); } }) }, diff --git a/assets/scripts/img_swiper.js b/assets/scripts/img_swiper.js index a5f02d2..e5865d3 100644 --- a/assets/scripts/img_swiper.js +++ b/assets/scripts/img_swiper.js @@ -22,6 +22,10 @@ cc.Class({ default: null, type: cc.Node }, + touchNode: { + default: null, + type: cc.Node, + }, currentIdx: 2, scrolling: false }, @@ -33,18 +37,20 @@ cc.Class({ this.leftBtn.on('click', () => { if (!self.scrolling) { self.scrolling = true; - this.moveLeft(); + self.moveRight(); } }); this.rightBtn.on('click', () => { if (!self.scrolling) { self.scrolling = true; - self.moveRight(); + self.moveLeft(); } }) }, start() { + // this.touchNode.on(cc.Node.EventType.TOUCH_END, this.onTouchEnd, this); + // this.touchNode.on(cc.Node.EventType.TOUCH_START, this.onTouchBg, this); }, // update (dt) {}, @@ -95,5 +101,19 @@ cc.Class({ var seq = cc.sequence(moveCurrent, moveFinish); self.currentNode.runAction(seq); self.leftNode.runAction(cc.moveTo(0.5, 0, 13)); - } + }, + onTouchBg(e) { + cc.log(e.getLocation()); + let location = e.getLocation(); + this.startX = location.x; + }, + onTouchEnd(e) { + cc.log('touch end'); + let location = e.getLocation(); + if (location.x - this.startX > 10) { + this.moveRight(); + } else if (location.x - this.startX < -10) { + this.moveLeft(); + } + }, }); diff --git a/assets/scripts/main.js b/assets/scripts/main.js index ea10cd5..25bce5a 100644 --- a/assets/scripts/main.js +++ b/assets/scripts/main.js @@ -148,7 +148,7 @@ cc.Class({ let offsetY = this.scrollView.getScrollOffset().y; let menuNo = 0; for(let i = 0; i < this.partsY.length; i++) { - if (offsetY >= this.partsY[i]) { + if (offsetY >= this.partsY[i]-20) { menuNo= i; } } @@ -285,12 +285,26 @@ cc.Class({ if (this.infoSchedule) { this.unschedule(this.infoSchedule); } + webapi.updateInviteInfo() + .then(rep => { + if (rep.errcode === 0) { + let text = `${stringUtil.parseMobile(rep.mobile)}接受了你的邀请`; + self.mainScrollContent.getComponent('scrollContent').updateTipTxt(text); + } else if (rep.errcode === 101) { + self.mainScrollContent.getComponent('scrollContent').hideTipTxt(); + } + }) + .catch(err => { + + }) this.infoSchedule = this.schedule(function () { webapi.updateInviteInfo() .then(rep => { if (rep.errcode === 0) { let text = `${stringUtil.parseMobile(rep.mobile)}接受了你的邀请`; self.mainScrollContent.getComponent('scrollContent').updateTipTxt(text); + } else if (rep.errcode === 101) { + self.mainScrollContent.getComponent('scrollContent').hideTipTxt(); } }) .catch(err => { diff --git a/assets/scripts/scrollContent.js b/assets/scripts/scrollContent.js index d7bf253..c7bcfb5 100644 --- a/assets/scripts/scrollContent.js +++ b/assets/scripts/scrollContent.js @@ -1,5 +1,6 @@ let onfire = require('./utils/onfire'); let webapi = require('./utils/webapi'); +let bowser = require('./utils/bowser'); cc.Class({ extends: cc.Component, @@ -92,7 +93,7 @@ cc.Class({ this.part2.addChild(this.puzzle); this.tipLabel = cc.instantiate(this.tipPrefab); this.part2.addChild(this.tipLabel); - + this.tipLabel.active = false; var imageSwiper = cc.instantiate(this.imageSwiperPrefab); this.part4.addChild(imageSwiper, 0); var bottomSwiper = cc.instantiate(this.bottomSwiperPrefab); @@ -109,6 +110,23 @@ cc.Class({ .catch(err => { cc.log('error get activity info'); }); + this.schedule(function () { + webapi.getActivityInfo() + .then(rep => { + if (rep.errcode === 0) { + processBar.getComponent('progressBar').updateShow(rep.count); + } + }) + .catch(err => { + cc.log('error get activity info'); + }); + }, 60); //每1分钟更新一次 + if (bowser.version.weiXin || !bowser.version.mobile) { + this.qrCodeWechat.active = true; + } else { + this.qrCodeWechat.active = false; + this.qrCodeQQ.position = cc.v2(0, -100); + } }, start() { @@ -148,6 +166,10 @@ cc.Class({ this.joinBtn.active = !status; }, updateTipTxt(str) { + this.tipLabel.active = true; this.tipLabel.getComponent('inviteTip').setLabelTxt(str); + }, + hideTipTxt() { + this.tipLabel.active = false; } }); diff --git a/assets/scripts/topMenuContent.js b/assets/scripts/topMenuContent.js index 6415512..9ecdb23 100644 --- a/assets/scripts/topMenuContent.js +++ b/assets/scripts/topMenuContent.js @@ -19,7 +19,7 @@ cc.Class({ btn.getComponent('topMenuBtn').selected = i === 0; this.btns.push(btn); this.node.addChild(btn); - let y = 350 - 120 * i; + let y = -250 - 100 * i; btn.setPosition(cc.v2(0, y)); } }, diff --git a/assets/scripts/utils/bowser.js b/assets/scripts/utils/bowser.js new file mode 100644 index 0000000..d374c94 --- /dev/null +++ b/assets/scripts/utils/bowser.js @@ -0,0 +1,38 @@ +export default { + version: function () { + var u = navigator.userAgent; + var ua = navigator.userAgent.toLocaleLowerCase(); + var app = navigator.appVersion; + return { + trident: u.indexOf('Trident') > -1, // IE内核 + presto: u.indexOf('Presto') > -1, // opera内核 + webKit: u.indexOf('AppleWebKit') > -1, //苹果、谷歌内核 + gecko: u.indexOf('Gecko') > -1 && u.indexOf('KHTML') == -1, // 火狐内核 + mobile: !!u.match(/AppleWebKit.*Mobile.*/) || !!u.match(/AppleWebKit/), // 是否为移动终端 + ios: !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/), // IOS终端 + android: u.indexOf('Android') > -1 || u.indexOf('Mac') > -1, // 安卓终端 + iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1, // 是否为iphone或QQHD浏览器 + iPad: u.indexOf('iPad') > -1, // 是否为iPad + webApp: u.indexOf('Safari') == -1, // 是否web应用程序,没有头部与底部 + QQbrw: u.indexOf('MQQBrowser') > -1, // QQ浏览器 + weiXin: u.indexOf('MicroMessenger') > -1, // 微信 + QQ: ua.match(/QQ/i) == "qq", // QQ + weiBo: ua.match(/WeiBo/i) == "weibo", // 微博 + ucLowEnd: u.indexOf('UCWEB7.') > -1, // + ucSpecial: u.indexOf('rv:1.2.3.4') > -1, + webview: !(u.match(/Chrome\/([\d.]+)/) || u.match(/CriOS\/([\d.]+)/)) && u.match(/(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/), + ucweb: function () { + try { + return parseFloat(u.match(/ucweb\d+\.\d+/gi).toString().match(/\d+\.\d+/).toString()) >= 8.2 + } catch (e) { + if (u.indexOf('UC') > -1) { + return true; + } + return false; + } + }(), + Symbian: u.indexOf('Symbian') > -1, + ucSB: u.indexOf('Firofox/1.') > -1 + }; + }() +} diff --git a/assets/scripts/utils/bowser.js.meta b/assets/scripts/utils/bowser.js.meta new file mode 100644 index 0000000..f89f6f7 --- /dev/null +++ b/assets/scripts/utils/bowser.js.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.0.5", + "uuid": "3e60567e-922d-44bc-9de7-25d2e6524d05", + "isPlugin": false, + "loadPluginInWeb": true, + "loadPluginInNative": true, + "loadPluginInEditor": false, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/scripts/utils/webapi.js b/assets/scripts/utils/webapi.js index 35cb3b2..b9f5138 100644 --- a/assets/scripts/utils/webapi.js +++ b/assets/scripts/utils/webapi.js @@ -1,6 +1,6 @@ var http = require('./http'); -const baseUrl = 'http://192.168.100.229:3000'; +const baseUrl = 'https://wechat-test.kingsome.cn'; export default { sendSms: (mobile, captcha) => { let data = {mobile: mobile}; diff --git a/settings/builder.json b/settings/builder.json new file mode 100644 index 0000000..3c66ba8 --- /dev/null +++ b/settings/builder.json @@ -0,0 +1,47 @@ +{ + "android-instant": { + "REMOTE_SERVER_ROOT": "", + "host": "", + "pathPattern": "", + "recordPath": "", + "scheme": "https", + "skipRecord": false + }, + "appKey": "", + "appSecret": "", + "encryptJs": true, + "excludeScenes": [], + "fb-instant-games": {}, + "includeAnySDK": false, + "includeSDKBox": false, + "inlineSpriteFrames": true, + "inlineSpriteFrames_native": true, + "jailbreakPlatform": false, + "md5Cache": false, + "mergeStartScene": false, + "oauthLoginServer": "", + "optimizeHotUpdate": false, + "orientation": { + "landscapeLeft": true, + "landscapeRight": true, + "portrait": false, + "upsideDown": false + }, + "packageName": "org.cocos2d.invite_page", + "privateKey": "", + "qqplay": { + "REMOTE_SERVER_ROOT": "", + "orientation": "portrait" + }, + "startScene": "5fc8d527-4f27-4e49-8845-be6e502f97f3", + "title": "invite_page", + "webOrientation": "auto", + "wechatgame": { + "REMOTE_SERVER_ROOT": "", + "appid": "wx6ac3f5090a6b99c5", + "orientation": "portrait", + "subContext": "" + }, + "xxteaKey": "d9dd9281-06c6-40", + "zipCompressJs": true +} \ No newline at end of file