From 1236cd5f998940f7c149542b2ad2056c1bb33993 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Thu, 26 May 2022 20:15:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9B=E5=9B=A2=E6=B4=BB=E5=8A=A8=EF=BC=9A?=
 =?UTF-8?q?=E7=B2=AE=E8=8D=89=E5=85=88=E8=A1=8C=E7=B2=BE=E5=BA=A6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/servers/connector/filter/global.ts | 9 +++++----
 game-server/app/util/routeUtil.ts                  | 1 +
 shared/domain/battleField/guildActivity.ts         | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/game-server/app/servers/connector/filter/global.ts b/game-server/app/servers/connector/filter/global.ts
index 5c09bac0f..ced1c5542 100644
--- a/game-server/app/servers/connector/filter/global.ts
+++ b/game-server/app/servers/connector/filter/global.ts
@@ -155,10 +155,6 @@ Filter.prototype.before = async function (routeRecord: RouteRecord, msg: any, se
             case 'guild.guildHandler.createGuild':
             case 'guild.guildHandler.setGuildInfo':
                 {
-                    if(!guildCode) {
-                        guildCode = genCode(6);
-                        msg.guildCode = guildCode;
-                    }
                     let result = await checkGuildName(guildCode, serverId, msg.name, msg.notice);
                     if(!result) hasBlockWords = true; 
                     break;
@@ -166,6 +162,11 @@ Filter.prototype.before = async function (routeRecord: RouteRecord, msg: any, se
         }
     }
 
+    if(routeRecord.route == 'guild.guildHandler.createGuild') {
+        let guildCode = genCode(6);
+        msg.guildCode = guildCode;
+    }
+
     if(hasBlockWords) return next(new Error('globalFilter'), resResult(STATUS.BLOCK_WORDS));
 
     next(null);
diff --git a/game-server/app/util/routeUtil.ts b/game-server/app/util/routeUtil.ts
index 24130f000..273ab9b98 100644
--- a/game-server/app/util/routeUtil.ts
+++ b/game-server/app/util/routeUtil.ts
@@ -53,6 +53,7 @@ export function guild(session: Session, msg: any, app: Application, cb: (err: Er
 
     let rid = session.get('roleId');
 
+    console.log('#### arg', msg.args);
     if (msg.args && msg.args.length > 0) {
         for (let arg of msg.args) {
             if (!arg.route) continue;
diff --git a/shared/domain/battleField/guildActivity.ts b/shared/domain/battleField/guildActivity.ts
index ae4513d85..12323cb3e 100644
--- a/shared/domain/battleField/guildActivity.ts
+++ b/shared/domain/battleField/guildActivity.ts
@@ -351,9 +351,10 @@ export class RaceActivityRankParam {
         this.code = woodenHorse.guildCode;
         this.name = woodenHorse.guildName;
         this.durability = woodenHorse.durability;
-        this.sortDistance = woodenHorse.distance
+        let distance = woodenHorse.distance > 1000? 1000: woodenHorse.distance;
+        this.sortDistance = distance;
         this.sortTime = woodenHorse.time - woodenHorse.allStartTime;
-        this.num = Math.floor(woodenHorse.distance);
+        this.num = Math.floor(distance);
         this.time = Math.floor((woodenHorse.time - woodenHorse.allStartTime)/1000)
     }