Ver Fonte

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

kaka há 5 anos atrás
pai
commit
955c3e6409
90 ficheiros alterados com 5177 adições e 1714 exclusões
  1. 33 33
      assets/resources/data/guide_data.json
  2. 41 41
      assets/resources/data/rule_data.json
  3. 166 186
      assets/resources/game/prefab/game.prefab
  4. 246 126
      assets/resources/game/prefab/gameplay.prefab
  5. 5 5
      assets/resources/game/prefab/uiPanel/GetPropUI.prefab
  6. 26 12
      assets/resources/module/agreementTip/agreementTip.prefab
  7. 165 151
      assets/resources/module/blessingBag/blessingBag.prefab
  8. 542 84
      assets/resources/module/guide/guide.prefab
  9. 21 7
      assets/resources/module/help/help.prefab
  10. 2 2
      assets/resources/module/login/login.prefab
  11. 86 72
      assets/resources/module/moreGame/moreGame.prefab
  12. 20 6
      assets/resources/module/pigBank/pigBank.prefab
  13. 4 4
      assets/resources/module/redBagCash/redBagCash.prefab
  14. 207 7
      assets/resources/module/redBagCode/redBagCode.prefab
  15. BIN
      assets/resources/module/redBagCode/texture/jiaocheng.png
  16. 36 0
      assets/resources/module/redBagCode/texture/jiaocheng.png.meta
  17. 296 121
      assets/resources/module/redCode/redCode.prefab
  18. 328 85
      assets/resources/module/reward/reward.prefab
  19. 232 95
      assets/resources/module/reward/rewardLuck.prefab
  20. 224 101
      assets/resources/module/reward/rewardMission.prefab
  21. 12 0
      assets/resources/module/reward/spine.meta
  22. 13 0
      assets/resources/module/reward/spine/hb_star.atlas
  23. 5 0
      assets/resources/module/reward/spine/hb_star.atlas.meta
  24. 344 0
      assets/resources/module/reward/spine/hb_star.json
  25. 9 0
      assets/resources/module/reward/spine/hb_star.json.meta
  26. BIN
      assets/resources/module/reward/spine/hb_star.png
  27. 36 0
      assets/resources/module/reward/spine/hb_star.png.meta
  28. 91 77
      assets/resources/module/setting/setting.prefab
  29. 22 8
      assets/resources/module/sign/sign.prefab
  30. 159 145
      assets/resources/module/turnable/turnable.prefab
  31. 146 0
      assets/resources/spine/game/changjing.atlas
  32. 5 0
      assets/resources/spine/game/changjing.atlas.meta
  33. 441 0
      assets/resources/spine/game/changjing.json
  34. 9 0
      assets/resources/spine/game/changjing.json.meta
  35. BIN
      assets/resources/spine/game/changjing.png
  36. 36 0
      assets/resources/spine/game/changjing.png.meta
  37. 2 2
      assets/resources/spine/game/pandan.json
  38. BIN
      assets/resources/spine/game/pandan.png
  39. 2 2
      assets/resources/spine/game/pandan.png.meta
  40. BIN
      assets/resources/video/Redeem.mp4
  41. 18 1
      assets/script/before/GamePlay.ts
  42. 13 10
      assets/script/before/view/GetPropUI.ts
  43. 7 2
      assets/script/before/view/PauseUI.ts
  44. 1 0
      assets/script/before/view/uiItem/CellItem.ts
  45. 8 3
      assets/script/game/component/NumberAnim.ts
  46. 1 0
      assets/script/game/data/LoginData.ts
  47. 4 1
      assets/script/game/data/module/CashNormalData.ts
  48. 3 3
      assets/script/game/data/module/GuideData.ts
  49. 4 1
      assets/script/game/data/module/ReceiptNoticeData.ts
  50. 5 0
      assets/script/game/data/module/RedBagCashData.ts
  51. 18 9
      assets/script/game/game/Game.ts
  52. 7 0
      assets/script/game/module/agreementTip/agreementTip.ts
  53. 10 0
      assets/script/game/module/blessingBag/BlessingBag.ts
  54. 64 23
      assets/script/game/module/guide/Guide.ts
  55. 6 1
      assets/script/game/module/help/Help.ts
  56. 3 0
      assets/script/game/module/login/Login.ts
  57. 4 0
      assets/script/game/module/moreGame/MoreGame.ts
  58. 11 3
      assets/script/game/module/pigBank/PigBank.ts
  59. 2 2
      assets/script/game/module/receiptNotice/ReceiptNotice.ts
  60. 27 1
      assets/script/game/module/redBagCode/RedBagCode.ts
  61. 6 0
      assets/script/game/module/redCode/RedCode.ts
  62. 11 0
      assets/script/game/module/reward/Reward.ts
  63. 7 2
      assets/script/game/module/setting/Setting.ts
  64. 15 0
      assets/script/game/module/sign/Sign.ts
  65. 6 2
      assets/script/game/module/turntable/Turnable.ts
  66. 25 0
      assets/script/mk/sdk/ad/IADSDKMgr.ts
  67. 9 0
      assets/script/mk/sdk/ad/IADSDKMgr.ts.meta
  68. 75 7
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATBanner.ts
  69. 115 4
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATInterstitial.ts
  70. 10 8
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATNative.ts
  71. 1 0
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATNativeJS.js
  72. 52 17
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideo.ts
  73. 1 0
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideoJS.js
  74. 28 16
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr.ts
  75. 0 0
      assets/script/mk/sdk/ad/zgSingleton.ts
  76. 1 1
      assets/script/mk/sdk/ad/zgSingleton.ts.meta
  77. 35 6
      assets/script/mk/system/AdSystem.ts
  78. 0 1
      assets/script/mk/system/GuideSystem.ts
  79. 3 2
      assets/script/mk/system/PoolSystem.ts
  80. 9 9
      assets/script/mk/system/TipSystem.ts
  81. 1 1
      assets/script/mk/utils/GameUtil.ts
  82. 2 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/EasyEliminate.iml
  83. 8 8
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.stderr.txt
  84. 67 67
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.stdout.txt
  85. BIN
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/EasyEliminate-release.apk
  86. BIN
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/mk_framework-release.apk
  87. 3 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/qsllx/wxapi/WXEntryActivity.java
  88. 2 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java
  89. 456 125
      build/jsb-link/js backups (useful for debugging)/main.index.js
  90. 1 1
      settings/project.json

+ 33 - 33
assets/resources/data/guide_data.json

@@ -6,63 +6,63 @@
 		"tr_form": 2,
 		"dialog": "欢迎来到轻松连连消",
 		"display_rect": "",
-		"click_node": "",
+		"click_rect": "all",
 		"finger": "",
 		"lag_next": 0
 	},
 	{
 		"id": "1_2",
-		"trigger": null,
+		"trigger": 1,
 		"tr_num": null,
 		"tr_form": 2,
 		"dialog": "点击“开始游戏”,让我来介绍一下",
 		"display_rect": "",
-		"click_node": "btn_start",
-		"finger": "100:0",
+		"click_rect": "界面层/game/开始按钮",
+		"finger": "50:20",
 		"lag_next": 0
 	},
 	{
 		"id": "1_3",
-		"trigger": null,
+		"trigger": 1,
 		"tr_num": null,
 		"tr_form": 1,
 		"dialog": "点击这两个动物即可消除哦",
 		"display_rect": "-300:100:100:500",
-		"click_node": "",
-		"finger": "",
+		"click_rect": "event",
+		"finger": "50:20",
 		"lag_next": 1
 	},
 	{
 		"id": "1_4",
-		"trigger": null,
+		"trigger": 1,
 		"tr_num": null,
 		"tr_form": 1,
 		"dialog": "消除可获得大量进度哦",
-		"display_rect": "",
-		"click_node": "",
-		"finger": "",
+		"display_rect": "300:100:100:500",
+		"click_rect": "event",
+		"finger": "50:20",
 		"lag_next": 2
 	},
 	{
 		"id": "1_5",
-		"trigger": null,
+		"trigger": 1,
 		"tr_num": null,
 		"tr_form": 1,
 		"dialog": "进度攒满即可通关",
-		"display_rect": "",
-		"click_node": "",
-		"finger": "",
+		"display_rect": "100:100:100:500",
+		"click_rect": "event",
+		"finger": "50:20",
 		"lag_next": 0
 	},
 	{
 		"id": "1_6",
-		"trigger": null,
+		"trigger": 1,
 		"tr_num": null,
 		"tr_form": 1,
 		"dialog": "继续点击消除吧",
-		"display_rect": "",
-		"click_node": "",
-		"finger": "",
+		"display_rect": "200:100:100:500",
+		"click_rect": "event",
+		"finger": "50:20",
 		"lag_next": 0
 	},
 	{
@@ -71,20 +71,20 @@
 		"tr_num": null,
 		"tr_form": 1,
 		"dialog": "点击领取红包币",
-		"display_rect": "",
-		"click_node": "",
-		"finger": "",
+		"display_rect": "300:100:100:500",
+		"click_rect": "event",
+		"finger": "50:20",
 		"lag_next": 0
 	},
 	{
 		"id": "2_2",
-		"trigger": null,
+		"trigger": 1,
 		"tr_num": null,
 		"tr_form": 1,
 		"dialog": "红包币可用于提现",
-		"display_rect": "",
-		"click_node": "",
-		"finger": "",
+		"display_rect": "200:100:100:500",
+		"click_rect": "event",
+		"finger": "50:20",
 		"lag_next": 0
 	},
 	{
@@ -93,20 +93,20 @@
 		"tr_num": null,
 		"tr_form": 2,
 		"dialog": "达到提现条件啦!",
-		"display_rect": "",
-		"click_node": "",
-		"finger": "",
+		"display_rect": "100:100:100:500",
+		"click_rect": "event",
+		"finger": "50:20",
 		"lag_next": 0
 	},
 	{
 		"id": "3_2",
-		"trigger": null,
+		"trigger": 1,
 		"tr_num": null,
 		"tr_form": 1,
 		"dialog": "点击即可提现",
-		"display_rect": "",
-		"click_node": "",
-		"finger": "",
+		"display_rect": "300:100:100:500",
+		"click_rect": "event",
+		"finger": "50:20",
 		"lag_next": 0
 	}
 ]

+ 41 - 41
assets/resources/data/rule_data.json

