Merge pull request #399 from Panxuc/dev

DragonAura · web-flow · commit 3e201cf3eb34 · 2024-05-24T21:12:29.000+08:00
fix: 🐛 factory die too many times
diff --git a/logic/GameClass/GameObj/Areas/Construction.cs b/logic/GameClass/GameObj/Areas/Construction.cs
@@ -63,16 +63,17 @@ public bool Construct(int constructSpeed, ConstructionType constructionType, Shi
     }
     public bool BeAttacked(Bullet bullet)
     {
+        var previousActivated = IsActivated.Get();
         if (bullet!.Parent!.TeamID != TeamID)
         {
             long subHP = bullet.AP;
             HP.SubPositiveV(subHP);
         }
-        if (HP == 0)
+        if (HP.IsBelowMaxTimes(0.5))
         {
             IsActivated.Set(false);
         }
-        return HP.IsBelowMaxTimes(0.5);
+        return HP.IsBelowMaxTimes(0.5) && previousActivated;
     }
     public void AddConstructNum(int add = 1)
     {

Original file line number	Diff line number	Diff line change
`@@ -63,16 +63,17 @@ public bool Construct(int constructSpeed, ConstructionType constructionType, Shi`
`63`	`63`	`}`
`64`	`64`	`public bool BeAttacked(Bullet bullet)`
`65`	`65`	`{`
	`66`	`+ var previousActivated = IsActivated.Get();`
`66`	`67`	`if (bullet!.Parent!.TeamID != TeamID)`
`67`	`68`	`{`
`68`	`69`	`long subHP = bullet.AP;`
`69`	`70`	`HP.SubPositiveV(subHP);`
`70`	`71`	`}`
`71`		`- if (HP == 0)`
	`72`	`+ if (HP.IsBelowMaxTimes(0.5))`
`72`	`73`	`{`
`73`	`74`	`IsActivated.Set(false);`
`74`	`75`	`}`
`75`		`- return HP.IsBelowMaxTimes(0.5);`
	`76`	`+ return HP.IsBelowMaxTimes(0.5) && previousActivated;`
`76`	`77`	`}`
`77`	`78`	`public void AddConstructNum(int add = 1)`
`78`	`79`	`{`