Merge branch 'dev' of GameCenter/game-center into master

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/GameBackApplication.java

@@ -18,7 +18,7 @@ public class GameBackApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(GameBackApplication.class, args);
-        System.out.println("角色新手引导回传bug修改 ( ´･･)ﾉ(._.`)  \n" +
+        System.out.println("角色新手引导回传bug, 判定条件修改 ( ´･･)ﾉ(._.`)  \n" +
                 " ______  __     __     \n" +
                 "/_____/\\/__/\\ /__/\\    \n" +
                 "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TencentMiniGameBackRpcImpl.java

@@ -149,7 +149,8 @@ public class TencentMiniGameBackRpcImpl implements ITencentMiniGameBackRpc {
                 if (!Objects.equals(oldRole.getTutorialFinishBackStatus(), BackStatusEnum.SUCCESS.getBackStatus())) {
                     //回传策略
                     GameBackPolicy gameBackPolicy = oldRole.getBackPolicyId() == null ? null : gameBackPolicyService.getById(roleRegisterLog.getBackPolicyId());
-                    //新手引导回传
+                    //新手引导回传, 设置最新等级
+                    oldRole.setRoleLevel(dto.getRoleLevel());
                     gameTencentMiniGameRoleRegisterService.tutorialFinishBack(oldRole, gameBackPolicy);
                 }
                 // 创角已回传, 不重复执行回传

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentMiniGameRoleRegisterServiceImpl.java

@@ -188,11 +188,11 @@ public class GameTencentMiniGameRoleRegisterServiceImpl extends ServiceImpl<Game
         }
         TutorialFinish tutorialFinish = JsonUtil.toObj(gameBackPolicy.getTutorialFinishJson(), TutorialFinish.class);
         //条件设置为空, 不回传
-        if (tutorialFinish == null) {
+        if (tutorialFinish == null || tutorialFinish.getRoleLevel() == null) {
             return;
         }
         //不满足等级条件判断, 不回传
-        if (tutorialFinish.getRoleLevel() != null && tutorialFinish.getRoleLevel() < gameBackPolicy.getRoleLevelMin()) {
+        if (roleRegisterLog.getRoleLevel() < tutorialFinish.getRoleLevel()) {
             return;
         }
         //执行完成新手引导回传