@@ -1,23 +1,23 @@
 {
 	"server": [
-		"轻松消消乐用户协议",
+		"轻松连连消用户协议",
 		"",
-		"  欢迎您使用轻松消消乐软件及相关服务! ",
+		"  欢迎您使用轻松连连消软件及相关服务! ",
 		"",
-		"  在此特别提醒您(用户)在使用轻松消消乐之前,请认真阅读本《用户协议》(以下简称“本协议”),确保您充分理解本协议中各条款,特别是涉及免除或者限制责任的条款、权利许可和信息使用的条款、同意开通的条款、法律适用和争议解决条款等。其中,免除或者限制责任条款等重要内容将以加粗划线形式提示您注意,您应重点阅读。如您未满18周岁,请您在法定监护人陪同下仔细阅读并充分理解本协议,并征得法定监护人的同意后下载本软件。请您审慎阅读并选择接受或不接受本协议。 ",
-		"除非您接受本协议所有条款,否则您无权使用“轻松消消乐”软件或者通过任何方式使用“轻松消消乐”服务,或者获得“轻松消消乐”软件提供的任何服务。若您使用“轻松消消乐”软件及相关服务(以下简称“本服务”),则视为您已充分理解本协议,并承诺作为本协议的一方当事人接受本协议各项条款的约束。 ",
+		"  在此特别提醒您(用户)在使用轻松连连消之前,请认真阅读本《用户协议》(以下简称“本协议”),确保您充分理解本协议中各条款,特别是涉及免除或者限制责任的条款、权利许可和信息使用的条款、同意开通的条款、法律适用和争议解决条款等。其中,免除或者限制责任条款等重要内容将以加粗划线形式提示您注意,您应重点阅读。如您未满18周岁,请您在法定监护人陪同下仔细阅读并充分理解本协议,并征得法定监护人的同意后下载本软件。请您审慎阅读并选择接受或不接受本协议。 ",
+		"除非您接受本协议所有条款,否则您无权使用“轻松连连消”软件或者通过任何方式使用“轻松连连消”服务,或者获得“轻松连连消”软件提供的任何服务。若您使用“轻松连连消”软件及相关服务(以下简称“本服务”),则视为您已充分理解本协议,并承诺作为本协议的一方当事人接受本协议各项条款的约束。 ",
 		"",
-		"本协议约定开发公司与用户之间关于“轻松消消乐”软件服务(以下简称“服务”)的权利义务。 ",
+		"本协议约定开发公司与用户之间关于“轻松连连消”软件服务(以下简称“服务”)的权利义务。 ",
 		"  1. 定义 ",
-		"  a. 用户:指所有直接或间接获取和使用“轻松消消乐”软件及相关服务的自然人、法人和其他组织等。在本协议中称为“用户”或称“您”。 ",
-		"  b. 轻松消消乐:指由公司合法拥有并运营的、标注名称为“轻松消消乐”的客户端应用程序,公司向用户提供以手机安全工具和网赚为主的新型服务。 ",
-		"  c. 本协议:本协议内容同时包括公司已经发布及后续可能不断更新、修订或发布的关于“轻松消消乐”软件及相关服务的相关协议、政策、规则等内容。 ",
+		"  a. 用户:指所有直接或间接获取和使用“轻松连连消”软件及相关服务的自然人、法人和其他组织等。在本协议中称为“用户”或称“您”。 ",
+		"  b. 轻松连连消:指由公司合法拥有并运营的、标注名称为“轻松连连消”的客户端应用程序,公司向用户提供以手机安全工具和网赚为主的新型服务。 ",
+		"  c. 本协议:本协议内容同时包括公司已经发布及后续可能不断更新、修订或发布的关于“轻松连连消”软件及相关服务的相关协议、政策、规则等内容。 ",
 		"",
 		"  2. 基于软件提供服务 ",
-		"  公司依托“轻松消消乐”软件向您提供服务,您还应遵守以下约定: ",
+		"  公司依托“轻松连连消”软件向您提供服务,您还应遵守以下约定: ",
 		"  a.您在使用本服务的过程中可能需要下载软件,对于这些软件,公司给予您一项个人的、不可转让及非排他性的许可。您仅可为访问或使用本服务的目的而使用这些软件。 ",
-		"  b. 您使用“轻松消消乐”软件及相关服务,可以通过预装、公司已授权的第三方下载等方式获取“轻松消消乐”客户端应用程序。若您并非从公司或经公司授权的第三方获取本软件的,公司无法保证非官方版本的“轻松消消乐”软件能够正常使用,您因此遭受的损失与公司无关。 ",
-		"  c.为了改善用户体验、保证服务的安全性及产品功能的一致性,公司可能会对软件进行更新。您应该将相关软件更新到最新版本,否则公司并不保证其能正常使用,您有权选择接受更新版本或服务,如您不接受,部分功能将受到限制或不能继续使用。如您不再需要使用“轻松消消乐”软件及相关服务可自行卸载。 ",
+		"  b. 您使用“轻松连连消”软件及相关服务,可以通过预装、公司已授权的第三方下载等方式获取“轻松连连消”客户端应用程序。若您并非从公司或经公司授权的第三方获取本软件的,公司无法保证非官方版本的“轻松连连消”软件能够正常使用,您因此遭受的损失与公司无关。 ",
+		"  c.为了改善用户体验、保证服务的安全性及产品功能的一致性,公司可能会对软件进行更新。您应该将相关软件更新到最新版本,否则公司并不保证其能正常使用,您有权选择接受更新版本或服务,如您不接受,部分功能将受到限制或不能继续使用。如您不再需要使用“轻松连连消”软件及相关服务可自行卸载。 ",
 		"  d.除非公司书面许可,您不得从事下列任一行为: ",
 		"  1) 对软件进行反向工程、反向汇编、反向编译,或者以其他方式尝试发现软件的源代码; ",
 		"  2) 对软件或者软件运行过程中释放到任何终端内存中的数据、软件运行过程中客户端与服务器端的交互数据,以及软件运行所必需的系统数据,进行复制、修改、增加、删除、挂接运行或创作任何衍生作品,形式包括但不限于使用插件、外挂或非经公司授权的第三方工具/服务接入软件和相关系统; ",
@@ -25,7 +25,7 @@
 		"  4) 通过非公司开发、授权的第三方软件、插件、外挂、系统,登录或使用公司软件及服务,或制作、发布、传播非公司开发、授权的第三方软件、插件、外挂、系统。 ",
 		"",
 		"  3. 个人信息保护 ",
-		"  为了实现本协议约定的目的,不断优化用户体验,向用户提供更加个性化、智能化的内容与服务,轻松消消乐会收集您的相关个人信息。关于轻松消消乐收集信息的类型、使用目的以及如何保护您的信息安全,请了解我们的《轻松消消乐隐私政策》,该《隐私政策》构成本协议的一部分。 ",
+		"  为了实现本协议约定的目的,不断优化用户体验,向用户提供更加个性化、智能化的内容与服务,轻松连连消会收集您的相关个人信息。关于轻松连连消收集信息的类型、使用目的以及如何保护您的信息安全,请了解我们的《轻松连连消隐私政策》,该《隐私政策》构成本协议的一部分。 ",
 		"",
 		"  4. 遵守当地法律监管 ",
 		"  a.您在使用本服务过程中应当遵守当地相关的法律法规,并尊重当地的道德和风俗习惯。如果您的行为违反了当地法律法规或道德风俗,您应当为此独立承担责任。 ",
@@ -44,7 +44,7 @@
 		"  3) 用户操作不当; ",
 		"  4) 用户通过非公司授权的方式使用本服务; ",
 		"  5) 其他公司无法控制或合理预见的情形。 ",
-		"  c.您理解并同意,“轻松消消乐”软件及相关服务可能会受多种因素的影响或干扰,公司不保证(包括但不限于): ",
+		"  c.您理解并同意,“轻松连连消”软件及相关服务可能会受多种因素的影响或干扰,公司不保证(包括但不限于): ",
 		"  1) 公司完全适合用户的使用要求; ",
 		"  2) 公司不受干扰,及时、安全、可靠或不出现错误;您经由公司取得的任何软件、服务或其他材料符合用户的期望; ",
 		"  3) 软件中任何错误都将能得到更正。 ",
@@ -78,15 +78,15 @@
 		"  d.对于应用中的金币奖励规则、活动规则、提现规则,本公司拥有最终解释权。 "
 	],
 	"privacy": [
-		"轻松消消乐隐私政策 ",
+		"轻松连连消隐私政策 ",
 		"",
 		"开发者公司: 苏州白羊座信息科技有限公司 ",
 		"",
-		"欢迎您使用“轻松消消乐”软件及相关服务! ",
+		"欢迎您使用“轻松连连消”软件及相关服务! ",
 		"",
-		"轻松消消乐软件服务是由苏州白羊座信息科技有限公司(简称“我们”或“公司”)开发并发布。保护用户个人信息是公司的一项基本原则。公司依据法律法规收集、使用个人信息,坚持遵循个人信息收集、使用的合法、正当、必要的原则。 ",
+		"轻松连连消软件服务是由苏州白羊座信息科技有限公司(简称“我们”或“公司”)开发并发布。保护用户个人信息是公司的一项基本原则。公司依据法律法规收集、使用个人信息,坚持遵循个人信息收集、使用的合法、正当、必要的原则。 ",
 		"",
-		"在使用“轻松消消乐”软件及相关服务前,请您务必仔细阅读并透彻理解本隐私政策,公司将会收集和使用您的相关信息。您一旦选择使用“轻松消消乐”软件及相关服务,即意味着您同意公司按照本隐私政策收集、保护、使用、共享、披露及保护您的信息。如果您未满18周岁,请您在监护人陪同下仔细阅读并充分理解本隐私政策,并征得监护人的同意后使用我们的服务或向我们提供信息。 ",
+		"在使用“轻松连连消”软件及相关服务前,请您务必仔细阅读并透彻理解本隐私政策,公司将会收集和使用您的相关信息。您一旦选择使用“轻松连连消”软件及相关服务,即意味着您同意公司按照本隐私政策收集、保护、使用、共享、披露及保护您的信息。如果您未满18周岁,请您在监护人陪同下仔细阅读并充分理解本隐私政策,并征得监护人的同意后使用我们的服务或向我们提供信息。 ",
 		"",
 		"请您审慎阅读并选择接受或者不接受本隐私政策,有关您个人信息权益的条款等重要内容我们已用加粗形式提示,请特别关注。如果您不同意本隐私政策,我们无法为您提供完整的产品和服务,您也可以选择停止使用。当您选择继续或再次使用时,基于提供产品和服务所必需,将视为您接受和认可我们按照本政策对您的相关信息进行处理。 ",
 		"本隐私政策将帮助你了解: ",
@@ -95,7 +95,7 @@
 		"当您使用或开启相关功能或使用服务时,为实现功能、服务所必需,我们会收集、使用相关信息。除非是为实现基本业务功能或根据法律法规要求所必需的必要信息,您均可以拒绝提供且不影响其他功能或服务。我们将在隐私政策中逐项说明哪些是必要信息。 ",
 		"如果您未登录帐号,我们会通过设备对应的标识符信息来保障基本功能。如果您登录了账号,我们会根据账号信息实现信息推送。 ",
 		"精确地理位置、相册权限,均不会默认开启,只有经过您的明示授权才会在为实现特定功能或服务时使用,您也可以撤回授权。特别需要指出的是,即使经过您的授权,我们获得了这些敏感权限,也不会在相关功能或服务不需要时而收集您的信息。 ",
-		"本隐私政策适用于您通过轻松消消乐应用程序、供第三方网站和应用程序使用的轻松消消乐软件开发工具包(SDK)和应用程序编程接口(API)方式来访问和使用我们的产品和服务。 ",
+		"本隐私政策适用于您通过轻松连连消应用程序、供第三方网站和应用程序使用的轻松连连消软件开发工具包(SDK)和应用程序编程接口(API)方式来访问和使用我们的产品和服务。 ",
 		"下文将帮您详细了解我们收集原则、如何收集、使用、存储、传输、共享、转让(如适用)与保护个人信息。 ",
 		"其中,有关您个人信息权益的条款重要内容请特别关注: ",
 		"1、收集信息的原则及目的 ",
@@ -103,7 +103,7 @@
 		"3、我们如何共享、转让、公开披露个人信息 ",
 		"4、我们如何存储个人信息 ",
 		"5、我们如何保护个人信息的安全 ",
-		"6、轻松消消乐使用到的部分权限说明 ",
+		"6、轻松连连消使用到的部分权限说明 ",
 		"7、第三方合作伙伴收集的信息 ",
 		"8、访问隐私政策 ",
 		"9、停止运营向您告知 ",
@@ -112,7 +112,7 @@
 		"12、联系我们 ",
 		"",
 		"一.收集信息的原则及目的 ",
-		"在您使用“轻松消消乐”及服务的过程中,我们将根据合法、正当、必要的原则,收集信息。我们收集或您提供的信息将用于: ",
+		"在您使用“轻松连连消”及服务的过程中,我们将根据合法、正当、必要的原则,收集信息。我们收集或您提供的信息将用于: ",
 		"1、保障产品的正常基础运行; ",
 		"2、实现各项功能和服务; ",
 		"3、优化、改善产品和服务; ",
@@ -123,7 +123,7 @@
 		"我们会按照如下方式收集您在使用服务时主动提供的,以及通过自动化手段收集您在使用功能或接受服务过程中产生的信息: ",
 		"2.1 注册、登录、认证 ",
 		"2.1.1 注册、登录 ",
-		"您可以使用第三方账号登录并使用,您将授权我们获取您在第三方平台注册的公开信息(头像、昵称以及您授权的其他信息),用于与轻松消消乐账号绑定,使您可以直接登录并使用本产品和相关服务。 ",
+		"您可以使用第三方账号登录并使用,您将授权我们获取您在第三方平台注册的公开信息(头像、昵称以及您授权的其他信息),用于与轻松连连消账号绑定,使您可以直接登录并使用本产品和相关服务。 ",
 		"2.1.2 认证 ",
 		"在您使用身份认证的功能或服务时,根据相关法律法规,您可能需要提供您的真实身份信息(真实姓名、身份证号码、电话号码等)以完成实名验证。这些信息属于个人敏感信息,您可以拒绝提供,但您将可能无法获得相关服务,但不影响其他功能与服务的正常使用。 ",
 		"在您使用身份认证的功能或服务时,根据相关法律法规,您可能需要提供您的真实身份信息(真实姓名、身份证号码、电话号码等)以完成实名验证。这些信息属于个人敏感信息,您可以拒绝提供,但您将可能无法获得相关服务,但不影响其他功能与服务的正常使用。 ",
@@ -137,7 +137,7 @@
 		"2.3 会话和可用数据 ",
 		"“会话和可用数据”是关于您提供给我们的在您使用应用程序和服务的信息,包括但不限于您使用应用程序和服务产生的连接和服务相关的数据信息。会话和可用数据包括和连接请求、服务器通信和数据共享相关的信息,包含网络测试,服务质量、日期、时间和地理位置。我们也可以集中处理会话和可用数据。请注意,会话和可用数据不包括任何个人信息,也不包括您可以通过使用应用程序(如照片、联系人、日程安排等)或服务发送或共享的内容。 ",
 		"2.4 收集、使用个人信息目的变更 ",
-		"请您了解,随着我们业务的发展,可能会对“轻松消消乐”的功能和提供的服务有所调整变化。原则上,当新功能或服务与我们当前提供的功能或服务相关时,收集与使用的个人信息将与原处理目的具有直接或合理关联。在与原处理目的无直接或合理关联的场景下,我们收集、使用您的个人信息,会再次进行告知,并征得您的同意。 ",
+		"请您了解,随着我们业务的发展,可能会对“轻松连连消”的功能和提供的服务有所调整变化。原则上,当新功能或服务与我们当前提供的功能或服务相关时,收集与使用的个人信息将与原处理目的具有直接或合理关联。在与原处理目的无直接或合理关联的场景下,我们收集、使用您的个人信息,会再次进行告知,并征得您的同意。 ",
 		"2.5依法豁免征得同意收集和使用的个人信息 ",
 		"请您理解,在下列情形中,根据法律法规及相关国家标准,我们收集和使用您的个人信息无需征得您的授权同意: ",
 		"a.与国家安全、国防安全直接相关的; ",
@@ -160,7 +160,7 @@
 		"b.合法正当与最小必要原则: 向关联方、第三方共享的数据必须具有合法正当目的,且共享的数据以达成目的必要为限。 ",
 		"c.安全审慎原则: 我们将审慎评估关联方、第三方数据使用共享信息的目的,对这些合作方的安全保障能力进行综合评估,并要求其遵循合作法律协议。我们会对合作方获取信息的软件工具开发包(SDK)、应用程序接口(API)进行严格的安全监测,以保护数据安全。 ",
 		"3.1.2 实现功能或服务的共享信息 ",
-		"当您在使用轻松消消乐中由我们的关联方、第三方提供的功能,或者当软件服务提供商、智能设备提供商、系统服务提供商与我们联合为您提供服务时我们会将去标识化后的个人信息与这些关联方、第三方共享,进行综合统计并通过算法做特征与偏好分析趣的信息。 ",
+		"当您在使用轻松连连消中由我们的关联方、第三方提供的功能,或者当软件服务提供商、智能设备提供商、系统服务提供商与我们联合为您提供服务时我们会将去标识化后的个人信息与这些关联方、第三方共享,进行综合统计并通过算法做特征与偏好分析趣的信息。 ",
 		"3.1.3 实现广告相关的共享信息 ",
 		"a.广告推送:我们可能与委托我们进行推广和广告投放的合作伙伴共享信息,但我们不会共享用于识别您个人身份的信息(姓名、身份证号),仅会向这些合作伙伴提供不能识别您个人身份的间接画像标签及去标识化或匿名化后的信息,以帮助其在不识别您个人身份的前提下提升广告有效触达率。 ",
 		"b.分析产品使用情况:为分析我们服务的使用情况,提升用户使用的体验,可能会与关联方或第三方共享产品使用情况(崩溃、闪退)的统计性数据,这些数据难以与其他信息结合识别您的个人身份。 ",
@@ -195,7 +195,7 @@
 		"4.1 存储地点 ",
 		"我们依照法律法规的规定,将在境内运营过程中收集和产生的您的个人信息存储于中华人民共和国境内。目前,我们不会将上述信息传输至境外,如果我们向境外传输,我们将会遵循相关国家规定或者征求您的同意。 ",
 		"4.2 存储期限 ",
-		"我们仅在为提供“轻松消消乐”及服务之目的所必需的期间内保留您的个人信息,超出必要期限后,我们将对您的个人信息进行删除或匿名化处理,但法律法规另有规定的除外。 ",
+		"我们仅在为提供“轻松连连消”及服务之目的所必需的期间内保留您的个人信息,超出必要期限后,我们将对您的个人信息进行删除或匿名化处理,但法律法规另有规定的除外。 ",
 		"",
 		"五.我们如何保护个人信息的安全 ",
 		"a.我们非常重视您个人信息的安全,将努力采取合理的安全措施(包括技术方面和管理方面)来保护您的个人信息,防止您提供的个人信息被不当使用或未经授权的情况下被访问、公开披露、使用、修改、损坏、丢失或泄漏。 ",
@@ -204,23 +204,23 @@
 		"d.尽管已经采取了上述合理有效措施,并已经遵守了相关法律规定要求的标准,但请您理解,由于技术的限制以及可能存在的各种恶意手段,在互联网行业,即便竭尽所能加强安全措施,也不可能始终保证信息百分之百的安全,我们将尽力确保您提供给我们的个人信息的安全性。 ",
 		"e.您知悉并理解,您接入我们的服务所用的系统和通讯网络,有可能因我们可控范围外的因素而出现问题。因此,我们强烈建议您采取积极措施保护个人信息的安全,包括但不限于使用复杂密码、定期修改密码、不将自己的账号密码及相关个人信息透露给他人。 ",
 		"f.我们会制定应急处理预案,并在发生用户信息安全事件时立即启动应急预案,努力阻止这些安全事件的影响和后果扩大。一旦发生用户信息安全事件(泄露、丢失)后,我们将按照法律法规的要求,及时向您告知:安全事件的基本情况和可能的影响、我们已经采取或将要采取的处置措施、您可自主防范和降低风险的建议、对您的补救措施。我们将及时将事件相关情况以推送通知、邮件、信函、短信及相关形式告知您,难以逐一告知时,我们会采取合理、有效的方式发布公告。同时,我们还将按照相关监管部门要求,上报用户信息安全事件的处置情况。 ",
-		"g.您一旦离开“轻松消消乐”及相关服务,浏览或使用其他网站、服务及内容资源,我们将没有能力和直接义务保护您在轻松消消乐及相关服务之外的软件、网站提交的任何个人信息,无论您登录、浏览或使用上述软件、网站是否基于“轻松消消乐”的链接或引导。 ",
+		"g.您一旦离开“轻松连连消”及相关服务,浏览或使用其他网站、服务及内容资源,我们将没有能力和直接义务保护您在轻松连连消及相关服务之外的软件、网站提交的任何个人信息,无论您登录、浏览或使用上述软件、网站是否基于“轻松连连消”的链接或引导。 ",
 		"",
-		"六.轻松消消乐使用到的部分权限说明 ",
+		"六.轻松连连消使用到的部分权限说明 ",
 		"a.地理位置信息 ",
 		"本软件不会出于任何恶意目的获取、保存用户的位置信息。我们使用这些权限提供更优质的服务,这有助于改善用户体验。我们绝不会上传任何用户的位置信息。 ",
 		"b.互联网访问 ",
-		"访问互联网权限。轻松消消乐将会使用网络以执行某些功能,包括病毒库更新、垃圾缓存数据库、接受版本更新信息等。 ",
+		"访问互联网权限。轻松连连消将会使用网络以执行某些功能,包括病毒库更新、垃圾缓存数据库、接受版本更新信息等。 ",
 		"c.读取、修改存储设备的内容权限 ",
-		"轻松消消乐使用此权限查看存储在设备上文件并对文件执行操作。我们承诺,我们只会读取文件名、文件大小以向用户显示,用于下载并安装APP以及下载查看相关文件。绝不会保存、上传任何的文件内容,并且绝不会向任何人或第三方利益信息披露您的隐私。 ",
+		"轻松连连消使用此权限查看存储在设备上文件并对文件执行操作。我们承诺,我们只会读取文件名、文件大小以向用户显示,用于下载并安装APP以及下载查看相关文件。绝不会保存、上传任何的文件内容,并且绝不会向任何人或第三方利益信息披露您的隐私。 ",
 		"d.通知栏权限 ",
 		"此权限仅用于在首次使用通知管理功能时引导用户。 ",
 		"e.获取手机状态的权限 ",
-		"此权限可以让我们识别您的手机设备,轻松消消乐将会利用该权限将用户游戏中的重要数据和设备绑定,防止数据丢失。 ",
+		"此权限可以让我们识别您的手机设备,轻松连连消将会利用该权限将用户游戏中的重要数据和设备绑定,防止数据丢失。 ",
 		"f.拨打电话的权限 ",
 		"此权限可以让我们为您与客服取得联系,解决您遇到的问题。 ",
 		"g.追踪用户安装来源的权限 ",
-		"此权限可以用于判断用户从何渠道安装了轻松消消乐。 ",
+		"此权限可以用于判断用户从何渠道安装了轻松连连消。 ",
 		"h.录制音频的权限 ",
 		"此权限可以帮助您和客服进行交流,解决您遇到的问题。 ",
 		"",
@@ -230,32 +230,32 @@
 		"",
 		"八.访问隐私政策 ",
 		"a.您可以在首次访问App欢迎页时,查看本隐私政策的全部内容,也可在“设置”-“隐私政策”查看本隐私政策的全部内容。 ",
-		"b.请您了解,本隐私政策中所述的“轻松消消乐”及相关服务可能会根据您所使用的手机型号、系统版本、软件应用程序版本、移动客户端等因素而有所不同。最终的产品和服务以您所使用的“轻松消消乐”软件及相关服务为准。 ",
+		"b.请您了解,本隐私政策中所述的“轻松连连消”及相关服务可能会根据您所使用的手机型号、系统版本、软件应用程序版本、移动客户端等因素而有所不同。最终的产品和服务以您所使用的“轻松连连消”软件及相关服务为准。 ",
 		"",
 		"九.停止运营向您告知 ",
 		"如我们停止运营,我们将及时停止收集您个人信息的活动,将停止运营的通知以逐一送达或公告的形式通知您,并对所持有的您的个人信息进行删除或匿名化处理。 ",
 		"",
 		"十.未成年人条款 ",
-		"a.若您是未满18周岁的未成年人,在使用“轻松消消乐”及相关服务前,应在您的父母或其他监护人监护、指导下共同阅读并同意本隐私政策。 ",
+		"a.若您是未满18周岁的未成年人,在使用“轻松连连消”及相关服务前,应在您的父母或其他监护人监护、指导下共同阅读并同意本隐私政策。 ",
 		"b.我们根据国家相关法律法规的规定保护未成年人的个人信息,只会在法律允许、父母或其他监护人明确同意或保护未成年人所必要的情况下收集、使用、储存、共享、转让或披露未成年人的个人信息;如果我们发现在未事先获得可证实的父母同意的情况下收集了未成年人的个人信息,则会设法尽快删除相关信息。 ",
 		"c.若您是未成年人的监护人,当您对您所监护的未成年人的个人信息有相关疑问时,请通过公司本隐私政策公示的联系方式与我们联系。 ",
 		"d.对于可能涉及的不满14周岁的儿童个人信息,我们进一步采取以下措施予以保障:对于收集到的儿童个人信息,我们除遵守本隐私政策关于用户个人信息的约定外,还会秉持正当必要、知情同意、目的明确、安全保障、依法利用的原则,严格遵循《儿童个人信息网络保护规定》等法律法规的要求进行存储、使用、披露,且不会超过实现收集、使用目的所必须的期限,到期后我们会对儿童个人信息进行删除或匿名化处理。 ",
 		"",
 		"十一.隐私政策的修订和通知",
-		"a.为了给您提供更好的服务,轻松消消乐及相关服务将不时更新与变化,我们会适时对本隐私政策进行修订,这些修订构成本隐私政策的一部分并具有等同于本隐私政策的效力,未经您明确同意,我们不会削减您依据当前生效的本隐私政策所应享受的权利。 ",
-		"b.本隐私政策更新后,我们会在轻松消消乐发出更新版本,并在更新后的条款生效前通过适当的方式提醒您更新的内容,以便您及时了解本隐私政策的最新版本。若您继续使用我们的服务,即表示同意接受修订后的本政策并受之约束。 ",
+		"a.为了给您提供更好的服务,轻松连连消及相关服务将不时更新与变化,我们会适时对本隐私政策进行修订,这些修订构成本隐私政策的一部分并具有等同于本隐私政策的效力,未经您明确同意,我们不会削减您依据当前生效的本隐私政策所应享受的权利。 ",
+		"b.本隐私政策更新后,我们会在轻松连连消发出更新版本,并在更新后的条款生效前通过适当的方式提醒您更新的内容,以便您及时了解本隐私政策的最新版本。若您继续使用我们的服务,即表示同意接受修订后的本政策并受之约束。 ",
 		"",
 		"用户协议作弊条款 ",
 		"关于禁止作弊行为的声明 ",
-		"1、用户需要遵守轻松消消乐相关规则获取相应奖励(包括金币、现金、实物等),禁止通过违反产品规则、采取作弊行为或非法途径等方式获取奖励。 ",
-		"2、作弊行为是指用户是在主动与被动的情况下,在轻松消消乐使用过程中存在异常数据、非正常游戏行为、恶意耗时(包括但不限于断网、修改本地数据、修改本地时间)、利用作弊软件或程序漏洞获得不正当利益、以及为了自己获得利益而损害他人利益的行为,损害公平性或破坏秩序等行为都属于作弊行为,包括但不限于: ",
+		"1、用户需要遵守轻松连连消相关规则获取相应奖励(包括金币、现金、实物等),禁止通过违反产品规则、采取作弊行为或非法途径等方式获取奖励。 ",
+		"2、作弊行为是指用户是在主动与被动的情况下,在轻松连连消使用过程中存在异常数据、非正常游戏行为、恶意耗时(包括但不限于断网、修改本地数据、修改本地时间)、利用作弊软件或程序漏洞获得不正当利益、以及为了自己获得利益而损害他人利益的行为,损害公平性或破坏秩序等行为都属于作弊行为,包括但不限于: ",
 		"(1)通过大量购买手机号、设备号的方式恶意注册来骗取奖励; ",
-		"(2)通过欺骗等违反诚实信用原则的方法骗取邀请其他用户下载、注册轻松消消乐; ",
-		"(3)通过手动重复点击、自动程序化点击等方法点击轻松消消乐内容; ",
+		"(2)通过欺骗等违反诚实信用原则的方法骗取邀请其他用户下载、注册轻松连连消; ",
+		"(3)通过手动重复点击、自动程序化点击等方法点击轻松连连消内容; ",
 		"(4)通过对涉及的链接或推广内容进行域名劫持、恶意跳转、恶意刷量、作弊等; ",
-		"(5)其他违背用户真实体验轻松消消乐的目的而骗取奖励的行为。 ",
-		"3、轻松消消乐有权根据产品运营逻辑及采购的第三方反作弊机制判定用户是否构成作弊或其他违反产品规则及用户协议的行为。如轻松消消乐判定用户构成作弊或存在作弊的可能,轻松消消乐有权取消用户奖励不予发放、清空数据或封号等处罚,且有权追究其法律责任。 ",
-		"4、如用户对轻松消消乐作弊行为判定及处罚等行为存有异议,应及时通过在线客服或发送邮件方式向轻松消消乐申诉并提交充足证据证明其符合活动规则且不存在作弊或其他违反规则或用户协议的行为。最终用户是否构成作弊应以轻松消消乐认定为准。 ",
+		"(5)其他违背用户真实体验轻松连连消的目的而骗取奖励的行为。 ",
+		"3、轻松连连消有权根据产品运营逻辑及采购的第三方反作弊机制判定用户是否构成作弊或其他违反产品规则及用户协议的行为。如轻松连连消判定用户构成作弊或存在作弊的可能,轻松连连消有权取消用户奖励不予发放、清空数据或封号等处罚,且有权追究其法律责任。 ",
+		"4、如用户对轻松连连消作弊行为判定及处罚等行为存有异议,应及时通过在线客服或发送邮件方式向轻松连连消申诉并提交充足证据证明其符合活动规则且不存在作弊或其他违反规则或用户协议的行为。最终用户是否构成作弊应以轻松连连消认定为准。 ",
 		"5、如用户发现软件存在漏洞,有义务向车神驾临及时通报,我们将视情况予以奖励。 ",
 		"",
 		"                开发者公司: 苏州白羊座信息科技有限公司"

Diff do ficheiro suprimidas por serem muito extensas
+ 166 - 186
assets/resources/game/prefab/game.prefab


Diff do ficheiro suprimidas por serem muito extensas
+ 246 - 126
assets/resources/game/prefab/gameplay.prefab


+ 5 - 5
assets/resources/game/prefab/uiPanel/GetPropUI.prefab

@@ -829,8 +829,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        -501.714,
+        280,
+        205,
         0,
         0,
         0,
@@ -1030,7 +1030,7 @@
         1,
         1,
         1,
-        1
+        0
       ]
     },
     "_eulerAngles": {
@@ -1404,8 +1404,8 @@
     "clickEvents": [],
     "_N$interactable": true,
     "_N$enableAutoGrayEffect": false,
-    "_N$transition": 0,
-    "transition": 0,
+    "_N$transition": 3,
+    "transition": 3,
     "_N$normalColor": {
       "__type__": "cc.Color",
       "r": 255,

+ 26 - 12
assets/resources/module/agreementTip/agreementTip.prefab

@@ -24,17 +24,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 52
-      },
-      {
         "__id__": 53
       },
       {
         "__id__": 54
+      },
+      {
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 55
+      "__id__": 56
     },
     "_opacity": 255,
     "_color": {
@@ -116,11 +116,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 52
     },
     "_opacity": 255,
     "_color": {
@@ -533,8 +533,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "欢迎使用豪车大富翁,豪车大富翁非常重视您的隐私和个人信息保护。在您使用豪车大富翁之前,请认真阅读",
-    "_N$string": "欢迎使用豪车大富翁,豪车大富翁非常重视您的隐私和个人信息保护。在您使用豪车大富翁之前,请认真阅读",
+    "_string": "欢迎使用本软件,本软件非常重视您的隐私和个人信息保护。在您使用本软件之前,请认真阅读",
+    "_N$string": "欢迎使用本软件,本软件非常重视您的隐私和个人信息保护。在您使用本软件之前,请认真阅读",
     "_fontSize": 32,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -1144,8 +1144,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "您同意并接受全部条款后方可开始使用豪车大富翁。",
-    "_N$string": "您同意并接受全部条款后方可开始使用豪车大富翁。",
+    "_string": "您同意并接受全部条款后方可开始使用本软件。",
+    "_N$string": "您同意并接受全部条款后方可开始使用本软件。",
     "_fontSize": 32,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -1602,7 +1602,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 50
     },
     "_opacity": 255,
     "_color": {
@@ -1770,10 +1770,24 @@
     "panel_name": "game/prefab/game",
     "open_type": 0,
     "transition_type": 3,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 49
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "27e8eZbIM9ApIU8LRLiALwU",
+    "handler": "clickClose",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

Diff do ficheiro suprimidas por serem muito extensas
+ 165 - 151
assets/resources/module/blessingBag/blessingBag.prefab


+ 542 - 84
assets/resources/module/guide/guide.prefab

@@ -21,29 +21,26 @@
         "__id__": 2
       },
       {
-        "__id__": 11
+        "__id__": 9
       },
       {
         "__id__": 14
       },
       {
         "__id__": 17
-      },
-      {
-        "__id__": 20
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 23
+        "__id__": 35
       },
       {
-        "__id__": 24
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 37
     },
     "_opacity": 255,
     "_color": {
@@ -107,11 +104,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 9
+        "__id__": 7
       }
     ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 8
     },
     "_opacity": 255,
     "_color": {
@@ -175,13 +172,10 @@
       },
       {
         "__id__": 5
-      },
-      {
-        "__id__": 6
       }
     ],
     "_prefab": {
-      "__id__": 8
+      "__id__": 6
     },
     "_opacity": 120,
     "_color": {
@@ -292,11 +286,152 @@
     "_id": ""
   },
   {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
+    },
+    "fileId": "46PGyVrkVNE4PKNVed+BPO",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Mask",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_spriteFrame": null,
+    "_type": 0,
+    "_segments": 64,
+    "_N$alphaThreshold": 0.1,
+    "_N$inverted": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
+    },
+    "fileId": "af2wWWnb1LsrA0wok8WpNl",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "点击区域",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_opacity": 0,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 247,
+      "g": 193,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 200,
+      "height": 200
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -69.034,
+        137.01,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 9
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
     "__type__": "cc.Button",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 3
+      "__id__": 9
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -305,7 +440,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 7
+        "__id__": 12
       }
     ],
     "_N$interactable": true,
@@ -361,7 +496,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 3
+      "__id__": 1
     },
     "_id": ""
   },
@@ -372,7 +507,7 @@
     },
     "component": "",
     "_componentId": "cc77atmGeBM4bPWFiQFl7H6",
-    "handler": "clickBg",
+    "handler": "clickNodeClick",
     "customEventData": ""
   },
   {
@@ -383,15 +518,79 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "46PGyVrkVNE4PKNVed+BPO",
+    "fileId": "60Q2zcsidNuakhBvwjcngt",
     "sync": false
   },
   {
-    "__type__": "cc.Mask",
+    "__type__": "cc.Node",
+    "_name": "hand",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 15
+      }
+    ],
+    "_prefab": {
+      "__id__": 16
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 94,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__id__": 14
     },
     "_enabled": true,
     "_materials": [
@@ -399,11 +598,23 @@
         "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
       }
     ],
-    "_spriteFrame": null,
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "e374d43a-3f16-493f-a5c9-af57ec3d09cb"
+    },
     "_type": 0,
-    "_segments": 64,
-    "_N$alphaThreshold": 0.1,
-    "_N$inverted": true,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
     "_id": ""
   },
   {
@@ -414,25 +625,38 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "af2wWWnb1LsrA0wok8WpNl",
+    "fileId": "14BeehV6RGZ63hNNH505Ak",
     "sync": false
   },
   {
     "__type__": "cc.Node",
-    "_name": "block",
+    "_name": "描述",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
     },
-    "_children": [],
-    "_active": false,
+    "_children": [
+      {
+        "__id__": 18
+      },
+      {
+        "__id__": 21
+      },
+      {
+        "__id__": 24
+      },
+      {
+        "__id__": 27
+      }
+    ],
+    "_active": true,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 13
+      "__id__": 34
     },
     "_opacity": 255,
     "_color": {
@@ -445,7 +669,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 1334
+      "height": 180
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -457,7 +681,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        -541,
         0,
         0,
         0,
@@ -482,42 +706,21 @@
     "_id": ""
   },
   {
-    "__type__": "cc.BlockInputEvents",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 11
-    },
-    "_enabled": true,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
-    },
-    "fileId": "f7UFOYdFFDHpdFu3DllFXp",
-    "sync": false
-  },
-  {
     "__type__": "cc.Node",
-    "_name": "hand",
+    "_name": "bg",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 17
     },
     "_children": [],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
