Merge branch 'dev' into tap

Gameserver/App/process/UserProc.php

@@ -42,40 +42,39 @@ class UserProc {
             case CmdCode::user_rename:                                          # 6010 改名
                 return self::ReName();
             case CmdCode::cmd_user_completeNewbieGuide:                         # 6011 新手引导更新
-                return self::completeNewbieGuide();    
+                return self::completeNewbieGuide();
             case CmdCode::cmd_user_clearGuideInfo:                              # 6012 清理引导记录
                 return self::clearGuideInfo();
             default:
                 Err(ErrCode::cmd_err);
         }
     }
-    
-    public static function clearGuideInfo(){
+
+    public static function clearGuideInfo() {
         list($id) = req()->paras;                                               # 参数:引导模块
-                                      
 //        if(in_array($id,ctx()->privateState->funUnlockRecord_3)){
 //            StlUtil::arrayRemove(ctx()->privateState->funUnlockRecord_3, $id); 
 //        }
-                   
+
         UserProc::updateUserInfo();                                             # 回写数据
         return Resp::ok(array());
     }
-    
+
     /**
      * 更新新手引导阶段步骤   
      */
     public static function completeNewbieGuide() {
-        list($guideType,$guide_type_forceSave) = req()->paras;                                       # 参数: 新手引导步骤
-                                        
+        list($guideType, $guide_type_forceSave) = req()->paras;                                       # 参数: 新手引导步骤
+
         ctx()->base(true)->guide_type = $guideType;
-        
-        $forceSave = $guide_type_forceSave == true?1:0;
+
+        $forceSave = $guide_type_forceSave == true ? 1 : 0;
         ctx()->base(true)->guide_type_forceSave = $forceSave;
-               
-        if(in_array($guideType,ctx()->privateState->funUnlockRecord_3) && $guide_type_forceSave==true){
-            StlUtil::arrayRemove(ctx()->privateState->funUnlockRecord_3, $guideType); 
+
+        if (in_array($guideType, ctx()->privateState->funUnlockRecord_3) && $guide_type_forceSave == true) {
+            StlUtil::arrayRemove(ctx()->privateState->funUnlockRecord_3, $guideType);
         }
-        
+
         UserProc::updateUserInfo();                                             # 回写数据
         return Resp::ok(array());
     }
@@ -396,8 +395,8 @@ class UserProc {
             UserProc::checkContidays();                                         # 连续登录,状态检查
             //PayProc::m_refreshChargeOrders();                                   # 刷新订单, 多平台版本
             PayProc::selfhelpCheckOrders();
-            PayProc::checkDeltest();                                            # 检查内侧充值记录(函数内部会只检查一次)
-            //self::checkMissOrder();                                             #校验是否有漏单
+//            PayProc::checkDeltest();                                            # 检查内侧充值记录(函数内部会只检查一次)
+//            self::checkMissOrder();                                             #校验是否有漏单
             $game->RegenNewToken();
             UserProc::updateUserInfo();                                         # 这一步回存操作只有在 userInfo正常存在的情况下才进行