From 720d89e988df29af8d40be55e3c8be4816d315dd Mon Sep 17 00:00:00 2001
From: dy <askjjdk@153.com>
Date: Thu, 21 Dec 2023 17:33:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E8=A7=92=E7=9A=AE=E8=82=A4=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/shared/public/hero.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/shared/public/hero.ts b/src/shared/public/hero.ts
index 03a3c99..94af102 100644
--- a/src/shared/public/hero.ts
+++ b/src/shared/public/hero.ts
@@ -70,6 +70,14 @@ export class HeroShared {
                     }
                 }
             }
+
+            if (otherBuff.model) {
+                for (let [id, item] of Object.entries(otherBuff.model)) {
+                    if (item.time == -1 || item.time > G.time) {
+                        PublicShared.mergeProperty(buff, G.gc.playerModel[id].buff);
+                    }
+                }
+            }
         }
 
         //计算装备属性