-        "__id__": 15
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 20
     },
     "_opacity": 255,
     "_color": {
@@ -529,8 +732,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 94,
-      "height": 100
+      "width": 718,
+      "height": 176
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -571,7 +774,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 18
     },
     "_enabled": true,
     "_materials": [
@@ -582,7 +785,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "e374d43a-3f16-493f-a5c9-af57ec3d09cb"
+      "__uuid__": "83b7eeb0-b60b-4e20-82d4-42a63882d451"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -606,7 +809,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "14BeehV6RGZ63hNNH505Ak",
+    "fileId": "f4RgKyMztI74KS85gXMxFG",
     "sync": false
   },
   {
@@ -614,17 +817,17 @@
     "_name": "panda",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 17
     },
     "_children": [],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
-        "__id__": 18
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 19
+      "__id__": 23
     },
     "_opacity": 255,
     "_color": {
@@ -648,8 +851,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        248.359,
+        50,
         0,
         0,
         0,
@@ -678,7 +881,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 17
+      "__id__": 21
     },
     "_enabled": true,
     "_materials": [
@@ -713,7 +916,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "3cRKT5DgZB8pBFgouS+/15",
+    "fileId": "36vBBjdHRDnbPFi6zydrK7",
     "sync": false
   },
   {
@@ -721,17 +924,17 @@
     "_name": "head",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 17
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 26
     },
     "_opacity": 255,
     "_color": {
@@ -755,8 +958,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        289.752,
+        269.056,
         0,
         0,
         0,
@@ -785,7 +988,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 20
+      "__id__": 24
     },
     "_enabled": true,
     "_materials": [
@@ -820,7 +1023,260 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "d2aUUUlOJOUKUrYxLZQ314",
+    "fileId": "9dNDd0PytJdpl2jR0QvaxY",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "文本",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 17
+    },
+    "_children": [
+      {
+        "__id__": 28
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 31
+      }
+    ],
+    "_prefab": {
+      "__id__": 32
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 400,
+      "height": 63
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -100,
+        -10,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrivateNode",
+    "_name": "RICHTEXT_CHILD",
+    "_objFlags": 1024,
+    "_parent": {
+      "__id__": 27
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 29
+      }
+    ],
+    "_prefab": {
+      "__id__": 30
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 255,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 342.81,
+      "height": 63
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -200,
+        -31.5,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "showInEditor": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 28
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "点击2个或者更多来",
+    "_N$string": "点击2个或者更多来",
+    "_fontSize": 40,
+    "_lineHeight": 50,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_isSystemFontUsed": false,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
+    },
+    "fileId": "f9mlOp3ChKlY+khHxIF6IF",
+    "sync": false
+  },
+  {
+    "__type__": "cc.RichText",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 27
+    },
+    "_enabled": true,
+    "_fontFamily": "Arial",
+    "_isSystemFontUsed": false,
+    "_N$string": "<color=#00ff00>点击2个或者更多来</color>",
+    "_N$horizontalAlign": 0,
+    "_N$fontSize": 40,
+    "_N$font": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_N$cacheMode": 0,
+    "_N$maxWidth": 400,
+    "_N$lineHeight": 50,
+    "_N$imageAtlas": null,
+    "_N$handleTouchEvent": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
+    },
+    "fileId": "809f6J/xJK4q9BbJwTkArE",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 17
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": {
+      "__id__": 1
+    },
+    "_alignFlags": 4,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 36,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
+    },
+    "fileId": "b0tx8+nQpDRYgh40cIHHL+",
     "sync": false
   },
   {
@@ -834,21 +1290,23 @@
     "node_display": {
       "__id__": 2
     },
-    "node_click": null,
+    "node_click": {
+      "__id__": 9
+    },
     "node_bg": {
       "__id__": 3
     },
-    "node_block": {
-      "__id__": 11
-    },
     "node_finger": {
       "__id__": 15
     },
     "node_head": {
-      "__id__": 15
+      "__id__": 25
     },
     "node_person": {
-      "__id__": 18
+      "__id__": 22
+    },
+    "rich_dialog": {
+      "__id__": 31
     },
     "_id": ""
   },

+ 21 - 7
assets/resources/module/help/help.prefab

@@ -24,9 +24,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 18
-      },
-      {
         "__id__": 19
       },
       {
@@ -34,10 +31,13 @@
       },
       {
         "__id__": 21
+      },
+      {
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 23
     },
     "_opacity": 255,
     "_color": {
@@ -110,7 +110,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 17
+      "__id__": 18
     },
     "_opacity": 255,
     "_color": {
@@ -502,7 +502,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 17
     },
     "_opacity": 255,
     "_color": {
@@ -622,10 +622,24 @@
       "__id__": 1
     },
     "transition_type": 3,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 16
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "7626bHemEpG267E801XmW+W",
+    "handler": "onClickClose",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

+ 2 - 2
assets/resources/module/login/login.prefab

@@ -278,7 +278,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        412,
+        362,
         0,
         0,
         0,
@@ -349,7 +349,7 @@
     "_alignFlags": 1,
     "_left": 0,
     "_right": 0,
-    "_top": 100,
+    "_top": 150,
     "_bottom": 0,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,

+ 86 - 72
assets/resources/module/moreGame/moreGame.prefab

@@ -27,14 +27,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 54
       },
       {
-        "__id__": 54
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 55
+      "__id__": 56
     },
     "_opacity": 255,
     "_color": {
@@ -215,20 +215,20 @@
         "__id__": 7
       },
       {
-        "__id__": 18
+        "__id__": 19
       },
       {
-        "__id__": 43
+        "__id__": 44
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 51
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 53
     },
     "_opacity": 255,
     "_color": {
@@ -289,20 +289,20 @@
         "__id__": 8
       },
       {
-        "__id__": 12
+        "__id__": 13
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 15
+        "__id__": 16
       },
       {
-        "__id__": 16
+        "__id__": 17
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 18
     },
     "_opacity": 255,
     "_color": {
@@ -369,7 +369,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 12
     },
     "_opacity": 255,
     "_color": {
@@ -462,10 +462,24 @@
       "__id__": 1
     },
     "transition_type": 0,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 11
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "a6705qKu8tPpoRd4ECt6v+E",
+    "handler": "onClickClose",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -487,11 +501,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 14
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 15
     },
     "_opacity": 255,
     "_color": {
@@ -545,7 +559,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 12
+      "__id__": 13
     },
     "_enabled": true,
     "_materials": [
@@ -662,20 +676,20 @@
     },
     "_children": [
       {
-        "__id__": 19
+        "__id__": 20
       },
       {
-        "__id__": 28
+        "__id__": 29
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 41
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 42
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -729,24 +743,24 @@
     "_name": "moreGame_bg_item",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 19
     },
     "_children": [
       {
-        "__id__": 20
+        "__id__": 21
       },
       {
-        "__id__": 23
+        "__id__": 24
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 26
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 27
+      "__id__": 28
     },
     "_opacity": 255,
     "_color": {
@@ -800,17 +814,17 @@
     "_name": "moreGame_icon_begin",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 19
+      "__id__": 20
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 23
     },
     "_opacity": 255,
     "_color": {
@@ -864,7 +878,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 20
+      "__id__": 21
     },
     "_enabled": true,
     "_materials": [
@@ -907,17 +921,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 19
+      "__id__": 20
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 24
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 26
     },
     "_opacity": 255,
     "_color": {
@@ -971,7 +985,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 23
+      "__id__": 24
     },
     "_enabled": true,
     "_materials": [
@@ -1015,7 +1029,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 20
     },
     "_enabled": true,
     "_materials": [
@@ -1058,27 +1072,27 @@
     "_name": "New ScrollView",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 19
     },
     "_children": [
       {
-        "__id__": 29
+        "__id__": 30
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 37
-      },
-      {
         "__id__": 38
       },
       {
         "__id__": 39
+      },
+      {
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 41
     },
     "_opacity": 255,
     "_color": {
@@ -1132,24 +1146,24 @@
     "_name": "view",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 28
+      "__id__": 29
     },
     "_children": [
       {
-        "__id__": 30
+        "__id__": 31
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 35
       },
       {
-        "__id__": 35
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 37
     },
     "_opacity": 255,
     "_color": {
@@ -1203,20 +1217,20 @@
     "_name": "content",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 29
+      "__id__": 30
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 32
       },
       {
-        "__id__": 32
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 34
     },
     "_opacity": 255,
     "_color": {
@@ -1270,7 +1284,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 31
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1297,7 +1311,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 31
     },
     "_enabled": true,
     "_layoutSize": {
@@ -1340,7 +1354,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 30
     },
     "_enabled": true,
     "_materials": [
@@ -1360,7 +1374,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 30
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1398,7 +1412,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 29
     },
     "_enabled": true,
     "horizontal": false,
@@ -1410,10 +1424,10 @@
     "scrollEvents": [],
     "cancelInnerEvents": false,
     "_N$content": {
-      "__id__": 30
+      "__id__": 31
     },
     "content": {
-      "__id__": 30
+      "__id__": 31
     },
     "_N$horizontalScrollBar": null,
     "_N$verticalScrollBar": null,
@@ -1424,7 +1438,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 29
     },
     "_enabled": true,
     "pre_item": [
@@ -1447,7 +1461,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 29
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1485,7 +1499,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 19
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1527,20 +1541,20 @@
     },
     "_children": [
       {
-        "__id__": 44
+        "__id__": 45
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 49
       },
       {
-        "__id__": 49
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 50
+      "__id__": 51
     },
     "_opacity": 255,
     "_color": {
@@ -1594,20 +1608,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 43
+      "__id__": 44
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 46
       },
       {
-        "__id__": 46
+        "__id__": 47
       }
     ],
     "_prefab": {
-      "__id__": 47
+      "__id__": 48
     },
     "_opacity": 255,
     "_color": {
@@ -1661,7 +1675,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 44
+      "__id__": 45
     },
     "_enabled": true,
     "_materials": [
@@ -1694,7 +1708,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 44
+      "__id__": 45
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1732,7 +1746,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 43
+      "__id__": 44
     },
     "_enabled": true,
     "_materials": [
@@ -1764,7 +1778,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 43
+      "__id__": 44
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1854,7 +1868,7 @@
     },
     "_enabled": true,
     "node_sv": {
-      "__id__": 28
+      "__id__": 29
     },
     "moreGameNormalNode": {
       "__uuid__": "0acc5eb1-6666-4231-8d4e-796b2a1c57e9"

+ 20 - 6
assets/resources/module/pigBank/pigBank.prefab

@@ -27,9 +27,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 63
-      },
-      {
         "__id__": 64
       },
       {
@@ -37,10 +34,13 @@
       },
       {
         "__id__": 66
+      },
+      {
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 67
+      "__id__": 68
     },
     "_opacity": 255,
     "_color": {
@@ -2053,7 +2053,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 63
     },
     "_opacity": 255,
     "_color": {
@@ -2221,10 +2221,24 @@
       "__id__": 1
     },
     "transition_type": 3,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 62
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "b7b79eT6/VPr5yd7mCH4hR7",
+    "handler": "onClickClose",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

+ 4 - 4
assets/resources/module/redBagCash/redBagCash.prefab

@@ -1406,7 +1406,7 @@
       "ctor": "Float64Array",
       "array": [
         285,
-        356,
+        364,
         0,
         0,
         0,
@@ -1533,7 +1533,7 @@
       "ctor": "Float64Array",
       "array": [
         285,
-        319.232,
+        320,
         0,
         0,
         0,
@@ -1712,8 +1712,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 53,
-      "height": 49
+      "width": 88,
+      "height": 88
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 207 - 7
assets/resources/module/redBagCode/redBagCode.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 29
+        "__id__": 34
       },
       {
-        "__id__": 30
+        "__id__": 35
       },
       {
-        "__id__": 31
+        "__id__": 36
       },
       {
-        "__id__": 32
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 38
     },
     "_opacity": 255,
     "_color": {
@@ -108,16 +108,19 @@
       },
       {
         "__id__": 24
+      },
+      {
+        "__id__": 27
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 27
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 28
+      "__id__": 33
     },
     "_opacity": 255,
     "_color": {
@@ -989,6 +992,200 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "视频按钮",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 28
+      },
+      {
+        "__id__": 29
+      }
+    ],
+    "_prefab": {
+      "__id__": 31
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 206,
+      "height": 115
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -219,
+        -285.929,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        0
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 27
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "e8f358fc-75b7-4bc5-a106-c623cadfc9ed"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 27
+    },
+    "_enabled": true,
+    "_normalMaterial": {
+      "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+    },
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 30
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "f7616rh8MtO1ZZziaU2Xf1w",
+    "handler": "clickTeach",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "157bf3d2-0395-4138-a922-782117d5c979"
+    },
+    "fileId": "67sJgI3fdJvZzQ7ZfOcxJ2",
+    "sync": false
+  },
+  {
     "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
@@ -1040,6 +1237,9 @@
     "lbl_none": {
       "__id__": 25
     },
+    "videoPre": {
+      "__uuid__": "33e934e4-3ffd-4bc1-bd4d-58a9b515f7f5"
+    },
     "_id": ""
   },
   {

BIN
assets/resources/module/redBagCode/texture/jiaocheng.png


+ 36 - 0
assets/resources/module/redBagCode/texture/jiaocheng.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "6bf3a36e-1a91-4890-a98e-0545d9301823",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 206,
+  "height": 115,
+  "platformSettings": {},
+  "subMetas": {
+    "jiaocheng": {
+      "ver": "1.0.4",
+      "uuid": "e8f358fc-75b7-4bc5-a106-c623cadfc9ed",
+      "rawTextureUuid": "6bf3a36e-1a91-4890-a98e-0545d9301823",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 206,
+      "height": 115,
+      "rawWidth": 206,
+      "rawHeight": 115,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

Diff do ficheiro suprimidas por serem muito extensas
+ 296 - 121
assets/resources/module/redCode/redCode.prefab


+ 328 - 85
assets/resources/module/reward/reward.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 116
+        "__id__": 122
       },
       {
-        "__id__": 117
+        "__id__": 123
       },
       {
-        "__id__": 118
+        "__id__": 124
       },
       {
-        "__id__": 119
+        "__id__": 125
       }
     ],
     "_prefab": {
-      "__id__": 120
+      "__id__": 126
     },
     "_opacity": 255,
     "_color": {
@@ -101,17 +101,20 @@
         "__id__": 35
       },
       {
-        "__id__": 97
+        "__id__": 100
+      },
+      {
+        "__id__": 117
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 114
+        "__id__": 120
       }
     ],
     "_prefab": {
-      "__id__": 115
+      "__id__": 121
     },
     "_opacity": 255,
     "_color": {
@@ -1335,20 +1338,23 @@
         "__id__": 64
       },
       {
-        "__id__": 72
+        "__id__": 67
       },
       {
-        "__id__": 88
+        "__id__": 75
+      },
+      {
+        "__id__": 91
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 95
+        "__id__": 98
       }
     ],
     "_prefab": {
-      "__id__": 96
+      "__id__": 99
     },
     "_opacity": 255,
     "_color": {
@@ -2350,6 +2356,123 @@
   },
   {
     "__type__": "cc.Node",
+    "_name": "hb_star",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 35
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 65
+      }
+    ],
+    "_prefab": {
+      "__id__": 66
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 527.04,
+      "height": 450.45
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "sp.Skeleton",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 64
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
+      }
+    ],
+    "paused": false,
+    "defaultSkin": "default",
+    "defaultAnimation": "animation",
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "loop": false,
+    "premultipliedAlpha": true,
+    "timeScale": 1,
+    "_accTime": 0,
+    "_playCount": 0,
+    "_frameCache": null,
+    "_curFrame": null,
+    "_skeletonCache": null,
+    "_animationName": "animation",
+    "_animationQueue": [],
+    "_headAniInfo": null,
+    "_playTimes": 0,
+    "_isAniComplete": true,
+    "_N$skeletonData": {
+      "__uuid__": "4ff19fc9-047e-44b1-aac9-98904d537eb9"
+    },
+    "_N$_defaultCacheMode": 0,
+    "_N$debugSlots": false,
+    "_N$debugBones": false,
+    "_N$debugMesh": false,
+    "_N$useTint": false,
+    "_N$enableBatch": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "14193c60-068a-42b4-92cf-a6cb623fe40f"
+    },
+    "fileId": "82zX+QnGFOmoRA7XVQZGGG",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
     "_name": "幸运红包封面",
     "_objFlags": 0,
     "_parent": {
@@ -2357,16 +2480,16 @@
     },
     "_children": [
       {
-        "__id__": 65
+        "__id__": 68
       },
       {
-        "__id__": 68
+        "__id__": 71
       }
     ],
     "_active": false,
     "_components": [],
     "_prefab": {
-      "__id__": 71
+      "__id__": 74
     },
     "_opacity": 255,
     "_color": {
@@ -2420,17 +2543,17 @@
     "_name": "熊猫动画",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 64
+      "__id__": 67
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 66
+        "__id__": 69
       }
     ],
     "_prefab": {
-      "__id__": 67
+      "__id__": 70
     },
     "_opacity": 255,
     "_color": {
@@ -2484,7 +2607,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 65
+      "__id__": 68
     },
     "_enabled": true,
     "_materials": [
@@ -2537,17 +2660,17 @@
     "_name": "幸运盖子",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 64
+      "__id__": 67
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 69
+        "__id__": 72
       }
     ],
     "_prefab": {
-      "__id__": 70
+      "__id__": 73
     },
     "_opacity": 255,
     "_color": {
@@ -2601,7 +2724,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 68
+      "__id__": 71
     },
     "_enabled": true,
     "_materials": [
@@ -2659,22 +2782,22 @@
     },
     "_children": [
       {
-        "__id__": 73
-      },
-      {
         "__id__": 76
       },
       {
         "__id__": 79
       },
       {
-        "__id__": 83
+        "__id__": 82
+      },
+      {
+        "__id__": 86
       }
     ],
     "_active": false,
     "_components": [],
     "_prefab": {
-      "__id__": 87
+      "__id__": 90
     },
     "_opacity": 255,
     "_color": {
@@ -2728,17 +2851,17 @@
     "_name": "熊猫动画",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 72
+      "__id__": 75
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 74
+        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 75
+      "__id__": 78
     },
     "_opacity": 255,
     "_color": {
@@ -2792,7 +2915,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 73
+      "__id__": 76
     },
     "_enabled": true,
     "_materials": [
@@ -2845,17 +2968,17 @@
     "_name": "通关盖子",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 72
+      "__id__": 75
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 77
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 78
+      "__id__": 81
     },
     "_opacity": 255,
     "_color": {
@@ -2909,7 +3032,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 76
+      "__id__": 79
     },
     "_enabled": true,
     "_materials": [
@@ -2952,20 +3075,20 @@
     "_name": "按钮_下一关",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 72
+      "__id__": 75
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 80
+        "__id__": 83
       },
       {
-        "__id__": 81
+        "__id__": 84
       }
     ],
     "_prefab": {
-      "__id__": 82
+      "__id__": 85
     },
     "_opacity": 255,
     "_color": {
@@ -3019,7 +3142,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 79
+      "__id__": 82
     },
     "_enabled": true,
     "_materials": [
@@ -3051,7 +3174,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 79
+      "__id__": 82
     },
     "_enabled": true,
     "node_panel": {
@@ -3077,20 +3200,20 @@
     "_name": "按钮_返回主页",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 72
+      "__id__": 75
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 84
+        "__id__": 87
       },
       {
-        "__id__": 85
+        "__id__": 88
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 89
     },
     "_opacity": 255,
     "_color": {
@@ -3144,7 +3267,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 83
+      "__id__": 86
     },
     "_enabled": true,
     "_materials": [
@@ -3176,7 +3299,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 83
+      "__id__": 86
     },
     "_enabled": true,
     "node_panel": {
@@ -3217,17 +3340,17 @@
     },
     "_children": [
       {
-        "__id__": 89
+        "__id__": 92
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 92
+        "__id__": 95
       }
     ],
     "_prefab": {
-      "__id__": 94
+      "__id__": 97
     },
     "_opacity": 255,
     "_color": {
@@ -3281,17 +3404,17 @@
     "_name": "动画",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 88
+      "__id__": 91
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 90
+        "__id__": 93
       }
     ],
     "_prefab": {
-      "__id__": 91
+      "__id__": 94
     },
     "_opacity": 255,
     "_color": {
@@ -3345,7 +3468,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 89
+      "__id__": 92
     },
     "_enabled": true,
     "_materials": [
@@ -3398,7 +3521,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 88
+      "__id__": 91
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -3407,7 +3530,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 93
+        "__id__": 96
       }
     ],
     "_N$interactable": true,
