From 2e956765fdbd19d8b8fc4c97f30732d2afcff4af Mon Sep 17 00:00:00 2001
From: shangfengh <3495281661@qq.com>
Date: Mon, 3 Apr 2023 00:37:31 +0800
Subject: [PATCH] build: :construction: adjust the Rescue mechanism

---
 logic/GameClass/GameObj/Character/Skill.cs |  8 ++++----
 logic/Gaming/AttackManager.cs              |  3 ---
 logic/Gaming/CharacterManager .cs          | 16 +++++++++++++---
 logic/Preparation/Utility/GameData.cs      |  4 ++--
 logic/cmd/gameServer.cmd                   |  8 +++-----
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/logic/GameClass/GameObj/Character/Skill.cs b/logic/GameClass/GameObj/Character/Skill.cs
index 5bad9f6..3fcdded 100644
--- a/logic/GameClass/GameObj/Character/Skill.cs
+++ b/logic/GameClass/GameObj/Character/Skill.cs
@@ -5,8 +5,8 @@ namespace GameClass.GameObj
 {
     public class CanBeginToCharge : IActiveSkill
     {
-        public int SkillCD => GameData.commonSkillCD / 5;
-        public int DurationTime => GameData.commonSkillTime * 6 / 10;
+        public int SkillCD => GameData.commonSkillCD * 24 / 30;
+        public int DurationTime => GameData.commonSkillTime * 5 / 10;
 
         private readonly object commonSkillLock = new object();
         public object ActiveSkillLock => commonSkillLock;
@@ -65,8 +65,8 @@ namespace GameClass.GameObj
 
     public class JumpyBomb : IActiveSkill
     {
-        public int SkillCD => GameData.commonSkillCD / 25 * 5;
-        public int DurationTime => GameData.commonSkillTime / 2;
+        public int SkillCD => GameData.commonSkillCD / 2;
+        public int DurationTime => GameData.commonSkillTime * 3 / 10;
         private readonly object commonSkillLock = new object();
         public object ActiveSkillLock => commonSkillLock;
 
diff --git a/logic/Gaming/AttackManager.cs b/logic/Gaming/AttackManager.cs
index 98e3b5e..d07af70 100644
--- a/logic/Gaming/AttackManager.cs
+++ b/logic/Gaming/AttackManager.cs
@@ -105,10 +105,7 @@ namespace Gaming
                 if (bullet.TypeOfBullet == BulletType.BombBomb && objBeingShot != null)
                 {
                     bullet.Parent.BulletOfPlayer = BulletType.JumpyDumpty;
-                    Debugger.Output(bullet, "JumpyDumpty!");
-                    Attack((Character)bullet.Parent, bullet.FacingDirection.Angle());
                     Attack((Character)bullet.Parent, bullet.FacingDirection.Angle() + Math.PI);
-                    Attack((Character)bullet.Parent, bullet.FacingDirection.Angle() + Math.PI / 2.0);
                     Attack((Character)bullet.Parent, bullet.FacingDirection.Angle() + Math.PI * 3.0 / 2.0);
                 }
 
diff --git a/logic/Gaming/CharacterManager .cs b/logic/Gaming/CharacterManager .cs
index e877543..e432f41 100644
--- a/logic/Gaming/CharacterManager .cs	
+++ b/logic/Gaming/CharacterManager .cs	
@@ -203,12 +203,22 @@ namespace Gaming
                     return;
                 }
                 ghost.AddScore(GameData.TrickerScoreStudentBeAddicted);
+                if (player.GamingAddiction > 0)
+                {
+                    if (player.GamingAddiction < GameData.BeginGamingAddiction)
+                        player.GamingAddiction = GameData.BeginGamingAddiction;
+                    else if (player.GamingAddiction < GameData.MidGamingAddiction)
+                        player.GamingAddiction = GameData.MidGamingAddiction;
+                    else
+                    {
+                        ghost.AddScore(GameData.TrickerScoreStudentDie);
+                        Die(player);
+                    }
+                }
+                player.PlayerState = PlayerStateType.Addicted;
                 new Thread
                     (() =>
                     {
-                        if (player.GamingAddiction > GameData.BeginGamingAddiction && player.GamingAddiction < GameData.MidGamingAddiction)
-                            player.GamingAddiction = GameData.MidGamingAddiction;
-                        player.PlayerState = PlayerStateType.Addicted;
 #if DEBUG
                         Debugger.Output(player, " is addicted ");
 #endif
diff --git a/logic/Preparation/Utility/GameData.cs b/logic/Preparation/Utility/GameData.cs
index e556e86..7ef90e5 100644
--- a/logic/Preparation/Utility/GameData.cs
+++ b/logic/Preparation/Utility/GameData.cs
@@ -91,8 +91,8 @@ namespace Preparation.Utility
 
         public const int basicHp = 3000000;                             // 初始血量
         public const int basicMaxGamingAddiction = 60000;//基本完全沉迷时间
-        public const int BeginGamingAddiction = 10003;
-        public const int MidGamingAddiction = 30000;
+        public const int BeginGamingAddiction = 20900;
+        public const int MidGamingAddiction = 40300;
         public const int basicTreatmentDegree = 1500000;
         public const int basicTimeOfRescue = 1000;
 
diff --git a/logic/cmd/gameServer.cmd b/logic/cmd/gameServer.cmd
index f5ba89c..658db13 100644
--- a/logic/cmd/gameServer.cmd
+++ b/logic/cmd/gameServer.cmd
@@ -4,12 +4,10 @@ start cmd /k ..\Server\bin\Debug\net6.0\Server.exe --ip 0.0.0.0  --port 8888 --s
 
 ping -n 2 127.0.0.1 > NUL
 
-start cmd /k ..\Client\bin\Debug\net6.0-windows\Client.exe --cl --port 8888 --characterID 4 --type 2 --occupation 2
+start cmd /k ..\Client\bin\Debug\net6.0-windows\Client.exe --cl --port 8888 --characterID 0 --type 1 --occupation 1
 
-start cmd /k ..\Client\bin\Debug\net6.0-windows\Client.exe --cl --port 8888 --characterID 0 --type 1 --occupation 3
+start cmd /k ..\Client\bin\Debug\net6.0-windows\Client.exe --cl --port 8888 --characterID 1 --type 1 --occupation 2
 
-start cmd /k ..\Client\bin\Debug\net6.0-windows\Client.exe --cl --port 8888 --characterID 1 --type 1 --occupation 3
-
-start cmd /k ..\Client\bin\Debug\net6.0-windows\Client.exe --cl --port 8888 --characterID 2 --type 1 --occupation 3
+start cmd /k ..\Client\bin\Debug\net6.0-windows\Client.exe --cl --port 8888 --characterID 2 --type 1 --occupation 2
 
 start cmd /k ..\Client\bin\Debug\net6.0-windows\Client.exe --cl --port 8888 --characterID 3 --type 1 --occupation 3