Merge branch 'master' into feature/backend

# Conflicts:
#	game-server/app/servers/connector/filter/global.ts

game-server/app/servers/activity/handler/dailyCoinHandler.ts

@@ -128,7 +128,7 @@ export class DailyCoinHandler {
         //免费期间
         let time = moment(new Date()).valueOf();
         let result = await addReward(roleId, roleName, sid, serverId, newReward)
-        await ActivityDailyCoinModel.addExchangeRecord(serverId, activityId, roleId, playerData.beginTime, count, addCoin, `${count}&${consumeGold}&${addCoin}&${time}`);
+        await ActivityDailyCoinModel.addExchangeRecord(serverId, activityId, roleId, playerData.roundIndex, count, addCoin, `${count}&${consumeGold}&${addCoin}&${time}`);
 
         let exchangeCount = playerData.exchangeCount + count;
         return resResult(STATUS.SUCCESS, Object.assign(result, {

game-server/app/servers/activity/handler/dailyMealHandler.ts

@@ -52,7 +52,7 @@ export class DailyMealHandler {
         const serverId = session.get('serverId');
         const sid = session.get('sid');
         const roleName = session.get('roleName');
-        
+
 
         let playerData = await getPlayerDailyMealData(activityId, serverId, roleId)
         if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
@@ -77,7 +77,7 @@ export class DailyMealHandler {
         //免费期间
         let rewardParamArr: Array<RewardParam> = stringToRewardParam(itemData.reward);
         let result = await addReward(roleId, roleName, sid, serverId, rewardParamArr)
-        await ActivityDailyMealModel.addReceiveRecord(serverId, activityId, roleId, type, curDate);
+        await ActivityDailyMealModel.addReceiveRecord(serverId, activityId, roleId, type, curDate, playerData.roundIndex);
         itemData.isReceive = true;
         return resResult(STATUS.SUCCESS, Object.assign(result, {
             param: { activityId, type },

game-server/app/servers/connector/filter/global.ts

@@ -3,7 +3,7 @@ import {Application, RouteRecord, FrontendOrBackendSession, HandlerCallback, pin
 import { refresh } from '../../../services/refreshService';
 import { checkPrivateChat, checkGuildChat, checkOtherChat, checkRoleName, checkGuildName } from "../../../services/sdkService";
 import { resResult, checkWhiteListWithUid, genCode } from "../../../pubUtils/util";
-import { BLOCK_TYPE, CHANNEL_PREFIX, STATUS } from "../../../consts";
+import { BLOCK_TYPE, CHANNEL_PREFIX, MSG_TYPE, STATUS } from "../../../consts";
 import { UserModel } from "../../../db/User";
 import { SERVER_DEBUG_MODE } from "../../../pubUtils/dicParam";
 export function globalFilter(app: Application) {
@@ -51,12 +51,14 @@ Filter.prototype.before = async function (routeRecord: RouteRecord, msg: any, se
         switch(routeRecord.route) {
             case 'chat.chatHandler.sendPrivateMessage':
                 {
+                    if(msg.type == MSG_TYPE.IMG) break;
                     let result = await checkPrivateChat(roleId, msg.targetRoleId, msg.content);
                     if(!result) hasBlockWords = true; 
                     break;
                 }
             case 'chat.chatHandler.sendGroupMessage':
                 {
+                    if(msg.type == MSG_TYPE.IMG) break;
                     if(msg.channel == CHANNEL_PREFIX.GUILD) {
                         let result = await checkGuildChat(roleId, guildCode, msg.content);
                         if(!result) hasBlockWords = true; 

game-server/app/servers/role/handler/roleHandler.ts

@@ -26,7 +26,7 @@ import { getActivities } from '../../../services/activity/activityService';
 import * as dicParam from '../../../pubUtils/dicParam';
 import Counter from '../../../db/Counter';
 import { UserModel } from '../../../db/User';
-import { checkFilterWords, reportTAEvent } from '../../../services/sdkService';
+import { checkFilterWords, reportTAEvent, treatRoleName } from '../../../services/sdkService';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -614,4 +614,16 @@ export class RoleHandler {
         return resResult(STATUS.SUCCESS);
 
     }
+
+    async debugTreatRoleName(msg: { magicWord: string }, session: BackendSession) {
+        let roleId: string = session.get('roleId');
+
+        let { magicWord } = msg;
+        if (magicWord !== DEBUG_MAGIC_WORD) {
+            return resResult(STATUS.TOKEN_ERR);
+        }
+
+        await treatRoleName(roleId, true);
+        return resResult(STATUS.SUCCESS);
+    }
 }