@@ -3525,9 +3648,6 @@
     },
     "_children": [
       {
-        "__id__": 98
-      },
-      {
         "__id__": 101
       },
       {
@@ -3538,12 +3658,15 @@
       },
       {
         "__id__": 110
+      },
+      {
+        "__id__": 113
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 113
+      "__id__": 116
     },
     "_opacity": 255,
     "_color": {
@@ -3597,17 +3720,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 97
+      "__id__": 100
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 99
+        "__id__": 102
       }
     ],
     "_prefab": {
-      "__id__": 100
+      "__id__": 103
     },
     "_opacity": 255,
     "_color": {
@@ -3661,7 +3784,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 98
+      "__id__": 101
     },
     "_enabled": true,
     "_materials": [
@@ -3704,17 +3827,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 97
+      "__id__": 100
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 102
+        "__id__": 105
       }
     ],
     "_prefab": {
-      "__id__": 103
+      "__id__": 106
     },
     "_opacity": 255,
     "_color": {
@@ -3768,7 +3891,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 101
+      "__id__": 104
     },
     "_enabled": true,
     "_materials": [
@@ -3811,17 +3934,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 97
+      "__id__": 100
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 105
+        "__id__": 108
       }
     ],
     "_prefab": {
-      "__id__": 106
+      "__id__": 109
     },
     "_opacity": 255,
     "_color": {
@@ -3875,7 +3998,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 104
+      "__id__": 107
     },
     "_enabled": true,
     "_materials": [
@@ -3918,17 +4041,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 97
+      "__id__": 100
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 108
+        "__id__": 111
       }
     ],
     "_prefab": {
-      "__id__": 109
+      "__id__": 112
     },
     "_opacity": 255,
     "_color": {
@@ -3982,7 +4105,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 107
+      "__id__": 110
     },
     "_enabled": true,
     "_materials": [
@@ -4025,17 +4148,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 97
+      "__id__": 100
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 111
+        "__id__": 114
       }
     ],
     "_prefab": {
-      "__id__": 112
+      "__id__": 115
     },
     "_opacity": 255,
     "_color": {
@@ -4089,7 +4212,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 110
+      "__id__": 113
     },
     "_enabled": true,
     "_materials": [
@@ -4139,6 +4262,123 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "hb_star",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 118
+      }
+    ],
+    "_prefab": {
+      "__id__": 119
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 527.04,
+      "height": 450.45
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -75.987,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "sp.Skeleton",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 117
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
+      }
+    ],
+    "paused": false,
+    "defaultSkin": "default",
+    "defaultAnimation": "animation",
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "loop": true,
+    "premultipliedAlpha": true,
+    "timeScale": 1,
+    "_accTime": 0,
+    "_playCount": 0,
+    "_frameCache": null,
+    "_curFrame": null,
+    "_skeletonCache": null,
+    "_animationName": "animation",
+    "_animationQueue": [],
+    "_headAniInfo": null,
+    "_playTimes": 0,
+    "_isAniComplete": true,
+    "_N$skeletonData": {
+      "__uuid__": "4ff19fc9-047e-44b1-aac9-98904d537eb9"
+    },
+    "_N$_defaultCacheMode": 0,
+    "_N$debugSlots": false,
+    "_N$debugBones": false,
+    "_N$debugMesh": false,
+    "_N$useTint": false,
+    "_N$enableBatch": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "14193c60-068a-42b4-92cf-a6cb623fe40f"
+    },
+    "fileId": "b3dkmVZh9PS75QyQ5zVqZh",
+    "sync": false
+  },
+  {
     "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
@@ -4213,16 +4453,16 @@
     "_enabled": true,
     "lid_type": 0,
     "node_luck": {
-      "__id__": 64
+      "__id__": 67
     },
     "node_mission": {
-      "__id__": 72
+      "__id__": 75
     },
     "anim_open_redbag": {
-      "__id__": 95
+      "__id__": 98
     },
     "btn_watch_video": {
-      "__id__": 92
+      "__id__": 95
     },
     "node_coin": {
       "__id__": 44
@@ -4230,6 +4470,9 @@
     "lbl_reward_value": {
       "__id__": 47
     },
+    "hb_star": {
+      "__id__": 64
+    },
     "spr_cash_out": {
       "__id__": 20
     },

+ 232 - 95
assets/resources/module/reward/rewardLuck.prefab

@@ -21,26 +21,26 @@
         "__id__": 2
       },
       {
-        "__id__": 116
+        "__id__": 119
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 121
+        "__id__": 125
       },
       {
-        "__id__": 122
+        "__id__": 126
       },
       {
-        "__id__": 123
+        "__id__": 127
       },
       {
-        "__id__": 124
+        "__id__": 128
       }
     ],
     "_prefab": {
-      "__id__": 125
+      "__id__": 129
     },
     "_opacity": 255,
     "_color": {
@@ -104,17 +104,17 @@
         "__id__": 35
       },
       {
-        "__id__": 97
+        "__id__": 100
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 114
+        "__id__": 117
       }
     ],
     "_prefab": {
-      "__id__": 115
+      "__id__": 118
     },
     "_opacity": 255,
     "_color": {
@@ -1338,20 +1338,23 @@
         "__id__": 64
       },
       {
-        "__id__": 72
+        "__id__": 67
       },
       {
-        "__id__": 79
+        "__id__": 75
+      },
+      {
+        "__id__": 82
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 95
+        "__id__": 98
       }
     ],
     "_prefab": {
-      "__id__": 96
+      "__id__": 99
     },
     "_opacity": 255,
     "_color": {
@@ -2353,6 +2356,123 @@
   },
   {
     "__type__": "cc.Node",
+    "_name": "hb_star",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 35
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 65
+      }
+    ],
+    "_prefab": {
+      "__id__": 66
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 527.04,
+      "height": 450.45
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "sp.Skeleton",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 64
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
+      }
+    ],
+    "paused": false,
+    "defaultSkin": "default",
+    "defaultAnimation": "animation",
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "loop": false,
+    "premultipliedAlpha": true,
+    "timeScale": 1,
+    "_accTime": 0,
+    "_playCount": 0,
+    "_frameCache": null,
+    "_curFrame": null,
+    "_skeletonCache": null,
+    "_animationName": "animation",
+    "_animationQueue": [],
+    "_headAniInfo": null,
+    "_playTimes": 1,
+    "_isAniComplete": true,
+    "_N$skeletonData": {
+      "__uuid__": "4ff19fc9-047e-44b1-aac9-98904d537eb9"
+    },
+    "_N$_defaultCacheMode": 0,
+    "_N$debugSlots": false,
+    "_N$debugBones": false,
+    "_N$debugMesh": false,
+    "_N$useTint": false,
+    "_N$enableBatch": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "eb3877a0-0566-4cd8-bb4e-fe5969e6f0e2"
+    },
+    "fileId": "c6aRTtlwNPzIXwh3KOjCt7",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
     "_name": "幸运红包封面",
     "_objFlags": 0,
     "_parent": {
@@ -2360,16 +2480,16 @@
     },
     "_children": [
       {
-        "__id__": 65
+        "__id__": 68
       },
       {
-        "__id__": 68
+        "__id__": 71
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 71
+      "__id__": 74
     },
     "_opacity": 255,
     "_color": {
@@ -2423,17 +2543,17 @@
     "_name": "熊猫动画",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 64
+      "__id__": 67
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 66
+        "__id__": 69
       }
     ],
     "_prefab": {
-      "__id__": 67
+      "__id__": 70
     },
     "_opacity": 255,
     "_color": {
@@ -2487,7 +2607,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 65
+      "__id__": 68
     },
     "_enabled": true,
     "_materials": [
@@ -2540,17 +2660,17 @@
     "_name": "幸运盖子",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 64
+      "__id__": 67
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 69
+        "__id__": 72
       }
     ],
     "_prefab": {
-      "__id__": 70
+      "__id__": 73
     },
     "_opacity": 255,
     "_color": {
@@ -2604,7 +2724,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 68
+      "__id__": 71
     },
     "_enabled": true,
     "_materials": [
@@ -2662,17 +2782,17 @@
     },
     "_children": [
       {
-        "__id__": 73
+        "__id__": 76
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 76
+        "__id__": 79
       }
     ],
     "_prefab": {
-      "__id__": 78
+      "__id__": 81
     },
     "_opacity": 255,
     "_color": {
@@ -2726,17 +2846,17 @@
     "_name": "动画",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 72
+      "__id__": 75
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 74
+        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 75
+      "__id__": 78
     },
     "_opacity": 255,
     "_color": {
@@ -2790,7 +2910,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 73
+      "__id__": 76
     },
     "_enabled": true,
     "_materials": [
@@ -2843,7 +2963,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 72
+      "__id__": 75
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2852,7 +2972,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 77
+        "__id__": 80
       }
     ],
     "_N$interactable": true,
@@ -2940,22 +3060,22 @@
     },
     "_children": [
       {
-        "__id__": 80
-      },
-      {
         "__id__": 83
       },
       {
         "__id__": 86
       },
       {
-        "__id__": 90
+        "__id__": 89
+      },
+      {
+        "__id__": 93
       }
     ],
     "_active": false,
     "_components": [],
     "_prefab": {
-      "__id__": 94
+      "__id__": 97
     },
     "_opacity": 0,
     "_color": {
@@ -3009,17 +3129,17 @@
     "_name": "熊猫动画",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 79
+      "__id__": 82
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 81
+        "__id__": 84
       }
     ],
     "_prefab": {
-      "__id__": 82
+      "__id__": 85
     },
     "_opacity": 255,
     "_color": {
@@ -3073,7 +3193,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 80
+      "__id__": 83
     },
     "_enabled": true,
     "_materials": [
@@ -3126,17 +3246,17 @@
     "_name": "通关盖子",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 79
+      "__id__": 82
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 84
+        "__id__": 87
       }
     ],
     "_prefab": {
-      "__id__": 85
+      "__id__": 88
     },
     "_opacity": 255,
     "_color": {
@@ -3190,7 +3310,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 83
+      "__id__": 86
     },
     "_enabled": true,
     "_materials": [
@@ -3233,20 +3353,20 @@
     "_name": "按钮_下一关",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 79
+      "__id__": 82
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 87
+        "__id__": 90
       },
       {
-        "__id__": 88
+        "__id__": 91
       }
     ],
     "_prefab": {
-      "__id__": 89
+      "__id__": 92
     },
     "_opacity": 255,
     "_color": {
@@ -3300,7 +3420,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 86
+      "__id__": 89
     },
     "_enabled": true,
     "_materials": [
@@ -3332,7 +3452,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 86
+      "__id__": 89
     },
     "_enabled": true,
     "node_panel": {
@@ -3358,20 +3478,20 @@
     "_name": "按钮_返回主页",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 79
+      "__id__": 82
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 91
+        "__id__": 94
       },
       {
-        "__id__": 92
+        "__id__": 95
       }
     ],
     "_prefab": {
-      "__id__": 93
+      "__id__": 96
     },
     "_opacity": 255,
     "_color": {
@@ -3425,7 +3545,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 90
+      "__id__": 93
     },
     "_enabled": true,
     "_materials": [
@@ -3457,7 +3577,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 90
+      "__id__": 93
     },
     "_enabled": true,
     "node_panel": {
@@ -3528,9 +3648,6 @@
     },
     "_children": [
       {
-        "__id__": 98
-      },
-      {
         "__id__": 101
       },
       {
@@ -3541,12 +3658,15 @@
       },
       {
         "__id__": 110
+      },
+      {
+        "__id__": 113
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 113
+      "__id__": 116
     },
     "_opacity": 255,
     "_color": {
@@ -3600,17 +3720,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 97
+      "__id__": 100
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 99
+        "__id__": 102
       }
     ],
     "_prefab": {
-      "__id__": 100
+      "__id__": 103
     },
     "_opacity": 255,
     "_color": {
@@ -3664,7 +3784,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 98
+      "__id__": 101
     },
     "_enabled": true,
     "_materials": [
@@ -3707,17 +3827,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 97
+      "__id__": 100
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 102
+        "__id__": 105
       }
     ],
     "_prefab": {
-      "__id__": 103
+      "__id__": 106
     },
     "_opacity": 255,
     "_color": {
@@ -3771,7 +3891,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 101
+      "__id__": 104
     },
     "_enabled": true,
     "_materials": [
@@ -3814,17 +3934,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 97
+      "__id__": 100
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 105
+        "__id__": 108
       }
     ],
     "_prefab": {
-      "__id__": 106
+      "__id__": 109
     },
     "_opacity": 255,
     "_color": {
@@ -3878,7 +3998,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 104
+      "__id__": 107
     },
     "_enabled": true,
     "_materials": [
@@ -3921,17 +4041,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 97
+      "__id__": 100
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 108
+        "__id__": 111
       }
     ],
     "_prefab": {
-      "__id__": 109
+      "__id__": 112
     },
     "_opacity": 255,
     "_color": {
@@ -3985,7 +4105,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 107
+      "__id__": 110
     },
     "_enabled": true,
     "_materials": [
@@ -4028,17 +4148,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 97
+      "__id__": 100
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 111
+        "__id__": 114
       }
     ],
     "_prefab": {
-      "__id__": 112
+      "__id__": 115
     },
     "_opacity": 255,
     "_color": {
@@ -4092,7 +4212,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 110
+      "__id__": 113
     },
     "_enabled": true,
     "_materials": [
@@ -4190,17 +4310,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 117
+        "__id__": 120
       },
       {
-        "__id__": 118
+        "__id__": 121
       },
       {
-        "__id__": 119
+        "__id__": 123
       }
     ],
     "_prefab": {
-      "__id__": 120
+      "__id__": 124
     },
     "_opacity": 255,
     "_color": {
@@ -4254,7 +4374,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 116
+      "__id__": 119
     },
     "_enabled": true,
     "_materials": [
@@ -4286,22 +4406,36 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 116
+      "__id__": 119
     },
     "_enabled": true,
     "node_panel": {
       "__id__": 1
     },
     "transition_type": 3,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 122
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "43f3akkA71HA76UhTj/R19X",
+    "handler": "onClickClose",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.Animation",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 116
+      "__id__": 119
     },
     "_enabled": true,
     "_defaultClip": {
@@ -4363,16 +4497,16 @@
     "_enabled": true,
     "lid_type": 1,
     "node_luck": {
-      "__id__": 64
+      "__id__": 67
     },
     "node_mission": {
-      "__id__": 79
+      "__id__": 82
     },
     "anim_open_redbag": {
-      "__id__": 95
+      "__id__": 98
     },
     "btn_watch_video": {
-      "__id__": 76
+      "__id__": 79
     },
     "node_coin": {
       "__id__": 47
@@ -4380,6 +4514,9 @@
     "lbl_reward_value": {
       "__id__": 44
     },
+    "hb_star": {
+      "__id__": 64
+    },
     "spr_cash_out": {
       "__id__": 20
     },
@@ -4407,7 +4544,7 @@
       "a": 230
     },
     "design_block_node": {
-      "__id__": 68
+      "__id__": 71
     },
     "bClickClose": false,
     "_id": ""

+ 224 - 101
assets/resources/module/reward/rewardMission.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 126
+        "__id__": 129
       },
       {
-        "__id__": 127
+        "__id__": 130
       },
       {
-        "__id__": 128
+        "__id__": 131
       },
       {
-        "__id__": 129
+        "__id__": 132
       }
     ],
     "_prefab": {
-      "__id__": 130
+      "__id__": 133
     },
     "_opacity": 255,
     "_color": {
@@ -101,17 +101,17 @@
         "__id__": 35
       },
       {
-        "__id__": 107
+        "__id__": 110
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 124
+        "__id__": 127
       }
     ],
     "_prefab": {
-      "__id__": 125
+      "__id__": 128
     },
     "_opacity": 255,
     "_color": {
@@ -1335,20 +1335,23 @@
         "__id__": 64
       },
       {
-        "__id__": 72
+        "__id__": 67
       },
       {
-        "__id__": 98
+        "__id__": 75
+      },
+      {
+        "__id__": 101
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 105
+        "__id__": 108
       }
     ],
     "_prefab": {
-      "__id__": 106
+      "__id__": 109
     },
     "_opacity": 255,
     "_color": {
@@ -2350,6 +2353,123 @@
   },
   {
     "__type__": "cc.Node",
+    "_name": "hb_star",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 35
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 65
+      }
+    ],
+    "_prefab": {
+      "__id__": 66
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 527.04,
+      "height": 450.45
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "sp.Skeleton",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 64
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
+      }
+    ],
+    "paused": false,
+    "defaultSkin": "default",
+    "defaultAnimation": "animation",
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "loop": false,
+    "premultipliedAlpha": true,
+    "timeScale": 1,
+    "_accTime": 0,
+    "_playCount": 0,
+    "_frameCache": null,
+    "_curFrame": null,
+    "_skeletonCache": null,
+    "_animationName": "animation",
+    "_animationQueue": [],
+    "_headAniInfo": null,
+    "_playTimes": 0,
+    "_isAniComplete": true,
+    "_N$skeletonData": {
+      "__uuid__": "4ff19fc9-047e-44b1-aac9-98904d537eb9"
+    },
+    "_N$_defaultCacheMode": 0,
+    "_N$debugSlots": false,
+    "_N$debugBones": false,
+    "_N$debugMesh": false,
+    "_N$useTint": false,
+    "_N$enableBatch": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "1271c454-f06d-4155-9cf2-b2a644dc6b18"
+    },
+    "fileId": "e6P0yNDhVLXown3GHe8nEx",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
     "_name": "幸运红包封面",
     "_objFlags": 0,
     "_parent": {
@@ -2357,16 +2477,16 @@
     },
     "_children": [
       {
-        "__id__": 65
+        "__id__": 68
       },
       {
-        "__id__": 68
+        "__id__": 71
       }
     ],
     "_active": false,
     "_components": [],
     "_prefab": {
-      "__id__": 71
+      "__id__": 74
     },
     "_opacity": 255,
     "_color": {
@@ -2420,17 +2540,17 @@
     "_name": "熊猫动画",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 64
+      "__id__": 67
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 66
+        "__id__": 69
       }
     ],
     "_prefab": {
-      "__id__": 67
+      "__id__": 70
     },
     "_opacity": 255,
     "_color": {
@@ -2484,7 +2604,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 65
+      "__id__": 68
     },
     "_enabled": true,
     "_materials": [
@@ -2537,17 +2657,17 @@
     "_name": "幸运盖子",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 64
+      "__id__": 67
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 69
+        "__id__": 72
       }
     ],
     "_prefab": {
-      "__id__": 70
+      "__id__": 73
     },
     "_opacity": 255,
     "_color": {
@@ -2601,7 +2721,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 68
+      "__id__": 71
     },
     "_enabled": true,
     "_materials": [
@@ -2659,22 +2779,22 @@
     },
     "_children": [
       {
-        "__id__": 73
-      },
-      {
         "__id__": 76
       },
       {
         "__id__": 79
       },
       {
-        "__id__": 88
+        "__id__": 82
+      },
+      {
+        "__id__": 91
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 97
+      "__id__": 100
     },
     "_opacity": 255,
     "_color": {
@@ -2728,17 +2848,17 @@
     "_name": "熊猫动画",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 72
+      "__id__": 75
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 74
+        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 75
+      "__id__": 78
     },
     "_opacity": 255,
     "_color": {
@@ -2792,7 +2912,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 73
+      "__id__": 76
     },
     "_enabled": true,
     "_materials": [
@@ -2845,17 +2965,17 @@
     "_name": "通关盖子",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 72
+      "__id__": 75
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 77
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 78
+      "__id__": 81
     },
     "_opacity": 255,
     "_color": {
@@ -2909,7 +3029,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 76
+      "__id__": 79
     },
     "_enabled": true,
     "_materials": [
@@ -2952,24 +3072,24 @@
     "_name": "按钮_下一关",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 72
+      "__id__": 75
     },
     "_children": [
       {
-        "__id__": 80
+        "__id__": 83
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 84
+        "__id__": 87
       },
       {
-        "__id__": 85
+        "__id__": 88
       }
     ],
     "_prefab": {
-      "__id__": 87
+      "__id__": 90
     },
     "_opacity": 255,
     "_color": {
@@ -3023,20 +3143,20 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 79
+      "__id__": 82
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 81
+        "__id__": 84
       },
       {
-        "__id__": 82
+        "__id__": 85
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 86
     },
     "_opacity": 255,
     "_color": {
@@ -3090,7 +3210,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 80
+      "__id__": 83
     },
     "_enabled": true,
     "_materials": [
@@ -3125,7 +3245,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 80
+      "__id__": 83
     },
     "_enabled": true,
     "_color": {
@@ -3154,7 +3274,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 79
+      "__id__": 82
     },
     "_enabled": true,
     "_materials": [
@@ -3186,7 +3306,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 79
+      "__id__": 82
     },
     "_enabled": true,
     "node_panel": {
@@ -3195,7 +3315,7 @@
     "transition_type": 3,
     "onComplete": [
       {
-        "__id__": 86
+        "__id__": 89
       }
     ],
     "_id": ""
@@ -3226,24 +3346,24 @@
     "_name": "按钮_返回主页",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 72
+      "__id__": 75
     },
     "_children": [
       {
-        "__id__": 89
+        "__id__": 92
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 93
+        "__id__": 96
       },
       {
-        "__id__": 94
+        "__id__": 97
       }
     ],
     "_prefab": {
-      "__id__": 96
+      "__id__": 99
     },
     "_opacity": 255,
     "_color": {
@@ -3297,20 +3417,20 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 88
+      "__id__": 91
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 90
+        "__id__": 93
       },
       {
-        "__id__": 91
+        "__id__": 94
       }
     ],
     "_prefab": {
-      "__id__": 92
+      "__id__": 95
     },
     "_opacity": 255,
     "_color": {
@@ -3364,7 +3484,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 89
+      "__id__": 92
     },
     "_enabled": true,
     "_materials": [
@@ -3399,7 +3519,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 89
+      "__id__": 92
     },
     "_enabled": true,
     "_color": {
@@ -3428,7 +3548,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 88
+      "__id__": 91
     },
     "_enabled": true,
     "_materials": [
@@ -3460,7 +3580,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 88
+      "__id__": 91
     },
     "_enabled": true,
     "node_panel": {
@@ -3469,7 +3589,7 @@
     "transition_type": 3,
     "onComplete": [
       {
-        "__id__": 95
+        "__id__": 98
       }
     ],
     "_id": ""
@@ -3515,17 +3635,17 @@
     },
     "_children": [
       {
-        "__id__": 99
+        "__id__": 102
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 102
+        "__id__": 105
       }
     ],
     "_prefab": {
-      "__id__": 104
+      "__id__": 107
     },
     "_opacity": 255,
     "_color": {
@@ -3579,17 +3699,17 @@
     "_name": "动画",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 98
+      "__id__": 101
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 100
+        "__id__": 103
       }
     ],
     "_prefab": {
-      "__id__": 101
+      "__id__": 104
     },
     "_opacity": 255,
     "_color": {
@@ -3643,7 +3763,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 99
+      "__id__": 102
     },
     "_enabled": true,
     "_materials": [
@@ -3696,7 +3816,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 98
+      "__id__": 101
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -3705,7 +3825,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 103
+        "__id__": 106
       }
     ],
     "_N$interactable": true,
