Merge branch 'bugfix' into dev

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);
+                    }
+                }
+            }
         }
 
         //计算装备属性