Merge branch 'feature/weiwang' into dev

2024-01-04 17:17:28 +08:00 · 2024-01-04 17:17:28 +08:00 · e2df48498a
commit e2df48498a
parent 3c7985642e 42601c29fd
5 changed files with 7 additions and 7 deletions
--- a/src/cross/protocols/serviceProto.ts
+++ b/src/cross/protocols/serviceProto.ts
@ -1319,7 +1319,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                },
                {
                    "id": 38,
-                    "name": "weiwang",
+                    "name": "weiwangbuff",
                    "type": {
                        "type": "Interface",
                        "indexSignature": {
--- a/src/monopoly/protocols/serviceProto.ts
+++ b/src/monopoly/protocols/serviceProto.ts
@ -2640,7 +2640,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                },
                {
                    "id": 38,
-                    "name": "weiwang",
+                    "name": "weiwangbuff",
                    "type": {
                        "type": "Interface",
                        "indexSignature": {
--- a/src/public/fight.ts
+++ b/src/public/fight.ts
@ -106,7 +106,7 @@ export class FightFun {
        if (["tanxian"].indexOf(type) != -1) {
            // 威望buff
            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);
--- a/src/shared/protocols/serviceProto.ts
+++ b/src/shared/protocols/serviceProto.ts
@ -4588,7 +4588,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                },
                {
                    "id": 38,
-                    "name": "weiwang",
+                    "name": "weiwangbuff",
                    "type": {
                        "type": "Interface",
                        "indexSignature": {
@ -5846,7 +5846,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                },
                {
                    "id": 38,
-                    "name": "weiwang",
+                    "name": "weiwangbuff",
                    "type": {
                        "type": "Interface",
                        "indexSignature": {
@ -24447,7 +24447,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                },
                {
                    "id": 38,
-                    "name": "weiwang",
+                    "name": "weiwangbuff",
                    "type": {
                        "type": "Interface",
                        "indexSignature": {
--- a/src/shared/protocols/user/PtlLogin.ts
+++ b/src/shared/protocols/user/PtlLogin.ts
@ -194,5 +194,5 @@ export type playerAppend = {
        [id: string]: number;
    };
    /**威望额外属性*/
-    weiwang?: { [k: string]: number };
+    weiwangbuff?: { [k: string]: number };
 };