@@ -3823,9 +3943,6 @@
     },
     "_children": [
       {
-        "__id__": 108
-      },
-      {
         "__id__": 111
       },
       {
@@ -3836,12 +3953,15 @@
       },
       {
         "__id__": 120
+      },
+      {
+        "__id__": 123
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 123
+      "__id__": 126
     },
     "_opacity": 255,
     "_color": {
@@ -3895,17 +4015,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 107
+      "__id__": 110
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 109
+        "__id__": 112
       }
     ],
     "_prefab": {
-      "__id__": 110
+      "__id__": 113
     },
     "_opacity": 255,
     "_color": {
@@ -3959,7 +4079,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 108
+      "__id__": 111
     },
     "_enabled": true,
     "_materials": [
@@ -4002,17 +4122,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 107
+      "__id__": 110
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 112
+        "__id__": 115
       }
     ],
     "_prefab": {
-      "__id__": 113
+      "__id__": 116
     },
     "_opacity": 255,
     "_color": {
@@ -4066,7 +4186,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 111
+      "__id__": 114
     },
     "_enabled": true,
     "_materials": [
@@ -4109,17 +4229,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 107
+      "__id__": 110
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 115
+        "__id__": 118
       }
     ],
     "_prefab": {
-      "__id__": 116
+      "__id__": 119
     },
     "_opacity": 255,
     "_color": {
@@ -4173,7 +4293,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 114
+      "__id__": 117
     },
     "_enabled": true,
     "_materials": [
@@ -4216,17 +4336,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 107
+      "__id__": 110
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 118
+        "__id__": 121
       }
     ],
     "_prefab": {
-      "__id__": 119
+      "__id__": 122
     },
     "_opacity": 255,
     "_color": {
@@ -4280,7 +4400,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 117
+      "__id__": 120
     },
     "_enabled": true,
     "_materials": [
@@ -4323,17 +4443,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 107
+      "__id__": 110
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 121
+        "__id__": 124
       }
     ],
     "_prefab": {
-      "__id__": 122
+      "__id__": 125
     },
     "_opacity": 255,
     "_color": {
@@ -4387,7 +4507,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 120
+      "__id__": 123
     },
     "_enabled": true,
     "_materials": [
@@ -4511,16 +4631,16 @@
     "_enabled": true,
     "lid_type": 2,
     "node_luck": {
-      "__id__": 64
+      "__id__": 67
     },
     "node_mission": {
-      "__id__": 72
+      "__id__": 75
     },
     "anim_open_redbag": {
-      "__id__": 105
+      "__id__": 108
     },
     "btn_watch_video": {
-      "__id__": 102
+      "__id__": 105
     },
     "node_coin": {
       "__id__": 47
@@ -4528,6 +4648,9 @@
     "lbl_reward_value": {
       "__id__": 44
     },
+    "hb_star": {
+      "__id__": 64
+    },
     "spr_cash_out": {
       "__id__": 20
     },

+ 12 - 0
assets/resources/module/reward/spine.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "0b3ddea9-edbb-4992-9775-a827c2ff9e06",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 13 - 0
assets/resources/module/reward/spine/hb_star.atlas

@@ -0,0 +1,13 @@
+
+hb_star.png
+size: 18,20
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+xing
+  rotate: false
+  xy: 2, 2
+  size: 14, 16
+  orig: 16, 18
+  offset: 1, 1
+  index: -1

+ 5 - 0
assets/resources/module/reward/spine/hb_star.atlas.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.1",
+  "uuid": "e7f6e717-3b33-4873-8935-75a27a306cb3",
+  "subMetas": {}
+}

+ 344 - 0
assets/resources/module/reward/spine/hb_star.json

@@ -0,0 +1,344 @@
+{
+"skeleton": {
+	"hash": "YIpORjrjMBx3POI9KjpTQORgSWg",
+	"spine": "3.8.99",
+	"x": -301.83,
+	"y": 39.82,
+	"width": 527.04,
+	"height": 450.45,
+	"images": "",
+	"audio": ""
+},
+"bones": [
+	{ "name": "root" },
+	{ "name": "xing", "parent": "root", "x": 191.89, "y": 329.46 },
+	{ "name": "xing2", "parent": "root", "x": -158.11, "y": 138.71, "scaleX": 0.5659, "scaleY": 0.5659 },
+	{ "name": "xing3", "parent": "root", "x": 130.64, "y": 75.71 },
+	{ "name": "xing4", "parent": "root", "x": -220.28, "y": 411.45, "scaleX": 0.5629, "scaleY": 0.5629 },
+	{ "name": "xing5", "parent": "root", "x": -264.86, "y": 341.71 },
+	{ "name": "xing6", "parent": "root", "x": 130.64, "y": 465.96, "scaleX": 0.5629, "scaleY": 0.5629 },
+	{ "name": "xing7", "parent": "root", "x": 31.27, "y": 174.21, "scaleX": 0.5629, "scaleY": 0.5629 },
+	{ "name": "xing8", "parent": "root", "x": -34.98, "y": 300.34, "scaleX": 0.5629, "scaleY": 0.5629 }
+],
+"slots": [
+	{ "name": "xing", "bone": "xing", "attachment": "xing" },
+	{ "name": "xing2", "bone": "xing2", "attachment": "xing" },
+	{ "name": "xing3", "bone": "xing3", "attachment": "xing" },
+	{ "name": "xing4", "bone": "xing4", "attachment": "xing" },
+	{ "name": "xing6", "bone": "xing6", "attachment": "xing" },
+	{ "name": "xing7", "bone": "xing7", "attachment": "xing" },
+	{ "name": "xing8", "bone": "xing8", "attachment": "xing" },
+	{ "name": "xing5", "bone": "xing5", "attachment": "xing" }
+],
+"skins": [
+	{
+		"name": "default",
+		"attachments": {
+			"xing": {
+				"xing": { "x": -1.82, "y": 3.65, "scaleX": 4.3928, "scaleY": 4.3928, "width": 16, "height": 18 }
+			},
+			"xing2": {
+				"xing": { "x": -1.82, "y": 3.65, "scaleX": 4.3928, "scaleY": 4.3928, "width": 16, "height": 18 }
+			},
+			"xing3": {
+				"xing": { "x": -1.82, "y": 3.65, "scaleX": 4.3928, "scaleY": 4.3928, "width": 16, "height": 18 }
+			},
+			"xing4": {
+				"xing": { "x": -1.82, "y": 3.65, "scaleX": 4.3928, "scaleY": 4.3928, "width": 16, "height": 18 }
+			},
+			"xing5": {
+				"xing": { "x": -1.82, "y": 3.65, "scaleX": 4.3928, "scaleY": 4.3928, "width": 16, "height": 18 }
+			},
+			"xing6": {
+				"xing": { "x": -1.82, "y": 3.65, "scaleX": 4.3928, "scaleY": 4.3928, "width": 16, "height": 18 }
+			},
+			"xing7": {
+				"xing": { "x": -1.82, "y": 3.65, "scaleX": 4.3928, "scaleY": 4.3928, "width": 16, "height": 18 }
+			},
+			"xing8": {
+				"xing": { "x": -1.82, "y": 3.65, "scaleX": 4.3928, "scaleY": 4.3928, "width": 16, "height": 18 }
+			}
+		}
+	}
+],
+"animations": {
+	"animation": {
+		"slots": {
+			"xing": {
+				"color": [
+					{ "color": "ffffff00" },
+					{ "time": 0.3333, "color": "ffffffff" },
+					{ "time": 0.6667, "color": "ffffff00" },
+					{ "time": 1, "color": "ffffffff" },
+					{ "time": 1.3333, "color": "ffffff00" }
+				]
+			},
+			"xing2": {
+				"color": [
+					{ "color": "ffffff00" },
+					{ "time": 0.3333, "color": "ffffffff" },
+					{ "time": 0.6667, "color": "ffffff00" },
+					{ "time": 1, "color": "ffffffff" },
+					{ "time": 1.3333, "color": "ffffff00" }
+				]
+			},
+			"xing3": {
+				"color": [
+					{ "color": "ffffff00" },
+					{ "time": 0.3333, "color": "ffffffff" },
+					{ "time": 0.6667, "color": "ffffff00" },
+					{ "time": 1, "color": "ffffffff" },
+					{ "time": 1.3333, "color": "ffffff00" }
+				]
+			},
+			"xing4": {
+				"color": [
+					{ "color": "ffffff00" },
+					{ "time": 0.3333, "color": "ffffffff" },
+					{ "time": 0.6667, "color": "ffffff00" },
+					{ "time": 1, "color": "ffffffff" },
+					{ "time": 1.3333, "color": "ffffff00" }
+				]
+			},
+			"xing5": {
+				"color": [
+					{ "color": "ffffff00" },
+					{ "time": 0.3333, "color": "ffffffff" },
+					{ "time": 0.6667, "color": "ffffff00" },
+					{ "time": 1, "color": "ffffffff" },
+					{ "time": 1.3333, "color": "ffffff00" }
+				]
+			},
+			"xing6": {
+				"color": [
+					{ "color": "ffffff00" },
+					{ "time": 0.3333, "color": "ffffffff" },
+					{ "time": 0.6667, "color": "ffffff00" },
+					{ "time": 1, "color": "ffffffff" },
+					{ "time": 1.3333, "color": "ffffff00" }
+				]
+			},
+			"xing7": {
+				"color": [
+					{ "color": "ffffff00" },
+					{ "time": 0.3333, "color": "ffffffff" },
+					{ "time": 0.6667, "color": "ffffff00" },
+					{ "time": 1, "color": "ffffffff" },
+					{ "time": 1.3333, "color": "ffffff00" }
+				]
+			},
+			"xing8": {
+				"color": [
+					{ "color": "ffffff00" },
+					{ "time": 0.3333, "color": "ffffffff" },
+					{ "time": 0.6667, "color": "ffffff00" },
+					{ "time": 1, "color": "ffffffff" },
+					{ "time": 1.3333, "color": "ffffff00" }
+				]
+			}
+		},
+		"bones": {
+			"xing": {
+				"rotate": [
+					{},
+					{ "time": 0.3333, "angle": -94.71 },
+					{ "time": 0.6333, "angle": 159.72 },
+					{ "time": 0.6667 },
+					{ "time": 1, "angle": -94.71 },
+					{ "time": 1.3, "angle": 159.72 },
+					{ "time": 1.3333 }
+				],
+				"translate": [
+					{ "curve": "stepped" },
+					{ "time": 0.3333, "curve": "stepped" },
+					{ "time": 0.6667, "curve": "stepped" },
+					{ "time": 1, "curve": "stepped" },
+					{ "time": 1.3333 }
+				],
+				"scale": [
+					{ "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.3333, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.6667, "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
+					{ "time": 1, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
+					{ "time": 1.3333, "x": 0.737, "y": 0.737 }
+				]
+			},
+			"xing2": {
+				"rotate": [
+					{},
+					{ "time": 0.3333, "angle": -94.71 },
+					{ "time": 0.6333, "angle": 159.72 },
+					{ "time": 0.6667 },
+					{ "time": 1, "angle": -94.71 },
+					{ "time": 1.3, "angle": 159.72 },
+					{ "time": 1.3333 }
+				],
+				"translate": [
+					{ "curve": "stepped" },
+					{ "time": 0.3333, "curve": "stepped" },
+					{ "time": 0.6667, "curve": "stepped" },
+					{ "time": 1, "curve": "stepped" },
+					{ "time": 1.3333 }
+				],
+				"scale": [
+					{ "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.3333, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.6667, "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
+					{ "time": 1, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
+					{ "time": 1.3333, "x": 0.737, "y": 0.737 }
+				]
+			},
+			"xing3": {
+				"rotate": [
+					{},
+					{ "time": 0.3333, "angle": -94.71 },
+					{ "time": 0.6333, "angle": 159.72 },
+					{ "time": 0.6667 },
+					{ "time": 1, "angle": -94.71 },
+					{ "time": 1.3, "angle": 159.72 },
+					{ "time": 1.3333 }
+				],
+				"translate": [
+					{ "curve": "stepped" },
+					{ "time": 0.3333, "curve": "stepped" },
+					{ "time": 0.6667, "curve": "stepped" },
+					{ "time": 1, "curve": "stepped" },
+					{ "time": 1.3333 }
+				],
+				"scale": [
+					{ "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.3333, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.6667, "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
+					{ "time": 1, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
+					{ "time": 1.3333, "x": 0.737, "y": 0.737 }
+				]
+			},
+			"xing4": {
+				"rotate": [
+					{},
+					{ "time": 0.3333, "angle": -94.71 },
+					{ "time": 0.6333, "angle": 159.72 },
+					{ "time": 0.6667 },
+					{ "time": 1, "angle": -94.71 },
+					{ "time": 1.3, "angle": 159.72 },
+					{ "time": 1.3333 }
+				],
+				"translate": [
+					{ "curve": "stepped" },
+					{ "time": 0.3333, "curve": "stepped" },
+					{ "time": 0.6667, "curve": "stepped" },
+					{ "time": 1, "curve": "stepped" },
+					{ "time": 1.3333 }
+				],
+				"scale": [
+					{ "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.3333, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.6667, "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
+					{ "time": 1, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
+					{ "time": 1.3333, "x": 0.737, "y": 0.737 }
+				]
+			},
+			"xing5": {
+				"rotate": [
+					{},
+					{ "time": 0.3333, "angle": -94.71 },
+					{ "time": 0.6333, "angle": 159.72 },
+					{ "time": 0.6667 },
+					{ "time": 1, "angle": -94.71 },
+					{ "time": 1.3, "angle": 159.72 },
+					{ "time": 1.3333 }
+				],
+				"translate": [
+					{ "curve": "stepped" },
+					{ "time": 0.3333, "curve": "stepped" },
+					{ "time": 0.6667, "curve": "stepped" },
+					{ "time": 1, "curve": "stepped" },
+					{ "time": 1.3333 }
+				],
+				"scale": [
+					{ "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.3333, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.6667, "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
+					{ "time": 1, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
+					{ "time": 1.3333, "x": 0.737, "y": 0.737 }
+				]
+			},
+			"xing6": {
+				"rotate": [
+					{},
+					{ "time": 0.3333, "angle": -94.71 },
+					{ "time": 0.6333, "angle": 159.72 },
+					{ "time": 0.6667 },
+					{ "time": 1, "angle": -94.71 },
+					{ "time": 1.3, "angle": 159.72 },
+					{ "time": 1.3333 }
+				],
+				"translate": [
+					{ "curve": "stepped" },
+					{ "time": 0.3333, "curve": "stepped" },
+					{ "time": 0.6667, "curve": "stepped" },
+					{ "time": 1, "curve": "stepped" },
+					{ "time": 1.3333 }
+				],
+				"scale": [
+					{ "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.3333, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.6667, "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
+					{ "time": 1, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
+					{ "time": 1.3333, "x": 0.737, "y": 0.737 }
+				]
+			},
+			"xing7": {
+				"rotate": [
+					{},
+					{ "time": 0.3333, "angle": -94.71 },
+					{ "time": 0.6333, "angle": 159.72 },
+					{ "time": 0.6667 },
+					{ "time": 1, "angle": -94.71 },
+					{ "time": 1.3, "angle": 159.72 },
+					{ "time": 1.3333 }
+				],
+				"translate": [
+					{ "curve": "stepped" },
+					{ "time": 0.3333, "curve": "stepped" },
+					{ "time": 0.6667, "curve": "stepped" },
+					{ "time": 1, "curve": "stepped" },
+					{ "time": 1.3333 }
+				],
+				"scale": [
+					{ "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.3333, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.6667, "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
+					{ "time": 1, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
+					{ "time": 1.3333, "x": 0.737, "y": 0.737 }
+				]
+			},
+			"xing8": {
+				"rotate": [
+					{},
+					{ "time": 0.3333, "angle": -94.71 },
+					{ "time": 0.6333, "angle": 159.72 },
+					{ "time": 0.6667 },
+					{ "time": 1, "angle": -94.71 },
+					{ "time": 1.3, "angle": 159.72 },
+					{ "time": 1.3333 }
+				],
+				"translate": [
+					{ "curve": "stepped" },
+					{ "time": 0.3333, "curve": "stepped" },
+					{ "time": 0.6667, "curve": "stepped" },
+					{ "time": 1, "curve": "stepped" },
+					{ "time": 1.3333 }
+				],
+				"scale": [
+					{ "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.3333, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.6667, "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
+					{ "time": 1, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
+					{ "time": 1.3333, "x": 0.737, "y": 0.737 }
+				]
+			}
+		}
+	}
+}
+}

+ 9 - 0
assets/resources/module/reward/spine/hb_star.json.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.3",
+  "uuid": "4ff19fc9-047e-44b1-aac9-98904d537eb9",
+  "textures": [
+    "a546159c-493d-4b57-83f5-e290fed7ec9e"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

BIN
assets/resources/module/reward/spine/hb_star.png


+ 36 - 0
assets/resources/module/reward/spine/hb_star.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "a546159c-493d-4b57-83f5-e290fed7ec9e",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 18,
+  "height": 20,
+  "platformSettings": {},
+  "subMetas": {
+    "hb_star": {
+      "ver": "1.0.4",
+      "uuid": "4153cb9e-8c15-4b0a-a003-3a48893c1a9b",
+      "rawTextureUuid": "a546159c-493d-4b57-83f5-e290fed7ec9e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 14,
+      "height": 16,
+      "rawWidth": 18,
+      "rawHeight": 20,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 91 - 77
assets/resources/module/setting/setting.prefab

@@ -24,9 +24,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 89
-      },
-      {
         "__id__": 90
       },
       {
@@ -34,10 +31,13 @@
       },
       {
         "__id__": 92
+      },
+      {
+        "__id__": 93
       }
     ],
     "_prefab": {
-      "__id__": 93
+      "__id__": 94
     },
     "_opacity": 255,
     "_color": {
@@ -125,47 +125,47 @@
         "__id__": 37
       },
       {
-        "__id__": 43
+        "__id__": 44
       },
       {
-        "__id__": 46
+        "__id__": 47
       },
       {
-        "__id__": 49
+        "__id__": 50
       },
       {
-        "__id__": 54
+        "__id__": 55
       },
       {
-        "__id__": 59
+        "__id__": 60
       },
       {
-        "__id__": 64
+        "__id__": 65
       },
       {
-        "__id__": 68
+        "__id__": 69
       },
       {
-        "__id__": 73
+        "__id__": 74
       },
       {
-        "__id__": 76
+        "__id__": 77
       },
       {
-        "__id__": 81
+        "__id__": 82
       },
       {
-        "__id__": 84
+        "__id__": 85
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 87
+        "__id__": 88
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 89
     },
     "_opacity": 255,
     "_color": {
@@ -737,8 +737,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 106,
-      "height": 106
+      "width": 117,
+      "height": 117
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1475,7 +1475,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 42
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -1643,10 +1643,24 @@
       "__id__": 1
     },
     "transition_type": 3,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 42
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "6cec48K3X9GK6QSjqp7IWnc",
+    "handler": "onClickClose",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1668,11 +1682,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 44
+        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 45
+      "__id__": 46
     },
     "_opacity": 255,
     "_color": {
@@ -1726,7 +1740,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 43
+      "__id__": 44
     },
     "_enabled": true,
     "_materials": [
@@ -1775,11 +1789,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 47
+        "__id__": 48
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 49
     },
     "_opacity": 255,
     "_color": {
@@ -1833,7 +1847,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 46
+      "__id__": 47
     },
     "_enabled": true,
     "_materials": [
@@ -1882,14 +1896,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 51
       },
       {
-        "__id__": 51
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 53
+      "__id__": 54
     },
     "_opacity": 255,
     "_color": {
@@ -1943,7 +1957,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 49
+      "__id__": 50
     },
     "_enabled": true,
     "_materials": [
@@ -1975,7 +1989,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 49
+      "__id__": 50
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1984,7 +1998,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 52
+        "__id__": 53
       }
     ],
     "_N$interactable": true,
@@ -2040,7 +2054,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 49
+      "__id__": 50
     },
     "_id": ""
   },
@@ -2076,14 +2090,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 55
+        "__id__": 56
       },
       {
-        "__id__": 56
+        "__id__": 57
       }
     ],
     "_prefab": {
-      "__id__": 58
+      "__id__": 59
     },
     "_opacity": 255,
     "_color": {
@@ -2137,7 +2151,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 54
+      "__id__": 55
     },
     "_enabled": true,
     "_materials": [
@@ -2169,7 +2183,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 54
+      "__id__": 55
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2178,7 +2192,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 57
+        "__id__": 58
       }
     ],
     "_N$interactable": true,
@@ -2234,7 +2248,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 54
+      "__id__": 55
     },
     "_id": ""
   },
@@ -2270,14 +2284,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 60
+        "__id__": 61
       },
       {
-        "__id__": 61
+        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 63
+      "__id__": 64
     },
     "_opacity": 255,
     "_color": {
@@ -2331,7 +2345,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 59
+      "__id__": 60
     },
     "_enabled": true,
     "_materials": [
@@ -2363,7 +2377,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 59
+      "__id__": 60
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2372,7 +2386,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 62
+        "__id__": 63
       }
     ],
     "_N$interactable": true,
@@ -2428,7 +2442,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 59
+      "__id__": 60
     },
     "_id": ""
   },
@@ -2464,14 +2478,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 65
+        "__id__": 66
       },
       {
-        "__id__": 66
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 67
+      "__id__": 68
     },
     "_opacity": 255,
     "_color": {
@@ -2525,7 +2539,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 64
+      "__id__": 65
     },
     "_enabled": true,
     "_materials": [
@@ -2558,7 +2572,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 64
+      "__id__": 65
     },
     "_enabled": true,
     "_color": {
@@ -2593,14 +2607,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 69
+        "__id__": 70
       },
       {
-        "__id__": 70
+        "__id__": 71
       }
     ],
     "_prefab": {
-      "__id__": 72
+      "__id__": 73
     },
     "_opacity": 255,
     "_color": {
@@ -2654,7 +2668,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 68
+      "__id__": 69
     },
     "_enabled": true,
     "_materials": [
@@ -2687,7 +2701,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 68
+      "__id__": 69
     },
     "_enabled": true,
     "panel_name": "module/setting/rule",
@@ -2695,7 +2709,7 @@
     "transition_type": 3,
     "onComplete": [
       {
-        "__id__": 71
+        "__id__": 72
       }
     ],
     "_id": ""
@@ -2732,11 +2746,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 74
+        "__id__": 75
       }
     ],
     "_prefab": {
-      "__id__": 75
+      "__id__": 76
     },
     "_opacity": 255,
     "_color": {
@@ -2790,7 +2804,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 73
+      "__id__": 74
     },
     "_enabled": true,
     "_materials": [
@@ -2839,14 +2853,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 77
+        "__id__": 78
       },
       {
-        "__id__": 78
+        "__id__": 79
       }
     ],
     "_prefab": {
-      "__id__": 80
+      "__id__": 81
     },
     "_opacity": 255,
     "_color": {
@@ -2900,7 +2914,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 76
+      "__id__": 77
     },
     "_enabled": true,
     "_materials": [
@@ -2933,7 +2947,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 76
+      "__id__": 77
     },
     "_enabled": true,
     "panel_name": "module/setting/rule",
@@ -2941,7 +2955,7 @@
     "transition_type": 3,
     "onComplete": [
       {
-        "__id__": 79
+        "__id__": 80
       }
     ],
     "_id": ""
@@ -2978,11 +2992,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 82
+        "__id__": 83
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 84
     },
     "_opacity": 255,
     "_color": {
@@ -3036,7 +3050,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 81
+      "__id__": 82
     },
     "_enabled": true,
     "_materials": [
@@ -3085,11 +3099,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 85
+        "__id__": 86
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 87
     },
     "_opacity": 255,
     "_color": {
@@ -3143,7 +3157,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 84
+      "__id__": 85
     },
     "_enabled": true,
     "_materials": [
@@ -3240,13 +3254,13 @@
       "__id__": 25
     },
     "img_music": {
-      "__id__": 50
+      "__id__": 51
     },
     "img_effect": {
-      "__id__": 55
+      "__id__": 56
     },
     "lbl_version": {
-      "__id__": 85
+      "__id__": 86
     },
     "_id": ""
   },

+ 22 - 8
assets/resources/module/sign/sign.prefab

@@ -27,9 +27,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 48
-      },
-      {
         "__id__": 49
       },
       {
@@ -37,10 +34,13 @@
       },
       {
         "__id__": 51
+      },
+      {
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 53
     },
     "_opacity": 255,
     "_color": {
@@ -1562,7 +1562,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 47
+      "__id__": 48
     },
     "_opacity": 255,
     "_color": {
@@ -1574,8 +1574,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 53,
-      "height": 49
+      "width": 88,
+      "height": 88
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1723,10 +1723,24 @@
       "__id__": 1
     },
     "transition_type": 0,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 47
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "92c1epESLhJSLrId9Dkn6Wd",
+    "handler": "onClickClose",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

Diff do ficheiro suprimidas por serem muito extensas
+ 159 - 145
assets/resources/module/turnable/turnable.prefab


+ 146 - 0
assets/resources/spine/game/changjing.atlas

@@ -0,0 +1,146 @@
+
+changjing.png
+size: 2041,1011
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+背景/changjing
+  rotate: true
+  xy: 2, 2
+  size: 750, 2037
+  orig: 750, 2037
+  offset: 0, 0
+  index: -1
+背景/shu
+  rotate: true
+  xy: 904, 754
+  size: 182, 294
+  orig: 182, 294
+  offset: 0, 0
+  index: -1
+背景/wave1
+  rotate: false
+  xy: 373, 954
+  size: 278, 55
+  orig: 300, 300
+  offset: 12, 86
+  index: -1
+背景/wave2
+  rotate: false
+  xy: 603, 851
+  size: 299, 94
+  orig: 300, 300
+  offset: 1, 51
+  index: -1
+背景/wave3
+  rotate: false
+  xy: 303, 869
+  size: 298, 83
+  orig: 300, 300
+  offset: 2, 62
+  index: -1
+背景/wave4
+  rotate: false
+  xy: 2, 877
+  size: 299, 76
+  orig: 300, 300
+  offset: 1, 69
+  index: -1
+背景/wave5
+  rotate: false
+  xy: 1548, 934
+  size: 300, 75
+  orig: 300, 300
+  offset: 0, 73
+  index: -1
+背景/wave6
+  rotate: false
+  xy: 1248, 937
+  size: 298, 72
+  orig: 300, 300
+  offset: 2, 76
+  index: -1
+背景/wave7
+  rotate: false
+  xy: 949, 938
+  size: 297, 71
+  orig: 300, 300
+  offset: 3, 79
+  index: -1
+背景/wave8
+  rotate: false
+  xy: 653, 947
+  size: 294, 62
+  orig: 300, 300
+  offset: 6, 80
+  index: -1
+背景/xie1
+  rotate: false
+  xy: 297, 955
+  size: 74, 54
+  orig: 78, 56
+  offset: 2, 1
+  index: -1
+背景/xie10
+  rotate: false
+  xy: 193, 980
+  size: 102, 29
+  orig: 108, 34
+  offset: 3, 3
+  index: -1
+背景/xie2
+  rotate: true
+  xy: 126, 986
+  size: 23, 32
+  orig: 23, 32
+  offset: 0, 0
+  index: -1
+背景/xie3
+  rotate: true
+  xy: 160, 986
+  size: 23, 31
+  orig: 23, 31
+  offset: 0, 0
+  index: -1
+背景/xie4
+  rotate: true
+  xy: 87, 994
+  size: 15, 17
+  orig: 18, 19
+  offset: 2, 1
+  index: -1
+背景/xie5
+  rotate: true
+  xy: 48, 995
+  size: 14, 17
+  orig: 17, 20
+  offset: 1, 1
+  index: -1
+背景/xie6
+  rotate: false
+  xy: 106, 994
+  size: 18, 15
+  orig: 21, 17
+  offset: 2, 1
+  index: -1
+背景/xie7
+  rotate: false
+  xy: 67, 995
+  size: 18, 14
+  orig: 21, 17
+  offset: 1, 1
+  index: -1
+背景/xie8
+  rotate: false
+  xy: 2, 1001
+  size: 21, 8
+  orig: 24, 10
+  offset: 2, 1
+  index: -1
+背景/xie9
+  rotate: false
+  xy: 25, 1001
+  size: 21, 8
+  orig: 24, 10
+  offset: 1, 1
+  index: -1

