Merge branch 'feature/weiwang' into dev
This commit is contained in:
commit
e2df48498a
@ -1319,7 +1319,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 38,
|
"id": 38,
|
||||||
"name": "weiwang",
|
"name": "weiwangbuff",
|
||||||
"type": {
|
"type": {
|
||||||
"type": "Interface",
|
"type": "Interface",
|
||||||
"indexSignature": {
|
"indexSignature": {
|
||||||
|
@ -2640,7 +2640,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 38,
|
"id": 38,
|
||||||
"name": "weiwang",
|
"name": "weiwangbuff",
|
||||||
"type": {
|
"type": {
|
||||||
"type": "Interface",
|
"type": "Interface",
|
||||||
"indexSignature": {
|
"indexSignature": {
|
||||||
|
@ -106,7 +106,7 @@ export class FightFun {
|
|||||||
if (["tanxian"].indexOf(type) != -1) {
|
if (["tanxian"].indexOf(type) != -1) {
|
||||||
// 威望buff
|
// 威望buff
|
||||||
let weiwang = await G.mongodb.collection("weiwang").findOne({ uid: call.uid });
|
let weiwang = await G.mongodb.collection("weiwang").findOne({ uid: call.uid });
|
||||||
ext_buff["weiwang"] = weiwang?.buff ? weiwang.buff : { "atk": 0, "def": 0, "hp": 0 };
|
ext_buff["weiwangbuff"] = weiwang?.buff ? weiwang.buff : { "atk": 0, "def": 0, "hp": 0 };
|
||||||
}
|
}
|
||||||
|
|
||||||
let my = data || await call.conn.getDefaultFightData(undefined, ext_buff);
|
let my = data || await call.conn.getDefaultFightData(undefined, ext_buff);
|
||||||
|
@ -4588,7 +4588,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 38,
|
"id": 38,
|
||||||
"name": "weiwang",
|
"name": "weiwangbuff",
|
||||||
"type": {
|
"type": {
|
||||||
"type": "Interface",
|
"type": "Interface",
|
||||||
"indexSignature": {
|
"indexSignature": {
|
||||||
@ -5846,7 +5846,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 38,
|
"id": 38,
|
||||||
"name": "weiwang",
|
"name": "weiwangbuff",
|
||||||
"type": {
|
"type": {
|
||||||
"type": "Interface",
|
"type": "Interface",
|
||||||
"indexSignature": {
|
"indexSignature": {
|
||||||
@ -24447,7 +24447,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 38,
|
"id": 38,
|
||||||
"name": "weiwang",
|
"name": "weiwangbuff",
|
||||||
"type": {
|
"type": {
|
||||||
"type": "Interface",
|
"type": "Interface",
|
||||||
"indexSignature": {
|
"indexSignature": {
|
||||||
|
@ -194,5 +194,5 @@ export type playerAppend = {
|
|||||||
[id: string]: number;
|
[id: string]: number;
|
||||||
};
|
};
|
||||||
/**威望额外属性*/
|
/**威望额外属性*/
|
||||||
weiwang?: { [k: string]: number };
|
weiwangbuff?: { [k: string]: number };
|
||||||
};
|
};
|
Loading…
Reference in New Issue
Block a user