Merge branch 'feature/weiwang' into dev

src/cross/protocols/serviceProto.ts

@@ -1316,6 +1316,20 @@ export const serviceProto: ServiceProto<ServiceType> = {
                         }
                     },
                     "optional": true
+                },
+                {
+                    "id": 38,
+                    "name": "weiwang",
+                    "type": {
+                        "type": "Interface",
+                        "indexSignature": {
+                            "keyType": "String",
+                            "type": {
+                                "type": "Number"
+                            }
+                        }
+                    },
+                    "optional": true
                 }
             ]
         },

src/monopoly/protocols/serviceProto.ts

@@ -2637,6 +2637,20 @@ export const serviceProto: ServiceProto<ServiceType> = {
                         }
                     },
                     "optional": true
+                },
+                {
+                    "id": 38,
+                    "name": "weiwang",
+                    "type": {
+                        "type": "Interface",
+                        "indexSignature": {
+                            "keyType": "String",
+                            "type": {
+                                "type": "Number"
+                            }
+                        }
+                    },
+                    "optional": true
                 }
             ]
         },

src/shared/protocols/serviceProto.ts

@@ -4585,6 +4585,20 @@ export const serviceProto: ServiceProto<ServiceType> = {
                         }
                     },
                     "optional": true
+                },
+                {
+                    "id": 38,
+                    "name": "weiwang",
+                    "type": {
+                        "type": "Interface",
+                        "indexSignature": {
+                            "keyType": "String",
+                            "type": {
+                                "type": "Number"
+                            }
+                        }
+                    },
+                    "optional": true
                 }
             ]
         },
@@ -5829,6 +5843,20 @@ export const serviceProto: ServiceProto<ServiceType> = {
                         }
                     },
                     "optional": true
+                },
+                {
+                    "id": 38,
+                    "name": "weiwang",
+                    "type": {
+                        "type": "Interface",
+                        "indexSignature": {
+                            "keyType": "String",
+                            "type": {
+                                "type": "Number"
+                            }
+                        }
+                    },
+                    "optional": true
                 }
             ]
         },
@@ -24380,6 +24408,20 @@ export const serviceProto: ServiceProto<ServiceType> = {
                         }
                     },
                     "optional": true
+                },
+                {
+                    "id": 38,
+                    "name": "weiwang",
+                    "type": {
+                        "type": "Interface",
+                        "indexSignature": {
+                            "keyType": "String",
+                            "type": {
+                                "type": "Number"
+                            }
+                        }
+                    },
+                    "optional": true
                 }
             ]
         },

src/shared/protocols/user/PtlLogin.ts

@@ -193,4 +193,6 @@ export type playerAppend = {
     chatFrames?: {
         [id: string]: number;
     };
+    /**威望额外属性*/
+    weiwang?: { [k: string]: number };
 };

src/shared/public/hero.ts

@@ -278,6 +278,11 @@ export class HeroShared {
             }
         }
 
+        // 威望加成计算
+        if (otherBuff?.weiwang) {
+            PublicShared.mergeProperty(buff, otherBuff?.weiwang || {});
+        }
+
         //最后进行加成属性计算
         for (let k in buff) {
             if (k.indexOf('pro') == -1) continue;