+ 5 - 0
assets/resources/spine/game/changjing.atlas.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.1",
+  "uuid": "de6d99fc-0c32-4fa7-b9ca-137eda682b31",
+  "subMetas": {}
+}

Diff do ficheiro suprimidas por serem muito extensas
+ 441 - 0
assets/resources/spine/game/changjing.json


+ 9 - 0
assets/resources/spine/game/changjing.json.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.3",
+  "uuid": "8fbd7e3c-7aa6-4f14-8950-fad61df23914",
+  "textures": [
+    "c17a5060-6dda-4de7-843c-5fd4f3062899"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

BIN
assets/resources/spine/game/changjing.png


+ 36 - 0
assets/resources/spine/game/changjing.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "c17a5060-6dda-4de7-843c-5fd4f3062899",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 2041,
+  "height": 1011,
+  "platformSettings": {},
+  "subMetas": {
+    "changjing": {
+      "ver": "1.0.4",
+      "uuid": "feb1b101-5471-4867-9ff9-788d7ea47f99",
+      "rawTextureUuid": "c17a5060-6dda-4de7-843c-5fd4f3062899",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 2037,
+      "height": 1007,
+      "rawWidth": 2041,
+      "rawHeight": 1011,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

Diff do ficheiro suprimidas por serem muito extensas
+ 2 - 2
assets/resources/spine/game/pandan.json


BIN
assets/resources/spine/game/pandan.png


+ 2 - 2
assets/resources/spine/game/pandan.png.meta

@@ -18,11 +18,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0.5,
+      "offsetX": 0,
       "offsetY": 0,
       "trimX": 3,
       "trimY": 2,
-      "width": 1843,
+      "width": 1842,
       "height": 396,
       "rawWidth": 1848,
       "rawHeight": 400,

BIN
assets/resources/video/Redeem.mp4


+ 18 - 1
assets/script/before/GamePlay.ts

@@ -186,6 +186,7 @@ export default class GamePlay extends cc.Component {
             this.initEvent();
 
             this.intervalShowGuide();
+            this.intervalShowInter();
 
             cc.tween(this.btn_gameGetRed1).delay(0.2).to(1, { y: 60 }, { easing: "" }).to(1, { y: 0 }, { easing: "" }).union().repeatForever().start();
             cc.tween(this.btn_gameGetRed2).delay(0.4).to(1, { y: 60 }, { easing: "" }).to(1, { y: 0 }, { easing: "" }).union().repeatForever().start();
@@ -220,7 +221,7 @@ export default class GamePlay extends cc.Component {
         // this.node_top.y = (cc.winSize.height - this.node_top.height) * 0.5 + 5;
         const world_pos = gData.gameData.gameStyle.node_top_ui.parent.convertToWorldSpaceAR(gData.gameData.gameStyle.node_top_ui.getPosition());
         const node_pos = this.node_top.parent.convertToNodeSpaceAR(world_pos);
-        this.node_top.y = node_pos.y - 20;
+        this.node_top.y = node_pos.y - 40;
     }
 
     update(dt) {
@@ -412,6 +413,7 @@ export default class GamePlay extends cc.Component {
     onClickBtn(event: cc.Event.EventTouch) {
 
         this.intervalShowGuide();
+        this.intervalShowInter();
 
         //是否已经通关
         if (this.ifPass) {
@@ -1109,4 +1111,19 @@ export default class GamePlay extends cc.Component {
             this.couldCleanVecArr = [];
         }
     }
+
+    public interval_ShowInter: number = null;
+    //间隔显示
+    intervalShowInter() {
+        this.cancelShowInter();
+        this.interval_ShowGuide = setInterval(() => {
+            mk.ad.showInterAd(0);
+        }, 15000);
+    }
+
+    cancelShowInter() {
+        if (this.interval_ShowGuide) {
+            clearInterval(this.interval_ShowGuide);
+        }
+    }
 }

+ 13 - 10
assets/script/before/view/GetPropUI.ts

@@ -32,20 +32,20 @@ export default class GetPropUI extends cc.Component {
     start() {
         this.adapt();
         this.initEvent();
+        //mk.ad.showBannerAd();
+        // mk.ad.showNativeAd(4);
+        // mk.ad.showInterAd(0);
     }
 
     // update (dt) {}
 
     onEnable() {
         GameMgr.Inst.sendEvent(UI_NAME.GetPropUI, `进入获取道具界面`);
-        // //显示广告
-        // AdMgr.Inst.showNativeAd(4, true);
         this.init();
     }
 
     onDisable() {
         GamePlay.Inst.curPropType = PROPTYPE.Null;
-        // AdMgr.Inst.destroyNativeAd();
     }
 
     /**适配 */
@@ -64,7 +64,6 @@ export default class GetPropUI extends cc.Component {
                 prop.active = false;
             }
         }
-
     }
 
     /**初始化事件 */
@@ -89,12 +88,13 @@ export default class GetPropUI extends cc.Component {
     onClickClose() {
         GameMgr.Inst.sendEvent(UI_NAME.GetPropUI, "点击关闭按钮");
         mk.ui.closePanel("GetPropUI");
+
     }
 
     /**点击获取 */
     onClickGet() {
         GameMgr.Inst.sendEvent(UI_NAME.GetPropUI, `点击${GamePlay.Inst.curPropType}按钮`);
-
+        GamePlay.Inst.cancelShowInter();
         mk.ad.watchAd((ifsuccess: boolean) => {
             this.watchCallBack(ifsuccess)
         });
@@ -102,14 +102,17 @@ export default class GetPropUI extends cc.Component {
 
     /**观看回调 */
     watchCallBack(ifSuccess: boolean = false) {
+
         if (ifSuccess) {
-            // mk.console.log("观看成功")
-            mk.tip.pop("观看成功,获取奖励")
+            this.scheduleOnce(() => {
+                mk.tip.pop("观看成功,获取奖励")
+            }, 0)
             this.watchSuccess();
         }
         else {
-            // mk.console.log("观看失败")
-            mk.tip.pop("观看失败,无法领取奖励哦")
+            this.scheduleOnce(() => {
+                mk.tip.pop("观看失败,无法领取奖励哦")
+            }, 0)
             this.watchFailed();
         }
     }
@@ -119,7 +122,7 @@ export default class GetPropUI extends cc.Component {
         GameMgr.Inst.sendEvent(UI_NAME.GetPropUI, `视频获取${GamePlay.Inst.curPropType}道具成功`);
         EffectMgr.Inst.addTip("观看视频成功,获得道具");
         DataMgr.Inst.updatePropNum(1, GamePlay.Inst.curPropType, 1);
-        mk.ui.closePanel("GetPropUI")
+        // mk.ui.closePanel("GetPropUI")
     }
 
     /**观看失败 */

+ 7 - 2
assets/script/before/view/PauseUI.ts

@@ -42,12 +42,14 @@ export default class PauseUI extends cc.Component {
 
     // LIFE-CYCLE CALLBACKS:
 
-    // onLoad () {}
+    onLoad() {
+     
+    }
 
     start() {
+        mk.ad.showNativeAd(4);
 
         this.node_bg.setContentSize(cc.winSize.width, cc.winSize.height);
-
         this.initEvent();
     }
 
@@ -116,6 +118,7 @@ export default class PauseUI extends cc.Component {
 
         console.log("点击关闭按钮", this.node.name);
         mk.ui.closePanel(this.node.name);
+        mk.ad.destroyNativeAd();
     }
 
     onClickMusicSwitch() {
@@ -144,5 +147,7 @@ export default class PauseUI extends cc.Component {
         //     Main.Inst.node_start.active = true;
         //     Main.Inst.node_game.active = false;
         // },2000)
+
+        mk.ad.destroyNativeAd();
     }
 }

+ 1 - 0
assets/script/before/view/uiItem/CellItem.ts

@@ -142,6 +142,7 @@ export default class CellItem extends cc.Component {
 
         //重置提示
         GamePlay.Inst.intervalShowGuide();
+        GamePlay.Inst.intervalShowInter();
 
         if (GamePlay.Inst.node_changeCellItemUI.active) {
             GamePlay.Inst.node_changeCellItemUI.active = false;

+ 8 - 3
assets/script/game/component/NumberAnim.ts

@@ -17,8 +17,9 @@ export default class NumberAnim extends cc.Component {
      * 设置数值
      * @param new_value 目标值
      */
-    public setValue(new_value: number) {
-        let time = new_value - this.targetProgress;
+    public setValue(new_value: number, toFixed: number = 0) {
+        this.toFixed = toFixed;
+        this.len_target = new_value.toString().length;
         this.targetProgress = new_value;
         this.PlayMoneyAni(0.3)
     }
@@ -36,6 +37,10 @@ export default class NumberAnim extends cc.Component {
     private lastNum: number = 0;
     /** 动画中 */
     private isPlayAni: boolean = false;
+    /** 目标值长度 */
+    private len_target: number = 0;
+    /** 保留小数点位数 */
+    private toFixed: number = 0;
 
     private PlayMoneyAni(time) {
         this.totalTime = time;
@@ -67,7 +72,7 @@ export default class NumberAnim extends cc.Component {
             if (this.curValue == this.targetProgress) {
                 this.lbl_count.string = `${this.targetProgress}`;
             } else {
-                this.lbl_count.string = `${this.curValue.toFixed(0)}`;
+                this.lbl_count.string = `${this.curValue.toFixed(this.toFixed)}`;
             }
         }
     }

+ 1 - 0
assets/script/game/data/LoginData.ts

@@ -252,6 +252,7 @@ export class LoginData {
             if (this.isAuth) {
                 gData.wechatData.nickName = data.nickname;
                 gData.wechatData.avatar = data.headimgurl;
+                gData.wechatData.unionid = this.uin;
                 gData.gameData.init_head = true;
                 mk.storage.setStorage(StorageKey.isAuth, 1);
                 mk.storage.setStorage(StorageKey.nickname, gData.wechatData.nickName, false);

+ 4 - 1
assets/script/game/data/module/CashNormalData.ts

@@ -34,7 +34,10 @@ export class CashNormalData extends Data {
     public init_rmb_style = true;
 
     private _receip_total_rmb: number = 0;
-    /** 到账毛币总数 */
+    /**
+     * 到账毛币总数
+     * - 单位 分
+     */
     set receip_total_rmb(value: number) {
         this._receip_total_rmb = value;
         this.init_rmb_style = true;

+ 3 - 3
assets/script/game/data/module/GuideData.ts

@@ -8,7 +8,7 @@ export class GuideData {
     public data: Map<number, GuideVO[]>;
 
     /** 当前引导id */
-    public crtID:number = null;
+    public crtID: number = null;
 
     public init(config) {
         this.data = new Map<number, GuideVO[]>();
@@ -25,7 +25,7 @@ export class GuideData {
             guide.tr_form = o.tr_form;
             guide.dialog = o.dialog;
             guide.display_rect = o.display_rect;
-            guide.click_node = o.click_node;
+            guide.click_rect = o.click_rect;
             guide.finger = o.finger;
             guide.lag_next = o.lag_next;
             if (id != guide.id) {
@@ -59,7 +59,7 @@ export class GuideVO {
     /** 透明点击区域(与click_node不共存) */
     display_rect: string;
     /** 点击组件名字(必须在代码中预先设置) */
-    click_node: string;
+    click_rect: string;
     /** 手指位置 */
     finger: string;
     /** 下个时间 */

+ 4 - 1
assets/script/game/data/module/ReceiptNoticeData.ts

@@ -11,7 +11,10 @@ export class ReceiptNoticeData extends Data {
     public init_style = true;
 
     private _receip_rmb: number = 0;
-    /** 到账毛币数量 */
+    /**
+     * 到账毛币数量
+     * - 单位 分
+     */
     set receip_rmb(value: number) {
         this._receip_rmb = value;
         this.init_style = true;

+ 5 - 0
assets/script/game/data/module/RedBagCashData.ts

@@ -1,5 +1,6 @@
 
 import { Data } from "../../../mk/data/Data";
+import JsbSystem from "../../../mk/system/JsbSystem";
 import { GameProp } from "../GameData";
 /**
  * 红包提现数据
@@ -48,6 +49,10 @@ export class RedBagCashData extends Data {
      * 提现操作
      */
     public async cashOP() {
+        if (!gData.loginData.isAuth) {
+            JsbSystem.WxAuth();
+            return;
+        }
         /** 提现档位 */
         const cash_index = this.cash_bar;
         let data = { index: cash_index };

+ 18 - 9
assets/script/game/game/Game.ts

@@ -50,19 +50,19 @@ export default class Game extends cc.Component {
         this.initQiPaos();
         this.initInfo();
 
-        if(gData.gameData.isNewPlayer()){
-            // this.initGuide();
-            // gData.gameData.setProp(GameProp.newPlayer,1);
-        }
+        // if(gData.gameData.isNewPlayer()){
+        //     this.initGuide();
+        //     gData.gameData.setProp(GameProp.newPlayer,0);
+        // }
     }
 
-    private initGuide(){
+    private initGuide() {
         mk.guide.open(1);
     }
 
     update() {
         if (gData.gameData.init_coin) {
-            this.initInfo();
+            this.changeInfo();
         }
 
         if (gData.gameData.init_head) {
@@ -70,7 +70,6 @@ export default class Game extends cc.Component {
         }
     }
     lateUpdate() {
-        gData.gameData.init_coin = false;
         gData.gameData.init_head = false;
     }
 
@@ -99,7 +98,18 @@ export default class Game extends cc.Component {
 
     private initInfo() {
         this.lbl_redMoney.string = gData.gameData.gameData.redMoney + "";
-        this.lbl_rmb.string = gData.gameData.gameData.piggyBank + "";
+        // this.lbl_rmb.string = gData.gameData.gameData.piggyBank + "";
+        const new_count = gData.gameData.gameData.piggyBank / 100;
+        this.lbl_rmb.string = new_count.toFixed(2);
+        gData.gameData.init_coin = false;
+    }
+
+    private changeInfo() {
+        this.lbl_redMoney.node.getComponent('NumberAnim').setValue(gData.gameData.gameData.redMoney);
+        // this.lbl_rmb.node.getComponent('NumberAnim').setValue(gData.gameData.gameData.piggyBank);
+        const new_count = gData.gameData.gameData.piggyBank / 100;
+        this.lbl_rmb.node.getComponent('NumberAnim').setValue(new_count.toFixed(2), 2);
+        gData.gameData.init_coin = false;
     }
 
     private async initHead() {
@@ -116,7 +126,6 @@ export default class Game extends cc.Component {
     /** */
     public onClickStart() {
         this.node_gameplay.active = true;
-
     }
 
     /**点击分享 */

+ 7 - 0
assets/script/game/module/agreementTip/agreementTip.ts

@@ -22,5 +22,12 @@ export default class agreementTip extends cc.Component {
     async clickRule(data) {
         gData.setting.rule_type = parseInt(data);
     }
+
+    /**
+     * 关闭面板
+     */
+    private clickClose() {
+        mk.ui.closePanel(this.node.name);
+    }
     // update (dt) {}
 }

+ 10 - 0
assets/script/game/module/blessingBag/BlessingBag.ts

@@ -3,6 +3,7 @@
  * @author kaka
  */
 
+import JsbSystem from "../../../mk/system/JsbSystem";
 import { AdFun } from "../../data/AdData";
 import { cashProType } from "../../data/module/CashProData";
 
@@ -229,6 +230,10 @@ export default class BlessingBag extends cc.Component {
 
     Click_AdProgressBtn() {
         mk.audio.playEffect("button");
+        if (!gData.loginData.isAuth) {
+            JsbSystem.WxAuth();
+            return;
+        }
         if (gData.blessingBag.videoRbData.needToWatchTheVideo != 1) {
             //免费加进度
             gData.blessingBag.HttpNoAdProgress();
@@ -338,4 +343,9 @@ export default class BlessingBag extends cc.Component {
         gData.blessingBag.adsource_id_value = this.inputBox.string;
     }
 
+
+    /** 点击关闭 */
+    onClickClose() {
+        mk.ad.checkShowInterByChance();
+    }
 }

+ 64 - 23
assets/script/game/module/guide/Guide.ts

@@ -15,19 +15,21 @@ export default class Guide extends cc.Component {
     node_click: cc.Node = null;
     @property({ type: cc.Node, displayName: "背景" })
     node_bg: cc.Node = null;
-    @property(cc.Node)
-    node_block: cc.Node = null;
     @property({ type: cc.Sprite, displayName: "手指" })
     node_finger: cc.Sprite = null;
     @property({ type: cc.Sprite, displayName: "头像" })
     node_head: cc.Sprite = null;
     @property({ type: cc.Sprite, displayName: "形象" })
     node_person: cc.Sprite = null;
+    @property({ type: cc.RichText, displayName: "对话内容" })
+    rich_dialog: cc.RichText = null;
 
 
     private guides: GuideVO[];
     private crtStep: number;
     private crtGuide: GuideVO;
+    private targetNode: cc.Node;
+    private event_name: string;
 
     onLoad() {
 
@@ -50,41 +52,80 @@ export default class Guide extends cc.Component {
     }
 
     private updateGuide() {
-        if(this.crtGuide == null){
+        if (this.crtGuide == null) {
             this.close();
         }
-        else{
-            this.reset();
-            if(this.crtGuide.display_rect != ""){
+        else {
+            this.targetNode = null;
+            this.event_name = null;
+
+            //点击全屏下一步,显示区域不显示,点击区域全屏
+            if (this.crtGuide.click_rect == "all") {
+                this.node_display.width = 0;
+                this.node_display.height = 0;
+                this.node_click.x = 0;
+                this.node_click.y = 0;
+                this.node_click.width = this.node.width;
+                this.node_click.height = this.node.height;
+            }
+            else if (this.crtGuide.click_rect.indexOf("event") != -1) {//点击区域下一步,并发送事件,显示区域读配置,点击区域=显示区域
+                this.event_name = "event_guide_" + this.crtGuide.id + "_" + this.crtStep;
                 let arr = this.crtGuide.display_rect.split(":");
-                this.node_display.x = parseInt(arr[0]);
-                this.node_display.y = parseInt(arr[1]);
-                this.node_display.width = parseInt(arr[2]);
-                this.node_display.height = parseInt(arr[3]);
+                this.node_display.x = this.node_click.x = parseInt(arr[0]);
+                this.node_display.y = this.node_click.y = parseInt(arr[1]);
+                this.node_display.width = this.node_click.width = parseInt(arr[2]);
+                this.node_display.height = this.node_click.height = parseInt(arr[3]);
             }
-            else if(this.crtGuide.click_node != ""){
-                
+            else {//点击按钮下一步,显示区域为配置的node,点击区域=显示区域
+                this.targetNode = cc.find("Canvas/" + this.crtGuide.click_rect);
+                this.node_display.width = this.targetNode.width;
+                this.node_display.height = this.targetNode.height;
+                let pos = mk.game.getWorldPos(this.targetNode);
+                this.node_display.setPosition(pos);
             }
-            if(this.crtGuide.finger != ""){
-                
+
+            if (this.crtGuide.finger == "") {
+                this.node_finger.node.active = false;
             }
-        }
-    }
+            else {
+                this.node_finger.node.active = true;
+                let arr = this.crtGuide.finger.split(":");
+                this.node_finger.node.x = this.node_display.x + parseInt(arr[0]);
+                this.node_finger.node.y = this.node_display.y + parseInt(arr[1]);
+            }
+
+            if (this.crtGuide.tr_form == 1) {
+                this.node_head.node.active = true;
+                this.node_person.node.active = false;
+            }
+            else {
+                this.node_head.node.active = false;
+                this.node_person.node.active = true;
+            }
+
+            this.node_bg.x = -this.node_display.x;
+            this.node_bg.y = -this.node_display.y;
 
-    clickBg() {
-        console.log("clickBg");
-        if (this.crtGuide && this.crtGuide.click_node == "" && this.crtGuide.display_rect == "") {
-            this.nextStep();
+            this.rich_dialog.string = `<color=#000000>${this.crtGuide.dialog}</color>`;
         }
     }
 
-    clickNodeClick() {
+    async clickNodeClick() {
         console.log("clickNodeClick");
-
+        if (this.targetNode) {
+            this.targetNode.getComponent(cc.Button).clickEvents[0].emit([]);
+        }
+        if (this.event_name) {
+            mk.event.emit(this.event_name);
+        }
+        if (this.crtGuide.lag_next > 0) {
+            await mk.time.WaitForSeconds(this.crtGuide.lag_next);
+        }
+        this.nextStep();
     }
 
 
-    private close(){
+    private close() {
         mk.guide.close();
         this.node.destroy();
     }

+ 6 - 1
assets/script/game/module/help/Help.ts

@@ -11,7 +11,8 @@ export default class Help extends cc.Component {
     @property({ type: cc.Label, displayName: '文字说明' })
     lbl_desc: cc.Label = null;
 
-    start(){
+    start() {
+        mk.ad.showNativeAd(4);
     }
 
     update() {
@@ -23,4 +24,8 @@ export default class Help extends cc.Component {
     lateUpdate() {
         gData.help.init_desc_name = false;
     }
+
+    onClickClose() {
+        mk.ad.destroyNativeAd();
+    }
 }

+ 3 - 0
assets/script/game/module/login/Login.ts

@@ -65,6 +65,9 @@ export default class Login extends cc.Component {
     public login() {
         //初始化相关数据
         mk.pool.init(gData.gameData.pools);
+        //取消构造的时候自动初始化,手动初始化
+        mk.ad.init();
+        
         gData.appData.init();
         gData.adData.init();
         gData.loginData.init();

+ 4 - 0
assets/script/game/module/moreGame/MoreGame.ts

@@ -54,4 +54,8 @@ export default class MoreGame extends cc.Component {
         }
         this.node_sv.emit('srollview-init', data)
     }
+    
+    onClickClose() {
+        mk.ad.checkShowInterByChance();
+    }
 }

+ 11 - 3
assets/script/game/module/pigBank/PigBank.ts

@@ -1,3 +1,4 @@
+import JsbSystem from "../../../mk/system/JsbSystem";
 
 const { ccclass, property } = cc._decorator;
 /**
@@ -72,8 +73,8 @@ export default class PigBank extends cc.Component {
      * - 精确到分
      */
     private initDeposit() {
-        const new_count = gData.gameData.gameData.piggyBank.toFixed(2)
-        this.lbl_deposit.string = new_count + '元';
+        const new_count = gData.gameData.gameData.piggyBank / 100;
+        this.lbl_deposit.string = new_count.toFixed(2) + '元';
     }
 
     /**
@@ -88,6 +89,10 @@ export default class PigBank extends cc.Component {
             mk.tip.pop('满' + gData.pigbank.cash_min_limit + '元可提现')
             return;
         }
+        if (!gData.loginData.isAuth) {
+            JsbSystem.WxAuth();
+            return;
+        }
         gData.pigbank.cashOP();
         mk.ui.closePanel(this.node.name);
     }
@@ -100,5 +105,8 @@ export default class PigBank extends cc.Component {
         gData.help.des = des;
     }
 
-
+    /** 点击关闭 */
+    onClickClose() {
+        mk.ad.checkShowInterByChance();
+    }
 }

+ 2 - 2
assets/script/game/module/receiptNotice/ReceiptNotice.ts

@@ -35,8 +35,8 @@ export default class ReceiptNotice extends cc.Component {
      * 初始化样式
      */
     private initStyle() {
-        this.lbl_receipt_rmb.string = '¥' + gData.receiptNotice.receip_rmb + '元';
-        this.lbl_rmb_total.string = '¥' + gData.cashNormal.receip_total_rmb + '元';
+        this.lbl_receipt_rmb.string = '¥' + Math.floor(gData.receiptNotice.receip_rmb / 100) + '元';
+        this.lbl_rmb_total.string = '¥' + Math.floor(gData.cashNormal.receip_total_rmb / 100) + '元';
         this.lbl_user_name.string = gData.wechatData.nickName || '';
     }
 }

+ 27 - 1
assets/script/game/module/redBagCode/RedBagCode.ts

@@ -11,7 +11,8 @@ export default class RedBagCode extends cc.Component {
     private scroll_view: cc.ScrollView = null!;
     @property({ displayName: 'lbl暂无提现', type: cc.Label })
     private lbl_none: cc.Label = null;
-    // onLoad () {}
+    @property(cc.Prefab)
+    videoPre: cc.Prefab = null;
 
     start() {
         this.initList();
@@ -38,4 +39,29 @@ export default class RedBagCode extends cc.Component {
             this.lbl_none.node.active = true;
         }
     }
+
+    coolTime = false
+    videoNode = null
+    /** 点击教程 */
+    clickTeach() {
+        mk.audio.playEffect('button');
+        if (this.coolTime) {
+            return
+        }
+
+        this.coolTime = true
+
+        gData.redCodeData.teachVideoType = 1;
+        console.log('clickTeach')
+        this.videoNode = cc.instantiate(this.videoPre)
+        this.videoNode.getChildByName('video').on("completed", this.onCompleted, this)
+        this.node.addChild(this.videoNode)
+    }
+
+    onCompleted() {
+        this.videoNode.getChildByName('video').off("completed", this.onCompleted, this)
+        this.videoNode.destroy()
+        mk.audio.setResumeMusic();
+        this.coolTime = false
+    }
 }

+ 6 - 0
assets/script/game/module/redCode/RedCode.ts

@@ -36,6 +36,8 @@ export default class RedCode extends cc.Component {
     coolTime = false
 
     start() {
+        mk.ad.showNativeAd(4);
+
         this.coolTime = false
         this.labOfficial.string = `“${this.officialStr}”`
         this.labRed.string = `“${this.redCodeStr}”`
@@ -97,4 +99,8 @@ export default class RedCode extends cc.Component {
         mk.audio.playEffect("button");
         mk.audio.setResumeMusic();
     }
+
+    onClickClose() {
+        mk.ad.destroyNativeAd();
+    }
 }

+ 11 - 0
assets/script/game/module/reward/Reward.ts

@@ -40,6 +40,8 @@ export default class Reward extends cc.Component {
     private node_coin: cc.Sprite = null;
     @property({ displayName: '奖励数量', type: cc.Label })
     private lbl_reward_value: cc.Label = null;
+    @property({ displayName: '星星闪闪效果', type: cc.Node })
+    private hb_star: cc.Node = null;
 
     // 底部提现相关
     @property({ displayName: 'spr提现进度', type: cc.Sprite })
@@ -54,11 +56,15 @@ export default class Reward extends cc.Component {
     private cur_stage: number = LidType.none;
 
     onLoad() {
+        this.hb_star.active = false;
         this.lbl_reward_value.string = '0';
         // gData.reward.data = [{ rewardType: 3, rewardNum: 100 }]// 测试数据
     }
 
     start() {
+        mk.ad.showBannerAd();
+        mk.ad.checkShowInterByChance();
+
         /** 盖子 */
         this.initLid();
         // gData.gameData.gameData.redMoney = 1500;// 测试数据
@@ -158,6 +164,7 @@ export default class Reward extends cc.Component {
         }
         if (!gData.reward.data || !gData.reward.data.length) return;
         mk.audio.playEffect("rewardOpen");
+        this.hb_star.active = true;
         this.cur_stage = LidType.none;
 
         // 数据排序:多条奖励,只展示红包,把红包放在首位
@@ -233,4 +240,8 @@ export default class Reward extends cc.Component {
         }
     }
 
+    onClickClose() {
+        mk.ad.destroyNativeAd();
+        mk.ad.checkShowInterByChance();
+    }
 }

+ 7 - 2
assets/script/game/module/setting/Setting.ts

@@ -30,7 +30,7 @@ export default class Setting extends cc.Component {
     }
 
     start() {
-
+        mk.ad.showNativeAd(4);
     }
 
     private async initData() {
@@ -44,7 +44,7 @@ export default class Setting extends cc.Component {
         this.img_effect.spriteFrame = await mk.loader.load(effect, cc.SpriteFrame);
 
         console.log("=== gData.wechatData.avatar", gData.wechatData.avatar);
-        let result = await mk.loader.loadRemote(gData.wechatData.avatar+"?aaa=aa.jpg", null);
+        let result = await mk.loader.loadRemote(gData.wechatData.avatar + "?aaa=aa.jpg", null);
         this.img_head.spriteFrame = new cc.SpriteFrame(result);
         console.log("=== loadHead:", result);
         // this.img_head.spriteFrame = result;
@@ -95,4 +95,9 @@ export default class Setting extends cc.Component {
     onDestroy() {
 
     }
+
+    onClickClose() {
+       mk.ad.destroyNativeAd();
+       mk.ad.checkShowInterByChance();
+    }
 }

+ 15 - 0
assets/script/game/module/sign/Sign.ts

@@ -1,5 +1,7 @@
+import JsbSystem from "../../../mk/system/JsbSystem";
 import TableView from "../../component/TableView";
 import { AdFun } from "../../data/AdData";
+import { RewardType } from "../../data/GameData";
 
 /**
  * 签到界面
@@ -25,6 +27,7 @@ export default class Sign extends cc.Component {
     }
 
     start() {
+        mk.ad.showNativeAd(4);
         // gData.sign.sign_can = gData.gameData.getProp(GameProp.sign_can);
         gData.sign.initListData();
         gData.sign.init_data = true;
@@ -68,6 +71,13 @@ export default class Sign extends cc.Component {
         if (gData.gameData.gameData.isSignInToday == 1) return;
         if (!gData.sign.haveSignDay()) return;
 
+        const index_old = gData.sign.getItemIndexByCanSign();
+        if (gData.sign.c_sign[index_old].rewardType === RewardType.rmb) {
+            if (!gData.loginData.isAuth) {
+                JsbSystem.WxAuth();
+                return;
+            }
+        }
         // 看广告
         mk.ad.watchAd((success: boolean) => {
             mk.console.log("watchAD:" + success);
@@ -105,4 +115,9 @@ export default class Sign extends cc.Component {
             this.anim_btn.getComponent('SetGray').setGray(true);
         }
     }
+
+    onClickClose() {
+        mk.ad.destroyNativeAd();
+        mk.ad.checkShowInterByChance();
+    }
 }

+ 6 - 2
assets/script/game/module/turntable/Turnable.ts

@@ -80,11 +80,11 @@ export default class Turnable extends cc.Component {
         let index = 0;
         let i = 0;
         while (i < this.rewardWeights.length - 1) {
-            if(i < type - 1){
+            if (i < type - 1) {
                 index += this.rewardWeights[i];
                 i++;
             }
-            else{
+            else {
                 index += Math.floor(Math.random() * this.rewardWeights[i]);
                 break;
             }
@@ -156,4 +156,8 @@ export default class Turnable extends cc.Component {
     onDestroy() {
 
     }
+
+    onClickClose() {
+        mk.ad.checkShowInterByChance();
+    }
 }

+ 25 - 0
assets/script/mk/sdk/ad/IADSDKMgr.ts

@@ -0,0 +1,25 @@
+export interface IADSDKMgr {
+
+    /** 初始化SDK */
+    initSDK();
+
+    /** 观看视频 */
+    showVideoAd();
+    
+    /** 显示插屏 */
+    showInterAd();
+    
+    /** 加载原生 */
+    loadNativeAd(type: number, show: boolean);
+    
+    /** 销毁原生 */
+    destroyNativeAd();
+    
+    /** 显示banner */
+    showBannerAd();
+    
+    /** 销毁banner */
+    destoryBanner();
+
+    showInter();
+}

+ 9 - 0
assets/script/mk/sdk/ad/IADSDKMgr.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "9f951073-d437-4549-b159-5ce7b8c1e491",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 75 - 7
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATBanner.ts

@@ -1,4 +1,4 @@
-import { zgSingleton } from "../zgSingleton";
+import { zgSingleton } from "../../zgSingleton";
 import ATSDKMgr from "./ATSDKMgr";
 
 /**
@@ -9,8 +9,10 @@ import ATSDKMgr from "./ATSDKMgr";
 export default class ATBanner extends zgSingleton {
 
     init() {
-        cc["ATNativeJS"].proxy = this;;
-        cc["ATNativeJS"].init();
+        cc["ATBannerJS"].proxy = this;
+        console.log("cc[ATBannerJS]", cc["ATBannerJS"]);
+        console.log("window[ATBannerJS]", window["ATBannerJS"]);
+        cc["ATBannerJS"].init();
         this.loadBanner();
     }
 
@@ -25,15 +27,81 @@ export default class ATBanner extends zgSingleton {
 
     /* *加载banner */
     loadBanner() {
-        cc["ATNativeJS"].loadBanner();
+        cc["ATBannerJS"].loadBanner();
     }
-    
+
     /** 显示banner */
     showBanner() {
-        cc["ATNativeJS"].showBanner();
+        cc["ATBannerJS"].showBanner();
     }
 
     destroyBanner() {
-        cc["ATNativeJS"].destroyBanner()
+        cc["ATBannerJS"].destroyBanner()
+    }
+
+    //广告回调部分------------------------------------------------------------------------
+    /**
+     * banner加载成功
+     * @param {*} placementId 广告位id
+     * @returns 
+     */
+    onBannerAdLoaded(placementId) {
+        // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdLoaded(" + placementId + ")");
+    }
+
+    /**
+     *  banner加载失败
+     * @param {*} placementId 广告位id
+     * @param {*} errorInfo   错误信息
+     * @returns 
+     */
+    onBannerAdLoadFail(placementId, errorInfo) {
+        // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdLoadFail(" + placementId + ", " + errorInfo + ")");
+    }
+
+    /**
+     * banner展示成功
+     * @param {*} placementId  广告位id
+     * @param {*} callbackInfo 回调信息
+     * @returns 
+     */
+    onBannerAdShow(placementId, callbackInfo) {
+        // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdShow(" + placementId + ", " + callbackInfo + ")");
+    }
+
+    /**
+     * banner被点击
+     * @param {*} placementId  广告位id
+     * @param {*} callbackInfo 回调信息
+     * @returns 
+     */
+    onBannerAdClick(placementId, callbackInfo) {
+        // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdClick(" + placementId + ", " + callbackInfo + ")");
+    }
+
+    /** banner自动刷新成功 */
+    onBannerAdAutoRefresh(placementId, callbackInfo) {
+        // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdAutoRefresh(" + placementId + ", " + callbackInfo + ")");
+    }
+
+    /**
+     * banner自动刷新失败
+     * @param {*} placementId 广告位id
+     * @param {*} errorInfo   错误信息
+     * @returns 
+     */
+    onBannerAdAutoRefreshFail(placementId, errorInfo) {
+        // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdAutoRefreshFail(" + placementId + ", " + errorInfo + ")");
+    }
+
+    /**
+     * banner关闭按钮被点击
+     * @param {*} placementId  广告位id
+     * @param {*} callbackInfo 错误信息
+     * @returns 
+     */
+    onBannerAdCloseButtonTapped(placementId, callbackInfo) {
+        // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdCloseButtonTapped(" + placementId + ", " + callbackInfo + ")");
+
     }
 }

+ 115 - 4
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATInterstitial.ts

@@ -1,5 +1,5 @@
 
-import { zgSingleton } from "../zgSingleton";
+import { zgSingleton } from "../../zgSingleton";
 import ATSDKMgr from "./ATSDKMgr";
 
 /**
@@ -9,11 +9,14 @@ import ATSDKMgr from "./ATSDKMgr";
  */
 export default class ATInterstitial extends zgSingleton {
 
-   
+    private ATInterstitialJS: any;
+
     init() {
-        cc["ATInterstitialJS"].proxy = this;;
-        cc["ATInterstitialJS"].init();
+        this.ATInterstitialJS = cc["ATInterstitialJS"];
+        this.ATInterstitialJS.proxy = this;;
+        this.ATInterstitialJS.init();
         // this.loadNative();
+        this.loadInter(0);
     }
 
     /** 广告位id */
@@ -33,4 +36,112 @@ export default class ATInterstitial extends zgSingleton {
             }
         }
     }
+
+    /** 插屏广告
+     * @param type 0 普通插屏 1 全屏视频插屏
+     */
+    loadInter(type) {
+        // // console.log('99999999   loadInterPre  ', type)
+        // if (!this.onloadInter) {
+        //     this.onloadInter = true
+        //     // console.log('99999999   loadInter  ', type)
+        this.ATInterstitialJS.loadInter(type);
+
+        //     //FC:UROI事件
+        //     if (GameM.commonData.ifUROI) {
+        //         let eventID = EncryptUtil.randomString(32);
+        //         AdM.sendUROIEvent(eventID, '', GameM.commonData.interPlaceId, "ad_request", "interstitial", 'other', '')
+        //     }
+        // }
+    }
+
+    showInter(type) {
+        // this.interType = type
+        // if (cc["thirdVideo"].checkInterReady(type)) {
+        //     // console.log('99999999   showInter success')
+        //     cc["thirdVideo"].showInter(type);
+        // }
+        // else {
+        //     // console.log('99999999   showInter fail')
+        //     this.loadInter(type)
+        // }
+        this.ATInterstitialJS.showInter(0);
+    }
+
+    //广告回调部分------------------------------------------------------------------------
+    onInterstitialAdLoaded(placementId) {
+        // this.onloadInter = false
+        // // console.log('99999999   onInterstitialAdLoaded  ')
+        // if (GameM.commonData.ifUROI) {
+        //     let eventID = EncryptUtil.randomString(32);
+        //     AdM.sendUROIEvent(eventID, '', placementId, "ad_fill", "interstitial", 'other', '')
+        // }
+    }
+
+    onInterstitialAdLoadFail(placementId, errorInfo) {
+        // this.onloadInter = false
+        // // console.log('99999999   onInterstitialAdLoadFail')
+
+        // if (placementId == GameM.commonData.fullInterPlaceId) {
+        //     EffectNode.instance.PlayTip('拉取全屏视频失败,请稍后再试')
+        //     GameM.commonData.updateADLog(10, placementId)
+        // }
+        // else if (placementId == GameM.commonData.interPlaceId) {
+        //     GameM.commonData.updateADLog(11, placementId)
+        // }
+    }
+
+    //广告展示成功
+    onInterstitialAdShow(placementId, callbackInfo) {
+        // // console.log('99999999   onInterstitialAdShow')
+        // let data = JSON.parse(callbackInfo)
+        // let id = 2
+        // if (placementId == GameM.commonData.interPlaceId) {
+        //     id = 2
+        // }
+        // else if (placementId == GameM.commonData.fullInterPlaceId) {
+        //     id = 9
+        // }
+        // GameM.commonData.updateADLog(id, placementId, data.adunit_format, data.network_type, data.network_placement_id,
+        //     data.network_firm_id, data.adsource_id, data.adsource_index, data.adsource_price,
+        //     data.adsource_isheaderbidding, data.publisher_revenue, data.precision, data.ecpm_level)
+
+        // if (GameM.commonData.ifUROI) {
+        //     let eventID = EncryptUtil.randomString(32);
+        //     let adAdn = this.getAdAdn(data.network_firm_id)
+        //     let price = GameM.commonData.getAdPrice(data.adsource_id, data.adsource_price)
+        //     AdM.sendUROIEvent(eventID, data.id, placementId, "ad_show", "interstitial", adAdn, price)
+        // }
+    }
+
+    onInterstitialAdClick(placementId, callbackInfo) {
+        // let data = JSON.parse(callbackInfo)
+
+        // if (GameM.commonData.ifUROI) {
+        //     let eventID = EncryptUtil.randomString(32);
+        //     let adAdn = this.getAdAdn(data.network_firm_id)
+        //     let price = GameM.commonData.getAdPrice(data.adsource_id, data.adsource_price)
+        //     AdM.sendUROIEvent(eventID, data.id, placementId, "ad_click", "interstitial", adAdn, price)
+        // }
+    }
+
+    //插屏广告关闭
+    onInterstitialAdClose(placementId, callbackInfo) {
+        // //给奖励
+        // // console.log('AnyThinkInterstitialDemo  ', this.interType)
+        // if (placementId == GameM.commonData.fullInterPlaceId) {
+        //     GameM.commonData.showFull = false
+        //     GameM.commonData.todayFullInterTimes++
+        //     GameM.globalStorage.setStorage(STORAGE_KEY.todayFullInterTimes, GameM.commonData.todayFullInterTimes)
+        //     AdM.videoReward()
+
+        //     let data = JSON.parse(callbackInfo)
+        //     GameM.commonData.updateADLog(8, placementId, data.adunit_format, data.network_type, data.network_placement_id,
+        //         data.network_firm_id, data.adsource_id, data.adsource_index, data.adsource_price,
+        //         data.adsource_isheaderbidding, data.publisher_revenue, data.precision, data.ecpm_level)
+        // }
+
+        // this.loadInter(this.interType)
+    }
+
 }

+ 10 - 8
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATNative.ts

@@ -1,4 +1,4 @@
-import { zgSingleton } from "../zgSingleton";
+import { zgSingleton } from "../../zgSingleton";
 import ATSDKMgr from "./ATSDKMgr";
 
 /**
@@ -8,10 +8,12 @@ import ATSDKMgr from "./ATSDKMgr";
  */
 export class ATNative extends zgSingleton {
 
+    private ATNativeJS: any;
     /** 初始化 */
     init() {
-        cc["ATNativeJS"].proxy = this;;
-        cc["ATNativeJS"].init();
+        this.ATNativeJS = cc["ATNativeJS"];
+        this.ATNativeJS.proxy = this;;
+        this.ATNativeJS.init();
         this.loadNative();
     }
 
@@ -29,8 +31,8 @@ export class ATNative extends zgSingleton {
      * @param type 类型对应不同位置
      * @param show 是否加载完显示显示
      */
-    loadNative(type = 0, show = false) {
-        cc["ATNativeJS"].loadNative(type, show);
+    loadNative(type = 4, show = false) {
+        this.ATNativeJS.loadNative(type, show);
     }
 
     /** 
@@ -38,7 +40,7 @@ export class ATNative extends zgSingleton {
      * @param type 0 弹窗里  1 最底部 2 新车奖励 3 底部小窗口
      */
     showNative(type) {
-        cc["ATNativeJS"].showNative(type);
+        this.ATNativeJS.showNative(type);
     }
 
     /**
@@ -56,11 +58,11 @@ export class ATNative extends zgSingleton {
 
     /** 销毁baaner */
     destroyNative() {
-        cc["ATNativeJS"].destroyNative();
+        this.ATNativeJS.destroyNative();
     }
 
     /** 当前是否有banner显示 */
     getIsNativeShow() {
-        return cc["ATNativeJS"].nativeShow
+        return this.ATNativeJS.nativeShow
     }
 }

+ 1 - 0
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATNativeJS.js

@@ -145,6 +145,7 @@ var ATNativeJS = cc.Class({
         ATNativeJSSDK.showAd(this.placementID(), nativeAdViewProperty);
     },
 
+    //广告回调部分------------------------------------------------------------------------
     /**
      * 原生广告加载成功
      * @param {*} placementId 

+ 52 - 17
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideo.ts

@@ -1,4 +1,4 @@
-import { zgSingleton } from "../zgSingleton";
+import { zgSingleton } from "../../zgSingleton";
 import ATSDKMgr, { AdPlayStateType } from "./ATSDKMgr";
 
 /**
@@ -8,18 +8,22 @@ import ATSDKMgr, { AdPlayStateType } from "./ATSDKMgr";
  */
 export class ATRewardVideo extends zgSingleton {
 
-    /**是否加载成功 */
-    public ifLoadSuccess: boolean = false;
+    /** 激励视频状态 */
+    public reawardAdState: RewardAdLoadState = 0;
+    /** 是否加载完显示 */
+    public ifLoadShow: boolean = false;
     /**是否观看完毕 */
     public ifWatchEnd: boolean = false;
 
     init() {
- 
+
         cc["ATRewardVideoJS"].proxy = this;
         cc["ATRewardVideoJS"].init();
-       
+
         this.ifWatchEnd = false;
-        this.loadAd();
+        if (this.reawardAdState == RewardAdLoadState.Unload) {
+            this.loadAd();
+        }
     }
 
     /** 广告位id */
@@ -33,13 +37,22 @@ export class ATRewardVideo extends zgSingleton {
 
     /** 加载广告 */
     loadAd() {
-        this.ifLoadSuccess = false;
+        console.log("anythink === 加载激励视频广告", RewardAdLoadState[this.reawardAdState]);
+        if (this.reawardAdState == RewardAdLoadState.Loading) {
+            return;
+        }
+        this.reawardAdState = RewardAdLoadState.Loading;
         cc["ATRewardVideoJS"].loadAd("userIdKey", "userDataKey");
     }
 
     /** 显示广告 */
     showAd() {
-        this.ifLoadSuccess = true;
+        if (this.reawardAdState != RewardAdLoadState.LoadSuccess) {
+            this.loadAd();
+            this.ifLoadShow = true;
+            return;
+        }
+
         cc["ATRewardVideoJS"].showAd();
     }
 
@@ -55,15 +68,23 @@ export class ATRewardVideo extends zgSingleton {
     onRewardedVideoAdLoaded(placementId: string) {
         // ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdLoaded(" + placementId + ")");
         // ATRewardVideo.getInstance().showAd()
+        console.log("anythink === 加载激励视频广告成功", this.checkReady(), RewardAdLoadState[this.reawardAdState])
+        this.reawardAdState = RewardAdLoadState.LoadSuccess;
+        if (this.ifLoadShow) {
+            this.showAd();
+            this.ifLoadShow = false;
+        }
     }
 
     /**
-     * 激励视频播放失败
+     * 激励视频加载失败
      * @param placementId 广告位id
      * @param errorInfo   错误信息
      */
     onRewardedVideoAdFailed(placementId, errorInfo) {
-        //ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdFailed(" + placementId + ", " + errorInfo + ")");
+        // ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdFailed(" + placementId + ", " + errorInfo + ")");
+        console.log("anythink === 加载激励视频广告失败", RewardAdLoadState[this.reawardAdState]);
+        this.reawardAdState = RewardAdLoadState.LoadFail;
     }
 
     /**
@@ -80,9 +101,11 @@ export class ATRewardVideo extends zgSingleton {
         // HttpMgr.Inst.updateADLog(4, placementId, data.adunit_format, data.network_type, data.network_placement_id,
         //     data.network_firm_id, data.adsource_id, data.adsource_index, data.adsource_price,
         //     data.adsource_isheaderbidding, data.publisher_revenue, data.precision, data.ecpm_level);
-        gData.adData.updateData(placementId,data);
+        gData.adData.updateData(placementId, data);
 
-        this.loadAd();
+        this.reawardAdState = RewardAdLoadState.Unload;
+        //点击关闭的时候重新加载(亲测,即使在start这边 加载 也是在点击关闭时候才返回成功)
+        //this.loadAd();
     }
 
     /**
@@ -125,7 +148,7 @@ export class ATRewardVideo extends zgSingleton {
 
         if (this.ifWatchEnd) {
             // 2021/06/03(勿删)此处为星云埋点,先注释,待接口调通,恢复
-            //视频埋点结束
+            // 视频埋点结束
             // let data = JSON.parse(callbackInfo)
             // HttpMgr.Inst.updateVideoTimes(placementId, data.adunit_format, data.network_type, data.network_placement_id,
             //     data.network_firm_id, data.adsource_id, data.adsource_index, data.adsource_price,
@@ -138,10 +161,8 @@ export class ATRewardVideo extends zgSingleton {
         }
 
         this.ifWatchEnd = false;
-
-        if (!this.ifLoadSuccess) {
-            this.loadAd();
-        }
+        
+        this.loadAd();
     }
 
     /**
@@ -163,4 +184,18 @@ export class ATRewardVideo extends zgSingleton {
         // ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onReward(" + placementId + ", " + callbackInfo + ")");
         this.ifWatchEnd = true;
     }
+}
+
+/** 激励视频广告加载状态 */
+export enum RewardAdLoadState {
+    /** 未加载 */
+    Unload = 0,
+    /** 加载中 */
+    Loading = 1,
+    /** 加载成功 */
+    LoadSuccess = 2,
+    /** 加载失败 */
+    LoadFail = 3,
+    /** 播放结束 */
+    PlayEnd = 4
 }

+ 1 - 0
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideoJS.js

@@ -34,6 +34,7 @@ var ATRewardVideoJS = cc.Class({
         ATRewardedVideoJSSDK.showAdInScenario(this.placementID(), "");
     },
 
+    //广告回调部分------------------------------------------------------------------------
     /** 检测广告是否加载好 */
     checkReady: function () {
         ATJSSDK.printLog("AnyThinkRewardedVideo::checkReady()   " + (ATRewardedVideoJSSDK.hasAdReady(this.placementID()) ? "Ready" : "No"));

+ 28 - 16
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr.ts

@@ -1,15 +1,14 @@
-import AdSystem from "../../../../system/AdSystem";
 import JsbSystem from "../../../../system/JsbSystem";
-import { zgSingleton } from "../zgSingleton";
+import { IADSDKMgr as IADSDKMgr } from "../../IADSDKMgr";
+import { zgSingleton } from "../../zgSingleton";
 import ATBanner from "./ATBanner";
 import ATInterstitial from "./ATInterstitial";
 import { ATNative } from "./ATNative";
 import { ATRewardVideo } from "./ATRewardVideo";
 
 const { ccclass, property } = cc._decorator;
-
 @ccclass
-export default class ATSDKMgr extends zgSingleton {
+export default class ATSDKMgr extends zgSingleton implements IADSDKMgr {
 
     /**Topon Appid */
     public static topon_android_appId = "a5f8fa5f10c661";
@@ -41,8 +40,10 @@ export default class ATSDKMgr extends zgSingleton {
         ATRewardVideo.getInstance().init();
         //初始化原生广告
         ATNative.getInstance().init();
-        // ATInterstitial.getInstance().init();
-        // ATBanner.getInstance().init();
+        // //初始化插屏广告
+        ATInterstitial.getInstance().init();
+        //初始化banner广告
+        ATBanner.getInstance().init();
     }
 
     placementID() {
@@ -57,23 +58,22 @@ export default class ATSDKMgr extends zgSingleton {
     public getAdvertiseChannel() {
         let str = JsbSystem.getAdvertisingChannel();
         if (!str) {
+            //channelId,AppId,AppSecreate,激励视频,插屏,信息流,开屏,banner
             str = '1,a60cac090a6eb0,66b742dd0e502b64d783d9c66a9d30c4,b60cac0e43c0e1,b60cac0e4892fa,b60cac0e4d08e8,b60cac0e5754fc,b60cac0e524313';
         }
         console.log("getAdvertiseChannel..." + str);
 
         let arr = str.split(',')
-        let channel = arr[0]
-        ATSDKMgr.topon_android_appId = arr[1]
-        ATSDKMgr.topon_android_appSecret = arr[2]
-        ATSDKMgr.topon_rewardVideo_placementId = arr[3]
-        ATSDKMgr.topon_inter_placementId = arr[4]
-        ATSDKMgr.topon_native_placementId = arr[5]
-        if (arr.length >= 7 && arr[6]) {
-            ATSDKMgr.topon_fullinter_placementId = arr[6]
-        }
+        let channel = arr[0];
+        ATSDKMgr.topon_android_appId = arr[1];
+        ATSDKMgr.topon_android_appSecret = arr[2];
+        ATSDKMgr.topon_rewardVideo_placementId = arr[3];
+        ATSDKMgr.topon_inter_placementId = arr[4];
+        ATSDKMgr.topon_native_placementId = arr[5];
+        ATSDKMgr.topon_fullinter_placementId = arr[6];
+        ATSDKMgr.topon_banner_placementId = arr[7];
     }
 
-
     /**显示视频广告 */
     showVideoAd() {
         ATRewardVideo.getInstance().showAd();
@@ -115,6 +115,18 @@ export default class ATSDKMgr extends zgSingleton {
     destroyNativeAd() {
         ATNative.getInstance().destroyNative();
     }
+
+    showBannerAd() {
+        ATBanner.getInstance().showBanner();
+    }
+
+    destoryBanner() {
+        ATBanner.getInstance().destroyBanner();
+    }
+
+    showInter() {
+        ATInterstitial.getInstance().showInter(0);
+    }
 }
 
 /** 广告播放状态类型 */

+ 0 - 0
assets/script/mk/sdk/ad/toppon/zgSingleton.ts → assets/script/mk/sdk/ad/zgSingleton.ts


+ 1 - 1
assets/script/mk/sdk/ad/toppon/zgSingleton.ts.meta → assets/script/mk/sdk/ad/zgSingleton.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.8",
-  "uuid": "32a8d1fd-ea9e-4cd1-baa9-a87b984269da",
+  "uuid": "ef0c44c0-f2eb-4c22-9b82-017fda9ced10",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

+ 35 - 6
assets/script/mk/system/AdSystem.ts

@@ -1,3 +1,4 @@
+import { IADSDKMgr } from "../sdk/ad/IADSDKMgr";
 import JsbSystem from "./JsbSystem";
 
 /**
@@ -10,13 +11,13 @@ export default class AdSystem {
     /** 构造函数
      * @param adSdk 传入当前使用广告sdk
      */
-    constructor(adSdk: any) {
+    constructor(adSdk: IADSDKMgr) {
         this.adSdk = adSdk;
-        this.init();
+        // this.init();
     }
 
     /** 广告sdk */
-    public adSdk: any = null;
+    private adSdk: IADSDKMgr = null;
 
     /** 是否显示广告 */
     public ifShowAd: boolean = true;
@@ -69,13 +70,13 @@ export default class AdSystem {
 
     /** 观看广告失败 */
     public watchAdFail() {
-        mk.console.log("watchAdFail");
+        mk.console.log("=== watchAdFail");
         this.videoAdcallBack(false);
     }
 
     /** 观看广告取消 */
     public watchAdCancel() {
-        mk.console.log("watchAdCancel");
+        mk.console.log("=== watchAdCancel");
         this.videoAdcallBack(false);
     }
 
@@ -84,7 +85,7 @@ export default class AdSystem {
      * @param placementId 广告位id
      */
     public wacthAdSuccess(placementId = '') {
-        mk.console.log("wacthAdSuccess");
+        mk.console.log("=== wacthAdSuccess");
         this.videoAdcallBack(true);
         this.initLastTimeStamp();
     }
@@ -143,4 +144,32 @@ export default class AdSystem {
         }
         return false;
     }
+
+    public showBannerAd() {
+        if (!this.ifShowAd) {
+            return;
+        }
+        this.adSdk.showBannerAd();
+    }
+
+    /**
+     * showInterAd
+     * @param type
+     */
+    public showInterAd(type: number) {
+        if (!this.ifShowAd) {
+            return;
+        }
+        this.adSdk.showInter();
+    }
+
+    /**
+     * 根据几率检测弹出插屏
+     */
+    public checkShowInterByChance() {
+        let random = Math.random();
+        if (random < 0.5) {
+            this.showInterAd(0);
+        }
+    }
 }

+ 0 - 1
assets/script/mk/system/GuideSystem.ts

@@ -1,5 +1,4 @@
 import { GameProp } from "../../game/data/GameData";
-import { Guide } from "../../game/data/module/GuideData";
 
 
 /**

+ 3 - 2
assets/script/mk/system/PoolSystem.ts

@@ -43,7 +43,7 @@ export default class PoolSystem {
         } else {
             let prefab = await mk.loader.load(url, cc.Prefab);
             node = cc.instantiate(prefab);
-            pool.put(node);
+            pool && pool.put(node);
         }
         return node;
     }
@@ -54,7 +54,8 @@ export default class PoolSystem {
      * @param node 
      */
     return(name, node: cc.Node) {
-        node.destroy();
+        // node.destroy();
+        node.removeFromParent();
         let pool = this.poolList[name];
         if (pool) {
             pool.put(node);

+ 9 - 9
assets/script/mk/system/TipSystem.ts

@@ -7,23 +7,23 @@ const { ccclass, property } = cc._decorator;
  */
 export default class TipSystem extends cc.Component {
     @property({ type: cc.Integer, displayName: "飘动时间" })
-    private tween_time: number = 1;
+     tween_time: number = 1;
     @property({ type: cc.Integer, displayName: "开始坐标x" })
-    private src_x: number = 0;
+     src_x: number = 0;
     @property({ type: cc.Integer, displayName: "开始坐标y" })
-    private src_y: number = 0;
+     src_y: number = 0;
     @property({ type: cc.Integer, displayName: "目标坐标x" })
-    private tar_x: number = 0;
+     tar_x: number = 0;
     @property({ type: cc.Integer, displayName: "目标坐标y" })
-    private tar_y: number = 200;
+     tar_y: number = 200;
     @property({ type: cc.Integer, displayName: "背景透明度" })
-    private bg_opacity: number = 40;
+     bg_opacity: number = 40;
     @property({ displayName: "背景颜色" })
-    private bg_color = new cc.Color(200, 200, 200);
+     bg_color = new cc.Color(200, 200, 200);
     @property({ displayName: "文本颜色" })
-    private tip_color = new cc.Color(255, 255, 255);
+     tip_color = new cc.Color(255, 255, 255);
     @property({ type: cc.Integer, displayName: "文本字体" })
-    private tip_size: number = 40;
+     tip_size: number = 40;
 
     onLoad() {
         mk.tip = this;

+ 1 - 1
assets/script/mk/utils/GameUtil.ts

@@ -33,7 +33,7 @@ export default class GameUtil {
      * 获取世界坐标
      * @param 需要获取的节点
      */
-    public static getWorldPos(node: cc.Node): cc.Vec2 {
+    public getWorldPos(node: cc.Node): cc.Vec2 {
         let originX = node.x;
         let originY = node.y;
         let curNode = node;

+ 2 - 2
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/EasyEliminate.iml

@@ -40,10 +40,10 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../../Classes" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/../../../app">
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />

+ 8 - 8
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.stderr.txt

@@ -8,6 +8,14 @@ D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos
     that->Set(context(), name_string, function);
     ^~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 1 warning generated.
+In file included from D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_agent.cc:6:
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.h:528:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+    that->Set(context(), name_string, function);
+    ^~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_agent.cc:675:3: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+  message->Set(parent_env_->context(), FIXED_ONE_BYTE_STRING(isolate, "cmd"),
+  ^~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+2 warnings generated.
 In file included from D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:6:
 D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.h:528:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
     that->Set(context(), name_string, function);
@@ -68,14 +76,6 @@ D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos
     process->Set(env->context(),env->events_string(), events_obj);
     ^~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 16 warnings generated.
-In file included from D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_agent.cc:6:
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.h:528:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-    that->Set(context(), name_string, function);
-    ^~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_agent.cc:675:3: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-  message->Set(parent_env_->context(), FIXED_ONE_BYTE_STRING(isolate, "cmd"),
-  ^~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-2 warnings generated.
 In file included from D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_io.cc:5:
 D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.h:528:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
     that->Set(context(), name_string, function);

+ 67 - 67
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.stdout.txt

@@ -1,54 +1,55 @@
 Android NDK: WARNING: Unsupported source file extensions in D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x/cocos/Android.mk for module cocos2dx_static    
 Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/RecyclePool.hpp    
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= EffectBase.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= EffectVariant.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= EffectBase.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_gfx_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_renderer_manual.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_video_auto.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_gfx_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_gfx_manual.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_webview_auto.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SocketIO.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= WebSocketServer.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_audioengine_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_renderer_auto.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SocketIO.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_websocket_server.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= tinysndfile.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_websocket.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_socketio.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_audioengine_auto.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= mp3reader.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_spine_manual.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_socketio.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_websocket.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_particle_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2djs <= main.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_spine_manual.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= WebSocket-libwebsockets.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= cocos2d.cpp
 [armeabi-v7a] Compile++ arm  : cocos2djs <= AppDelegate.cpp
-[armeabi-v7a] Compile++ arm  : cocos2djs <= jsb_module_register.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCSAXParser.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCImage.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= WebSocket-libwebsockets.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_dragonbones_manual.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCSAXParser.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= MathUtil.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCImage.cpp
+[armeabi-v7a] Compile++ arm  : cocos2djs <= jsb_module_register.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCGeometry.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCVertex.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Mat4.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCFileUtils.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Quaternion.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Vec2.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCFileUtils.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Vec3.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_dragonbones_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Vec4.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Mat3.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_dragonbones_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCAutoreleasePool.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCData.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCRef.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCConfiguration.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= base64.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_spine_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= TGAlib.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccCArray.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_spine_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCValue.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccCArray.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCThreadPool.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= ZipUtils.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccTypes.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccRandom.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccTypes.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= etc1.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= etc2.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccUtils.cpp
@@ -57,8 +58,8 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCLog.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCGLUtils.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCScheduler.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCRenderTexture.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= csscolorparser.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCRenderTexture.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= LocalStorage-android.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCDownloader.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCDownloader-android.cpp
@@ -66,8 +67,8 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Uri.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= HttpClient-android.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_network_auto.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= JavaScriptJavaBridge.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_classtype.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_extension_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= config.cpp
@@ -76,44 +77,44 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= MappingUtils.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_conversions.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_network_manual.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= HandleObject.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= RefCounter.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= HandleObject.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_platform_android.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_xmlhttprequest.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Value.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= State.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_xmlhttprequest.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Class.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= ObjectWrap.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= xxtea.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Class.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Object.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= xxtea.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_global.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= tinyxml2.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= ioapi_mem.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_global.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ScriptEngine.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Utils.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ScriptEngine.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= EventDispatcher.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= ioapi.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= unzip.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= EventDispatcher.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ConvertUTFWrapper.cpp
 [armeabi-v7a] Compile arm    : cocos2dx_static <= ConvertUTF.c
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ConvertUTFWrapper.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= edtaa3func.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= SHA1.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= EditBox-android.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCTTFTypes.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCFontAtlas.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCTTFTypes.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCFontFreetype.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCTTFLabelAtlasCache.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= util.cc
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCLabelLayout.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= env.cc
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCTTFLabelRenderer.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCLabelLayout.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= inspector_socket.cc
 [armeabi-v7a] Compile arm    : cocos2dx_static <= http_parser.c
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= node.cc
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= node_debug_options.cc
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= GFXUtils.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= node_debug_options.cc
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= inspector_agent.cc
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= inspector_socket_server.cc
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= node.cc
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= inspector_io.cc
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Types.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= FrameBuffer.cpp
@@ -122,8 +123,8 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= GraphicsHandle.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= IndexBuffer.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderBuffer.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Program.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderTarget.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Program.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= State.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Texture.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Texture2D.cpp
@@ -135,31 +136,31 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Camera.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Light.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Model.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= BaseRenderer.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Pass.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= View.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= BaseRenderer.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Scene.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Technique.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= ProgramLib.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= AssemblerBase.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= MaskAssembler.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CustomAssembler.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderDataList.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderData.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= MaskAssembler.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Assembler.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= ForwardRenderer.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderData.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderDataList.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= TiledMapAssembler.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= AssemblerSprite.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SimpleSprite2D.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= SimpleSprite3D.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SimpleSprite2D.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= SlicedSprite3D.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= SlicedSprite2D.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= MeshAssembler.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Particle3DAssembler.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= MeshBuffer.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ModelBatcher.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= StencilManager.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= ParallelTask.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ModelBatcher.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= MemPool.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= NodeMemPool.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderFlow.cpp
@@ -173,24 +174,24 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoder.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderProvider.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= AudioEngine.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioEngine-inl.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderSLES.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderOgg.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioEngine-inl.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderMp3.cpp
 [armeabi-v7a] Compile++ arm  : cocos_extension_static <= AssetsManagerEx.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioResamplerCubic.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderWav.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderMp3.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= AudioResampler.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioResamplerCubic.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= PcmBufferProvider.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= PcmData.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= PcmAudioPlayer.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioPlayerProvider.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= PcmData.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= UrlAudioPlayer.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioPlayerProvider.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= AudioMixerController.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= PcmAudioService.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= Track.cpp
-[armeabi-v7a] Compile thumb  : audioengine_static <= format.c
+[armeabi-v7a] Compile++ thumb: audioengine_static <= PcmAudioService.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= AudioMixer.cpp
+[armeabi-v7a] Compile thumb  : audioengine_static <= format.c
 [armeabi-v7a] Compile++ thumb: audioengine_static <= minifloat.cpp
 [armeabi-v7a] Compile thumb  : audioengine_static <= primitives.c
 [armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_helper.cpp
@@ -200,24 +201,23 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ arm  : editor_support_static <= middleware-adapter.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= Animation.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= IOTypedArray.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= TypedArrayPool.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= AnimationState.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= MiddlewareManager.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= TypedArrayPool.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= AnimationStateData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= MiddlewareManager.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= Atlas.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= AtlasAttachmentLoader.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= ParticleSimulator.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= Attachment.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= ParticleSimulator.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= AttachmentLoader.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= AttachmentTimeline.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_editor_support_auto.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Bone.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= BoneData.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= BoundingBoxAttachment.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Bone.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= ClippingAttachment.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= ColorTimeline.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= Constraint.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_particle_auto.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= ConstraintData.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= CurveTimeline.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= DeformTimeline.cpp
@@ -262,8 +262,8 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ arm  : editor_support_static <= TransformConstraintTimeline.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= TranslateTimeline.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= Triangulator.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= TwoColorTimeline.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= Updatable.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= TwoColorTimeline.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= VertexAttachment.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= VertexEffect.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= AttachmentVertices.cpp
@@ -289,35 +289,35 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ arm  : editor_support_static <= BaseObject.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= Slot.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= Point.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= EventObject.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= Transform.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= EventObject.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= AnimationConfig.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= DragonBones.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= BoundingBoxData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= CanvasData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= DragonBones.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= AnimationData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= CanvasData.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= BaseFactory.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= ConstraintData.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= ArmatureData.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= DisplayData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= DragonBonesData.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= SkinData.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= TextureAtlasData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= DragonBonesData.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= UserData.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= DataParser.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= BinaryDataParser.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= CCTextureAtlasData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= JSONDataParser.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= CCArmatureDisplay.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= JSONDataParser.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= CCSlot.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= CCFactory.cpp
 [armeabi-v7a] Compile arm    : vorbisidec <= bitwise.c
-[armeabi-v7a] Compile++ arm  : editor_support_static <= ArmatureCache.cpp
 [armeabi-v7a] Compile arm    : vorbisidec <= dsp.c
 [armeabi-v7a] Compile++ arm  : editor_support_static <= ArmatureCacheMgr.cpp
-[armeabi-v7a] Compile arm    : vorbisidec <= codebook.c
+[armeabi-v7a] Compile++ arm  : editor_support_static <= ArmatureCache.cpp
 [armeabi-v7a] Compile arm    : vorbisidec <= floor0.c
 [armeabi-v7a] Compile arm    : vorbisidec <= floor1.c
+[armeabi-v7a] Compile arm    : vorbisidec <= codebook.c
 [armeabi-v7a] Compile arm    : vorbisidec <= floor_lookup.c
 [armeabi-v7a] Compile++ arm  : editor_support_static <= CCArmatureCacheDisplay.cpp
 [armeabi-v7a] Compile arm    : vorbisidec <= info.c
@@ -326,20 +326,20 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile arm    : vorbisidec <= misc.c
 [armeabi-v7a] Compile arm    : vorbisidec <= mdct.c
 [armeabi-v7a] Compile arm    : vorbisidec <= res012.c
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_normalize.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_alias_reduction.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= AttachUtil.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_normalize.cpp
 [armeabi-v7a] Compile arm    : vorbisidec <= vorbisfile.c
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_alias_reduction.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_crc.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_decode_header.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_decode_huff_cw.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_getbits.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_dequantize_sample.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_framedecoder.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_get_main_data_size.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_framedecoder.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_get_side_info.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_get_scale_factors.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_mpeg2_get_scale_data.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_get_scale_factors.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_mpeg2_get_scale_factors.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_mpeg2_stereo_proc.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_huffman_decoding.cpp
@@ -351,25 +351,25 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_poly_phase_synthesis.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_equalizer.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_seek_synch.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_stereo_proc.cpp
 [armeabi-v7a] Compile arm    : pvmp3dec <= pvmp3_polyphase_filter_window_gcc.s
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_reorder.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_stereo_proc.cpp
 [armeabi-v7a] Compile arm    : pvmp3dec <= pvmp3_mdct_18_gcc.s
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_reorder.cpp
 [armeabi-v7a] Compile arm    : pvmp3dec <= pvmp3_dct_9_gcc.s
 [armeabi-v7a] Compile arm    : pvmp3dec <= pvmp3_dct_16_gcc.s
 [armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= CCDevice-android.cpp
-[armeabi-v7a] Compile thumb  : cpufeatures <= cpu-features.c
 [armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= CCFileUtils-android.cpp
+[armeabi-v7a] Compile thumb  : cpufeatures <= cpu-features.c
 [armeabi-v7a] StaticLibrary  : libextension.a
 [armeabi-v7a] StaticLibrary  : libaudioengine.a
 [armeabi-v7a] StaticLibrary  : libvorbisidec.a
-[armeabi-v7a] StaticLibrary  : libpvmp3dec.a
 [armeabi-v7a] StaticLibrary  : libcpufeatures.a
 [armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= JniHelper.cpp
+[armeabi-v7a] StaticLibrary  : libpvmp3dec.a
 [armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= CCApplication-android.cpp
-[armeabi-v7a] StaticLibrary  : libeditorsupport.a
 [armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= JniImp.cpp
-[armeabi-v7a] StaticLibrary  : libcocos2d.a
+[armeabi-v7a] StaticLibrary  : libeditorsupport.a
 [armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= CCCanvasRenderingContext2D-android.cpp
+[armeabi-v7a] StaticLibrary  : libcocos2d.a
 [armeabi-v7a] StaticLibrary  : libcocos2dandroid.a
 [armeabi-v7a] SharedLibrary  : libcocos2djs.so

BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/EasyEliminate-release.apk


BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/mk_framework-release.apk


+ 3 - 2
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/qsllx/wxapi/WXEntryActivity.java

@@ -166,8 +166,9 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
 
     //分享相关---------------------------------------------------------------------------------------
     /** 分享图 */
-    public void sharePic(){
-        Bitmap bmp = BitmapFactory.decodeResource(getResources(), R.drawable.send_img);
+    public void sharePic(Context context){
+        //如果这段代码放置在AppActivity中则不需要context 直接getResources()
+        Bitmap bmp = BitmapFactory.decodeResource(context.getResources(), R.drawable.send_img);
         WXImageObject imgObj = new WXImageObject(bmp);
 
         WXMediaMessage msg = new WXMediaMessage();

+ 2 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java

@@ -28,6 +28,7 @@ public class ThirdSdkMgr {
 
     public static void regToWx()
     {
+
         WXEntryActivity.getInstance().regToWx(ThirdSdkMgr.appActivity);
     }
 
@@ -45,7 +46,7 @@ public class ThirdSdkMgr {
     public static  void sharePic()
     {
         Log.d("=== Android","微信分享大图");
-        WXEntryActivity.getInstance().sharePic();
+        WXEntryActivity.getInstance().sharePic(ThirdSdkMgr.appActivity);
     }
 
     /**

Diff do ficheiro suprimidas por serem muito extensas
+ 456 - 125
build/jsb-link/js backups (useful for debugging)/main.index.js


+ 1 - 1
settings/project.json

@@ -36,6 +36,6 @@
       "enable": false
     }
   },
-  "last-module-event-record-time": 1623807966016,
+  "last-module-event-record-time": 1624417441258,
   "start-scene": "6f522a54-3e0e-404d-a06c-bec8b4307c95"
 }

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff