创建公会

game-server/app/servers/battle/handler/dailyBattleHandler.ts

@@ -1,12 +1,13 @@
 import { Application, BackendSession } from 'pinus';
 import { DailyRecordModel } from '../../../db/DailyRecord';
 import { getGamedata } from '../../../pubUtils/gamedata';
-import { GOLD_COST_RATIO, CURRENCY_BY_TYPE, CURRENCY_TYPE } from '../../../consts';
+import { GOLD_COST_RATIO } from '../../../consts';
 import { STATUS } from '../../../consts/statusCode';
 import { resResult, calculateNum } from '../../../pubUtils/util';
 import { RoleModel } from '../../../db/Role';
 import { getDailyNum } from '../../../services/dailyBattleService';
 import { handleCost } from '../../../services/rewardService';
+import { getGoldObject } from '../../../pubUtils/itemUtils';
 
 export default function(app: Application) {
     return new DailyBattleHandler(app);
@@ -91,7 +92,7 @@ export class DailyBattleHandler {
             return resResult(STATUS.DAILY_REFRESH_GOLD_LACK);
         }
 
-        await handleCost(roleId, sid, [{id: CURRENCY_BY_TYPE.get(CURRENCY_TYPE.GOLD), count: buyCost}]);
+        await handleCost(roleId, sid, [getGoldObject(buyCost)]);
         let newDailyRecord = await DailyRecordModel.increseBuyCount(roleId, type, count);
 
         let checkDailyResult = await getDailyNum(newDailyRecord, timesPerDay, timesCanBuy);

game-server/app/servers/battle/handler/dungeonBattleHandler.ts

@@ -1,9 +1,10 @@
 import { Application, BackendSession } from 'pinus';
-import { GOLD_COST_RATIO, DUNGEON_CONST, CURRENCY_TYPE, CURRENCY_BY_TYPE } from '../../../consts';
+import { GOLD_COST_RATIO, DUNGEON_CONST } from '../../../consts';
 import { STATUS } from '../../../consts/statusCode';
 import { resResult, calculateNum, shouldRefresh } from '../../../pubUtils/util';
 import { RoleModel } from '../../../db/Role';
 import { handleCost } from '../../../services/rewardService';
+import { getGoldObject } from '../../../pubUtils/itemUtils';
 
 export default function(app: Application) {
     return new DungeonBattleHandler(app);
@@ -62,7 +63,7 @@ export class DungeonBattleHandler {
         if(buyCost > gold) {
             return resResult(STATUS.DAILY_REFRESH_GOLD_LACK);
         }
-        await handleCost(roleId, sid, [{id: CURRENCY_BY_TYPE.get(CURRENCY_TYPE.GOLD), count: buyCost}]);
+        await handleCost(roleId, sid, [getGoldObject(buyCost)]);
         await RoleModel.buyCnt(roleId, needRefresh, count, curTime);
 
         let nextCostGold = calculateNum(GOLD_COST_RATIO.DUNGRON_BUY_NUM, {num: dungeonBuyCnt + count + 1 }, 50);

game-server/app/servers/battle/handler/guildHandler.ts

@@ -1,8 +1,15 @@
-import {Application, BackendSession, pinus} from 'pinus';
+import { Application, BackendSession, pinus } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
-import { STATUS } from '../../../consts';
+import { STATUS, GUILD_OPERATE, GUILD_AUTH, GUILD_JOB } from '../../../consts';
+import { UserGuildModel } from '../../../db/UserGuild';
+import { checkAuth } from '../../../services/guildService';
+import { GuildModel } from '../../../db/Guild';
+import { RoleModel } from '../../../db/Role';
+import { GUILD } from '../../../pubUtils/dicParam';
+import { handleCost } from '../../../services/rewardService';
+import { getGoldObject } from '../../../pubUtils/itemUtils';
 
-export default function(app: Application) {
+export default function (app: Application) {
     return new GuildHandler(app);
 }
 
@@ -11,13 +18,46 @@ export class GuildHandler {
     }
 
     //TODO创建军团
-    async createGuild() {
+    async createGuild(msg: { name: string, icon: number, notice: string }, session: BackendSession) {
 
+        const roleId = session.get('roleId');
+        const sid = session.get('sid');
+        const { name, icon, notice } = msg;
+
+        // 检查权限是否够，包括是否参过团
+        const { auth } = await UserGuildModel.getMyGuild(roleId);
+        const checkResult = checkAuth(GUILD_OPERATE.CREATE_GUILD, auth);
+        if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
+
+        // 检查名字是否重
+        const checkNameResult = await GuildModel.checkName(name);
+        if(checkNameResult) return resResult(STATUS.GUILD_NAME_DUP);
+
+        // 检查元宝是否够
+        const role = await RoleModel.findByRoleId(roleId);
+        if(GUILD.GUILD_CREATE_COST > role.gold) { // TODO 系统参数表字段更改
+            return resResult(STATUS.DAILY_REFRESH_GOLD_LACK);
+        }
+
+        await handleCost(roleId, sid, [getGoldObject(GUILD.GUILD_CREATE_COST)]);
+
+        // 创建公会
+        const guild = await GuildModel.createGuild({ name, icon, notice, leader: role._id, members: [roleId], ce: role.ce });
+        if(!guild) return resResult(STATUS.GUILD_CREATE_ERROR);
+        const userGuild = await UserGuildModel.createUserGuild({ guildCode: guild.code, roleId, role: role._id, guild: guild._id, auth: GUILD_AUTH.LEADER, job: GUILD_JOB.JIANGJUN });
+        if(!userGuild) return resResult(STATUS.GUILD_CREATE_ERROR);
+
+        // TODO 加入排行
+        const rank = 0;
+
+        // 返回
+        const result = { ...guild, rank, myInfo: {...userGuild}};
+        return resResult(STATUS.SUCCESS, result);
     }
 
     //TODO 获取军团列表
-    async getGuildList(msg: {page: number, showPeopleMax: boolean, name: string }, session: BackendSession) {
-        
+    async getGuildList(msg: { page: number, showPeopleMax: boolean, name: string }, session: BackendSession) {
+
         const list = [{
             code: "code",
             name: "name",

game-server/app/servers/battle/handler/towerBattleHandler.ts

@@ -1,5 +1,5 @@
 import { STATUS } from './../../../consts/statusCode';
-import { HANG_UP_CONSTS, GOLD_COST_RATIO, TOWER_TASK_CONST, REDIS_KEY, CURRENCY_BY_TYPE, CURRENCY_TYPE } from './../../../consts';
+import { HANG_UP_CONSTS, GOLD_COST_RATIO, TOWER_TASK_CONST, REDIS_KEY } from './../../../consts';
 import { TowerTaskRecModel } from './../../../db/TowerTaskRec';
 import { HangUpSpdUpRecModel } from './../../../db/HangUpSpdUpRec';
 import { HangUpRecordModel } from './../../../db/HangUpRecord';
@@ -13,6 +13,7 @@ import { handleFixedReward, addItems, handleCost } from '../../../services/rewar
 import { checkBattleHeroes } from '../../../services/normalBattleService';
 import { getRank, setRank, initRank, existsRank } from '../../../services/redisService';
 import { RankParam } from '../../../pubUtils/interface';
+import { getGoldObject } from '../../../pubUtils/itemUtils';
 
 export default function(app: Application) {
     return new TowerBattleHandler(app);
@@ -135,7 +136,7 @@ export class TowerBattleHandler {
             return resResult(STATUS.TOWER_GOLD_NOT_ENOUGH);
         }
 
-        await handleCost(roleId, sid, [{id: CURRENCY_BY_TYPE.get(CURRENCY_TYPE.GOLD), count: costGold}])
+        await handleCost(roleId, sid, [getGoldObject(costGold)])
 
         const spdUpResult = await RoleModel.hangUpSpdUp(roleId, msg.speedUpCnt, curTime);
         if (!spdUpResult) {