xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.trgame.cn:zyztech/zyz_server into feature/normalBattle

Browse Source 
Conflicts:
	game-server/startGameServer.sh
	web-server/package.json
This commit is contained in:
luying
2020-09-14 10:55:46 +08:00
parent 0880f26aa1 47c902b931
commit b6725151d0
40 changed files with 145 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game-server/app.ts
View File

@@ -39,7 +39,7 @@ adminfilePath.ADMIN_USER = 'config/adminUser';
preload();
// 创建 mongodb 连接
mongoose.connect('mongodb://root:zyz_2020@dds-8vbdb47c6fb58a541.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdb47c6fb58a542.mongodb.zhangbei.rds.aliyuncs.com:3717/admin?replicaSet=mgset-500808098', { useNewUrlParser: true, useUnifiedTopology: true }, (err) => {
mongoose.connect('mongodb://dbop:zyzdbopbantu@dds-8vbdb47c6fb58a541.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdb47c6fb58a542.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-500808098', { useNewUrlParser: true, useUnifiedTopology: true }, (err) => {
if (err) {
console.log('mongodb connect err', err);
} else {

1
game-server/app/consts Symbolic link
View File

@@ -0,0 +1 @@
../../shared/consts

8
game-server/app/consts/consts.ts
View File

@@ -1,8 +0,0 @@
export const TURBO_CORE_URL = 'https://coresrv.tgamebox.cn';
export const APP_ID = 'AXaXmIHPs9eONvzrBesD8aSKQNXYdALF';
export const TURBO_PARM_SECRET = 'ipqw05du6ob4x130w89t31yrqd6xs005zzltcmg2zpqnvrjp1s';
export const ENCRYPT_IV = 'f7182j5f04e377ux';
export const ENCRYPT_KEY = 'fiqaxijabbantusmprc234fj';
export const AUTH_SMS_CNT_PER_DAY = 8;

1
game-server/app/db Symbolic link
View File

@@ -0,0 +1 @@
../../shared/db

12
game-server/app/servers/connector/handler/entryHandler.ts
View File

@@ -1,9 +1,9 @@
import { RoleModel } from '../../../../../shared/db/Role';
import { UserModel } from '../../../../../shared/db/User';
import { EquipModel } from './../../../db/Equip';
import { RoleModel } from './../../../db/Role';
import { UserModel } from '../../../db/User';
import { Application, Session } from 'pinus';
import {FrontendSession} from 'pinus';
import Hero from '../../../../../shared/db/Hero';
import Equip from '../../../../../shared/db/Equip';
import { HeroModel } from './../../../db/Hero';
export default function (app: Application) {
return new EntryHandler(app);
@@ -71,8 +71,8 @@ export class EntryHandler {
// put user into channel
let users = await self.app.rpc.chat.chatRemote.add.route(session)(role.roleId, self.app.get('serverId'), rid, true);
let heros = await Hero.findByRole(role.roleId);
let equips = await Equip.findbyRole(role.roleId);
let heros = await HeroModel.findByRole(role.roleId);
let equips = await EquipModel.findbyRole(role.roleId);
role['heros'] = heros;
role['equips'] = equips;
return {

6
game-server/app/servers/role/handler/roleHandler.ts
View File

@@ -1,6 +1,6 @@
import { CounterModel } from '../../../../../shared/db/Counter';
import { HeroModel } from '../../../../../shared/db/Hero';
import { EquipModel } from '../../../../../shared/db/Equip';
import { CounterModel } from '../../../db/Counter';
import { HeroModel } from '../../../db/Hero';
import { EquipModel } from '../../../db/Equip';
import {Application, BackendSession, createTcpMailBox} from 'pinus';
export default function(app: Application) {

61
game-server/package-lock.json generated
View File

@@ -31,9 +31,9 @@
}
},
"@typegoose/typegoose": {
"version": "7.3.0",
"resolved": "https://registry.npm.taobao.org/@typegoose/typegoose/download/@typegoose/typegoose-7.3.0.tgz",
"integrity": "sha1-Rp6ldTzFIP49D1xOVZsBpfsZHZM=",
"version": "7.3.5",
"resolved": "https://registry.npm.taobao.org/@typegoose/typegoose/download/@typegoose/typegoose-7.3.5.tgz",
"integrity": "sha1-94517zpL5R8DkYh55qjPDR/PecA=",
"requires": {
"lodash": "^4.17.19",
"loglevel": "^1.6.8",
@@ -63,7 +63,6 @@
"version": "4.0.2",
"resolved": "https://registry.npm.taobao.org/@types/bson/download/@types/bson-4.0.2.tgz",
"integrity": "sha1-esy4WUL8ObvbdRXU3kN8BPaYEV8=",
"dev": true,
"requires": {
"@types/node": "*"
}
@@ -90,20 +89,18 @@
}
},
"@types/mongodb": {
"version": "3.5.25",
"resolved": "https://registry.npm.taobao.org/@types/mongodb/download/@types/mongodb-3.5.25.tgz",
"integrity": "sha1-qxh9sE15+OPxWvI2Mn3JE52dRzY=",
"dev": true,
"version": "3.5.27",
"resolved": "https://registry.npm.taobao.org/@types/mongodb/download/@types/mongodb-3.5.27.tgz?cache=0&sync_timestamp=1599138259359&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fmongodb%2Fdownload%2F%40types%2Fmongodb-3.5.27.tgz",
"integrity": "sha1-FYp6Q84l7zWSrIpi5iqzi+v2YfI=",
"requires": {
"@types/bson": "*",
"@types/node": "*"
}
},
"@types/mongoose": {
"version": "5.7.35",
"resolved": "https://registry.npm.taobao.org/@types/mongoose/download/@types/mongoose-5.7.35.tgz?cache=0&sync_timestamp=1596698562534&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fmongoose%2Fdownload%2F%40types%2Fmongoose-5.7.35.tgz",
"integrity": "sha1-gzQUB2KAS4Q08bw+RSU0+qH/saY=",
"dev": true,
"version": "5.7.36",
"resolved": "https://registry.npm.taobao.org/@types/mongoose/download/@types/mongoose-5.7.36.tgz",
"integrity": "sha1-La4oxjBBxq+6ioPqApafRjs/ECE=",
"requires": {
"@types/mongodb": "*",
"@types/node": "*"
@@ -262,9 +259,9 @@
}
},
"bson": {
"version": "1.1.4",
"resolved": "https://registry.npm.taobao.org/bson/download/bson-1.1.4.tgz",
"integrity": "sha1-92hw15nxW4VN/7fuMvCodHl/fok="
"version": "1.1.5",
"resolved": "https://registry.npm.taobao.org/bson/download/bson-1.1.5.tgz?cache=0&sync_timestamp=1597069108497&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbson%2Fdownload%2Fbson-1.1.5.tgz",
"integrity": "sha1-Kqrpj832dQwISLDLod3sPHMGCjQ="
},
"buffer": {
"version": "5.6.0",
@@ -705,9 +702,9 @@
}
},
"lodash": {
"version": "4.17.19",
"resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.19.tgz?cache=0&sync_timestamp=1594227104529&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.19.tgz",
"integrity": "sha1-5I3e2+MLMyF4PFtDAfvTU7weSks="
"version": "4.17.20",
"resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.20.tgz?cache=0&sync_timestamp=1597336097104&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.20.tgz",
"integrity": "sha1-tEqbYpe8tpjxxRo1RaKzs2jVnFI="
},
"log4js": {
"version": "6.3.0",
@@ -722,9 +719,9 @@
}
},
"loglevel": {
"version": "1.6.8",
"resolved": "https://registry.npm.taobao.org/loglevel/download/loglevel-1.6.8.tgz",
"integrity": "sha1-iiX7ddCSIw7NRFcnDYC1TigBEXE="
"version": "1.7.0",
"resolved": "https://registry.npm.taobao.org/loglevel/download/loglevel-1.7.0.tgz?cache=0&sync_timestamp=1598447642950&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floglevel%2Fdownload%2Floglevel-1.7.0.tgz",
"integrity": "sha1-coFmhVp0DVnTjbAc9G8ELKoEG7A="
},
"make-error": {
"version": "1.3.6",
@@ -773,9 +770,9 @@
}
},
"mongodb": {
"version": "3.5.10",
"resolved": "https://registry.npm.taobao.org/mongodb/download/mongodb-3.5.10.tgz",
"integrity": "sha1-7UFJiNKTW1KQBM6tbf3SJoEliIc=",
"version": "3.6.1",
"resolved": "https://registry.npm.taobao.org/mongodb/download/mongodb-3.6.1.tgz",
"integrity": "sha1-LFzCqBRWuhg+jEMtgOeHMsxy2r0=",
"requires": {
"bl": "^2.2.0",
"bson": "^1.1.4",
@@ -786,9 +783,9 @@
},
"dependencies": {
"bl": {
"version": "2.2.0",
"resolved": "https://registry.npm.taobao.org/bl/download/bl-2.2.0.tgz?cache=0&sync_timestamp=1584503263385&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbl%2Fdownload%2Fbl-2.2.0.tgz",
"integrity": "sha1-4aV0zfUo5AUwGbuACwQcCsiNpJM=",
"version": "2.2.1",
"resolved": "https://registry.npm.taobao.org/bl/download/bl-2.2.1.tgz?cache=0&sync_timestamp=1599194088618&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbl%2Fdownload%2Fbl-2.2.1.tgz",
"integrity": "sha1-jBGntzBlXF1WiYzchxIk9A/ZAdU=",
"requires": {
"readable-stream": "^2.3.5",
"safe-buffer": "^5.1.1"
@@ -797,13 +794,13 @@
}
},
"mongoose": {
"version": "5.9.27",
"resolved": "https://registry.npm.taobao.org/mongoose/download/mongoose-5.9.27.tgz?cache=0&sync_timestamp=1596210635108&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmongoose%2Fdownload%2Fmongoose-5.9.27.tgz",
"integrity": "sha1-kUy8KkVFIJNPu/LA42bZx9gHazs=",
"version": "5.10.4",
"resolved": "https://registry.npm.taobao.org/mongoose/download/mongoose-5.10.4.tgz",
"integrity": "sha1-CVGSYZmCQ95H7XLtKNyMOtv2qRA=",
"requires": {
"bson": "^1.1.4",
"kareem": "2.3.1",
"mongodb": "3.5.10",
"mongodb": "3.6.1",
"mongoose-legacy-pluralize": "1.0.2",
"mpath": "0.7.0",
"mquery": "3.2.2",
@@ -1308,7 +1305,7 @@
},
"sift": {
"version": "7.0.1",
"resolved": "https://registry.npm.taobao.org/sift/download/sift-7.0.1.tgz?cache=0&sync_timestamp=1594916082498&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsift%2Fdownload%2Fsift-7.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/sift/download/sift-7.0.1.tgz",
"integrity": "sha1-R9YsULFZ0xbxNy+LU/nBDNIaSwg="
},
"sliced": {

6
game-server/package.json
View File

@@ -13,14 +13,15 @@
"gen-api-ref": "node ../../../node_modules/typedoc/bin/typedoc --mode file --hideGenerator --excludeExternals --ignoreCompilerErrors --out ../../../run/site/public/api-reference/pinus-loader lib/"
},
"dependencies": {
"@typegoose/typegoose": "^7.3.0",
"@typegoose/typegoose": "^7.3.5",
"@types/bluebird": "^3.5.19",
"@types/crc": "^3.4.0",
"@types/mongoose": "^5.7.36",
"@types/node": "8.10.54",
"@types/redis": "^2.8.25",
"bluebird": "^3.5.1",
"crc": "^3.5.0",
"mongoose": "^5.9.27",
"mongoose": "^5.10.4",
"pinus": "^1.4.9",
"pinus-robot": "^1.4.9",
"pinus-robot-plugin": "^1.4.9",
@@ -30,7 +31,6 @@
"ts-node": "^8.2.0"
},
"devDependencies": {
"@types/mongoose": "^5.7.35",
"tslint": "^5.9.1",
"typescript": "^3.9.7"
}

3
game-server/setEnv.sh
View File

@@ -1,3 +0,0 @@
npm i -D @types/mongoose
npm i -s @typegoose/typegoose
npm i -s mongoose

5
game-server/startGameServer.sh
View File

@@ -2,7 +2,6 @@
cnpm install -d #安装依赖库
npm run build
node generatePm2Config.js #使用pm2来做进程管理，生成进程配置文件
rm -rf /game-server/shared
cp -r /game-server/dist/shared /game-server
cp -r /game-server/config/resource /game-server/dist/game-server/config
#rm -rf /game-server/shared
#cp -r /game-server/dist/shared /game-server
pm2-runtime pomeloPm2Start.json #pm2 启动游戏服务器

1
game-server/tsconfig.json
View File

@@ -24,7 +24,6 @@
"watch":false //在监视模式下运行编译器。会监视输出文件，在它们改变时重新编译。
},
"include":[
"../shared/**/*.ts",
"./app/**/*.ts",
"./config/**/*.ts",
"./app.ts",